merge of '23d1f770a092f023ba951e138b787c9bacc3152d'

     and 'fe28a990b29bbfd099e38e4fe044896bd0a0d68e'

42 files changed, 835 insertions, 329 deletions

diff --git a/packages/bison/bison-native_2.3.bb b/packages/bison/bison-native_2.3.bb
new file mode 100644
index 0000000000..ec2f269eec
--- /dev/null
+++ b/packages/bison/bison-native_2.3.bb
@@ -0,0 +1,20 @@
+require bison_${PV}.bb
+SECTION = "devel"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/bison-${PV}"
+S = "${WORKDIR}/bison-${PV}"
+
+inherit native autotools
+
+do_stage() {
+	rm -f ${STAGING_BINDIR}/yacc
+	rm -f ${STAGING_BINDIR}/bison
+	install -m 0755 src/bison ${STAGING_BINDIR}/
+	cat >${STAGING_BINDIR}/yacc <<EOF
+#!/bin/sh
+exec ${STAGING_BINDIR}/bison -y "\$@"
+EOF
+	chmod a+rx ${STAGING_BINDIR}/yacc
+	install -d ${STAGING_DATADIR}/bison/m4sugar
+	install -m 0755 data/c.m4 data/glr.c data/lalr1.cc data/yacc.c ${STAGING_DATADIR}/bison/
+	install -m 0755 data/m4sugar/m4sugar.m4 ${STAGING_DATADIR}/bison/m4sugar/
+}
diff --git a/packages/bison/bison_2.3.bb b/packages/bison/bison_2.3.bb
new file mode 100644
index 0000000000..edf549f442
--- /dev/null
+++ b/packages/bison/bison_2.3.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "GNU Project parser generator (yacc replacement)."
+HOMEPAGE = "http://www.gnu.org/software/bison/"
+LICENSE = "GPL"
+SECTION = "devel"
+PRIORITY = "optional"
+
+SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
+	   file://m4.patch;patch=1"
+
+inherit autotools
diff --git a/packages/bison/bison-2.0/.mtn2git_empty b/packages/bison/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/bison/bison-2.0/.mtn2git_empty
+++ b/packages/bison/files/.mtn2git_empty
diff --git a/packages/bison/bison-2.0/m4.patch b/packages/bison/files/m4.patch
index b62fe89d04..b62fe89d04 100644
--- a/packages/bison/bison-2.0/m4.patch
+++ b/packages/bison/files/m4.patch
diff --git a/packages/bluez/bluez-utils_3.33.bb b/packages/bluez/bluez-utils_3.33.bb
index dc0ee8e739..314a83620d 100644
--- a/packages/bluez/bluez-utils_3.33.bb
+++ b/packages/bluez/bluez-utils_3.33.bb
@@ -1,12 +1,13 @@
 require bluez-utils3.inc
 
-PR = "r1"
+PR = "r2"
 
 # see bluez-utils3.inc for the explanation of these option
 EXTRA_OECONF = " \
                  --enable-bccmd \
 		 --enable-hid2hci \
-                 --disable-alsa \ 
+                 --enable-hidd \
+		 --disable-alsa \ 
 		 --disable-cups \
 		 --enable-glib \
 		 --disable-sdpd \
diff --git a/packages/chromium/.mtn2git_empty b/packages/chromium/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/chromium/.mtn2git_empty
diff --git a/packages/chromium/chromium_svn.bb b/packages/chromium/chromium_svn.bb
new file mode 100644
index 0000000000..98f4f10881
--- /dev/null
+++ b/packages/chromium/chromium_svn.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Google Chrome browser"
+LICENSE = "BSD"
+
+DEPENDS = "perl-native python-native flex-native gperf-native"
+
+PV = "0.0+svnr${SRCREV}"
+
+SRCREV = "1665"
+SRC_URI = "svn://src.chromium.org/svn/trunk/;module=src;proto=http"
+
+S = "${WORKDIR}/src/chrome"
+
+do_compile() {
+	cd ${S}
+	../third_party/scons/scons.py Hammer
+}	
diff --git a/packages/classpath/classpath-0.97.2/autotools.patch b/packages/classpath/classpath-0.97.2/autotools.patch
index 3df65cf892..e36e143b5f 100644
--- a/packages/classpath/classpath-0.97.2/autotools.patch
+++ b/packages/classpath/classpath-0.97.2/autotools.patch
@@ -11,16 +11,3 @@ Index: classpath-0.97.2/configure.ac
  dnl -----------------------------------------------------------
  dnl Enable collections.jar (disabled by default)
  dnl -----------------------------------------------------------
