Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

27 files changed, 114 insertions, 154 deletions

diff --git a/classes/base.bbclass b/classes/base.bbclass
index a94fa2723b..b191940038 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -1100,7 +1100,7 @@ sysroot_stage_dirs() {
 		sysroot_stage_libdir $from${base_libdir} $to${STAGING_DIR_HOST}${base_libdir}
 	fi
 	sysroot_stage_dir $from${datadir} $to${STAGING_DATADIR}
-	sysroot_stage_dir $from${sysconfdir} $to${sysconfdir}
+	sysroot_stage_dir $from${sysconfdir} $to${STAGING_ETCDIR}
 }
 
 sysroot_stage_all() {
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index c020efe88c..1151f4cc68 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -313,6 +313,7 @@ STAGING_DIR_HOST = "${STAGING_DIR}/${BASEPKG_HOST_SYS}"
 STAGING_BINDIR = "${STAGING_DIR_HOST}${bindir}"
 STAGING_LIBDIR = "${STAGING_DIR_HOST}${libdir}"
 STAGING_INCDIR = "${STAGING_DIR_HOST}${includedir}"
+STAGING_ETCDIR = "${STAGING_DIR_HOST}${sysconfdir}"
 STAGING_DATADIR = "${STAGING_DIR_HOST}${datadir}"
 STAGING_EXECPREFIXDIR = "${STAGING_DIR_HOST}${exec_prefix}"
 STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader"
diff --git a/conf/compatibility-providers.conf b/conf/compatibility-providers.conf
index e5d0596a6e..7823f6694d 100644
--- a/conf/compatibility-providers.conf
+++ b/conf/compatibility-providers.conf
@@ -44,7 +44,7 @@ PREFERRED_PROVIDER_libfribidi ?= "fribidi"
 PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
 PREFERRED_PROVIDER_libxss ?= "libxss"
 PREFERRED_PROVIDER_ntp ?= "ntp"
-PREFERRED_PROVIDER_openmoko-alsa-scenarios ?= "alsa-scenarii-shr"
+PREFERRED_PROVIDER_openmoko-alsa-scenarios ?= "fsodeviced"
 PREFERRED_PROVIDER_opkg ?= "opkg"
 #PREFERRED_PROVIDER_opkg ?= "opkg-nogpg"
 PREFERRED_PROVIDER_qemu-native ?= "qemu-native"
@@ -54,7 +54,7 @@ PREFERRED_PROVIDER_task-bootstrap ?= "task-bootstrap"
 PREFERRED_PROVIDER_tslib-conf ?= "tslib"
 PREFERRED_PROVIDER_tslib ?= "tslib"
 PREFERRED_PROVIDER_util-linux ?= "util-linux-ng"
-PREFERRED_PROVIDER_virtual/alsa-scenarios ?= "alsa-scenarii-shr"
+PREFERRED_PROVIDER_virtual/alsa-scenarios ?= "fsodeviced"
 PREFERRED_PROVIDER_virtual/db ?= "db"
 #PREFERRED_PROVIDER_virtual/db ?= "db3"
 PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index fe025eecd0..2ff99cb370 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -7,7 +7,7 @@ SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fso-boot ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsodatad ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsodeviced ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsogsmd ?= "33206723461710d5c50cbed2eaf2fd2440b7dff9"
 SRCREV_pn-fsolocationd ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsomusicd ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}"
@@ -33,7 +33,7 @@ SRCREV_pn-fso-sounds ?= "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815"
 SRCREV_pn-fso-specs ?= "bd8a5d1cf461c6633ddc8f4c91a1101ec835faad"
 SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8"
 SRCREV_pn-libfso-glib ?= "a1f2f14946ad154c5fb842fadf081fe377bd9924"
-SRCREV_pn-libframeworkd-glib ?= "be8b61dfe595c19abfaca3f308038ae70195f720"
+SRCREV_pn-libframeworkd-glib ?= "67e300e32f4b546ba23163109cbab68be8c70ce9"
 SRCREV_pn-libgsm0710 ?= "52eea64bdbb79c09002b46e98a5e656509884f72"
 SRCREV_pn-libpersistence ?= "217ad803745f8ac1f3c72c6715e2c0faefb3fd06"
 FSO_PYTHONHELPERS_SRCREV ?= "63b1dff1bc8ac22efabcee8a90e957c3b2423317"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index b51dab1a85..31d6c30a07 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -240,7 +240,7 @@ SRCREV_pn-psplash ?= "249"
 SRCREV_pn-pty-forward-native ?= "4662b55fdba528bb5b3349f83055bf236af5d63b"
 SRCREV_pn-pyefl-sudoku ?= "49"
 SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
