summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-09-02 13:56:26 +0000
committerKoen Kooi <koen@openembedded.org>2008-09-02 13:56:26 +0000
commitd1cf4ab9116fbea812d339d7f06c631927a446e4 (patch)
treecb6714a617c57cbdbd98a7e05d3ce4f9649c824c
parent41c19448c31f90f0f0a31b31dee3ba14ebbc5977 (diff)
gnas-minimal: add ffmpeg support
-rw-r--r--packages/gnash/gnash-minimal.inc14
-rw-r--r--packages/gnash/gnash-minimal_0.8.2.bb2
-rw-r--r--packages/gnash/gnash-minimal_0.8.3.bb2
-rw-r--r--packages/gnash/gnash-minimal_cvs.bb4
4 files changed, 15 insertions, 7 deletions
diff --git a/packages/gnash/gnash-minimal.inc b/packages/gnash/gnash-minimal.inc
index 9845638663..86c4a4278e 100644
--- 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 b5a9ca35a9..1c6065e74e 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 = "r1"
+PR = "r2"
diff --git a/packages/gnash/gnash-minimal_0.8.3.bb b/packages/gnash/gnash-minimal_0.8.3.bb
index 55748151c5..237097b94a 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 = "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 73a7e8f9b2..ba9e2afb67 100644
--- 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