-Index: classpath-0.97.2/Makefile.am
-===================================================================
---- classpath-0.97.2.orig/Makefile.am	2008-06-01 20:47:05.000000000 +0200
-+++ classpath-0.97.2/Makefile.am	2008-08-02 00:58:39.004023720 +0200
-@@ -5,7 +5,7 @@
- DIST_SUBDIRS = lib doc external include native resource scripts tools examples
- 
- # Allow users to pass site-specific flags to autoreconf via an env var. 
--ACLOCAL_AMFLAGS = -I m4 ${LOCAL_AUTORECONF_FLAGS}
-+ACLOCAL_AMFLAGS = -I m4 --install ${LOCAL_AUTORECONF_FLAGS}
- 
- native: lib
- 
diff --git a/packages/classpath/classpath-minimal-0.97.2/autotools.patch b/packages/classpath/classpath-minimal-0.97.2/autotools.patch
index 3df65cf892..e36e143b5f 100644
--- a/packages/classpath/classpath-minimal-0.97.2/autotools.patch
+++ b/packages/classpath/classpath-minimal-0.97.2/autotools.patch
@@ -11,16 +11,3 @@ Index: classpath-0.97.2/configure.ac
  dnl -----------------------------------------------------------
  dnl Enable collections.jar (disabled by default)
  dnl -----------------------------------------------------------
-Index: classpath-0.97.2/Makefile.am
-===================================================================
---- classpath-0.97.2.orig/Makefile.am	2008-06-01 20:47:05.000000000 +0200
-+++ classpath-0.97.2/Makefile.am	2008-08-02 00:58:39.004023720 +0200
-@@ -5,7 +5,7 @@
- DIST_SUBDIRS = lib doc external include native resource scripts tools examples
- 
- # Allow users to pass site-specific flags to autoreconf via an env var. 
--ACLOCAL_AMFLAGS = -I m4 ${LOCAL_AUTORECONF_FLAGS}
-+ACLOCAL_AMFLAGS = -I m4 --install ${LOCAL_AUTORECONF_FLAGS}
- 
- native: lib
- 
diff --git a/packages/classpath/classpath-minimal_0.97.2.bb b/packages/classpath/classpath-minimal_0.97.2.bb
index 5e6d53224e..8a87d1f636 100644
--- a/packages/classpath/classpath-minimal_0.97.2.bb
+++ b/packages/classpath/classpath-minimal_0.97.2.bb
@@ -6,9 +6,10 @@ SRC_URI += "\
   file://javanet-local.patch;patch=1;pnum=0 \
   file://ecj_java_dir.patch;patch=1 \
   file://autotools.patch;patch=1 \
+  file://decimalformat.patch;patch=1 \
   "
 
-PR = "r1"
+PR = "r2"
 
 PROVIDES = "${PN} classpath"
 
diff --git a/packages/classpath/classpath-native-0.97.2/autotools.patch b/packages/classpath/classpath-native-0.97.2/autotools.patch
index 3df65cf892..e36e143b5f 100644
--- a/packages/classpath/classpath-native-0.97.2/autotools.patch
+++ b/packages/classpath/classpath-native-0.97.2/autotools.patch
@@ -11,16 +11,3 @@ Index: classpath-0.97.2/configure.ac
  dnl -----------------------------------------------------------
  dnl Enable collections.jar (disabled by default)
  dnl -----------------------------------------------------------