-SRCREV_pn-pyphonelog ?= "7f3f460b5464d0ca5426131ac52bd10e496f02a5"
+SRCREV_pn-pyphonelog ?= "b70058755df1f12cd48db51fa4cd933c027e20c6"
 SRCREV_pn-pythm ?= "19"
 SRCREV_pn-python-coherence ?= "1161"
 SRCREV_pn-python-connexion ?= "1439"
diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh
index ce2959b134..2e2cefaac6 100755
--- a/contrib/angstrom/sort.sh
+++ b/contrib/angstrom/sort.sh
@@ -48,7 +48,7 @@ case "$arch" in
 	"armv4t")
 			machines="micro2440 ep93xx h6300 om-gta01 om-gta02 fic-gta01 fic-gta02" ;;
 	"armv5te")
-			machines="hawkboard da850-omapl138-evm da830-omapl137-evm htcalpine dm6446-evm dm6467-evm dm6467t-evm dm355-evm dm365-evm dm357-evm topas910 sheevaplug openrd-client openrd-base dm355-leopard n2100 dns323 mv2120 kuropro lspro tsx09 ts409 davinci-dvevm davinci-sffsdr neuros-osd neuros-osd2 gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmt650 palmt680 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa mx27ads at91sam9g20ek mainstone" ;;
+			machines="hawkboard da850-omapl138-evm da830-omapl137-evm htcalpine dm6446-evm dm6467-evm dm6467t-evm dm355-evm dm365-evm dm357-evm topas910 sheevaplug openrd-client openrd-base dm355-leopard n2100 dns323 mv2120 kuropro lspro tsx09 ts409 davinci-dvevm davinci-sffsdr neuros-osd neuros-osd2 gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmt650 palmt680 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa mx27ads at91sam9g20ek mainstone hipox" ;;
 	"armv5teb")
 			machines="ixp4xxbe nslu2be" ;;
 	"armv6-novfp")
diff --git a/recipes/abiword/abiword-2.5.inc b/recipes/abiword/abiword-2.5.inc
index f4d654ea4c..b8950ca92b 100644
--- a/recipes/abiword/abiword-2.5.inc
+++ b/recipes/abiword/abiword-2.5.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) Word"
-HOMEPAGE = "http://www.abiword.org""
+HOMEPAGE = "http://www.abiword.org"
 SECTION = "x11/office"
 LICENSE = "GPLv2"
 DEPENDS     = "asio goffice perl-native wv libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng libxml2"
diff --git a/recipes/angstrom/angstrom-uboot-scripts/palo43-dsplink.cmd b/recipes/angstrom/angstrom-uboot-scripts/palo43-dsplink.cmd
new file mode 100644
index 0000000000..b182bee9a2
--- /dev/null
+++ b/recipes/angstrom/angstrom-uboot-scripts/palo43-dsplink.cmd
@@ -0,0 +1,4 @@
+setenv vram '12M'
+setenv defaultdisplay 'lcd43 mem=99M@0x80000000 mem=128M@0x88000000 omapfb.vram=0:8M,1:2M,2:2M' 
+run loaduimage
+run mmcboot
diff --git a/recipes/angstrom/angstrom-uboot-scripts/pico-dsplink.cmd b/recipes/angstrom/angstrom-uboot-scripts/pico-dsplink.cmd
new file mode 100644
index 0000000000..da6ea75f89
--- /dev/null
+++ b/recipes/angstrom/angstrom-uboot-scripts/pico-dsplink.cmd
@@ -0,0 +1,3 @@
+setenv dvimode '640x480MR-24@60 mem=99M@0x80000000 mem=128M@0x88000000 omapfb.vram=0:6M,1:3M,2:3M'
+run loaduimage
+run mmcboot
diff --git a/recipes/cdparanoia/cdparanoia_svn.bb b/recipes/cdparanoia/cdparanoia_svn.bb
index 71fafee281..783d5071ff 100644
--- a/recipes/cdparanoia/cdparanoia_svn.bb
+++ b/recipes/cdparanoia/cdparanoia_svn.bb
@@ -2,19 +2,19 @@
 # Copyright (C) 2005, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
 
