7 files changed, 66 insertions, 5 deletions
diff --git a/packages/gnash/files/.mtn2git_empty b/packages/gnash/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnash/files/.mtn2git_empty
diff --git a/packages/gnash/files/libtool-2.2.patch b/packages/gnash/files/libtool-2.2.patch
new file mode 100644
index 0000000000..f0ec274104
--- /dev/null
+++ b/packages/gnash/files/libtool-2.2.patch
@@ -0,0 +1,35 @@
+diff -NrU5 gnash-0.8.3.orig/libbase/Makefile.am gnash-0.8.3/libbase/Makefile.am
+--- gnash-0.8.3.orig/libbase/Makefile.am	2008-06-26 22:56:12.000000000 +0200
++++ gnash-0.8.3/libbase/Makefile.am	2008-06-26 22:57:48.000000000 +0200
+@@ -19,13 +19,13 @@
+ 
+ # this is where Gnash plugins get installed
+ pluginsdir = $(prefix)/lib/gnash/plugins
+ 
+ if INSTALL_LTDL
+-include_HEADERS =  $(top_srcdir)/libltdl/ltdl.h
+-LIBLTDLLIB = libltdl.la
+-LIBLTDLHEAD =  $(top_srcdir)/libltdl/ltdl.h
++#include_HEADERS =  $(top_srcdir)/libltdl/ltdl.h
++#LIBLTDLLIB = libltdl.la
++#LIBLTDLHEAD =  $(top_srcdir)/libltdl/ltdl.h
+ endif
+ 
+ sysconf_DATA = gnashrc gnashpluginrc
+ 
+ edit = sed \
+@@ -174,12 +174,12 @@
+ 
+ libgnashbase_la_LDFLAGS = -release $(VERSION)
+ 
+ libltdlc_la_CPPFLAGS = $(LTDLINCL)
+ if CONVENIENCE_LTDL
+-noinst_LTLIBRARIES = libltdlc.la
+-libltdlc_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
++#noinst_LTLIBRARIES = libltdlc.la
++#libltdlc_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
+ endif
+ CLEANFILES = libltdl.la libltdlc.la gnashrc gnashpluginrc
+ 
+ libltdl_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
+ libltdl_la_LDFLAGS = -no-undefined -version-info 4:4:1
diff --git a/packages/gnash/gnash-minimal.inc b/packages/gnash/gnash-minimal.inc
index 06b4b9c6ec..f77ef6ae02 100644
--- a/packages/gnash/gnash-minimal.inc
+++ b/packages/gnash/gnash-minimal.inc
@@ -1,8 +1,7 @@
 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 = "agg libxml2 libmad zlib boost jpeg pango curl freetype"
-PR = "r5"
+DEPENDS = "virtual/libiconv virtual/libintl 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}
@@ -43,11 +42,13 @@ EXTRA_OECONF="--enable-gui=gtk \
 # detection because uclibc does not have argz.h which enables error_t 
 CFLAGS += " -D_GNU_SOURCE "
 
-PACKAGES =+ " libgnashamf libgnashbase libgnashserver libgnashmedia libltdl"
+PACKAGES =+ "libgnashnet libgnashamf libgnashbase libgnashserver libgnashmedia libltdl"
 
+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"
 FILES_libgnashserver = "${libdir}/gnash/libgnashserver-${PV}.so"
-
+FILES_libgnashnet = "${libdir}/gnash/libgnashnet.so.*"
diff --git a/packages/gnash/gnash-minimal_0.8.3.bb b/packages/gnash/gnash-minimal_0.8.3.bb
new file mode 100644
index 0000000000..b5bcf29683
--- /dev/null
+++ b/packages/gnash/gnash-minimal_0.8.3.bb
@@ -0,0 +1,12 @@
+require gnash-minimal.inc
+
+PR = "r6"
+
+EXTRA_OECONF += " --without-included-ltdl \
+                  --with-ltdl-include=${STAGING_INCDIR} \
+                  --with-ltdl-lib=${STAGING_LIBDIR} \
+"
+
+SRC_URI += "file://libtool-2.2.patch;patch=1"
+
+
diff --git a/packages/gnash/gnash-minimal_cvs.bb b/packages/gnash/gnash-minimal_cvs.bb
index c079caadc6..de0e6f9db9 100644
--- a/packages/gnash/gnash-minimal_cvs.bb
+++ b/packages/gnash/gnash-minimal_cvs.bb
@@ -1,4 +1,6 @@
 require gnash-minimal.inc
 
+PV = "0.8.2+cvs${SRCDATE}"
+
 SRC_URI = "cvs://anonymous:anonymous@cvs.sv.gnu.org/sources/gnash;module=gnash"
 S = ${WORKDIR}/gnash
diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc
index 31e84b84ac..ce66beec45 100644
--- a/packages/gnash/gnash.inc
+++ b/packages/gnash/gnash.inc
@@ -1,7 +1,7 @@
 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 = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype"
+DEPENDS = "libtool gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \
diff --git a/packages/gnash/gnash_0.8.3.bb b/packages/gnash/gnash_0.8.3.bb
new file mode 100644
index 0000000000..cc8de96995
--- /dev/null
+++ b/packages/gnash/gnash_0.8.3.bb
@@ -0,0 +1,11 @@
+require gnash.inc
+
+PR = "r2"
+
+EXTRA_OECONF += " --without-included-ltdl \
+                  --with-ltdl-include=${STAGING_INCDIR} \
+                  --with-ltdl-lib=${STAGING_LIBDIR} \
+"
+
+SRC_URI += "file://libtool-2.2.patch;patch=1"
+