merge of '0604b4d21148fa75a4b643461eb52fd689ac43c2'

     and 'dd2c41928ef5fc90d06676100aedb5fc3d716efa'

26 files changed, 201 insertions, 132 deletions

diff --git a/packages/ffmpeg/ffmpeg_cvs.bb b/packages/ffmpeg/ffmpeg_cvs.bb
deleted file mode 100644
index bfd68eb3e2..0000000000
--- a/packages/ffmpeg/ffmpeg_cvs.bb
+++ /dev/null
@@ -1,84 +0,0 @@
-#Remove the dash after cvs below when 0.4.9 changes in PV
-PV = "0.4.9-pre1+cvs-${SRCDATE}"
-DESCRIPTION = "ffmpeg"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "zlib libvorbis faac liba52 lame"
-LICENSE = "GPL"
-PR = "r1"
-S = "${WORKDIR}/ffmpeg"
-DEFAULT_PREFERENCE = "-1"
-
-inherit autotools
-
-SRC_URI = "cvs://anonymous@mplayerhq.hu/cvsroot/ffmpeg;module=ffmpeg \
-	file://configure.patch;patch=0 \
-	file://common.patch;patch=1 \
-	file://soname.patch;patch=1 \
-	"
-
-TARGET_LDFLAGS_append = " -lm -la52 "
-
-EXTRA_OECONF=" \
-	--enable-mp3lame \
-	--enable-vorbis \
-	--enable-faac \
-	--enable-a52 \
-	--enable-a52bin \
-	--enable-pp \
-#	--enable-shared-pp \
-	--enable-shared \
-	--disable-amr_nb \
-	--enable-amr_nb-fixed \
-	--disable-amr_wb \
-	--enable-pthreads \
-	--enable-gpl \
-	--enable-zlib \
-	\
-	--disable-audio-beos \
-	--disable-v4l \
-	--disable-dv1394 \
-	--disable-debug \
-	--disable-ffserver \
-	--disable-ffplay \
-	\
-	--cross-prefix=${TARGET_PREFIX} \
-	--extra-cflags=\$(TARGET_CFLAGS) \
-	--extra-ldflags=\$(TARGET_LDFLAGS) \
-	--extra-libs=\$(TARGET_LDFLAGS) \
-	\
-	--cpu=${PACKAGE_ARCH} \
-	--prefix=${D}${prefix} \
-	--mandir=${D}${prefix}/share/man \
-"
-
-PACKAGES += "libavcodec libavcodec-dev libavformat libavformat-dev"
-FILES_${PN} = "${bindir}"
-FILES_${PN}-dev = "${includedir}"
-FILES_libavcodec = "${libdir}/libavcodec*.so.*"
-FILES_libavcodec-dev = "${libdir}/libavcodec*.so ${libdir}/libavcodec*.la ${libdir}/libavcodec*.a"
-FILES_libavformat = "${libdir}/libavformat*.so.*"
-FILES_libavformat-dev = "${libdir}/libavformat*.so ${libdir}/libavformat*.la ${libdir}/libavformat*.a"
-
-# We do this because the install program is called with -s which causes it to call "strip" and it then mangles cross compiled stuff..
-PATH_prepend="${CROSS_DIR}/${TARGET_SYS}/bin:"
-
-
-do_configure_prepend() {
-	export CC="${CC}"
-}
-
-do_stage() {
-	oe_libinstall -a -so -C libavcodec libavcodec ${STAGING_LIBDIR}
-	oe_libinstall -a -so -C libavformat libavformat ${STAGING_LIBDIR}
-
-	install -d ${STAGING_INCDIR}/ffmpeg
-	install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/ffmpeg/avcodec.h
-	install -m 0644 ${S}/libavcodec/common.h ${STAGING_INCDIR}/ffmpeg/common.h
-	install -m 0644 ${S}/libavcodec/rational.h ${STAGING_INCDIR}/ffmpeg/rational.h
-	install -m 0644 ${S}/libavformat/avformat.h ${STAGING_INCDIR}/ffmpeg/avformat.h
-	install -m 0644 ${S}/libavformat/avio.h ${STAGING_INCDIR}/ffmpeg/avio.h
-	install -m 0644 ${S}/libavformat/rtp.h ${STAGING_INCDIR}/ffmpeg/rtp.h
-	install -m 0644 ${S}/libavformat/rtsp.h ${STAGING_INCDIR}/ffmpeg/rtsp.h
-	install -m 0644 ${S}/libavformat/rtspcodes.h ${STAGING_INCDIR}/ffmpeg/rtspcodes.h
-}
diff --git a/packages/ffmpeg/ffmpeg_svn.bb b/packages/ffmpeg/ffmpeg_svn.bb
new file mode 100644
index 0000000000..4098d721f9
--- /dev/null
+++ b/packages/ffmpeg/ffmpeg_svn.bb
@@ -0,0 +1,127 @@
+DESCRIPTION = "ffmpeg"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "zlib libvorbis faac liba52 lame"
+PV = "0.4.9+svn${SRCDATE}"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "svn://svn.mplayerhq.hu/ffmpeg/;module=trunk"
+
+S = "${WORKDIR}/trunk"
+
+inherit autotools
+
+TARGET_LDFLAGS_append = " -lm -la52 "
+
+EXTRA_OECONF = " \
+	--enable-mp3lame \
+        --enable-vorbis \
+        --enable-faad \
+        --enable-a52 \
+        --enable-a52bin \
+        --enable-pp \
+        --enable-shared \
+        --enable-pthreads \
+        --enable-gpl \
+        \
+        --disable-audio-beos \
+        --disable-v4l \
+        --disable-dv1394 \
+        --disable-debug \
+        --disable-ffserver \
+        --disable-ffplay \
+        \
+        --cross-prefix=${TARGET_PREFIX} \
+        \
+        --cpu=${PACKAGE_ARCH} \
+"
+
+
+# We do this because the install program is called with -s
+# which causes it to call "strip" and it then mangles cross compiled stuff..
+PATH_prepend="${CROSS_DIR}/${TARGET_SYS}/bin:"
+
+do_configure_prepend() {
+        export CC="${CC}"
+}
+
+oe_runconf () {
+        if [ -x ${S}/configure ] ; then
+                cfgcmd="${S}/configure \
+                        --prefix=${prefix} \
+                        --mandir=${mandir} \
+                        ${EXTRA_OECONF} \
+                    $@"
+                oenote "Running $cfgcmd..."
+                $cfgcmd || oefatal "oe_runconf failed"
+        else
+                oefatal "no configure script found"
+        fi
+
+}
+
+do_stage() {
+        oe_libinstall -a -so -C libavcodec libavcodec ${STAGING_LIBDIR}
+        oe_libinstall -a -so -C libavformat libavformat ${STAGING_LIBDIR}
+        oe_libinstall -a -so -C libavutil libavutil ${STAGING_LIBDIR}
+        oe_libinstall -a -so -C libpostproc libpostproc ${STAGING_LIBDIR}
+
+        install -d ${STAGING_INCDIR}/ffmpeg
+        install -m 0644 ${S}/libavcodec/avcodec.h \
+                ${STAGING_INCDIR}/ffmpeg/avcodec.h
+
+        install -m 0644 ${S}/libavformat/avformat.h \
+                ${STAGING_INCDIR}/ffmpeg/avformat.h
+        install -m 0644 ${S}/libavformat/avio.h \
+                ${STAGING_INCDIR}/ffmpeg/avio.h
+        install -m 0644 ${S}/libavformat/rtp.h \
+                ${STAGING_INCDIR}/ffmpeg/rtp.h
+        install -m 0644 ${S}/libavformat/rtsp.h \
+                ${STAGING_INCDIR}/ffmpeg/rtsp.h
+        install -m 0644 ${S}/libavformat/rtspcodes.h \
+                ${STAGING_INCDIR}/ffmpeg/rtspcodes.h
+
+        install -m 0644 ${S}/libavutil/avutil.h \
+                ${STAGING_INCDIR}/ffmpeg/avutil.h
+        install -m 0644 ${S}/libavutil/bswap.h \
+                ${STAGING_INCDIR}/ffmpeg/bswap.h
+        install -m 0644 ${S}/libavutil/common.h \
+                ${STAGING_INCDIR}/ffmpeg/common.h
+        install -m 0644 ${S}/libavutil/crc.h \
+                ${STAGING_INCDIR}/ffmpeg/crc.h
+        install -m 0644 ${S}/libavutil/integer.h \
+                ${STAGING_INCDIR}/ffmpeg/integer.h
+        install -m 0644 ${S}/libavutil/intfloat_readwrite.h \
+                ${STAGING_INCDIR}/ffmpeg/intfloat_readwrite.h
+        install -m 0644 ${S}/libavutil/mathematics.h \
+                ${STAGING_INCDIR}/ffmpeg/mathematics.h
+        install -m 0644 ${S}/libavutil/rational.h \
+                ${STAGING_INCDIR}/ffmpeg/rational.h
+}
+
+PACKAGES += "libavcodec libavcodec-dev \
+        libavformat libavformat-dev \
+        libavutil libavutil-dev \
+        libpostproc libpostproc-dev"
+
+FILES_${PN} = "${bindir}"
+FILES_${PN}-dev = "${includedir}"
+FILES_${PN}-doc = "${mandir}"
+
+FILES_libavcodec = "${libdir}/libavcodec*.so.*"
+FILES_libavcodec-dev = "${libdir}/libavcodec*.so \
+        ${libdir}/libavcodec*.la ${libdir}/libavcodec*.a"
+
+FILES_libavformat = "${libdir}/libavformat*.so.*"
+FILES_libavformat-dev = "${libdir}/libavformat*.so \
+        ${libdir}/libavformat*.la ${libdir}/libavformat*.a"
+
+FILES_libavutil = "${libdir}/libavutil*.so.*"
+FILES_libavutil-dev = "${libdir}/libavutil*.so \
+        ${libdir}/libavutil*.la ${libdir}/libavutil*.a"
+
+FILES_libpostproc = "${libdir}/libpostproc*.so.*"
+FILES_libpostproc-dev = "${libdir}/libpostproc*.so \
+        ${libdir}/libpostproc*.la ${libdir}/libpostproc*.a"
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_svn.bb b/packages/gpe-mini-browser/gpe-mini-browser_svn.bb
index dc5c022580..369ea5153d 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_svn.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_svn.bb
@@ -8,7 +8,7 @@ RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpe
 PV = "0.19+svn${SRCDATE}"
 PR = "r0"
 