-PR ="r1"
-LICENSE="GPL"
+PR = "r2"
+LICENSE = "GPL"
 
 PV = "10.2+svnr${SRCPV}"
 
-SRC_URI="svn://svn.xiph.org/trunk;module=cdparanoia;proto=http \
+SRC_URI = "svn://svn.xiph.org/trunk;module=cdparanoia;proto=http \
 	 file://fixes10.patch;patch=1 \
 	 file://Makefile.in.patch;patch=1 \
 	 file://interface_Makefile.in.patch;patch=1 \
 	 file://paranoia_Makefile.in.patch;patch=1 \
-         file://configure.in.patch;patch=1 "
+	 file://configure.in.patch;patch=1 "
 
-S="${WORKDIR}/cdparanoia"
+S = "${WORKDIR}/cdparanoia"
 
 PARALLEL_MAKE = ""
 
@@ -25,12 +25,3 @@ do_install() {
 		   INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install
 }
 
-do_stage() {
-	install -d ${STAGING_INCDIR} ${STAGING_LIBDIR}
-
-	install -m 0644 paranoia/cdda_paranoia.h ${STAGING_INCDIR}
-	install -m 0644 interface/cdda_interface.h ${STAGING_INCDIR}
-
-	oe_libinstall -C interface libcdda_interface ${STAGING_LIBDIR}
-	oe_libinstall -C paranoia libcdda_paranoia ${STAGING_LIBDIR}
-}
diff --git a/recipes/cups/cups.inc b/recipes/cups/cups.inc
index db4475cd5c..36e76c34fd 100644
--- a/recipes/cups/cups.inc
+++ b/recipes/cups/cups.inc
@@ -16,6 +16,7 @@ EXTRA_OECONF = " \
 		--enable-browsing \
                 --disable-openssl \
 		--disable-tiff \
+		--disable-ssl \
 		--without-php \
 		--without-perl \
 		--without-python \
diff --git a/recipes/gtk+/gtk+.inc b/recipes/gtk+/gtk+.inc
index 0444ff2f0d..6c8f0de65c 100644
--- a/recipes/gtk+/gtk+.inc
+++ b/recipes/gtk+/gtk+.inc
@@ -80,7 +80,7 @@ do_install_virtclass-native () {
 	rm -f ${D}${libdir}/gtk-2.0/*/*.la ${D}${libdir}/gtk-2.0/${LIBV}/*/*.la
 
 	mkdir -p "${D}${sysconfdir}/gtk-2.0"
-	${B}/gdk-pixbuf/gdk-pixbuf-query-loaders > "${D}${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders"
+	${B}/gdk-pixbuf/gdk-pixbuf-query-loaders ${B}/gdk-pixbuf/.libs/*.so | sed 's:${B}/gdk-pixbuf/.libs:${STAGING_LIBDIR}/gtk-2.0/${LIBV}/loaders:' > "${D}${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders"
 }
 
 postinst_prologue() {
diff --git a/recipes/gtk+/gtk+_2.18.6.bb b/recipes/gtk+/gtk+_2.18.6.bb
index 8546591187..1c2ca79016 100644
--- a/recipes/gtk+/gtk+_2.18.6.bb
+++ b/recipes/gtk+/gtk+_2.18.6.bb
@@ -7,7 +7,7 @@ PR = "${INC_PR}.3"
 
 BBCLASSEXTEND = "native"
 
-DEPENDS_virtclass-native = "libpng-native atk-native pango-native cairo-native libxrender-native"
+DEPENDS_virtclass-native = "libpng-native atk-native pango-native cairo-native libxrender-native libxext-native"
 PROVIDES_virtclass-native = "gdk-pixbuf-csource-native"
 
 # Enable xkb selectively
diff --git a/recipes/libxml/libxml2.inc b/recipes/libxml/libxml2.inc
index 207ef5b489..8d4900208e 100644
--- a/recipes/libxml/libxml2.inc
+++ b/recipes/libxml/libxml2.inc
@@ -7,7 +7,7 @@ DEPENDS_virtclass-native = "python-native"
 SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=archive"
 S = "${WORKDIR}/${BPN}-${PV}"
 
-INC_PR = "r5"
+INC_PR = "r6"
 
 BBCLASSEXTEND = "native"
 
@@ -28,7 +28,8 @@ export LDFLAGS += "-ldl"
 do_install_append() {
  	install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
 	#this is need it by php during its install
-	install -m 0755 xml2-config ${STAGING_BINDIR_CROSS}
+	install -d ${STAGING_BINDIR_CROSS}
+	install -m 0755 xml2-config ${STAGING_BINDIR_CROSS}/
 }
 do_install_append_virtclass-native() {
 	:
diff --git a/recipes/linux-libc-headers/linux-libc-headers-2.6.31/scsi-use-__u8.patch b/recipes/linux-libc-headers/linux-libc-headers-2.6.31/scsi-use-__u8.patch
new file mode 100644
index 0000000000..b75487965a
--- /dev/null
+++ b/recipes/linux-libc-headers/linux-libc-headers-2.6.31/scsi-use-__u8.patch
@@ -0,0 +1,26 @@
+This patch is from 
+http://patchwork.kernel.org/patch/38102/
+It seems its still under discussion and it will involve glibc to get it fixed correctly.
+for now OE uses scsi headers from kernel and not from glibc.
+
+-Khem
+
+Index: linux-2.6.31/include/scsi/scsi.h
+===================================================================
+--- linux-2.6.31.orig/include/scsi/scsi.h	2010-03-11 19:44:49.134590561 -0800
++++ linux-2.6.31/include/scsi/scsi.h	2010-03-11 19:45:12.744466326 -0800
+@@ -142,10 +142,10 @@ struct scsi_cmnd;
+ 
+ /* defined in T10 SCSI Primary Commands-2 (SPC2) */
+ struct scsi_varlen_cdb_hdr {
+-	u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
+-	u8 control;
+-	u8 misc[5];
+-	u8 additional_cdb_length;         /* total cdb length - 8 */
++	__u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
++	__u8 control;
++	__u8 misc[5];
++	__u8 additional_cdb_length;         /* total cdb length - 8 */
+ 	__be16 service_action;
+ 	/* service specific data follows */
+ };
diff --git a/recipes/linux-libc-headers/linux-libc-headers-2.6.32/scsi-use-__u8.patch b/recipes/linux-libc-headers/linux-libc-headers-2.6.32/scsi-use-__u8.patch
new file mode 100644
index 0000000000..b75487965a
--- /dev/null
+++ b/recipes/linux-libc-headers/linux-libc-headers-2.6.32/scsi-use-__u8.patch
@@ -0,0 +1,26 @@
+This patch is from 
+http://patchwork.kernel.org/patch/38102/
+It seems its still under discussion and it will involve glibc to get it fixed correctly.
+for now OE uses scsi headers from kernel and not from glibc.
+
+-Khem
+
+Index: linux-2.6.31/include/scsi/scsi.h
+===================================================================
+--- linux-2.6.31.orig/include/scsi/scsi.h	2010-03-11 19:44:49.134590561 -0800
++++ linux-2.6.31/include/scsi/scsi.h	2010-03-11 19:45:12.744466326 -0800
+@@ -142,10 +142,10 @@ struct scsi_cmnd;
+ 
+ /* defined in T10 SCSI Primary Commands-2 (SPC2) */
+ struct scsi_varlen_cdb_hdr {
+-	u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
+-	u8 control;
+-	u8 misc[5];
+-	u8 additional_cdb_length;         /* total cdb length - 8 */
++	__u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
++	__u8 control;
++	__u8 misc[5];
++	__u8 additional_cdb_length;         /* total cdb length - 8 */
+ 	__be16 service_action;
+ 	/* service specific data follows */
+ };
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
index 08a871e1ce..f01af4ecde 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
@@ -2,12 +2,13 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r2"
+PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch;patch=1 \
+           file://scsi-use-__u8.patch;patch=1 \
 	  "
 S = "${WORKDIR}/linux-${PV}"
 
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
index e1914b3286..29d52cfc51 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
@@ -2,12 +2,13 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r1"
+PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
 	   file://export_sa_family_t.patch;patch=1 \
+           file://scsi-use-__u8.patch;patch=1 \
 	  "
 S = "${WORKDIR}/linux-${PV}"
 
diff --git a/recipes/pingus/files/pingus-gta012.sh b/recipes/pingus/files/pingus-gta012.sh
index 70346c5646..4edcdc9060 100644
--- a/recipes/pingus/files/pingus-gta012.sh
+++ b/recipes/pingus/files/pingus-gta012.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
-xrandr -o 3
-pingus.bin --fast-mode -g 640x480 --disable-music --disable-sound --fullscreen
+xrandr -o 1
+pingus.bin -w -g 640x434 --disable-music --disable-sound
 xrandr -o 0
diff --git a/recipes/pingus/pingus_0.7.2.bb b/recipes/pingus/pingus_0.7.2.bb
index 10f99bae0e..6c1725f260 100644
--- a/recipes/pingus/pingus_0.7.2.bb
+++ b/recipes/pingus/pingus_0.7.2.bb
@@ -3,7 +3,7 @@ DEPENDS = "virtual/libiconv virtual/libsdl libsdl-image libsdl-mixer boost libpn
 LICENSE = "GPL"
 HOMEPAGE = "http://pingus.seul.org/"
 SECTION = "x11/games"
-PR = "r2"
+PR = "r3"
 
 ARM_INSTRUCTION_SET = "arm"
 
diff --git a/recipes/python/python-pygame-1.8.1/Setup b/recipes/python/python-pygame-1.8.1/Setup
deleted file mode 100644
index dd6d540da5..0000000000
--- a/recipes/python/python-pygame-1.8.1/Setup
+++ /dev/null
@@ -1,63 +0,0 @@
-#This Setup file is used by the setup.py script to configure the
-#python extensions. You will likely use the "config.py" which will
-#build a correct Setup file for you based on your system settings.
-#If not, the format is simple enough to edit by hand. First change
-#the needed commandline flags for each dependency, then comment out
-#any unavailable optional modules in the first optional section.
-
-
-SDL = -D_REENTRANT -Xlinker -lSDL -lpthread 
-FONT = -lSDL_ttf
-IMAGE = -lSDL_image
-MIXER = -lSDL_mixer
-SMPEG = -lsmpeg 
-PNG = -lpng
-JPEG = -ljpeg
-SCRAP = -lX11
-
-#DEBUG = -C-W -C-Wall
-DEBUG = 
-
-#the following modules are optional. you will want to compile
-#everything you can, but you can ignore ones you don't have
-#dependencies for, just comment them out
-
-imageext src/imageext.c $(SDL) $(IMAGE) $(PNG) $(JPEG) $(DEBUG)
-font src/font.c $(SDL) $(FONT) $(DEBUG)
-mixer src/mixer.c $(SDL) $(MIXER) $(DEBUG)
-mixer_music src/music.c $(SDL) $(MIXER) $(DEBUG)
-_numericsurfarray src/_numericsurfarray.c $(SDL) $(DEBUG)
-_numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
-scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
-
-#experimental new movie movie. requires libavcodec and libavformat.
-#add any necessary compile flags to this line and uncomment.
-#movieext src/movie.c  src/ffmovie.c $(SDL) -lavcodec -lavformat
-
-
-#these modules are required for pygame to run. they only require
-#SDL as a dependency. these should not be altered
-
-base src/base.c $(SDL) $(DEBUG)
-cdrom src/cdrom.c $(SDL) $(DEBUG)
-color src/color.c $(SDL) $(DEBUG)
-constants src/constants.c $(SDL) $(DEBUG)
-display src/display.c $(SDL) $(DEBUG)
-event src/event.c $(SDL) $(DEBUG)
-fastevent src/fastevent.c src/fastevents.c $(SDL) $(DEBUG)
-key src/key.c $(SDL) $(DEBUG)
-mouse src/mouse.c $(SDL) $(DEBUG)
-rect src/rect.c $(SDL) $(DEBUG)
-rwobject src/rwobject.c $(SDL) $(DEBUG)
-surface src/surface.c src/alphablit.c src/surface_fill.c $(SDL) $(DEBUG)
-surflock src/surflock.c $(SDL) $(DEBUG)
-time src/time.c $(SDL) $(DEBUG)
-joystick src/joystick.c $(SDL) $(DEBUG)
-draw src/draw.c $(SDL) $(DEBUG)
-image src/image.c $(SDL) $(DEBUG)
-overlay src/overlay.c $(SDL) $(DEBUG)
-transform src/transform.c src/rotozoom.c src/scale2x.c $(SDL) $(DEBUG)
-mask src/mask.c src/bitmask.c $(SDL) $(DEBUG)
-bufferproxy src/bufferproxy.c $(SDL) $(DEBUG)
-pixelarray src/pixelarray.c $(SDL) $(DEBUG)
-
diff --git a/recipes/python/python-pygame_1.8.1.bb b/recipes/python/python-pygame_1.9.1.bb
index 95191ce350..bbeedda3a9 100644
--- a/recipes/python/python-pygame_1.8.1.bb
+++ b/recipes/python/python-pygame_1.9.1.bb
@@ -4,27 +4,23 @@ HOMEPAGE = "http://www.pygame.org"
 LICENSE = "LGPL"
 DEPENDS = "libsdl-x11 libsdl-image libsdl-mixer libsdl-net libsdl-ttf python-numeric"
 DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'smpeg', d)}"
