7 files changed, 64 insertions, 9 deletions
diff --git a/recipes/gnash/gnash-fb_0.8.5.bb b/recipes/gnash/gnash-fb_0.8.5.bb
index a92b1e9664..77f1b48237 100644
--- a/recipes/gnash/gnash-fb_0.8.5.bb
+++ b/recipes/gnash/gnash-fb_0.8.5.bb
@@ -7,12 +7,12 @@ acpaths = " -Imacros"
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_angstrom = "1"
 
-SRC_URI += "file://gnash-glib-dependency.patch;patch=1"
+SRC_URI += "file://gnash-glib-dependency.patch"
 
 S = "${WORKDIR}/gnash-${PV}"
 
 # Boost lacks defines for lots of archs
-TARGET_CC_ARCH_append = " -I${STAGING_INCDIR}/libxml2 -DHAVE_POLL_H ${@[' -D_BIG_ENDIAN', ' -D_LITTLE_ENDIAN'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"
+TARGET_CC_ARCH_append = " -I${STAGING_INCDIR}/libxml2 -DHAVE_POLL_H ${@[' -D_BIG_ENDIAN', ' -D_LITTLE_ENDIAN'][bb.data.getVar('SITEINFO_ENDIANNESS', d, 1) == 'le']}"
 
 
 do_configure_prepend() {
diff --git a/recipes/gnash/gnash-minimal_0.8.3.bb b/recipes/gnash/gnash-minimal_0.8.3.bb
index 5852388867..f769996a2c 100644
--- a/recipes/gnash/gnash-minimal_0.8.3.bb
+++ b/recipes/gnash/gnash-minimal_0.8.3.bb
@@ -7,7 +7,7 @@ EXTRA_OECONF += " --without-included-ltdl \
                   --with-ltdl-lib=${STAGING_LIBDIR} \
 "
 
-SRC_URI += "file://libtool-2.2.patch;patch=1 file://libintl.patch;patch=1"
+SRC_URI += "file://libtool-2.2.patch file://libintl.patch"
 
 
 
diff --git a/recipes/gnash/gnash-minimal_cvs.bb b/recipes/gnash/gnash-minimal_cvs.bb
index e1eff37b88..fcef623060 100644
--- a/recipes/gnash/gnash-minimal_cvs.bb
+++ b/recipes/gnash/gnash-minimal_cvs.bb
@@ -6,9 +6,9 @@ PR = "r4"
 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"
+SRC_URI += "file://libtool-2.2.patch \
+            file://libintl.patch \
+            file://fix-trunc.diff"
 
 S = ${WORKDIR}/gnash
 
diff --git a/recipes/gnash/gnash.inc b/recipes/gnash/gnash.inc
index 159fb414df..a89444d240 100644
--- a/recipes/gnash/gnash.inc
+++ b/recipes/gnash/gnash.inc
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 DEPENDS = "giflib libtool gtk+ cairo libxml2 libsdl-mixer zlib boost jpeg pango curl freetype \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'ffmpeg libmad', d)}"
           
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \
           "
diff --git a/recipes/gnash/gnash_0.8.3.bb b/recipes/gnash/gnash_0.8.3.bb
index ccb8f28723..f3bb166b4e 100644
--- a/recipes/gnash/gnash_0.8.3.bb
+++ b/recipes/gnash/gnash_0.8.3.bb
@@ -7,7 +7,7 @@ EXTRA_OECONF += " --without-included-ltdl \
                   --with-ltdl-lib=${STAGING_LIBDIR} \
 "
 
-SRC_URI += "file://libtool-2.2.patch;patch=1"
+SRC_URI += "file://libtool-2.2.patch"
 
 
 SRC_URI[md5sum] = "5033ef2602ea1234a9ccb73000a0dedb"
diff --git a/recipes/gnash/gnash_0.8.5.bb b/recipes/gnash/gnash_0.8.5.bb
index 1394e2b5b8..669bb6a693 100644
--- a/recipes/gnash/gnash_0.8.5.bb
+++ b/recipes/gnash/gnash_0.8.5.bb
@@ -8,7 +8,7 @@ DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_angstrom = "1"
 
 # Boost lacks defines for lots of archs
-TARGET_CC_ARCH_append = " -I${STAGING_INCDIR}/libxml2 -DHAVE_POLL_H ${@[' -D_BIG_ENDIAN', ' -D_LITTLE_ENDIAN'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"
+TARGET_CC_ARCH_append = " -I${STAGING_INCDIR}/libxml2 -DHAVE_POLL_H ${@[' -D_BIG_ENDIAN', ' -D_LITTLE_ENDIAN'][bb.data.getVar('SITEINFO_ENDIANNESS', d, 1) == 'le']}"
 
 
 do_configure_prepend() {
diff --git a/recipes/gnash/gnash_0.8.7.bb b/recipes/gnash/gnash_0.8.7.bb
new file mode 100644
index 0000000000..a63e4d097c
--- /dev/null
+++ b/recipes/gnash/gnash_0.8.7.bb
@@ -0,0 +1,55 @@
+DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v8 features"
+HOMEPAGE = "http://www.gnu.org/software/gnash"
+LICENSE = "GPLv3"
+DEPENDS = "giflib cairo libtool gtk+ agg libsdl-mixer zlib boost jpeg pango curl freetype \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'ffmpeg', d)} speex"
+DEPENDS += "gst-plugins-base"
+          
+PR = "r0"
+
+SRC_URI = "ftp://ftp.gnu.org/gnu/gnash/0.8.7/gnash-0.8.7.tar.bz2"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-gui=gtk \
+                --enable-renderer=agg \
+                ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '--enable-media=ffmpeg', d)} \
+                --with-plugins-install=system \
+		--enable-plugins \
+                --disable-dependency-tracking \
+                --disable-testsuite \
+                --enable-media=ffmpeg \
+                --with-speex-incl=${STAGING_INCDIR}/speex \
+		--with-cairo-incl=${STAGING_INCDIR}/cairo \
+                --with-cairo-lib=${STAGING_LIBDIR} \
+                --with-jpeg-incl=${STAGING_INCDIR} \
+                --with-jpeg-lib=${STAGING_LIBDIR} \
+                --with-top-level=${STAGING_DIR_HOST}/usr \
+		--disable-avm2 \
+		"
+
+PACKAGES =+ " gnash-browser-plugin libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver "
+
+FILES_gnash-browser-plugin= "${libdir}/mozilla/plugins/*"
+FILES_libgnashamf = "${libdir}/gnash/libgnashamf-${PV}.so"
+FILES_libgnashbackend = "${libdir}/gnash/libgnashbackend-${PV}.so"
+FILES_libgnashbase = "${libdir}/gnash/libgnashbase-${PV}.so"
+FILES_libgnashgeo = "${libdir}/gnash/libgnashgeo-${PV}.so"
+FILES_libgnashgui = "${libdir}/gnash/libgnashgui-${PV}.so"
+FILES_libgnashplayer = "${libdir}/gnash/libgnashplayer-${PV}.so"
+FILES_libgnashserver = "${libdir}/gnash/libgnashserver-${PV}.so"
+
+RDEPENDS_${PN}-browser-plugin += "${PN}"
+
+acpaths = " -Imacros"
+
+# Boost lacks defines for lots of archs
+TARGET_CC_ARCH_append = " -I${STAGING_INCDIR}/libxml2 -DHAVE_POLL_H ${@[' -D_BIG_ENDIAN', ' -D_LITTLE_ENDIAN'][bb.data.getVar('SITEINFO_ENDIANNESS', d, 1) == 'le']}"
+
+
+do_install_append() {
+	oe_runmake DESTDIR=${D} install-plugin
+}
+
+SRC_URI[md5sum] = "039533fec46e46b94ac6b04e33d58f3a"
+SRC_URI[sha256sum] = "73b8a7c788511e453add26fd68cebd5818b39f9da21cc7c78e9cef8bc837e896"