-SRC_URI = "${GPE_SVN}"
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/extra;module=${PN}"
 
 S = "${WORKDIR}/gpe-mini-browser"
 
diff --git a/packages/gpm/gpm_1.20.1.bb b/packages/gpm/gpm_1.20.1.bb
index 5623ebbf16..c017cafc9a 100644
--- a/packages/gpm/gpm_1.20.1.bb
+++ b/packages/gpm/gpm_1.20.1.bb
@@ -1,21 +1,25 @@
-SECTION = "console/utils"
-LICENSE = "GPL"
-DEPENDS = "ncurses"
 DESCRIPTION = "GPM (General Purpose Mouse) is a mouse server \
 for the console and xterm, with sample clients included \
 (emacs, etc)."
+SECTION = "console/utils"
+LICENSE = "GPL"
+DEPENDS = "ncurses"
 
-PR="r1"
-PARALLEL_MAKE=""
+PR = "r2"
+PARALLEL_MAKE = ""
 
 SRC_URI = "ftp://arcana.linux.it/pub/gpm/gpm-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1 \
 	   file://no-docs.patch;patch=1 \
 	   file://init"
 
-inherit autotools
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "gpm"
+INITSCRIPT_PARAMS = "defaults"
 
 export LIBS = "-lm"
+
 do_configure_prepend () {
 	cp aclocal.m4 acinclude.m4
 }
