merge of '5238e30c679ed4c9836291822577cc8cf6d35993'

     and '562347f263f94adfc20ea37413a2b6b2a54028fb'

51 files changed, 2731 insertions, 686 deletions

diff --git a/conf/distro/angstrom-2007.1-oabi.conf b/conf/distro/angstrom-2007.1-oabi.conf
new file mode 100644
index 0000000000..e63dc61a48
--- /dev/null
+++ b/conf/distro/angstrom-2007.1-oabi.conf
@@ -0,0 +1,20 @@
+require conf/distro/angstrom-2007.1.conf
+
+#this is a special version of angstrom for armv4 based machines that can't do EABI
+#see http://wiki.debian.org/ArmEabiPort for details on that
+
+#set compatible machine so people don't 'accidentally' use this 
+COMPATIBLE_MACHINE = "(collie|h3600|h3800|simpad)"
+
+#only glibc based builds are supported ATM
+TARGET_OS = "linux"
+
+FEED_ARCH_collie       = "arm"
+FEED_ARCH_h3600        = "arm"
+FEED_ARCH_h3800        = "arm"
+FEED_ARCH_simpad       = "arm"
+
+
+
+
+
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index deefa1b698..e7e867e539 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -3,19 +3,11 @@
 #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
 
 TARGET_ARCH = "arm"
-PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel ?= "collie-kernels-2.4-embedix"
 
-#
-# no keyboard feature because 2.4 kernel keymap works ok and we have limited flash
-# no usbgadget feature because 2.4 kernel handle it in own way on each machine
-#
-MACHINE_FEATURES = "kernel24 apm pcmcia screen irda"
+MACHINE_KERNEL_VERSION ?= "2.4"
+include conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.conf
 
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-sa1100-bi \
-kernel-module-usbdcore kernel-module-usbdmonitor sharp-sdmmc-support"
-
-# kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 # This is needed for the ramdisk script to work
 MACHINE_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
@@ -24,14 +16,12 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
 
 IMAGE_LINGUAS = ""
 
-include conf/machine/include/tune-strongarm.conf
+IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
-SERIAL_CONSOLE = "115200 ttyS0"
+include conf/machine/include/tune-strongarm.conf
 
 ROOT_FLASH_SIZE = "14"
 # actually 14680064, see EXTRA_IMAGECMD above
 
-# Later versions are broken on kernel 2.4
-PREFERRED_VERSION_orinoco-modules = "0.13e"
-
 MACHINE_TASK_PROVIDER = "task-base"
