merge of '2461ced47a86df0e470945c4f28e9645fddf37ba'

     and 'ba8fff0d5b442b517dadcbd3c0b226e006d70325'

23 files changed, 128 insertions, 102 deletions

diff --git a/packages/bluez/bluez-utils-dbus_2.20.bb b/packages/bluez/bluez-utils-dbus_2.20.bb
index d55361c63d..e76868cb6c 100644
--- a/packages/bluez/bluez-utils-dbus_2.20.bb
+++ b/packages/bluez/bluez-utils-dbus_2.20.bb
@@ -1,6 +1,6 @@
 require bluez-utils.inc
 
-PR = "r11"
+PR = "r12"
 
 DEPENDS += "dbus"
 SRC_URI += "file://dbus.patch;patch=1 \
diff --git a/packages/bluez/bluez-utils-dbus_2.21.bb b/packages/bluez/bluez-utils-dbus_2.21.bb
index 11decf1208..cd98cfdfaa 100644
--- a/packages/bluez/bluez-utils-dbus_2.21.bb
+++ b/packages/bluez/bluez-utils-dbus_2.21.bb
@@ -1,6 +1,6 @@
 require bluez-utils.inc
 
-PR = "r5"
+PR = "r6"
 
 DEPENDS += "dbus"
 SRC_URI += "file://dbus.patch;patch=1 \
diff --git a/packages/bluez/bluez-utils-dbus_2.24.bb b/packages/bluez/bluez-utils-dbus_2.24.bb
index 601a3f1f0c..3e4d0d7898 100644
--- a/packages/bluez/bluez-utils-dbus_2.24.bb
+++ b/packages/bluez/bluez-utils-dbus_2.24.bb
@@ -1,6 +1,6 @@
 require bluez-utils.inc
 
-PR = "r2"
+PR = "r3"
 
 DEPENDS += "dbus"
 SRC_URI += "file://dbus-2.24.patch;patch=1"
diff --git a/packages/bluez/bluez-utils-dbus_2.25.bb b/packages/bluez/bluez-utils-dbus_2.25.bb
index 954121c330..e4ec42f4c2 100644
--- a/packages/bluez/bluez-utils-dbus_2.25.bb
+++ b/packages/bluez/bluez-utils-dbus_2.25.bb
@@ -1,6 +1,6 @@
 require bluez-utils.inc
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS += "dbus"
 SRC_URI += "file://dbus-2.24.patch;patch=1 \
diff --git a/packages/bluez/bluez-utils-nodbus_2.20.bb b/packages/bluez/bluez-utils-nodbus_2.20.bb
index e7b5ad5f43..ebb5667c0b 100644
--- a/packages/bluez/bluez-utils-nodbus_2.20.bb
+++ b/packages/bluez/bluez-utils-nodbus_2.20.bb
@@ -1,6 +1,6 @@
 require bluez-utils.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://hciattach_devlength.patch;patch=1"
 EXTRA_OECONF += "--without-dbus"
diff --git a/packages/bluez/bluez-utils-nodbus_2.21.bb b/packages/bluez/bluez-utils-nodbus_2.21.bb
index 5e1f417cc0..f1efd35a16 100644
--- a/packages/bluez/bluez-utils-nodbus_2.21.bb
+++ b/packages/bluez/bluez-utils-nodbus_2.21.bb
@@ -1,6 +1,6 @@
 require bluez-utils.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://hciattach_devlength.patch;patch=1"
 EXTRA_OECONF += "--without-dbus"
diff --git a/packages/bluez/bluez-utils-nodbus_2.24.bb b/packages/bluez/bluez-utils-nodbus_2.24.bb
index b0a601d625..e2f4c67384 100644
--- a/packages/bluez/bluez-utils-nodbus_2.24.bb
+++ b/packages/bluez/bluez-utils-nodbus_2.24.bb
@@ -1,5 +1,5 @@
 require bluez-utils.inc
 
-PR = "r2"
+PR = "r3"
 
 EXTRA_OECONF += "--without-dbus"