@@ -29,18 +33,5 @@ do_install () {
 	oe_runmake 'ROOT=${D}' install
 	install -d ${D}/${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/gpm
-}
-
-pkg_postinst () {
-	if test -n "${D}"; then
-		D="-r $D"
-	fi
-	update-rc.d $D gpm defaults
-}
-
-pkg_prerm () {
-	if test -n "${D}"; then
-		D="-r $D"
-	fi
-	update-rc.d $D gpm remove
+	cd ${D}${libdir} && ln -sf libgpm.so.1.19.0 libgpm.so.1
 }
diff --git a/packages/linux/linux-handhelds-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6/magician/defconfig
index c47caaefd3..112a49f206 100644
--- a/packages/linux/linux-handhelds-2.6/magician/defconfig
+++ b/packages/linux/linux-handhelds-2.6/magician/defconfig
@@ -764,7 +764,7 @@ CONFIG_I2C_CHARDEV=m
 #
 # I2C Hardware Bus support
 #
-CONFIG_I2C_PXA=m
+CONFIG_I2C_PXA=y
 # CONFIG_I2C_PXA_SLAVE is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
@@ -988,8 +988,8 @@ CONFIG_SND=m
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
 # CONFIG_SND_SEQUENCER is not set
-# CONFIG_SND_MIXER_OSS is not set
-# CONFIG_SND_PCM_OSS is not set
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
 # CONFIG_SND_DYNAMIC_MINORS is not set
 # CONFIG_SND_SUPPORT_OLD_API is not set
 CONFIG_SND_VERBOSE_PROCFS=y
diff --git a/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb b/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb
index 6b7eddb03b..72ddfb5613 100644
--- a/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb
+++ b/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb
@@ -7,6 +7,8 @@ RPROVIDES = "gconf"
 
 PR = "r3"
 
+DEFAULT_PREFERENCE = "-1"
+
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/g/gconf2/gconf2_${PV}.tar.gz \
            file://gconf-update.patch;patch=1;pnum=0 \
            file://free-entry-fix.diff;patch=1 \
diff --git a/packages/ossie/ossie-c-wavloader_svn.bb b/packages/ossie/ossie-c-wavloader_svn.bb
index 5fdc9332cf..8f79f4667e 100644
--- a/packages/ossie/ossie-c-wavloader_svn.bb
+++ b/packages/ossie/ossie-c-wavloader_svn.bb
@@ -1,8 +1,9 @@
-PR = "r0"
 DESCRIPTION = "OSSIE Waveform Loader"
 SECTION =  "apps"
 PRIORITY = "optional"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf expat"
 
diff --git a/packages/ossie/ossie-channeldemo_svn.bb b/packages/ossie/ossie-channeldemo_svn.bb
index 93a41b6c3c..ddfab221de 100644
--- a/packages/ossie/ossie-channeldemo_svn.bb
+++ b/packages/ossie/ossie-channeldemo_svn.bb
@@ -1,8 +1,9 @@
-PR = "r0"
 DESCRIPTION = "OSSIE Demo channel component"
 SECTION =  "apps"
 PRIORITY = "optional"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf"
 
diff --git a/packages/ossie/ossie-demo_svn.bb b/packages/ossie/ossie-demo_svn.bb
index d2777ecc10..c83ec256e8 100644
--- a/packages/ossie/ossie-demo_svn.bb
+++ b/packages/ossie/ossie-demo_svn.bb
@@ -1,8 +1,9 @@
-PR = "r0"
 DESCRIPTION = "OSSIE Demo waveform"
 SECTION =  "apps"
 PRIORITY = "optional"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf ossie-channeldemo ossie-rxdemo"
 RDEPENDS = "ossie-channeldemo ossie-rxdemo"
diff --git a/packages/ossie/ossie-gpp-device_svn.bb b/packages/ossie/ossie-gpp-device_svn.bb
index 39adc0a74c..f2a563624c 100644
--- a/packages/ossie/ossie-gpp-device_svn.bb
+++ b/packages/ossie/ossie-gpp-device_svn.bb
@@ -1,9 +1,10 @@
-PR = "r0"
 DESCRIPTION = "OSSIE General Purpose Processor device"
 SECTION =  "apps"
 PRIORITY = "optional"
 MAINTAINER = "Philip Balister philip@balister.org"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf"
 
diff --git a/packages/ossie/ossie-interpolator_svn.bb b/packages/ossie/ossie-interpolator_svn.bb
index ca561fe0a1..5efca0b229 100644
--- a/packages/ossie/ossie-interpolator_svn.bb
+++ b/packages/ossie/ossie-interpolator_svn.bb
@@ -1,8 +1,9 @@
-PR = "r0"
 DESCRIPTION = "OSSIE Interpolator component"
 SECTION =  "apps"
 PRIORITY = "optional"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf ossie-standardinterfaces ossie-sigproc"
 
diff --git a/packages/ossie/ossie-modulator_svn.bb b/packages/ossie/ossie-modulator_svn.bb
index c6ac6afe73..4090b671d6 100644
--- a/packages/ossie/ossie-modulator_svn.bb
+++ b/packages/ossie/ossie-modulator_svn.bb
@@ -1,8 +1,9 @@
-PR = "r0"
 DESCRIPTION = "OSSIE Modulator component"
 SECTION =  "apps"
 PRIORITY = "optional"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf ossie-standardinterfaces ossie-sigproc"
 
diff --git a/packages/ossie/ossie-nodebooter_svn.bb b/packages/ossie/ossie-nodebooter_svn.bb
index 5a941550db..0e4a4611d2 100644
--- a/packages/ossie/ossie-nodebooter_svn.bb
+++ b/packages/ossie/ossie-nodebooter_svn.bb
@@ -1,8 +1,9 @@
-PR = "r0"
 DESCRIPTION = "OSSIE Node Booter"
 SECTION =  "apps"
 PRIORITY = "optional"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf"
 
diff --git a/packages/ossie/ossie-randombits_svn.bb b/packages/ossie/ossie-randombits_svn.bb
index a3ddc23185..7e9854641a 100644
--- a/packages/ossie/ossie-randombits_svn.bb
+++ b/packages/ossie/ossie-randombits_svn.bb
@@ -1,8 +1,9 @@
-PR = "r0"
 DESCRIPTION = "OSSIE Random bit generator component"
 SECTION =  "apps"
 PRIORITY = "optional"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf ossie-standardinterfaces ossie-sigproc"
 
diff --git a/packages/ossie/ossie-rxdemo_svn.bb b/packages/ossie/ossie-rxdemo_svn.bb
index 34619b3845..8a0d4355d9 100644
--- a/packages/ossie/ossie-rxdemo_svn.bb
+++ b/packages/ossie/ossie-rxdemo_svn.bb
@@ -1,8 +1,9 @@
-PR = "r0"
 DESCRIPTION = "OSSIE Demo receiver component"
 SECTION =  "apps"
 PRIORITY = "optional"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf"
 
diff --git a/packages/ossie/ossie-sigproc_svn.bb b/packages/ossie/ossie-sigproc_svn.bb
index 5d3643bfde..a8fa03052f 100644
--- a/packages/ossie/ossie-sigproc_svn.bb
+++ b/packages/ossie/ossie-sigproc_svn.bb
@@ -1,8 +1,9 @@
-PR = "r0"
 DESCRIPTION = "OSSIE Signal Processing routines"
 SECTION =  "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf"
 
@@ -15,6 +16,8 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF_append_arm = " --enable-fpm=arm"
 
+CXXFLAGS_powerpc = "-lstdc++"
+
 do_stage () {
 	autotools_stage_all
 }
diff --git a/packages/ossie/ossie-soundout-device_svn.bb b/packages/ossie/ossie-soundout-device_svn.bb
index 2af60db834..111a96f493 100644
--- a/packages/ossie/ossie-soundout-device_svn.bb
+++ b/packages/ossie/ossie-soundout-device_svn.bb
@@ -1,9 +1,10 @@
-PR = "r0"
 DESCRIPTION = "OSSIE sound playback device"
 SECTION =  "apps"
 PRIORITY = "optional"
 MAINTAINER = "Philip Balister philip@balister.org"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "alsa-lib ossiecf ossie-standardinterfaces"
 
@@ -15,6 +16,8 @@ prefix="/home/sca"
 
 inherit autotools
 
+EXTRA_OECONF = "--with-omniorb=${STAGING_BINDIR}/.. IDL=${STAGING_BINDIR_NATIVE}/omniidl"
+
 FILES_${PN} += "/home/sca/xml/soundCard/*xml"
 
 BROKEN = "1"
diff --git a/packages/ossie/ossie-standardinterfaces_svn.bb b/packages/ossie/ossie-standardinterfaces_svn.bb
index 7482430ec8..c00bcd5c6b 100644
--- a/packages/ossie/ossie-standardinterfaces_svn.bb
+++ b/packages/ossie/ossie-standardinterfaces_svn.bb
@@ -1,8 +1,9 @@
-PR = "r0"
 DESCRIPTION = "OSSIE Standard port interfaces"
 SECTION =  "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf"
 
@@ -13,6 +14,10 @@ SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/standardInterfaces/trunk;module=
 
 inherit autotools pkgconfig
 
+EXTRA_OECONF = "--with-omniorb=${STAGING_BINDIR}/.. IDL=${STAGING_BINDIR_NATIVE}/omniidl"
+
+CXXFLAGS_powerpc += "-lstdc++"
+
 do_stage () {
 	autotools_stage_all
 }
diff --git a/packages/ossie/ossie-tx-random-data_svn.bb b/packages/ossie/ossie-tx-random-data_svn.bb
index 1597f5ec94..89ffe27a84 100644
--- a/packages/ossie/ossie-tx-random-data_svn.bb
+++ b/packages/ossie/ossie-tx-random-data_svn.bb
@@ -1,8 +1,9 @@
-PR = "r0"
 DESCRIPTION = "OSSIE transmit random bits waveform"
 SECTION =  "apps"
 PRIORITY = "optional"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf ossie-randombits ossie-modulator ossie-interpolator ossie-usrp-tx-control ossie-usrp-device ossie-gpp-device"
 RDEPENDS = "ossie-randombits ossie-modulator ossie-interpolator ossie-usrp-tx-control ossie-usrp-device ossie-gpp-device"
diff --git a/packages/ossie/ossie-usrp-device_svn.bb b/packages/ossie/ossie-usrp-device_svn.bb
index 943b53a464..3f29c2c4f2 100644
--- a/packages/ossie/ossie-usrp-device_svn.bb
+++ b/packages/ossie/ossie-usrp-device_svn.bb
@@ -1,9 +1,10 @@
-PR = "r0"
 DESCRIPTION = "OSSIE General Purpose Processor device"
 SECTION =  "apps"
 PRIORITY = "optional"
 MAINTAINER = "Philip Balister philip@balister.org"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf usrp ossie-standardinterfaces"
 
diff --git a/packages/ossie/ossie-usrp-tx-control_svn.bb b/packages/ossie/ossie-usrp-tx-control_svn.bb
index b3fca8fe9b..c3af96c2a3 100644
--- a/packages/ossie/ossie-usrp-tx-control_svn.bb
+++ b/packages/ossie/ossie-usrp-tx-control_svn.bb
@@ -1,8 +1,9 @@
-PR = "r0"
 DESCRIPTION = "OSSIE USRP TX side control component"
 SECTION =  "apps"
 PRIORITY = "optional"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf ossie-standardinterfaces"
 
diff --git a/packages/ossie/ossiecf_svn.bb b/packages/ossie/ossiecf_svn.bb
index 76317ac8bd..2c7b27ef7c 100644
--- a/packages/ossie/ossiecf_svn.bb
+++ b/packages/ossie/ossiecf_svn.bb
@@ -1,10 +1,10 @@
-PR = "r0"
 DESCRIPTION = "OSSIE Core Framework"
 SECTION =  "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-
 DEPENDS = "xerces-c omniorb libtool-cross"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 S="${WORKDIR}/ossie"
 
diff --git a/packages/tslib/tslib/magician/.mtn2git_empty b/packages/tslib/tslib/magician/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/tslib/tslib/magician/.mtn2git_empty
+++ /dev/null
diff --git a/packages/tslib/tslib/magician/tslib.sh b/packages/tslib/tslib/magician/tslib.sh
deleted file mode 100644
index 586d5c7deb..0000000000
--- a/packages/tslib/tslib/magician/tslib.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/packages/usrp/files/fix_compile_h.patch b/packages/usrp/files/fix_compile_h.patch
new file mode 100644
index 0000000000..02ba7e44a0
--- /dev/null
+++ b/packages/usrp/files/fix_compile_h.patch
@@ -0,0 +1,13 @@
+Index: gnuradio/trunk/usrp/host/lib/fusb_linux.cc
+===================================================================
+--- gnuradio/trunk/usrp/host/lib/fusb_linux.cc (revision 3534)
++++ gnuradio/trunk/usrp/host/lib/fusb_linux.cc (revision 3886)
+@@ -28,5 +28,7 @@
+ #include <usb.h>		// libusb header
+ #include <stdexcept>
++#ifdef HAVE_LINUX_COMPILER_H
+ #include <linux/compiler.h>
++#endif
+ #include <linux/usbdevice_fs.h>	// interface to kernel portion of user mode usb driver
+ #include <sys/ioctl.h>
+
diff --git a/packages/usrp/usrp_0.12.bb b/packages/usrp/usrp_0.12.bb
index 5fc6969f8c..ade37baf60 100644
--- a/packages/usrp/usrp_0.12.bb
+++ b/packages/usrp/usrp_0.12.bb
@@ -7,13 +7,16 @@ RDEPENDS = "python-core"
 PR = "r0"
 
 SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/usrp-${PV}.tar.gz \
-           file://usb11.patch;patch=1" \
+           file://usb11.patch;patch=1 \
+           file://fix_compile_h.patch;patch=1;pnum=3 \
            file://install_test.patch;patch=1"
 
 S = "${WORKDIR}/usrp-${PV}"
 
 inherit autotools pkgconfig
 
+CXXFLAGS_powerpc += "-lstdc++"
+
 export BUILD_SYS := "${BUILD_SYS}"
 export HOST_SYS := "${HOST_SYS}"