+GUI_MACHINE_CLASS_poodle = "smallscreen"
diff --git a/conf/machine/include/collie-2.4.conf b/conf/machine/include/collie-2.4.conf
new file mode 100644
index 0000000000..0412ea359a
--- /dev/null
+++ b/conf/machine/include/collie-2.4.conf
@@ -0,0 +1,17 @@
+PREFERRED_PROVIDER_virtual/kernel = "collie-kernels-2.4-embedix"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+#
+# no keyboard feature because 2.4 kernel keymap works ok and we have limited flash
+# no usbgadget feature because 2.4 kernel handle it in own way on each machine
+#
+MACHINE_FEATURES = "kernel24 apm pcmcia screen irda"
+
+MACHINE_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-sa1100-bi \
+                             kernel-module-usbdcore kernel-module-usbdmonitor \
+                             sharp-sdmmc-support"
+
+# kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied
+
+# Later versions are broken on kernel 2.4
+PREFERRED_VERSION_orinoco-modules = "0.13e"
diff --git a/conf/machine/include/collie-2.6.conf b/conf/machine/include/collie-2.6.conf
new file mode 100644
index 0000000000..eab879368c
--- /dev/null
+++ b/conf/machine/include/collie-2.6.conf
@@ -0,0 +1,4 @@
+PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
+
+SERIAL_CONSOLE = "115200 ttySA0"
+MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen"
diff --git a/packages/cairo/cairo_0.5.0.bb b/packages/cairo/cairo_0.5.0.bb
deleted file mode 100644
index 8ec642f38d..0000000000
--- a/packages/cairo/cairo_0.5.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SECTION = "libs"
-PRIORITY = "optional"
-# DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender xcb glitz"
-DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender"
-DESCRIPTION = "Cairo graphics library"
-LICENSE = "MPL LGPL"
-PR = "r0"
-
-SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
-}
diff --git a/packages/cairo/cairo_0.5.2.bb b/packages/cairo/cairo_0.5.2.bb
deleted file mode 100644
index 8ec642f38d..0000000000
--- a/packages/cairo/cairo_0.5.2.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SECTION = "libs"
-PRIORITY = "optional"
-# DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender xcb glitz"
-DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender"
-DESCRIPTION = "Cairo graphics library"
-LICENSE = "MPL LGPL"
-PR = "r0"
-
-SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
-}
diff --git a/packages/cairo/cairo_0.9.2.bb b/packages/cairo/cairo_0.9.2.bb
deleted file mode 100644
index cfbb18ed0e..0000000000
--- a/packages/cairo/cairo_0.9.2.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "virtual/libx11 libpng fontconfig libxrender"
-DESCRIPTION = "Cairo graphics library"
-LICENSE = "MPL LGPL"
-PR = "r1"
-
-SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
-}
diff --git a/packages/cairo/cairo_1.0.0.bb b/packages/cairo/cairo_1.0.0.bb
deleted file mode 100644
index 0260c267dd..0000000000
--- a/packages/cairo/cairo_1.0.0.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "virtual/libx11 libpng fontconfig libxrender"
-DESCRIPTION = "Cairo graphics library"
-LICENSE = "MPL LGPL"
-PR = "r1"
-
-SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/packages/cairo/cairo_1.0.2.bb b/packages/cairo/cairo_1.0.2.bb
deleted file mode 100644
index cef51d2212..0000000000
--- a/packages/cairo/cairo_1.0.2.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "virtual/libx11 libpng fontconfig libxrender"
-DESCRIPTION = "Cairo graphics library"
-LICENSE = "MPL LGPL"
-PR = "r0"
-
-SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
-	   file://gcc4-fix.patch;patch=1"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-autotools_stage_all
-}
diff --git a/packages/cairo/cairo_1.0.4.bb b/packages/cairo/cairo_1.0.4.bb
deleted file mode 100644
index 700f425113..0000000000
--- a/packages/cairo/cairo_1.0.4.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "virtual/libx11 libpng fontconfig libxrender"
-DESCRIPTION = "Cairo graphics library"
-LICENSE = "MPL LGPL"
-
-SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-autotools_stage_all
-}
diff --git a/packages/cairo/cairo_cvs.bb b/packages/cairo/cairo_cvs.bb
deleted file mode 100644
index ea20009e34..0000000000
--- a/packages/cairo/cairo_cvs.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-SECTION = "libs"
-PRIORITY = "optional"
-# DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender xcb glitz"
-DEPENDS = "virtual/libx11 libpixman libpng fontconfig libxrender"
-DESCRIPTION = "Cairo graphics library"
-LICENSE = "MPL LGPL"
-PR = "r2"
-DEFAULT_PREFERENCE = "-1"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=cairo"
-S = "${WORKDIR}/cairo"
-
-inherit autotools pkgconfig 
-
-do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
-}
diff --git a/packages/cairo/cairo_git.bb b/packages/cairo/cairo_git.bb
index beb900b40d..9d11c2685f 100644
--- a/packages/cairo/cairo_git.bb
+++ b/packages/cairo/cairo_git.bb
@@ -7,7 +7,7 @@ DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender"
 DESCRIPTION = "Cairo graphics library"
 LICENSE = "MPL LGPL"
 
-PV = "1.3.9+git${SRCDATE}"
+PV = "1.3.11+git${SRCDATE}"
 
 SRC_URI = "git://git.cairographics.org/git/cairo;protocol=git \
 	  "
