[oe-commits] org.oe.dev gnas-minimal: add ffmpeg support

[koen commit]

gnas-minimal: add ffmpeg support

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 6e8b3cd541933d9acf230ba09b3ce85f2b2e3b9b
ViewMTN: http://monotone.openembedded.org/revision/info/6e8b3cd541933d9acf230ba09b3ce85f2b2e3b9b
Files:
1
packages/gnash/gnash-minimal.inc
packages/gnash/gnash-minimal_0.8.2.bb
packages/gnash/gnash-minimal_0.8.3.bb
packages/gnash/gnash-minimal_cvs.bb
Diffs:

#
# mt diff -rcd61a824ab4e46a25a34674b534afd5182bde9ca -r6e8b3cd541933d9acf230ba09b3ce85f2b2e3b9b
#
#
#
# patch "packages/gnash/gnash-minimal.inc"
#  from [18f1cab966a482d9996417291c578d5d82ce2bcb]
#    to [cd2bb516d2fb57c4631871f835f678dd745a5039]
# 
# patch "packages/gnash/gnash-minimal_0.8.2.bb"
#  from [c0be1ee88262033c9d6942a9e663cd67fd8f9cf0]
#    to [3ae70d9eb17f024333e5820ee9a582905e662a1b]
# 
# patch "packages/gnash/gnash-minimal_0.8.3.bb"
#  from [36448f84bc62c99b5090bf2b25d855cc753f82a3]
#    to [0e6133b75a86e611b36f455f2aefd20f0340c995]
# 
# patch "packages/gnash/gnash-minimal_cvs.bb"
#  from [db4c2629fdbc1291308a0a48419a39a584264d1d]
#    to [fdecc6cfe242539023946edeea322beddd20342d]
#
============================================================
--- packages/gnash/gnash-minimal.inc	18f1cab966a482d9996417291c578d5d82ce2bcb
+++ packages/gnash/gnash-minimal.inc	cd2bb516d2fb57c4631871f835f678dd745a5039
@@ -2,7 +2,7 @@ LICENSE = "GPL-2"
 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"
 
============================================================
--- packages/gnash/gnash-minimal_0.8.2.bb	c0be1ee88262033c9d6942a9e663cd67fd8f9cf0
+++ packages/gnash/gnash-minimal_0.8.2.bb	3ae70d9eb17f024333e5820ee9a582905e662a1b
@@ -1,3 +1,3 @@ require gnash-minimal.inc
 require gnash-minimal.inc
 
+PR = "r2"
-PR = "r1"
============================================================
--- packages/gnash/gnash-minimal_0.8.3.bb	36448f84bc62c99b5090bf2b25d855cc753f82a3
+++ packages/gnash/gnash-minimal_0.8.3.bb	0e6133b75a86e611b36f455f2aefd20f0340c995
@@ -1,6 +1,6 @@ require gnash-minimal.inc
 require gnash-minimal.inc
 
-PR = "r7"
+PR = "r8"
 
 EXTRA_OECONF += " --without-included-ltdl \
                   --with-ltdl-include=${STAGING_INCDIR} \
============================================================
--- packages/gnash/gnash-minimal_cvs.bb	db4c2629fdbc1291308a0a48419a39a584264d1d
+++ packages/gnash/gnash-minimal_cvs.bb	fdecc6cfe242539023946edeea322beddd20342d
@@ -1,6 +1,10 @@ require gnash-minimal.inc
 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