-Index: classpath-0.97.2/Makefile.am
-===================================================================
---- classpath-0.97.2.orig/Makefile.am	2008-06-01 20:47:05.000000000 +0200
-+++ classpath-0.97.2/Makefile.am	2008-08-02 00:58:39.004023720 +0200
-@@ -5,7 +5,7 @@
- DIST_SUBDIRS = lib doc external include native resource scripts tools examples
- 
- # Allow users to pass site-specific flags to autoreconf via an env var. 
--ACLOCAL_AMFLAGS = -I m4 ${LOCAL_AUTORECONF_FLAGS}
-+ACLOCAL_AMFLAGS = -I m4 --install ${LOCAL_AUTORECONF_FLAGS}
- 
- native: lib
- 
diff --git a/packages/classpath/classpath-native_0.97.2.bb b/packages/classpath/classpath-native_0.97.2.bb
index c9a239418b..499ad9f5fb 100644
--- a/packages/classpath/classpath-native_0.97.2.bb
+++ b/packages/classpath/classpath-native_0.97.2.bb
@@ -1,6 +1,6 @@
 require classpath-native.inc
 
-PR = "r1"
+PR = "r2"
 
 # The code affected by the javanet-local patch
 # is usually not compiled. However if someone changes
@@ -12,5 +12,6 @@ SRC_URI += "\
   file://sun-security-getproperty_0.96.1.patch;patch=1;pnum=0 \
   file://ecj_java_dir.patch;patch=1 \
   file://autotools.patch;patch=1 \
+  file://decimalformat.patch;patch=1 \
   "
 
diff --git a/packages/classpath/classpath_0.97.2.bb b/packages/classpath/classpath_0.97.2.bb
index 1393e2c453..5267222104 100644
--- a/packages/classpath/classpath_0.97.2.bb
+++ b/packages/classpath/classpath_0.97.2.bb
@@ -6,9 +6,10 @@ SRC_URI += "\
   file://javanet-local.patch;patch=1;pnum=0 \
   file://ecj_java_dir.patch;patch=1 \
   file://autotools.patch;patch=1 \
+  file://decimalformat.patch;patch=1 \
   "
 
-PR = "r2"
+PR = "r3"
 
 DEPENDS += "gtk+ gconf libxtst"
 
diff --git a/packages/classpath/files/autotools.patch b/packages/classpath/files/autotools.patch
index baae366d5f..663c0340cd 100644
--- a/packages/classpath/files/autotools.patch
+++ b/packages/classpath/files/autotools.patch
@@ -22,16 +22,3 @@ Index: classpath-0.93/configure.ac
  
  # Handle -Werror default case.
  if test "$ENABLE_WERROR" = default; then
-Index: classpath-0.93/Makefile.am
-===================================================================
---- classpath-0.93.orig/Makefile.am	2006-02-08 08:35:30.000000000 +0100
-+++ classpath-0.93/Makefile.am	2008-08-24 21:45:42.405241264 +0200
-@@ -4,7 +4,7 @@
- SUBDIRS = lib doc external include native resource scripts tools $(EXAMPLESDIR)
- DIST_SUBDIRS = lib doc external include native resource scripts tools examples
- 
--ACLOCAL_AMFLAGS = -I m4
-+ACLOCAL_AMFLAGS = -I m4 --install
- 
- native: lib
- 
diff --git a/packages/ffmpeg/ffmpeg.inc b/packages/ffmpeg/ffmpeg.inc
index aab2c62fa9..44e00e6764 100644
--- a/packages/ffmpeg/ffmpeg.inc
+++ b/packages/ffmpeg/ffmpeg.inc
@@ -26,6 +26,49 @@ EXTRA_OECONF = "\
         \
 "
 