+RDEPENDS = "python-numeric"
 SRCNAME = "pygame"
 PR = "ml4"
 
-SRC_URI = "\
-  ftp://ftp.pygame.org/pub/pygame/${SRCNAME}-${PV}release.tar.gz \
-  file://Setup \
-"
+SRC_URI = "http://www.pygame.org/ftp/${SRCNAME}-${PV}release.tar.gz;name=archive"
+SRC_URI[archive.md5sum] = "1c4cdc708d17c8250a2d78ef997222fc"
+SRC_URI[archive.sha256sum] = "a26095472ae4be9631e0d5bfb9a52ac57a3a091e45757913128e4a473807d433"
 S = "${WORKDIR}/${SRCNAME}-${PV}release"
 
 inherit distutils
 
 do_configure_prepend() {
-	cat ${WORKDIR}/Setup >Setup
+	# Drop options to replace them later and drom pypm as we don't have portmidi/porttime
+	sed '/^SDL =/d; /^SMPEG =/d; /^movie src/d; /^pypm src/d' Setup.in > Setup
 	SDL="`sdl-config --cflags` `sdl-config --libs`"; echo "SDL=$SDL" >>Setup
 	if [ '${ENTERPRISE_DISTRO}' != '1' ]; then
+		SMPEG="`smpeg-config --cflags` `smpeg-config --libs`"; echo "SMPEG=$SMPEG" >>Setup
 		echo "movie src/movie.c \$(SDL) \$(SMPEG) \$(DEBUG)" >>Setup
 	fi
 }