diff --git a/packages/bluez/bluez-utils-nodbus_2.25.bb b/packages/bluez/bluez-utils-nodbus_2.25.bb
index 87068c9ab1..e56fab6c60 100644
--- a/packages/bluez/bluez-utils-nodbus_2.25.bb
+++ b/packages/bluez/bluez-utils-nodbus_2.25.bb
@@ -1,6 +1,6 @@
 require bluez-utils.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += " file://hciattach-ti-bts.patch;patch=1"
 EXTRA_OECONF += "--without-dbus"
diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc
index e71f2cef87..7eb181676d 100644
--- a/packages/bluez/bluez-utils.inc
+++ b/packages/bluez/bluez-utils.inc
@@ -21,7 +21,7 @@ SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1"
 S = "${WORKDIR}/bluez-utils-${PV}"
 
 EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} \
-                --enable-pcmcia --enable-initscripts --enable-bcm203x"
+                --enable-pcmcia --enable-initscripts --enable-bcm203x --enable-hid2hci"
 
 inherit autotools update-rc.d
 
diff --git a/packages/bluez/bluez-utils_3.1.bb b/packages/bluez/bluez-utils_3.1.bb
index 46565b8c1b..40aabaab50 100644
--- a/packages/bluez/bluez-utils_3.1.bb
+++ b/packages/bluez/bluez-utils_3.1.bb
@@ -6,7 +6,7 @@ RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
 RREPLACES = "bluez-utils-dbus"
 RCONFLICTS = "bluez-utils-dbus bluez-utils-nodbus"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
 	file://hcid.conf \
@@ -19,7 +19,7 @@ SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1"
 
 S = "${WORKDIR}/bluez-utils-${PV}"
 
-EXTRA_OECONF = "--enable-initscripts --enable-bcm203x"
+EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci"
 #  --enable-obex           enable OBEX support
 #  --enable-alsa           enable ALSA support
 #  --enable-cups           install CUPS backend support
diff --git a/packages/bluez/bluez-utils_3.4.bb b/packages/bluez/bluez-utils_3.4.bb
index 3b8702e997..49e6ded250 100644
--- a/packages/bluez/bluez-utils_3.4.bb
+++ b/packages/bluez/bluez-utils_3.4.bb
@@ -7,7 +7,7 @@ RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
 RREPLACES = "bluez-utils-dbus"
 RCONFLICTS_${PN} = "bluez-utils-nodbus"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
 	file://hcid.conf \
@@ -20,7 +20,7 @@ SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1"
 
 S = "${WORKDIR}/bluez-utils-${PV}"
 
-EXTRA_OECONF = "--enable-initscripts --enable-bcm203x"
+EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci"
 #  --enable-obex           enable OBEX support
 #  --enable-alsa           enable ALSA support
 #  --enable-cups           install CUPS backend support