+do_stage() {
+        for lib in libavcodec libavdevice libavformat \
+                   libavutil libpostproc libswscale
+        do
+            oe_libinstall -a -so -C $lib $lib ${STAGING_LIBDIR} || true
+            install -d ${STAGING_INCDIR}/$lib 
+        done 
+
+        install -d ${STAGING_INCDIR}/ffmpeg
+
+        install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/ffmpeg/avcodec.h
+        install -m 0644 ${S}/libavcodec/opt.h ${STAGING_INCDIR}/ffmpeg/opt.h
+        install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/libavcodec/avcodec.h
+        install -m 0644 ${S}/libavcodec/opt.h ${STAGING_INCDIR}/libavcodec/opt.h
+
+        install -m 0644 ${S}/libavdevice/avdevice.h  ${STAGING_INCDIR}/ffmpeg/avdevice.h
+        
+        for h in avformat.h avio.h rtp.h rtsp.h rtspcodes.h
+        do
+           install -m 0644 ${S}/libavformat/$h  ${STAGING_INCDIR}/ffmpeg/$h
+           install -m 0644 ${S}/libavformat/$h  ${STAGING_INCDIR}/libavformat/$h	
+	done
+
+		for h in adler32.h avstring.h avutil.h base64.h bswap.h \
+                 common.h crc.h fifo.h integer.h intfloat_readwrite.h \
+                 log.h lzo.h mathematics.h md5.h mem.h random.h \
+                 rational.h sha1.h
+		do
+           install -m 0644 ${S}/libavutil/$h        ${STAGING_INCDIR}/ffmpeg/$h
+           install -m 0644 ${S}/libavutil/$h        ${STAGING_INCDIR}/libavutil/$h 
+        done
+
+        install -d ${STAGING_INCDIR}/libswscale/ 
+        install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/ffmpeg/
+        install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/libswscale/
+
+        install -d ${STAGING_INCDIR}/libpostproc
+        install -d ${STAGING_INCDIR}/postproc 
+        install -m 0644 ${S}/libpostproc/postprocess.h ${STAGING_INCDIR}/libpostproc/postprocess.h
+        install -m 0644 ${S}/libpostproc/postprocess.h ${STAGING_INCDIR}/postproc/postprocess.h
+}
+
+
 PACKAGES += "${PN}-vhook-dbg ${PN}-vhook"
 
 FILES_${PN} = "${bindir}"
@@ -33,3 +76,36 @@ FILES_${PN}-dev = "${includedir}/${PN}"
 
 FILES_${PN}-vhook = "${libdir}/vhook"
 FILES_${PN}-vhook-dbg += "${libdir}/vhook/.debug"