-
-do_stage() {
-	distutils_stage_all
-}
-
-RDEPENDS = "python-numeric"
diff --git a/recipes/sdlperl/sdl-perl_1.20.3.bb b/recipes/sdlperl/sdl-perl_1.20.3.bb
index 6820fa05ce..b93637d7ae 100644
--- a/recipes/sdlperl/sdl-perl_1.20.3.bb
+++ b/recipes/sdlperl/sdl-perl_1.20.3.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 HOMEPAGE = "http://sdl.perl.org/"
 LICENSE = "GPL"
 DEPENDS = "perl virtual/libsdl libsdl-image libsdl-gfx libsdl-ttf libsdl-mixer libsdl-net smpeg"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://bloodgate.com/perl/sdl/pub/SDL_perl-${PV}.tar.gz"
 S = "${WORKDIR}/SDL_perl-${PV}"
@@ -13,6 +13,4 @@ inherit cpan
 do_configure_prepend() {
         # Search staging area for includes
         sed -i -e 's:/usr/\(local/\)\{0,1\}include:${STAGING_INCDIR}:g' Makefile.linux
-        # smpeg.h isn't in a subdirectry
-        sed -i -e 's:#include <smpeg/smpeg.h>:#include <smpeg.h>:g' SDL_perl.xs
 }
