Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev

30 files changed, 257 insertions, 48 deletions

diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass
index 89fb3a19f8..d2ca739e40 100644
--- a/classes/gnome.bbclass
+++ b/classes/gnome.bbclass
@@ -17,6 +17,9 @@ inherit autotools gtk-icon-cache pkgconfig gconf mime
 
 AUTOTOOLS_STAGE_PKGCONFIG = "1"
 
+PACKAGES =+ "${PN}-scrollkeeper-leftovers"
+FILES_${PN}-scrollkeeper-leftovers = "${localstatedir}/lib/scrollkeeper"
+
 gnome_stage_includes() {
 	autotools_stage_includes
 }
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 2764372fc1..5d41dd8900 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -218,7 +218,7 @@ sha256=f12ec5f0864d85268a8d67e4919cb7f3d7f0e06ed6cc278c952f6c342673d931
 md5=caea8bcfc9c1d391e56d85e437005a5d
 sha256=0875e553a17fe65e920ad810a67aa6faca582c53476d8dc75880a6b3da625d0b
 
-[http://directfb.org/downloads/Core/DirectFB-1.2.7.tar.gz]
+[http://directfb.org/downloads/Old/DirectFB-1.2.7.tar.gz]
 md5=59ca16f600e96c8c104a485ff7c322c6
 sha256=80ab8e34246a280bc380020cf331bcc0014cf816380cee3935ad455c108e661e
 
@@ -2758,6 +2758,10 @@ sha256=2bfc5db7703cbcaaa4be2576609136450e1dac5d4782707dd0dc81754e3c2489
 md5=ba06291b737077332e914d6d653501c6
 sha256=924dc4b8ae78da2c8f3af9c36ab85d08ee7f8ec0ae4dfe58840ae70041580063
 
+[http://www.kernel.org/pub/linux/bluetooth/bluez-4.40.tar.gz]
+md5=a25fa37c97c309338649f6a5fd4cea76
+sha256=1208d8e986f8b545659db21c8220ec28b48979627158123dd9018f9733d858d2
+
 [http://www.kernel.org/pub/linux/bluetooth/bluez-4.7.tar.gz]
 md5=2aa806940d2c841e57a9b2ab7302b750
 sha256=ed384dea4f5f21157758fcd7db64db19ce0b410509c26630706e4a3c779287a0
@@ -5298,6 +5302,10 @@ sha256=e0360be0eecee68649246c022825dd5422f895958ffa736886dd2a0b9ec7ebda
 md5=01c4c944a1b900b5b3bfa95d3a820b22
 sha256=998b50e3920546cb43cd281d519394a2db23f5bf10223cac49120296407b3c6d
 
+[http://ftp.gnome.org/pub/GNOME/sources/ekiga/3.2/ekiga-3.2.4.tar.bz2]
+md5=3009f30e124a2062370824bb307c5313
+sha256=21032e8a420365d0539c6356d220bb8634e9c1ee839bfcceb3c03d9e427cd397
+
 [http://effbot.org/media/downloads/elementtree-1.2.7-20070827-preview.zip]
 md5=30e2fe5edd143f347e03a8baf5d60f8a
 sha256=5071431068c58c1f56dcc8fff37f8a213351f3b45c012d3adb640ec9418053ad
@@ -17690,6 +17698,10 @@ sha256=c11daf4e0baf1bc70d30411944f9a3238d61e3c1972c33443dbe0cb078cfe2d7
 md5=c2b4f12822cef2182267ea0d020bddf6
 sha256=e6b48a294b35449c851c2a6ea6969041ed7f4148e92b3faa03a330b7bb5a59af
 
+[http://downloads.sourceforge.net/opalvoip/opal-3.6.2.tar.bz2]
+md5=88076eeadee1351704afb2aeb3532c17
+sha256=09ffe451256fafdd74d4dc35ed153b93c81328c397d36872cca1f0104877caca
+
 [http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz]
 md5=641cf53761f35ee979f3e888614797a0
 sha256=723e2c57c3cdffa7ff11f9b6b5478d6cb4af017e5a1ee7a56032969c39c1c2fe
@@ -19414,6 +19426,10 @@ sha256=c99897464bd07c73dbb72095a9806ddc0c26141230e34b181d7e742e78259e4b
 md5=122ab96fcc44110ce05153f259b3285a
 sha256=b8301389c1ee9968df8075942061665e33198d3865f92d8fb26e519068517305
 
+[http://downloads.sourceforge.net/opalvoip/ptlib-2.6.2.tar.bz2]
+md5=d478121cfc82da7c0f0ce0e53fc7c2fd
+sha256=941ead5179f5bab8dd6e81806b6e52120dc5b98c6ced8128df24639af1eabedd
+
 [http://pypi.python.org/packages/source/p/ptrace/ptrace-0.3.2.tar.gz]
 md5=8108c2474bef16d126e956dce3c5073b
 sha256=634fe75e195179adafb6218040724f38252bd0fc8f796bb3e3e9bdba065890c5
@@ -19550,7 +19566,7 @@ sha256=61598c9e3a0f7eb2e7367d4ecc71522c4f16a7d41ed31db29e3afee8d9843454
 md5=935aebcbe610fbc9de8125e7b7d71297
 sha256=61598c9e3a0f7eb2e7367d4ecc71522c4f16a7d41ed31db29e3afee8d9843454
 
-[http://www.openh323.org/bin/pwlib_1.5.2.tar.gz]
+[http://www.angstrom-distribution.org/unstable/sources/pwlib_1.5.2.tar.gz]
 md5=0fa33ba1b32b254abe0b731a52c0f2f9
 sha256=62b254548ad7a9e71231a160275827d67ff39022ee8e2854a7c9d9fe9a688e65
 
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 3432db42b5..ad34b7d48c 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -20,7 +20,7 @@ DISTRO_VERSION = "2009.X-test-${DATE}"
 DISTRO_REVISION = "2"
 DISTRO_PR = ".2"
 
-OLDEST_KERNEL ?= "2.6.18"
+OLDEST_KERNEL ?= "2.6.16"
 
 #build staging from packages
 INHERIT += "packaged-staging"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 7e921bf06a..2655bfe3bb 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -99,11 +99,6 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "1"
 # We only want to build UTF8 locales
 LOCALE_UTF8_ONLY = "1"
 
-#qemu doesn't like armv6/eabi/vfp
-ENABLE_BINARY_LOCALE_GENERATION_armv6 = "0"
-ENABLE_BINARY_LOCALE_GENERATION_armv6-novfp = "0"
-ENABLE_BINARY_LOCALE_GENERATION_armv7a = "0"
-
 #qemu has taken a dislike to armeb as well
 ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"
 
diff --git a/recipes/bluez/bluez-libs/avinfo-link.patch b/recipes/bluez/bluez-libs/avinfo-link.patch
new file mode 100644
index 0000000000..944a98abca
--- /dev/null
+++ b/recipes/bluez/bluez-libs/avinfo-link.patch
@@ -0,0 +1,22 @@
+--- tools/Makefile.am.old	2009-05-22 11:27:06.000000000 +0100
++++ tools/Makefile.am	2009-05-22 11:27:29.000000000 +0100
+@@ -1,8 +1,10 @@
+ 
+ if TOOLS
+ tools_programs = hcitool l2ping sdptool ciptool
++avinfo_programs = avinfo
+ tools_manfiles = hcitool.1 l2ping.1 sdptool.1 ciptool.1
+ else
++avinfo_programs =
+ tools_programs =
+ tools_manfiles =
+ endif
+@@ -41,7 +43,7 @@
+ 
+ bin_PROGRAMS = $(tools_programs) $(dfutool_programs) $(dfubabel_programs)
+ 
+-noinst_PROGRAMS = hcieventmask hcisecfilter ppporc avinfo $(usb_programs)
++noinst_PROGRAMS = hcieventmask hcisecfilter ppporc $(avinfo_programs) $(usb_programs)
+ 
+ hcieventmask_LDADD = @BLUEZ_LIBS@
+ 
diff --git a/recipes/bluez/bluez-libs_4.40.bb b/recipes/bluez/bluez-libs_4.40.bb
new file mode 100644
index 0000000000..578afaa5ec
--- /dev/null
+++ b/recipes/bluez/bluez-libs_4.40.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Linux Bluetooth Stack Userland V4"
+SECTION = "libs"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.bluez.org"
+LICENSE = "GPL"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
+        file://avinfo-link.patch;patch=1;pnum=0"
+
+S = "${WORKDIR}/bluez-${PV}"
+
+inherit autotools_stage
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+EXTRA_OECONF = "\
+  --disable-tools \
+  --disable-audio \
+  --disable-network \
+  --disable-serial \
+  --disable-service \
+  --disable-usb \
+"
+
+FILES_${PN} = "${libdir}/libbluetooth.so.*"
diff --git a/recipes/directfb/directfb_1.2.7.bb b/recipes/directfb/directfb_1.2.7.bb
index be6a6daa52..6a01195502 100644
--- a/recipes/directfb/directfb_1.2.7.bb
+++ b/recipes/directfb/directfb_1.2.7.bb
@@ -6,7 +6,7 @@ PR = "r0"
 DEPENDS += "sysfsutils"
 
 SRC_URI = " \
-    http://directfb.org/downloads/Core/DirectFB-${PV}.tar.gz \
+    http://directfb.org/downloads/Old/DirectFB-${PV}.tar.gz \
     file://directfb-1.2.x-fix-pkgconfig-cflags.patch;patch=1 \
     file://mkdfiff.patch;patch=1 \
     file://dont-use-linux-config.patch;patch=1 \
diff --git a/recipes/ekiga/ekiga_3.2.4.bb b/recipes/ekiga/ekiga_3.2.4.bb
new file mode 100644
index 0000000000..3a63015d66
--- /dev/null
+++ b/recipes/ekiga/ekiga_3.2.4.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Gnome videoconferencing application"
+LICENSE = "GPLv2"
+
+ARM_INSTRUCTION_SET = "arm"
+
+inherit gnome
+DEPENDS += " avahi libnotify eds-dbus libgnome gtkmm libsigc++-2.0 gstreamer gst-plugins-good gst-plugins-base gst-plugins-bad opal ptlib gnome-doc-utils"
+RDEPENDS += "gst-plugin-app gst-plugin-video4linux2 opal ptlib"
+
+EXTRA_OECONF = "--enable-static-libs   --disable-ldap --disable-gnome --enable-gstreamer   --disable-gdu --disable-scrollkeeper "
+
+do_configure_append() {
+	find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
+ 	find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
+}
+
+FILES_${PN} += "${datadir}/dbus-1 ${datadir}/icons"
+
diff --git a/recipes/ekiga/opal_3.6.2.bb b/recipes/ekiga/opal_3.6.2.bb
new file mode 100644
index 0000000000..502c344b13
--- /dev/null
+++ b/recipes/ekiga/opal_3.6.2.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "Open Phone Abstraction Library, implementation of the ITU H.323 teleconferencing protocol, and successor of the openh323 library."
+LICENSE = "MPL"
+
+inherit gnome
+
+DEPENDS += " ffmpeg ptlib virtual/libsdl openldap"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/opalvoip/opal-${PV}.tar.bz2 \
+           file://configure.diff;patch=1 \
+          "
+
+EXTRA_OECONF = "--enable-localgsm --disable-spandsp "
+ARM_INSTRUCTION_SET = "arm"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+do_configure() {
+	libtoolize --force
+	gnu-configize
+	oe_runconf
+}
+
+FILES_${PN} += "${libdir}/opal-${PV}/*/*.so ${libdir}/opal-${PV}/*/*/*.so"
+FILES_${PN}-dbg += "${libdir}/opal-${PV}/*/.debug ${libdir}/opal-${PV}/*/*/.debug"
+
+do_stage() {
+	autotools_stage_all
+}
+
diff --git a/recipes/ekiga/ptlib_2.6.2.bb b/recipes/ekiga/ptlib_2.6.2.bb
new file mode 100644
index 0000000000..93a3bd8c96
--- /dev/null
+++ b/recipes/ekiga/ptlib_2.6.2.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Portable Tools Libary"
+LICENSE = "MPL"
+
+inherit gnome
+
+DEPENDS += "libgsm openldap openssl expat virtual/libsdl alsa-lib"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/opalvoip/ptlib-${PV}.tar.bz2"
+
+do_configure() {
+    libtoolize --force
+	gnu-configize
+	oe_runconf
+}
+
+do_compile_append() {
+        sed -i -e s:${STAGING_DIR_TARGET}::g \
+               -e s:/${TARGET_SYS}::g \
+                  ptlib.pc
+}
+
+FILES_${PN} += "${libdir}/ptlib-${PV}/*/*/*.so"
+
+do_stage() {
+	autotools_stage_all
+}
+
+
+
+
diff --git a/recipes/glibc/glibc-initial_2.6.1.bb b/recipes/glibc/glibc-initial_2.6.1.bb
index 3ad96569f5..d66297090f 100644
--- a/recipes/glibc/glibc-initial_2.6.1.bb
+++ b/recipes/glibc/glibc-initial_2.6.1.bb
@@ -3,4 +3,4 @@ require glibc-initial.inc
 
 do_configure_prepend () {
 	unset CFLAGS
-}
\ No newline at end of file
+}
diff --git a/recipes/glibc/glibc_2.6.1.bb b/recipes/glibc/glibc_2.6.1.bb
index c1a95987bf..949708f2b4 100644
--- a/recipes/glibc/glibc_2.6.1.bb
+++ b/recipes/glibc/glibc_2.6.1.bb
@@ -1,5 +1,5 @@
 require glibc.inc
-PR = "r15"
+PR = "r16"
 
 PACKAGES_DYNAMIC = "libc6*"
 RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.11.bb b/recipes/gstreamer/gst-plugins-bad_0.10.11.bb
index dbfe6a978d..a90b88ee45 100644
--- a/recipes/gstreamer/gst-plugins-bad_0.10.11.bb
+++ b/recipes/gstreamer/gst-plugins-bad_0.10.11.bb
@@ -1,5 +1,7 @@
 require gst-plugins.inc
 
+PR = "${INC_PR}.1"
+
 SRC_URI += "file://vorbisenc.h file://vorbisdec.h \
             file://ivorbis-thumb.patch;patch=1"
 DEPENDS += "gst-plugins-base directfb"
diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.6.bb b/recipes/gstreamer/gst-plugins-bad_0.10.6.bb
index df7bf75852..bfc7217b50 100644
--- a/recipes/gstreamer/gst-plugins-bad_0.10.6.bb
+++ b/recipes/gstreamer/gst-plugins-bad_0.10.6.bb
@@ -1,5 +1,6 @@
 require gst-plugins.inc
-PR = "r2"
+
+PR = "${INC_PR}.1"
 
 SRC_URI += "file://vorbisenc.h file://vorbisdec.h \
             file://gst-plugins-directfb-fix.patch;patch=1;pnum=2 \
diff --git a/recipes/gstreamer/gst-plugins-base_0.10.17.bb b/recipes/gstreamer/gst-plugins-base_0.10.17.bb
index 0a1f17fcd8..3b07668902 100644
--- a/recipes/gstreamer/gst-plugins-base_0.10.17.bb
+++ b/recipes/gstreamer/gst-plugins-base_0.10.17.bb
@@ -1,5 +1,7 @@
 require gst-plugins.inc
 
+PR = "${INC_PR}.1"
+
 PROVIDES += "gst-plugins"
 
 # gst-plugins-base only builds the alsa plugin
diff --git a/recipes/gstreamer/gst-plugins-base_0.10.22.bb b/recipes/gstreamer/gst-plugins-base_0.10.22.bb
index 3086d93ffd..bcbfd6871d 100644
--- a/recipes/gstreamer/gst-plugins-base_0.10.22.bb
+++ b/recipes/gstreamer/gst-plugins-base_0.10.22.bb
@@ -1,5 +1,7 @@
 require gst-plugins.inc
 
+PR = "${INC_PR}.1"
+
 PROVIDES += "gst-plugins"
 
 PR = "r2"
diff --git a/recipes/gstreamer/gst-plugins-base_0.10.23.bb b/recipes/gstreamer/gst-plugins-base_0.10.23.bb
index d3bfb6c671..26dcfe3e3b 100644
--- a/recipes/gstreamer/gst-plugins-base_0.10.23.bb
+++ b/recipes/gstreamer/gst-plugins-base_0.10.23.bb
@@ -1,5 +1,7 @@
 require gst-plugins.inc
 
+PR = "${INC_PR}.1"
+
 PROVIDES += "gst-plugins"
 
 # gst-plugins-base only builds the alsa plugin
diff --git a/recipes/gstreamer/gst-plugins-good_0.10.13.bb b/recipes/gstreamer/gst-plugins-good_0.10.13.bb
index b77d1fcf47..d077d06d1c 100644
--- a/recipes/gstreamer/gst-plugins-good_0.10.13.bb
+++ b/recipes/gstreamer/gst-plugins-good_0.10.13.bb
@@ -1,6 +1,6 @@
 require gst-plugins.inc
 
-PR = "r1"
+PR = "${INC_PR}.1"
 
 inherit gconf 
 
diff --git a/recipes/gstreamer/gst-plugins-good_0.10.14.bb b/recipes/gstreamer/gst-plugins-good_0.10.14.bb
index d9f0349101..d077d06d1c 100644
--- a/recipes/gstreamer/gst-plugins-good_0.10.14.bb
+++ b/recipes/gstreamer/gst-plugins-good_0.10.14.bb
@@ -1,5 +1,7 @@
 require gst-plugins.inc
 
+PR = "${INC_PR}.1"
+
 inherit gconf 
 
 EXTRA_OECONF += " --enable-experimental  --enable-gst_v4l2 --enable-gconftool  --enable-external --with-check=no"
diff --git a/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb b/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb
index 545a43a494..0d024e15ea 100644
--- a/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb
+++ b/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb
@@ -1,7 +1,8 @@
 require gst-plugins.inc
 DEPENDS += "gst-plugins-base libsidplay"
 PROVIDES += "gst-plugin-sid"
-PR = "r5"
+
+PR = "${INC_PR}.1"
 
 SRC_URI = "\
   http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.bz2 \
diff --git a/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb b/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb
index 49350ed641..4d4f893075 100644
--- a/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb
+++ b/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb
@@ -1,6 +1,6 @@
 require gst-plugins.inc
 
-PR = "r1"
+PR = "${INC_PR}.1"
 
 DEPENDS += "gst-plugins-base mpeg2dec libsidplay"
 
diff --git a/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb b/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb
index 062404179e..9c28d208df 100644
--- a/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb
+++ b/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb
@@ -1,5 +1,7 @@
 require gst-plugins.inc
 
+PR = "${INC_PR}.1"
+
 DEPENDS += "gst-plugins-base mpeg2dec libsidplay"
 
 SRC_URI += "\
diff --git a/recipes/gstreamer/gst-plugins.inc b/recipes/gstreamer/gst-plugins.inc
index bcb3e39321..5d72eb8d02 100644
--- a/recipes/gstreamer/gst-plugins.inc
+++ b/recipes/gstreamer/gst-plugins.inc
@@ -3,6 +3,8 @@ DESCRIPTION = "Plugins for GStreamer"
 DEPENDS = "gstreamer libmikmod liboil libogg tremor libvorbis"
 DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}"
 
+INC_PR = "r6"
+
 PACKAGES_DYNAMIC = "gst-plugin-*"
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2"
@@ -33,7 +35,7 @@ python populate_packages_prepend () {
 	metapkg_rdepends = []
 	packages = bb.data.getVar('PACKAGES', d, 1).split()
 	for pkg in packages[1:]:
-		if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count('dev') and not pkg.count( 'locale' ):
+		if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.count('locale'):
 			metapkg_rdepends.append(pkg)
 	bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d)
 	bb.data.setVar('DESCRIPTION_' + metapkg, pn + ' meta package', d)
diff --git a/recipes/minisip/minisip-video_svn.bb b/recipes/nonworking/minisip/minisip-video_svn.bb
index 137f29f2d8..137f29f2d8 100644
--- a/recipes/minisip/minisip-video_svn.bb
+++ b/recipes/nonworking/minisip/minisip-video_svn.bb
diff --git a/recipes/pwlib/pwlib.inc b/recipes/pwlib/pwlib.inc
new file mode 100644
index 0000000000..981becf42f
--- /dev/null
+++ b/recipes/pwlib/pwlib.inc
@@ -0,0 +1,31 @@
+HOMEPAGE = "http://openh323.sourceforge.net/"
+DESCRIPTION = "Portable Text and GUI C/C++ Class Libarary."
+LICENSE = "GPL"
+DEPENDS = "openssl openldap"
+
+INC_PR = "r1"
+
+# Somebody should teach these people about naming tarballs ;-)
+MIN_VER ?= "1"
+SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}_${@bb.data.getVar('PV',d,1).split('.')[1]}_${@bb.data.getVar('PV',d,1).split('.')[1]}"
+SRC_URI = "http://www.voxgratia.org/releases/${PN}-v1_${SHRT_VER}-${MIN_VER}src.tar.gz"
+
+inherit autotools
+
+EXTRA_OECONF="--enable-ipv6 --disable-sasl --disable-sdl \
+	      --disable-video --enable-plugins --with-plugins=oss"
+
+# Use openSSL
+
+export OPENSSLFLAG="1"
+export OPENSSLDIR="${STAGING_LIBDIR}"
+export OPENSSLLIBS="-lssl -lcrypt"
+export MACHTYPE="x86"
+export OSTYPE="linux"
+export OSRELEASE="openembedded"
+
+export CPLUS="${CXX}"
+
+do_compile() {
+	oe_runmake opt
+}
diff --git a/recipes/pwlib/pwlib_1.5.2.bb b/recipes/pwlib/pwlib_1.5.2.bb
index a4ced1f35c..0963a82ba2 100644
--- a/recipes/pwlib/pwlib_1.5.2.bb
+++ b/recipes/pwlib/pwlib_1.5.2.bb
@@ -1,32 +1,6 @@
-# pwlib .bb build file
-# Copyright (C) 2006, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see /COPYING)
+require pwlib.inc
 
-HOMEPAGE="http://www.openh323.org/docs/PWLib/"
-DESCRIPTION="Portable Text and GUI C/C++ Class Libarary."
-LICENSE = "GPL"
+PR = "${INC_PR}.1"
 
-SRC_URI="http://www.openh323.org/bin/${PN}_${PV}.tar.gz"
-DEPENDS="openssl openldap"
-
-inherit autotools
-
-EXTRA_OECONF="--enable-ipv6 --disable-sasl --disable-sdl \
-	      --disable-video --enable-plugins --with-plugins=oss"
-
-S="${WORKDIR}/${PN}"
-
-# Use openSSL
-
-export OPENSSLFLAG="1"
-export OPENSSLDIR="${STAGING_LIBDIR}"
-export OPENSSLLIBS="-lssl -lcrypt"
-export MACHTYPE="x86"
-export OSTYPE="linux"
-export OSRELEASE="openembedded"
-
-export CPLUS="${CXX}"
-
-do_compile() {
-	oe_runmake opt
-}
+#seems like this very old source has vanished upstream
+SRC_URI = "http://www.angstrom-distribution.org/unstable/sources/pwlib_1.5.2.tar.gz"
diff --git a/recipes/pwlib/pwlib_1.6.6.4.bb b/recipes/pwlib/pwlib_1.6.6.4.bb
index c41400c001..fdadb359e7 100644
--- a/recipes/pwlib/pwlib_1.6.6.4.bb
+++ b/recipes/pwlib/pwlib_1.6.6.4.bb
@@ -1,3 +1,7 @@
+# status as of 2009/05/21: This particular bb file is broken beyond what I
+# (Laibsch) care to fix.  If you fix it, please base your changes on top
+# of pwlib.inc
+
 # pwlib .bb build file
 # Copyright (C) 2006, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see /COPYING)
diff --git a/recipes/snes9x/snes9x/configure.patch b/recipes/snes9x/snes9x/configure.patch
new file mode 100644
index 0000000000..e9fb685399
--- /dev/null
+++ b/recipes/snes9x/snes9x/configure.patch
@@ -0,0 +1,12 @@
+--- configure	2009-05-21 15:48:14.000000000 +0100
++++ configure	2009-05-21 15:48:14.000000000 +0100
+@@ -4474,9 +4474,6 @@
+   LIBS="-lX11 -lXext"
+   SYSLIBS="$SYSLIBS -L$x_libraries -lX11 -lXext"
+ fi
+-if test x$x_includes != x ; then
+-  XINCLUDES="-I$x_includes"
+-fi
+ echo $ac_n "checking for XDGAQueryVersion in -lXxf86dga""... $ac_c" 1>&6
+ echo "configure:4482: checking for XDGAQueryVersion in -lXxf86dga" >&5
+ ac_lib_var=`echo Xxf86dga'_'XDGAQueryVersion | sed 'y%./+-%__p_%'`
diff --git a/recipes/snes9x/snes9x/linkage.patch b/recipes/snes9x/snes9x/linkage.patch
new file mode 100644
index 0000000000..cc007b5fe7
--- /dev/null
+++ b/recipes/snes9x/snes9x/linkage.patch
@@ -0,0 +1,31 @@
+--- ppu.h~	2004-07-11 22:50:59.000000000 +0100
++++ ppu.h	2009-05-21 15:54:06.000000000 +0100
+@@ -332,10 +332,14 @@
+ 	uint8 _5A22;
+ } SnesModel;
+ 
++START_EXTERN_C
++
+ extern SnesModel* Model;
+ extern SnesModel M1SNES;
+ extern SnesModel M2SNES;
+ 
++END_EXTERN_C
++
+ #define MAX_5C77_VERSION 0x01
+ #define MAX_5C78_VERSION 0x03
+ #define MAX_5A22_VERSION 0x02
+--- dsp1.h~	2004-07-11 22:50:57.000000000 +0100
++++ dsp1.h	2009-05-21 15:53:46.000000000 +0100
+@@ -122,9 +122,10 @@
+ void S9xResetDSP1 ();
+ uint8 S9xGetDSP (uint16 Address);
+ void S9xSetDSP (uint8 Byte, uint16 Address);
+-END_EXTERN_C
+ 
+ extern struct SDSP1 DSP1;
+ 
++END_EXTERN_C
++
+ #endif
+ 
diff --git a/recipes/snes9x/snes9x_1.43-WIP1.bb b/recipes/snes9x/snes9x_1.43-WIP1.bb
index 0b746795f2..df623e591c 100644
--- a/recipes/snes9x/snes9x_1.43-WIP1.bb
+++ b/recipes/snes9x/snes9x_1.43-WIP1.bb
@@ -1,5 +1,5 @@
 SECTION = "x11/games"
-PR = "r3"
+PR = "r4"
 LICENSE = "snes9x"
 DEPENDS = "libxxf86dga libxxf86vm"
 DEPENDS_append_i686 = " nasm-native"
@@ -8,7 +8,9 @@ RDEPENDS_epia = "kernel-module-joydev"
 SRC_URI = "http://www.lysator.liu.se/snes9x/1.43-WIP1/snes9x-1.43-WIP1-src.tar.gz \
 	file://makefile.patch;patch=1;pnum=2 \
 	file://private.patch;patch=1;pnum=0 \
-	file://64bit.patch;patch=1"
+	file://64bit.patch;patch=1 \
+        file://configure.patch;patch=1;pnum=0 \
+        file://linkage.patch;patch=1;pnum=0"
 
 S = "${WORKDIR}/snes9x-1.43-dev-src/snes9x"