+
+
+PACKAGES += "libavcodec  libavcodec-dev  libavcodec-dbg \
+             libavdevice libavdevice-dev libavdevice-dbg \
+             libavformat libavformat-dev libavformat-dbg \
+             libavutil   libavutil-dev   libavutil-dbg \
+             libpostproc libpostproc-dev libpostproc-dbg \
+             libswscale  libswscale-dev  libswscale-dbg"
+
+FILES_${PN}-dev = "${includedir}"
+FILES_libavcodec = "${libdir}/libavcodec*.so.*"
+FILES_libavcodec-dev = "${libdir}/libavcodec*.so ${libdir}/pkgconfig/libavcodec.pc ${libdir}/libavcodec*.a"
+FILES_libavcodec-dbg += "${libdir}/.debug/libavcodec*"
+
+FILES_libavdevice = "${libdir}/libavdevice*.so.*"
+FILES_libavdevice-dev = "${libdir}/libavdevice*.so ${libdir}/pkgconfig/libavdevice.pc ${libdir}/libavdevice*.a"
+FILES_libavdevice-dbg += "${libdir}/.debug/libavdevice*"
+
+FILES_libavformat = "${libdir}/libavformat*.so.*"
+FILES_libavformat-dev = "${libdir}/libavformat*.so ${libdir}/pkgconfig/libavformat.pc ${libdir}/libavformat*.a"
+FILES_libavformat-dbg += "${libdir}/.debug/libavformat*"
+
+FILES_libavutil = "${libdir}/libavutil*.so.*"
+FILES_libavutil-dev = "${libdir}/libavutil*.so ${libdir}/pkgconfig/libavutil.pc ${libdir}/libavutil*.a"
+FILES_libavutil-dbg += "${libdir}/.debug/libavutil*"
+
+FILES_libpostproc = "${libdir}/libpostproc*.so.*"
+FILES_libpostproc-dev = "${libdir}/libpostproc*.so  ${libdir}/pkgconfig/libpostproc.pc ${libdir}/libpostproc*.a ${includedir}/postproc"
+FILES_libpostproc-dbg += "${libdir}/.debug/libpostproc*"
+
+FILES_libswscale = "${libdir}/libswscale*.so.*"
+FILES_libswscale-dev = "${libdir}/libswscale*.so ${libdir}/pkgconfig/libswscale.pc ${libdir}/libswscale*.a"
+FILES_libswscale-dbg += "${libdir}/.debug/libswscale*"
diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb
index b8bebebd0b..7f7b6cdba2 100644
--- a/packages/ffmpeg/ffmpeg_git.bb
+++ b/packages/ffmpeg/ffmpeg_git.bb
@@ -3,19 +3,20 @@ require ffmpeg.inc
 DEPENDS += "libgsm"
 
 PV = "0.4.9+${PR}+gitr${SRCREV}" 
-PR = "r29"
+PR = "r31"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_armv5te = "1"
 DEFAULT_PREFERENCE_armv6 = "1"
 DEFAULT_PREFERENCE_armv7a = "1"
+DEFAULT_PREFERENCE_avr32 = "1"
 
 FFBRANCH_arm = "arm"
 FFBRANCH ?= "master"
 
 # When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes
-SRCREV = "3692b8de9fae73860be636606cb6344f26e28b1a"
-SRCREV_arm = "2a56b3705935a53fb48d605340095fb462d6acc5"
+SRCREV = "b06c88bbec744970e023a03abed314f10d6936da"
+SRCREV_arm = "afb98868e19e63cbca6c9f0ed9e6cfa48d40277d"
 SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \
 "
 
@@ -56,83 +57,10 @@ EXTRA_OECONF = " \
 
 do_configure() {
         sed -i -e s:'check_cflags -std=c99'::g ${S}/configure
-	cd ${S} ; git clone git://git.mplayerhq.hu/libswscale || true  
+        cd ${S} ; git clone git://git.mplayerhq.hu/libswscale || true  
         mkdir -p ${B}
         cd ${B}
         ${S}/configure ${EXTRA_OECONF}
 		sed -i -e s:Os:O4:g ${B}/config.h
 }
 