diff --git a/recipes/smpeg/smpeg/as-fix.patch b/recipes/smpeg/smpeg/as-fix.patch
deleted file mode 100644
index 1a747018e5..0000000000
--- a/recipes/smpeg/smpeg/as-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
----
- configure.in |    1 +
- 1 file changed, 1 insertion(+)
-
---- trunk.orig/configure.in
-+++ trunk/configure.in
-@@ -54,10 +54,11 @@ AC_PROG_MAKE_SET
- AC_PROG_CC
- AC_PROG_CXX
- AC_LIBTOOL_WIN32_DLL
- AM_PROG_LIBTOOL
- AC_PROG_INSTALL
-+AM_PROG_AS
- 
- dnl Ugh.
- AS="$CC"
- CCAS="$CC"
- AC_SUBST(AS)
diff --git a/recipes/smpeg/smpeg_svn.bb b/recipes/smpeg/smpeg_svn.bb
index 343e0bd2eb..7883463df4 100644
--- a/recipes/smpeg/smpeg_svn.bb
+++ b/recipes/smpeg/smpeg_svn.bb
@@ -6,41 +6,31 @@ DEPENDS = "virtual/libsdl"
 PROVIDES = "smpeg"
 PV = "0.4.5+svnr${SRCPV}"
 PE = "1"
