gnas-minimal: add ffmpeg support

diff --git a/packages/gnash/gnash-minimal.inc b/packages/gnash/gnash-minimal.inc
index 9845638..86c4a42 100644 (file)
--- a/packages/gnash/gnash-minimal.inc
+++ b/packages/gnash/gnash-minimal.inc
@@ -2,7 +2,7 @@ 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 libtool agg libxml2 libmad zlib boost jpeg pango curl freetype"
+DEPENDS = "virtual/libiconv virtual/libintl ffmpeg libtool agg libxml2 libmad zlib boost jpeg pango curl freetype"
 RDEPENDS = "libltdl"
 
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2"
@@ -30,19 +30,23 @@ EXTRA_OECONF="--enable-gui=gtk \
                 --disable-expat \
                 --enable-mad \
                 --disable-gstreamer \
-                --disable-cairo \
+                --enable-media=ffmpeg \
                 --disable-plugin \
                 --disable-cygnal \
-               --disable-testsuite \
+                --disable-testsuite \
                 --enable-maintainer-mode \
                 --enable-fps-debug \
                 --enable-allstatic \
                 --with-top-level=${STAGING_DIR_HOST}/usr \
-                "
+                --disable-ltdl-install \
+                --without-included-ltdl \
+#  --with-ltdl-include=${STAGING_INCDIR} \
+#  --with-ltdl-lib=${STAGING_LIBDIR} \
+"
 
 # the test for error_t is wrong for uclibc, needs _GNU_SOURCE for correct
 # detection because uclibc does not have argz.h which enables error_t 
-CFLAGS += " -D_GNU_SOURCE "
+CFLAGS += " -D_GNU_SOURCE  -I${S}/libltdl  -I${STAGING_INCDIR}/libltdl"
 
 PACKAGES =+ "libgnashnet libgnashamf libgnashbase libgnashserver libgnashmedia libltdl"
 

diff --git a/packages/gnash/gnash-minimal_0.8.2.bb b/packages/gnash/gnash-minimal_0.8.2.bb
index b5a9ca3..1c6065e 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 = "r1"
+PR = "r2"

diff --git a/packages/gnash/gnash-minimal_0.8.3.bb b/packages/gnash/gnash-minimal_0.8.3.bb
index 5574815..237097b 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 = "r7"
+PR = "r8"
 
 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 73a7e8f..ba9e2af 100644 (file)
--- a/packages/gnash/gnash-minimal_cvs.bb
+++ b/packages/gnash/gnash-minimal_cvs.bb
@@ -1,6 +1,10 @@
 require gnash-minimal.inc
 
+
+PR = "r1"
+
 PV = "0.8.3+cvs${SRCDATE}"
 
 SRC_URI = "cvs://anonymous:anonymous@cvs.sv.gnu.org/sources/gnash;module=gnash"
+SRC_URI += "file://libtool-2.2.patch;patch=1 file://libintl.patch;patch=1"
 S = ${WORKDIR}/gnash