-do_stage() {
-        for lib in libavcodec libavdevice libavformat \
-                   libavutil libpostproc libswscale
-        do
-            oe_libinstall -a -so -C $lib $lib ${STAGING_LIBDIR} || true
-            install -d ${STAGING_INCDIR}/$lib 
-        done 
-
-        install -d ${STAGING_INCDIR}/ffmpeg
-
-        install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/ffmpeg/avcodec.h
-        install -m 0644 ${S}/libavcodec/opt.h ${STAGING_INCDIR}/ffmpeg/opt.h
-        install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/libavcodec/avcodec.h
-        install -m 0644 ${S}/libavcodec/opt.h ${STAGING_INCDIR}/libavcodec/opt.h
-
-        install -m 0644 ${S}/libavdevice/avdevice.h  ${STAGING_INCDIR}/ffmpeg/avdevice.h
-        
-        for h in avformat.h avio.h rtp.h rtsp.h rtspcodes.h
-        do
-           install -m 0644 ${S}/libavformat/$h  ${STAGING_INCDIR}/ffmpeg/$h
-           install -m 0644 ${S}/libavformat/$h  ${STAGING_INCDIR}/libavformat/$h	
-	done
-
-		for h in adler32.h avstring.h avutil.h base64.h bswap.h \
-                 common.h crc.h fifo.h integer.h intfloat_readwrite.h \
-                 log.h lzo.h mathematics.h md5.h mem.h random.h \
-                 rational.h sha1.h
-		do
-           install -m 0644 ${S}/libavutil/$h        ${STAGING_INCDIR}/ffmpeg/$h
-           install -m 0644 ${S}/libavutil/$h        ${STAGING_INCDIR}/libavutil/$h 
-        done
-
-        install -d ${STAGING_INCDIR}/libswscale/ 
-        install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/ffmpeg/
-        install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/libswscale/
-
-        install -d ${STAGING_INCDIR}/libpostproc
-        install -d ${STAGING_INCDIR}/postproc 
-        install -m 0644 ${S}/libpostproc/postprocess.h ${STAGING_INCDIR}/libpostproc/postprocess.h
-        install -m 0644 ${S}/libpostproc/postprocess.h ${STAGING_INCDIR}/postproc/postprocess.h
-}
-
-PACKAGES += "libavcodec  libavcodec-dev  libavcodec-dbg \
-             libavdevice libavdevice-dev libavdevice-dbg \
-             libavformat libavformat-dev libavformat-dbg \
-             libavutil   libavutil-dev   libavutil-dbg \
-             libpostproc libpostproc-dev libpostproc-dbg \
-             libswscale  libswscale-dev  libswscale-dbg"
-
-FILES_${PN}-dev = "${includedir}"
-FILES_libavcodec = "${libdir}/libavcodec*.so.*"
-FILES_libavcodec-dev = "${libdir}/libavcodec*.so ${libdir}/pkgconfig/libavcodec.pc ${libdir}/libavcodec*.a"
-FILES_libavcodec-dbg += "${libdir}/.debug/libavcodec*"
-
-FILES_libavdevice = "${libdir}/libavdevice*.so.*"
-FILES_libavdevice-dev = "${libdir}/libavdevice*.so ${libdir}/pkgconfig/libavdevice.pc ${libdir}/libavdevice*.a"
-FILES_libavdevice-dbg += "${libdir}/.debug/libavdevice*"
-
-FILES_libavformat = "${libdir}/libavformat*.so.*"
-FILES_libavformat-dev = "${libdir}/libavformat*.so ${libdir}/pkgconfig/libavformat.pc ${libdir}/libavformat*.a"
-FILES_libavformat-dbg += "${libdir}/.debug/libavformat*"
-
-FILES_libavutil = "${libdir}/libavutil*.so.*"
-FILES_libavutil-dev = "${libdir}/libavutil*.so ${libdir}/pkgconfig/libavutil.pc ${libdir}/libavutil*.a"
-FILES_libavutil-dbg += "${libdir}/.debug/libavutil*"
-
-FILES_libpostproc = "${libdir}/libpostproc*.so.*"
-FILES_libpostproc-dev = "${libdir}/libpostproc*.so  ${libdir}/pkgconfig/libpostproc.pc ${libdir}/libpostproc*.a ${includedir}/postproc"
-FILES_libpostproc-dbg += "${libdir}/.debug/libpostproc*"
-
-FILES_libswscale = "${libdir}/libswscale*.so.*"
-FILES_libswscale-dev = "${libdir}/libswscale*.so ${libdir}/pkgconfig/libswscale.pc ${libdir}/libswscale*.a"
-FILES_libswscale-dbg += "${libdir}/.debug/libswscale*"
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 \
                 "
diff --git a/packages/gnome/gnome-panel_2.22.2.bb b/packages/gnome/gnome-panel_2.22.2.bb
index b5f207a632..b96d985387 100644
--- a/packages/gnome/gnome-panel_2.22.2.bb
+++ b/