-SRCREV = "370"
+SRCREV = "387"
 
-SRC_URI = "svn://svn.icculus.org/smpeg/;module=trunk  \
-	   file://m4.patch;patch=1 \
-	   file://as-fix.patch;patch=1"
+SRC_URI = "svn://svn.icculus.org/smpeg/;module=trunk"
 
 S = "${WORKDIR}/trunk"
 
-inherit autotools
+inherit autotools binconfig
 
-export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
-
-CFLAGS_append = " -I${STAGING_INCDIR}/SDL"
 EXTRA_OECONF = "--disable-gtktest --disable-opengl-player --without-x \
 		--without-gtk --disable-gtk-player"
 
 do_configure_prepend () {
 	touch NEWS AUTHORS ChangeLog
-	rm -f acinclude.m4
-}
-
-do_stage() {
-	oe_libinstall -so -C .libs libsmpeg-0.4 ${STAGING_LIBDIR}
-	ln -sf libsmpeg-0.4.so ${STAGING_LIBDIR}/libsmpeg.so
-
-	for f in "*.h"
-	do
-		install -m 0644 ${f} ${STAGING_INCDIR}/SDL
-	done
-
-        cat smpeg-config | sed -e "s,-I/usr/include/SDL,-I${STAGING_INCDIR}/SDL," \
-                         | sed -e "s,-I/usr/include/smpeg, ," \
-                         | sed -e "s,libdirs ,mickey_is_cool ," \
-                         | sed -e "s,-lSDL ,-lSDL-1.2 , "> ${STAGING_BINDIR_CROSS}/smpeg-config
-        chmod a+rx ${STAGING_BINDIR_CROSS}/smpeg-config
+	# drop all .m4 which are available in staging
+	rm -f acinclude/gtk-2.0.m4 \
+	      acinclude/libtool.m4 \
+	      acinclude/ltdl.m4 \
+	      acinclude/ltoptions.m4 \
+	      acinclude/ltsugar.m4 \
+	      acinclude/ltversion.m4 \
+	      acinclude/lt~obsolete.m4 \
+	      acinclude/pkg.m4 \
+	      acinclude/sdl.m4 \
+	      aclocal.m4 \
+	      acinclude.m4
 }
 
 PACKAGES =+ "plaympeg "
diff --git a/recipes/tasks/task-shr-minimal.bb b/recipes/tasks/task-shr-minimal.bb
index 39763975dd..097129292e 100644
--- a/recipes/tasks/task-shr-minimal.bb
+++ b/recipes/tasks/task-shr-minimal.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SHR Lite Image Feed"
-PR = "r27"
+PR = "r28"
 PV = "2.0"
 LICENSE = "GPL"
 
@@ -120,6 +120,8 @@ RDEPENDS_${PN}-x = "\
 "
 
 RDEPENDS_${PN}-apps = "\
+# because of new opimd doesn't support SIM contacts itself
+  pisi \
   fso-abyss \
   task-fso2-compliance \
   phoneui-apps-messages \
diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index 3073cfe134..1c6e8a89e0 100644
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -7,7 +7,7 @@ inherit autotools
 
 DEFAULT_PREFERENCE = "-1"
 
-INC_PR = "r15"
+INC_PR = "r16"
 
 # allows for a release candidate
 RC ?= ""
@@ -211,7 +211,7 @@ pkg_postinst_${PN} () {
 
 pkg_prerm_${PN} () {
 	test -x ${base_sbindir}/pivot_root.${PN} && \
-	update-alternatives --remove pivot_root pivot_root.${PN}i
+	update-alternatives --remove pivot_root pivot_root.${PN}
 
 	for i in dmesg kill more halt hwclock mkswap reboot shutdown sln mkfs.minix fsck.minix hecdump last logger mesg renice wall vipw vigr chfn newgrp chsh login ; do
 		update-alternatives --remove $i $i.${PN}