diff options
Diffstat (limited to 'packages/gnash')
| -rw-r--r-- | packages/gnash/files/fix-trunc.diff | 13 | ||||
| -rw-r--r-- | packages/gnash/gnash-minimal.inc | 18 | ||||
| -rw-r--r-- | packages/gnash/gnash-minimal_0.8.2.bb | 2 | ||||
| -rw-r--r-- | packages/gnash/gnash-minimal_0.8.3.bb | 2 | ||||
| -rw-r--r-- | packages/gnash/gnash-minimal_cvs.bb | 14 | ||||
| -rw-r--r-- | packages/gnash/gnash.inc | 8 |
6 files changed, 43 insertions, 14 deletions
diff --git a/packages/gnash/files/fix-trunc.diff b/packages/gnash/files/fix-trunc.diff new file mode 100644 index 0000000000..a01ca311d0 --- /dev/null +++ b/packages/gnash/files/fix-trunc.diff @@ -0,0 +1,13 @@ +--- /tmp/utility.h 2008-09-02 16:35:44.000000000 +0200 ++++ gnash/libbase/utility.h 2008-09-02 16:36:10.000000000 +0200 +@@ -327,6 +327,10 @@ + #endif + } + ++#ifndef HAVE_TRUNC ++inline double trunc(double x) { return (x < 0 ? -(std::floor(-x)) : std::floor(x)); } ++#endif ++ + #endif // UTILITY_H + + diff --git a/packages/gnash/gnash-minimal.inc b/packages/gnash/gnash-minimal.inc index 9845638663..597f22bd70 100644 --- a/packages/gnash/gnash-minimal.inc +++ b/packages/gnash/gnash-minimal.inc @@ -2,8 +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" -RDEPENDS = "libltdl" +DEPENDS = "virtual/libiconv virtual/libintl ffmpeg libtool agg libxml2 libmad zlib boost jpeg pango curl freetype" SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2" S = ${WORKDIR}/gnash-${PV} @@ -30,25 +29,28 @@ 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 =+ "libgnashnet libgnashamf libgnashbase libgnashserver libgnashmedia" FILES_${PN}-dbg += "${libdir}/gnash/.debug" FILES_${PN}-dev += "${libdir}/gnash/*a" -FILES_libltdl = "${libdir}/gnash/libltdl*.so*" FILES_libgnashamf = "${libdir}/gnash/libgnashamf-${PV}.so" FILES_libgnashbase = "${libdir}/gnash/libgnashbase-${PV}.so" FILES_libgnashmedia = "${libdir}/gnash/libgnashmedia-${PV}.so" 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..992998bf55 100644 --- a/packages/gnash/gnash-minimal_cvs.bb +++ b/packages/gnash/gnash-minimal_cvs.bb @@ -1,6 +1,20 @@ 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 \ + file://fix-trunc.diff;patch=1" + S = ${WORKDIR}/gnash + + +do_configure_prepend() { + sed -i -e 's:dnl AC_CHECK_LIB(m, trunc:AC_CHECK_LIB(m, trunc:g' ${S}/configure.ac +} + + diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc index ce66beec45..60162ed1bd 100644 --- a/packages/gnash/gnash.inc +++ b/packages/gnash/gnash.inc @@ -1,8 +1,8 @@ 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 gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype" -PR = "r1" +DEPENDS = "libtool ffmpeg gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype" +PR = "r2" SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \ " @@ -11,7 +11,7 @@ inherit autotools pkgconfig EXTRA_OECONF = "--enable-gui=gtk \ --enable-renderer=cairo \ - --enable-media=none \ + --enable-media=ffmpeg \ --disable-klash \ --enable-z \ --enable-jpeg \ @@ -20,7 +20,7 @@ EXTRA_OECONF = "--enable-gui=gtk \ --enable-expat \ --enable-mad \ --enable-cairo \ - --disable-plugin \ + --enable-plugin \ --disable-cygnal \ --with-top-level=${STAGING_DIR_HOST}/usr \ " |