From 65a1dbd7faffb81ca0c0bf312e4f4e66ca02b0b1 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 12 Nov 2008 18:58:23 +0100 Subject: gnash: Build without ffmpeg Optionally depend on ffmpeg --- packages/gnash/gnash-minimal.inc | 7 ++++--- packages/gnash/gnash-minimal_0.8.2.bb | 2 +- packages/gnash/gnash-minimal_0.8.3.bb | 2 +- packages/gnash/gnash-minimal_cvs.bb | 2 +- packages/gnash/gnash.inc | 10 +++++----- packages/gnash/gnash_0.8.0.bb | 2 +- packages/gnash/gnash_0.8.1.bb | 2 +- packages/gnash/gnash_0.8.2.bb | 2 +- packages/gnash/gnash_0.8.3.bb | 2 +- 9 files changed, 16 insertions(+), 15 deletions(-) diff --git a/packages/gnash/gnash-minimal.inc b/packages/gnash/gnash-minimal.inc index 4f52322467..a8e5229f46 100644 --- a/packages/gnash/gnash-minimal.inc +++ b/packages/gnash/gnash-minimal.inc @@ -2,8 +2,8 @@ DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 featu HOMEPAGE = "http://www.gnu.org/software/gnash" LICENSE = "GPL-2" -DEPENDS = "virtual/libiconv virtual/libintl ffmpeg libtool agg libxml2 zlib boost jpeg pango curl freetype \ - ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}" +DEPENDS = "virtual/libiconv virtual/libintl libtool agg libxml2 zlib boost jpeg pango curl freetype \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'ffmpeg libmad', d)}" RRECOMMENDS_${PN} = "libltdl" SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2" @@ -28,8 +28,9 @@ EXTRA_OECONF="--enable-gui=gtk \ --disable-glext \ --disable-Xft \ --disable-expat \ - --enable-mad \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '--enable-mad', d)} \ --disable-gstreamer \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '--enable-media=ffmpeg', d)} \ --enable-media=ffmpeg \ --disable-plugin \ --disable-cygnal \ diff --git a/packages/gnash/gnash-minimal_0.8.2.bb b/packages/gnash/gnash-minimal_0.8.2.bb index ea99de1e39..81a97e3b7d 100644 --- a/packages/gnash/gnash-minimal_0.8.2.bb +++ b/packages/gnash/gnash-minimal_0.8.2.bb @@ -1,3 +1,3 @@ require gnash-minimal.inc -PR = "r3" +PR = "r4" diff --git a/packages/gnash/gnash-minimal_0.8.3.bb b/packages/gnash/gnash-minimal_0.8.3.bb index 237097b94a..6f78d94c10 100644 --- a/packages/gnash/gnash-minimal_0.8.3.bb +++ b/packages/gnash/gnash-minimal_0.8.3.bb @@ -1,6 +1,6 @@ require gnash-minimal.inc -PR = "r8" +PR = "r9" EXTRA_OECONF += " --without-included-ltdl \ --with-ltdl-include=${STAGING_INCDIR} \ diff --git a/packages/gnash/gnash-minimal_cvs.bb b/packages/gnash/gnash-minimal_cvs.bb index 7c36dbafff..e1eff37b88 100644 --- a/packages/gnash/gnash-minimal_cvs.bb +++ b/packages/gnash/gnash-minimal_cvs.bb @@ -1,7 +1,7 @@ require gnash-minimal.inc -PR = "r3" +PR = "r4" PV = "0.8.3+cvs${SRCDATE}" diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc index 59261e3121..f4c7c1338d 100644 --- a/packages/gnash/gnash.inc +++ b/packages/gnash/gnash.inc @@ -1,10 +1,10 @@ DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features" HOMEPAGE = "http://www.gnu.org/software/gnash" LICENSE = "GPL-2" -DEPENDS = "libtool ffmpeg gtk+ cairo libxml2 libsdl-mixer zlib boost jpeg pango curl freetype \ - ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}" +DEPENDS = "libtool gtk+ cairo libxml2 libsdl-mixer zlib boost jpeg pango curl freetype \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'ffmpeg libmad', d)}" -PR = "r3" +PR = "r4" SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \ " @@ -13,14 +13,14 @@ inherit autotools pkgconfig EXTRA_OECONF = "--enable-gui=gtk \ --enable-renderer=cairo \ - --enable-media=ffmpeg \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '--enable-media=ffmpeg', d)} \ --disable-klash \ --enable-z \ --enable-jpeg \ --disable-glext \ --enable-Xft \ --enable-expat \ - --enable-mad \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '--enable-mad', d)} \ --enable-cairo \ --enable-plugin \ --disable-cygnal \ diff --git a/packages/gnash/gnash_0.8.0.bb b/packages/gnash/gnash_0.8.0.bb index d9dc87a417..e809525606 100644 --- a/packages/gnash/gnash_0.8.0.bb +++ b/packages/gnash/gnash_0.8.0.bb @@ -1,3 +1,3 @@ require gnash.inc -PR = "r1" +PR = "r2" diff --git a/packages/gnash/gnash_0.8.1.bb b/packages/gnash/gnash_0.8.1.bb index d9dc87a417..e809525606 100644 --- a/packages/gnash/gnash_0.8.1.bb +++ b/packages/gnash/gnash_0.8.1.bb @@ -1,3 +1,3 @@ require gnash.inc -PR = "r1" +PR = "r2" diff --git a/packages/gnash/gnash_0.8.2.bb b/packages/gnash/gnash_0.8.2.bb index d9dc87a417..e809525606 100644 --- a/packages/gnash/gnash_0.8.2.bb +++ b/packages/gnash/gnash_0.8.2.bb @@ -1,3 +1,3 @@ require gnash.inc -PR = "r1" +PR = "r2" diff --git a/packages/gnash/gnash_0.8.3.bb b/packages/gnash/gnash_0.8.3.bb index 9afde70d98..1b36f30af0 100644 --- a/packages/gnash/gnash_0.8.3.bb +++ b/packages/gnash/gnash_0.8.3.bb @@ -1,6 +1,6 @@ require gnash.inc -PR = "r4" +PR = "r5" EXTRA_OECONF += " --without-included-ltdl \ --with-ltdl-include=${STAGING_INCDIR} \ -- cgit 1.2.3-korg