gnash: Build without ffmpeg

    Optionally depend on ffmpeg

diff --git a/packages/gnash/gnash-minimal.inc b/packages/gnash/gnash-minimal.inc
index 4f523224671ef2f93362bf4a75c98b2564557d70..a8e5229f46bb6c2c87b10e899cff7afe0f4443d7 100644 (file)
--- 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 ea99de1e39eb7dbfe16b15b5241bb1a9df91b433..81a97e3b7d8fe3eb2dec9c0cad7d1893f3722b92 100644 (file)
--- 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 237097b94ae823d2bf41f6b8b084316b4ad8a8ef..6f78d94c10a60311d0faf83b97d88714f4ef7bf3 100644 (file)
--- 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 7c36dbafff036381dc1bbfedf52c6b589ca3ec52..e1eff37b88adaf19505cc1e1f64429a76a95456a 100644 (file)
--- 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 59261e3121876b4877ea4259cce7d07614e724d5..f4c7c1338da3f948b834985a5b9220bc799119dc 100644 (file)
--- 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 d9dc87a4177c055a42ed81205d9bf252d9f3230f..e8095256063c98b5ae7fa5166f1279c97c505ea4 100644 (file)
--- 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 d9dc87a4177c055a42ed81205d9bf252d9f3230f..e8095256063c98b5ae7fa5166f1279c97c505ea4 100644 (file)
--- 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 d9dc87a4177c055a42ed81205d9bf252d9f3230f..e8095256063c98b5ae7fa5166f1279c97c505ea4 100644 (file)
--- 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 9afde70d985aa3d97c6b92bf4bd16804e652ead9..1b36f30af02659cb4d27c3583ad891adf9e9176e 100644 (file)
--- 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} \