diff --git a/packages/gnuz/.mtn2git_empty b/packages/gnuz/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gnuz/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gnuz/gnuz-levelmaker-native_0.1.1.bb b/packages/gnuz/gnuz-levelmaker-native_0.1.1.bb
deleted file mode 100644
index 4fec8271b3..0000000000
--- a/packages/gnuz/gnuz-levelmaker-native_0.1.1.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "Level maker for gnuZ"
-SECTION = "opie/games"
-PRIORITY = "optional"
-LICENSE = "GPL"
-AUTHOR = "Lukas Fraser"
-HOMEPAGE = "http://gnuz.4cows.net/eraser/gnuz/"
-DEPENDS = "qt-x11-free-native"
-
-SRC_URI = "http://gnuz.4cows.net/eraser/gnuz/gnuz-levelmaker_${PV}.tar.gz"
-
-S = "${WORKDIR}/gnuz_levelmaker"
-
-EXTRA_QMAKEVARS_POST += "LIBS+=-ldl CONFIG+=thread"
-
-inherit qmake qt3x11 native
-
-do_configure_prepend() {
-
-	${STAGING_BINDIR}/qmake -project
-}
-
-do_compile() {
-
-export OE_QMAKE_LINK="${CXX}"
-	oe_runmake
-}
-
-do_stage() {
-	install -m 0755 gnuz_levelmaker ${STAGING_BINDIR}/
-}
diff --git a/packages/gnuz/gnuz-package-native_0.1.bb b/packages/gnuz/gnuz-package-native_0.1.bb
deleted file mode 100644
index d67553a877..0000000000
--- a/packages/gnuz/gnuz-package-native_0.1.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "Level maker for gnuZ"
-SECTION = "opie/games"
-PRIORITY = "optional"
-LICENSE = "GPL"
-AUTHOR = "Lukas Fraser"
-HOMEPAGE = "http://gnuz.4cows.net/eraser/gnuz/"
-DEPENDS = "qt-x11-free-native"
-
-SRC_URI = "http://gnuz.4cows.net/eraser/gnuz/gnuz-package_${PV}.tar.gz"
-
-S = "${WORKDIR}/gnuz_package"
-
-EXTRA_QMAKEVARS_POST += "LIBS+=-ldl CONFIG+=thread"
-
-inherit qmake qt3x11 native
-
-do_configure_prepend() {
-
-	${STAGING_BINDIR}/qmake -project
-}
-
-do_compile() {
-
-export OE_QMAKE_LINK="${CXX}"
-	oe_runmake
-}
-
-do_stage() {
-	install -m 0755 gnuz_package ${STAGING_BINDIR}/
-}
diff --git a/packages/gnuz/gnuz_0.3.bb b/packages/gnuz/gnuz_0.3.bb
deleted file mode 100644
index 476b9ff5a6..0000000000
--- a/packages/gnuz/gnuz_0.3.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "gnuZ is a Lemmings style game"
-SECTION = "opie/games"
-PRIORITY = "optional"
-LICENSE = "GPL"
-AUTHOR = "Lukas Fraser"
-HOMEPAGE = "http://gnuz.4cows.net/eraser/gnuz/"
-PR = "r2"
-
-APPTYPE = "binary"
-APPNAME = "gnuz"
-APPDESKTOP = "${S}/data/"
-
-SRC_URI = "http://gnuz.4cows.net/eraser/gnuz/gnuz_0.3.tar.gz \
-           http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/gnuz-levels-0.3-1.tar.bz2"
-
-S = "${WORKDIR}/gnuz"
-
-inherit opie
-
-do_install_append() {
-
-        install -d ${D}${palmtopdir}/apps/Games \
-                   ${D}${palmtopdir}/pics \
-                   ${D}${palmtopdir}/share/gnuz/levels
-
-        install -m 0644 data/gnuz.png ${D}${palmtopdir}/pics/
-        install -m 0644 ${WORKDIR}/gnuz-levels/share/gnuz/levels/* ${D}${palmtopdir}/share/gnuz/levels/
-        install -m 0644 ${WORKDIR}/gnuz-levels/share/gnuz/*images.dat ${D}${palmtopdir}/share/gnuz/
-}
diff --git a/packages/omniorb/omniorb-native_4.0.7.bb b/packages/omniorb/omniorb-native_4.0.7.bb
index f9addd997d..be729fe6dc 100644
--- a/packages/omniorb/omniorb-native_4.0.7.bb
+++ b/packages/omniorb/omniorb-native_4.0.7.bb
@@ -11,6 +11,11 @@ do_compile () {
 	oe_runmake
 }
 
+# Ugly hack so libtool does not find native libs when building cross packages
+# We really only build this package for omniidl anyway
+do_stage_append() {
+	rm -f  ${STAGING_DIR}/${BUILD_SYS}/lib/libomni*
+}
 
 #do_stage() {
 #	install -m 0755 src/bison ${STAGING_BINDIR}/
diff --git a/packages/ossie/channeldemo_svn.bb b/packages/ossie/channeldemo_svn.bb
new file mode 100644
index 0000000000..d64464ade7
--- /dev/null
+++ b/packages/ossie/channeldemo_svn.bb
@@ -0,0 +1,19 @@
+PR = "r0"
+DESCRIPTION = "OSSIE Demo channel component"
+SECTION =  "apps"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+DEPENDS = "ossiecf"
+
+S="${WORKDIR}/ChannelDemo"
+
+
+SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/components/ChannelDemo/trunk;module=ChannelDemo;proto=https"
+
+prefix="/home/sca"
+
+inherit autotools
+
+FILES_${PN} += "/home/sca/xml/ChannelDemo/*.xml"
+
diff --git a/packages/ossie/gpp-device_svn.bb b/packages/ossie/gpp-device_svn.bb
new file mode 100644
index 0000000000..dcd58c73c6
--- /dev/null
+++ b/packages/ossie/gpp-device_svn.bb
@@ -0,0 +1,19 @@
+PR = "r0"
+DESCRIPTION = "OSSIE General Purpose Processor device"
+SECTION =  "apps"
+PRIORITY = "optional"
+MAINTAINER = "Philip Balister philip@balister.org"
+LICENSE = "GPL"
+
+DEPENDS = "ossiecf"
+
+S="${WORKDIR}/GPP"
+
+SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/platform/GPP/trunk;module=GPP;proto=https"
+
+prefix="/home/sca"
+
+inherit autotools
+
+FILES_${PN} += "/home/sca/xml/GPP/*xml"
+
diff --git a/packages/ossie/nodebooter_svn.bb b/packages/ossie/nodebooter_svn.bb
new file mode 100644
index 0000000000..34d6041e6c
--- /dev/null
+++ b/packages/ossie/nodebooter_svn.bb
@@ -0,0 +1,14 @@
+PR = "r0"
+DESCRIPTION = "OSSIE Node Booter"
+SECTION =  "apps"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+DEPENDS = "ossiecf"
+
+S="${WORKDIR}/nodebooter"
+
+SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/platform/nodebooter/trunk;module=nodebooter;proto=https"
+
+inherit autotools
+
diff --git a/packages/ossie/ossie-demo_svn.bb b/packages/ossie/ossie-demo_svn.bb
new file mode 100644
index 0000000000..df2d98ed9d
--- /dev/null
+++ b/packages/ossie/ossie-demo_svn.bb
@@ -0,0 +1,18 @@
+PR = "r0"
+DESCRIPTION = "OSSIE Demo waveform"
+SECTION =  "apps"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+DEPENDS = "ossiecf channeldemo rxdemo"
+
+S="${WORKDIR}/ossie_demo"
+
+
+SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/waveforms/ossie_demo/trunk;module=ossie_demo;proto=https"
+
+prefix="/home/sca"
+
+inherit autotools
+
+FILES_${PN} += "/home/sca/waveforms/ossie_demo/*.xml /home/sca/xml/TxDemo/*.xml"
diff --git a/packages/ossie/ossiecf_svn.bb b/packages/ossie/ossiecf_svn.bb
index 31a43ef223..d286ef4aa7 100644
--- a/packages/ossie/ossiecf_svn.bb
+++ b/packages/ossie/ossiecf_svn.bb
@@ -15,3 +15,6 @@ inherit autotools pkgconfig
 do_stage () {
 	autotools_stage_all
 }
+
+FILES_${PN} += "/home/sca/xml/dtd/*.dtd"
+
diff --git a/packages/ossie/rxdemo.bb b/packages/ossie/rxdemo.bb
new file mode 100644
index 0000000000..566397c72e
--- /dev/null
+++ b/packages/ossie/rxdemo.bb
@@ -0,0 +1,19 @@
+PR = "r0"
+DESCRIPTION = "OSSIE Demo receiver component"
+SECTION =  "apps"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+DEPENDS = "ossiecf"
+
+S="${WORKDIR}/RxDemo"
+
+
+SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/components/RxDemo/trunk;module=RxDemo;proto=https"
+
+prefix="/home/sca"
+
+inherit autotools
+
+FILES_${PN} += "/home/sca/xml/RxDemo/*.xml"
+
diff --git a/packages/ossie/standardinterfaces_svn.bb b/packages/ossie/standardinterfaces_svn.bb
new file mode 100644
index 0000000000..46b85f80ef
--- /dev/null
+++ b/packages/ossie/standardinterfaces_svn.bb
@@ -0,0 +1,18 @@
+PR = "r0"
+DESCRIPTION = "OSSIE Standard port interfaces"
+SECTION =  "libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+
+DEPENDS = "ossiecf"
+
+S="${WORKDIR}/standardInterfaces"
+
+SRCDATE = "now"
+SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/standardInterfaces/trunk;module=standardInterfaces;proto=https"
+
+inherit autotools pkgconfig
+
+do_stage () {
+	autotools_stage_all
+}