diff --git a/packages/gstreamer/gst-plugins-0.8.4/ivorbis.patch b/packages/gstreamer/gst-plugins-0.8.4/ivorbis.patch
deleted file mode 100644
index 22949f5e20..0000000000
--- a/packages/gstreamer/gst-plugins-0.8.4/ivorbis.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gst-plugins-0.8.1/ext/ivorbis/vorbis.c.old	2004-06-02 09:12:54.000000000 +0100
-+++ gst-plugins-0.8.1/ext/ivorbis/vorbis.c	2004-06-02 09:12:32.000000000 +0100
-@@ -21,7 +21,8 @@
- #include <config.h>
- #endif
- 
--#include <vorbisenc.h>
-+#include <gst/gst.h>
-+#include <tremor/ivorbiscodec.h>
- 
- extern GType ivorbisfile_get_type (void);
- 
diff --git a/packages/gstreamer/gst-plugins-0.8.7/lame-autoconf.patch b/packages/gstreamer/gst-plugins-0.8.7/lame-autoconf.patch
deleted file mode 100644
index 6f2a300254..0000000000
--- a/packages/gstreamer/gst-plugins-0.8.7/lame-autoconf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gst-plugins-0.8.7/configure.ac.orig	2005-03-03 16:40:45.000000000 +0100
-+++ gst-plugins-0.8.7/configure.ac	2005-03-03 16:41:55.000000000 +0100
-@@ -1197,7 +1197,7 @@
-     LAME_LIBS="-lmp3lame -lm"
-     dnl is lame presets available
-     LAME_CFLAGS=""
--    AC_TRY_RUN([
-+    AC_TRY_COMPILE([
- #include <lame/lame.h>
- int main (int argc, char *argv[])
- {
diff --git a/packages/gstreamer/gst-plugins-0.8.8/gst-plugins-0.8.8-try-esdsink.patch b/packages/gstreamer/gst-plugins-0.8.8/gst-plugins-0.8.8-try-esdsink.patch
deleted file mode 100644
index 553c7b4270..0000000000
--- a/packages/gstreamer/gst-plugins-0.8.8/gst-plugins-0.8.8-try-esdsink.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- gst-plugins-0.8.8.orig/gst-libs/gst/gconf/gconf.c	2005-02-02 09:14:01.000000000 +0100
-+++ gst-plugins-0.8.8/gst-libs/gst/gconf/gconf.c	2005-08-13 23:28:36.000000000 +0200
-@@ -205,9 +205,13 @@
-   if (!ret) {
-     ret = gst_element_factory_make (DEFAULT_AUDIOSINK, NULL);
- 
--    if (!ret)
--      g_warning ("No GConf default audio sink key and %s doesn't work",
--          DEFAULT_AUDIOSINK);
-+    if (!ret) {
-+      ret = gst_element_factory_make ("esdsink", NULL);
-+
-+      if (!ret)
-+        g_warning ("No GConf default audio sink key and neither %s nor esdsink work",
-+            DEFAULT_AUDIOSINK);
-+    }
-   }
- 
-   return ret;
diff --git a/packages/gstreamer/gst-plugins-0.8.8/lame-autoconf.patch b/packages/gstreamer/gst-plugins-0.8.8/lame-autoconf.patch
deleted file mode 100644
index 6f2a300254..0000000000
--- a/packages/gstreamer/gst-plugins-0.8.8/lame-autoconf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gst-plugins-0.8.7/configure.ac.orig	2005-03-03 16:40:45.000000000 +0100
-+++ gst-plugins-0.8.7/configure.ac	2005-03-03 16:41:55.000000000 +0100
-@@ -1197,7 +1197,7 @@
-     LAME_LIBS="-lmp3lame -lm"
-     dnl is lame presets available
-     LAME_CFLAGS=""
--    AC_TRY_RUN([
-+    AC_TRY_COMPILE([
- #include <lame/lame.h>
- int main (int argc, char *argv[])
- {
diff --git a/packages/gstreamer/gst-plugins_0.8.4.bb b/packages/gstreamer/gst-plugins_0.8.4.bb
deleted file mode 100644
index 31630d9e4c..0000000000
--- a/packages/gstreamer/gst-plugins_0.8.4.bb
+++ /dev/null
@@ -1,57 +0,0 @@
-LICENSE = "GPL"
-DESCRIPTION = "Plugins for GStreamer"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-PR = "r2"
-
-DEPENDS = "gstreamer libmikmod libmad libogg tremor libvorbis libid3tag gpe-soundserver gconf"
-
-SRC_URI = "http://gstreamer.freedesktop.org/src/gst-plugins/gst-plugins-${PV}.tar.bz2 \
-	   file://ivorbis.patch;patch=1 \
-	   file://try-esdsink.patch;patch=1 \
-	   file://lame-autoconf.patch;patch=1"
-
-EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --disable-aalib --disable-arts \
-                --disable-artsc --disable-libfame --disable-sdl --disable-shout2 \
-		--disable-gnome_vfs "
-
-inherit autotools pkgconfig gconf
-
-acpaths = "-I ${S}/common/m4 -I ${S}/m4"
-
-LIBV = "0.8"
-
-plugin_postinst() {
-	if [ x"$D" = "x" ]; then
-		gst-register --gst-registry=/var/cache/gstreamer-0.8/registry.xml
-	fi
-}
-
-PACKAGES_DYNAMIC = "gst-plugin-*"
-
-python populate_packages_prepend () {
-	gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d)
-	postinst = bb.data.getVar('plugin_postinst', d, 1)
-
-	do_split_packages(d, gst_libdir, '^libgst(.*)\.so$', 'gst-plugin-%s', 'GStreamer plugin for %s', postinst=postinst)
-	do_split_packages(d, gst_libdir, '^libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)')
-}
-
-do_stage() {
-	autotools_stage_includes
-	while read a b; do
-		oe_libinstall -C gst-libs/gst/$a -so libgst$b ${STAGING_LIBDIR}
-	done <<EOF
-. interfaces-0.8
-audio audio
-audio audiofilter
-gconf gconf-0.8
-idct idct
-media-info media-info-0.8
-play play-0.8
-resample resample
-riff riff
-video video
-xwindowlistener xwindowlistener
-EOF
-}
diff --git a/packages/gstreamer/gst-plugins_0.8.6.bb b/packages/gstreamer/gst-plugins_0.8.6.bb
deleted file mode 100644
index 89de3b8939..0000000000
--- a/packages/gstreamer/gst-plugins_0.8.6.bb
+++ /dev/null
@@ -1,56 +0,0 @@
-LICENSE = "GPL"
-DESCRIPTION = "Plugins for GStreamer"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-PR = "r2"
-
-DEPENDS = "gstreamer libmikmod libmad libogg tremor libvorbis libid3tag gpe-soundserver gconf"
-
-SRC_URI = "http://gstreamer.freedesktop.org/src/gst-plugins/gst-plugins-${PV}.tar.bz2 \
-	   file://try-esdsink.patch;patch=1 \
-	   file://lame-autoconf.patch;patch=1"
-
-EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --disable-aalib --disable-arts \
-                --disable-artsc --disable-libfame --disable-sdl --disable-shout2 \
-		--disable-gnome_vfs --disable-gconf --disable-libcaca"
-
-inherit autotools pkgconfig gconf
-
-acpaths = "-I ${S}/common/m4 -I ${S}/m4"
-
-LIBV = "0.8"
-
-plugin_postinst() {
-	if [ x"$D" = "x" ]; then
-		gst-register --gst-registry=/var/cache/gstreamer-0.8/registry.xml
-	fi
-}
-
-PACKAGES_DYNAMIC = "gst-plugin-*"
-
-python populate_packages_prepend () {
-	gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d)
-	postinst = bb.data.getVar('plugin_postinst', d, 1)
-
-	do_split_packages(d, gst_libdir, '^libgst(.*)\.so$', 'gst-plugin-%s', 'GStreamer plugin for %s', postinst=postinst)
-	do_split_packages(d, gst_libdir, '^libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)')
-}
-
-do_stage() {
-	autotools_stage_includes
-	while read a b; do
-		oe_libinstall -C gst-libs/gst/$a -so libgst$b ${STAGING_LIBDIR}
-	done <<EOF
-. interfaces-0.8
-audio audio
-audio audiofilter
-gconf gconf-0.8
-idct idct
-media-info media-info-0.8
-play play-0.8
-resample resample
-riff riff
-video video
-xwindowlistener xwindowlistener
-EOF
-}
diff --git a/packages/gstreamer/gst-plugins_0.8.7.bb b/packages/gstreamer/gst-plugins_0.8.7.bb
deleted file mode 100644
index 22b7e7dac2..0000000000
--- a/packages/gstreamer/gst-plugins_0.8.7.bb
+++ /dev/null
@@ -1,58 +0,0 @@
-LICENSE = "GPL"
-DESCRIPTION = "Plugins for GStreamer"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-PR = "r3"
-
-DEPENDS = "gstreamer libmikmod libmad libogg tremor libvorbis libid3tag gpe-soundserver gconf"
-
-SRC_URI = "http://gstreamer.freedesktop.org/src/gst-plugins/gst-plugins-${PV}.tar.bz2 \
-	   file://gst-plugins-0.8.7-httpsrc1.patch;patch=1 \
-	   file://lame-autoconf.patch;patch=1 \
-	   file://try-esdsink.patch;patch=1"
-
-EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --disable-aalib --disable-arts \
-                --disable-artsc --disable-jack  --disable-libfame --disable-sdl --disable-shout2 \
-		--disable-gnome_vfs --disable-gconf --disable-libcaca  --disable-directfb \
-		--disable-cairo"
-
-inherit autotools pkgconfig gconf
-
-acpaths = "-I ${S}/common/m4 -I ${S}/m4"
-
-LIBV = "0.8"
-
-plugin_postinst() {
-	if [ x"$D" = "x" ]; then
-		gst-register --gst-registry=/var/cache/gstreamer-0.8/registry.xml
-	fi
-}
-
-PACKAGES_DYNAMIC = "gst-plugin-*"
-
-python populate_packages_prepend () {
-	gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d)
-	postinst = bb.data.getVar('plugin_postinst', d, 1)
-
-	do_split_packages(d, gst_libdir, '^libgst(.*)\.so$', 'gst-plugin-%s', 'GStreamer plugin for %s', postinst=postinst)
-	do_split_packages(d, gst_libdir, '^libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)')
-}
-
-do_stage() {
-	autotools_stage_includes
-	while read a b; do
-		oe_libinstall -C gst-libs/gst/$a -so libgst$b ${STAGING_LIBDIR}
-	done <<EOF
-. interfaces-0.8
-audio audio
-audio audiofilter
-gconf gconf-0.8
-idct idct
-media-info media-info-0.8
-play play-0.8
-resample resample
-riff riff
-video video
-xwindowlistener xwindowlistener
-EOF
-}
diff --git a/packages/gstreamer/gst-plugins_0.8.8.bb b/packages/gstreamer/gst-plugins_0.8.8.bb
deleted file mode 100644
index 074522d173..0000000000
--- a/packages/gstreamer/gst-plugins_0.8.8.bb
+++ /dev/null
@@ -1,60 +0,0 @@
-LICENSE = "GPL"
-DESCRIPTION = "Plugins for GStreamer"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-PR = "r0"
-
-DEFAULT_PREFERENCE = "-1"
-
-DEPENDS = "gstreamer libmikmod libmad libogg tremor libvorbis libid3tag gpe-soundserver gconf"
-
-SRC_URI = "http://gstreamer.freedesktop.org/src/gst-plugins/gst-plugins-${PV}.tar.bz2 \
-	   file://gst-plugins-0.8.7-httpsrc1.patch;patch=1 \
-	   file://lame-autoconf.patch;patch=1 \
-	   file://gst-plugins-0.8.8-try-esdsink.patch;patch=1"
-
-EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --disable-aalib --disable-arts \
-                --disable-artsc --disable-jack  --disable-libfame --disable-sdl --disable-shout2 \
-		--disable-gnome_vfs --disable-gconf --disable-libcaca  --disable-directfb \
-		--disable-cairo"
-
-inherit autotools pkgconfig gconf
-
-acpaths = "-I ${S}/common/m4 -I ${S}/m4"
-
-LIBV = "0.8"
-
-plugin_postinst() {
-	if [ x"$D" = "x" ]; then
-		gst-register --gst-registry=/var/cache/gstreamer-0.8/registry.xml
-	fi
-}
-
-PACKAGES_DYNAMIC = "gst-plugin-*"
-
-python populate_packages_prepend () {
-	gst_libdir = bb.data.expand('${libdir}/gstreamer-${LIBV}', d)
-	postinst = bb.data.getVar('plugin_postinst', d, 1)
-
-	do_split_packages(d, gst_libdir, '^libgst(.*)\.so$', 'gst-plugin-%s', 'GStreamer plugin for %s', postinst=postinst)
-	do_split_packages(d, gst_libdir, '^libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)')
-}
-
-do_stage() {
-	autotools_stage_includes
-	while read a b; do
-		oe_libinstall -C gst-libs/gst/$a -so libgst$b ${STAGING_LIBDIR}
-	done <<EOF
-. interfaces-0.8
-audio audio
-audio audiofilter
-gconf gconf-0.8
-idct idct
-media-info media-info-0.8
-play play-0.8
-resample resample
-riff riff
-video video
-xwindowlistener xwindowlistener
-EOF
-}
diff --git a/packages/gstreamer/gstreamer-0.8.9/libm.patch b/packages/gstreamer/gstreamer-0.8.9/libm.patch
deleted file mode 100644
index 21ee09fc90..0000000000
--- a/packages/gstreamer/gstreamer-0.8.9/libm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gstreamer-0.8.9/configure.ac.old	2005-02-28 02:52:28.401347752 +0000
-+++ gstreamer-0.8.9/configure.ac	2005-02-28 02:52:29.728146048 +0000
-@@ -588,7 +588,7 @@
- dnl Private vars for libgst only
- GST_LIB_CFLAGS="$GST_PKG_CFLAGS $GST_INT_CFLAGS \
-   $VALGRIND_CFLAGS -I\$(top_srcdir)"
--GST_LIB_LIBS="$XML_LIBS $GLIB_LIBS -lpopt $GST_PKG_LIBS $LTLIBINTL $VALGRIND_LIBS"
-+GST_LIB_LIBS="$XML_LIBS $GLIB_LIBS -lpopt $GST_PKG_LIBS $LTLIBINTL $VALGRIND_LIBS -lm"
- GST_LIB_LDFLAGS="$GST_LT_LDFLAGS -version-info $GST_LIBVERSION $EXPORT_