merge of '08199c52a592fe71e2675200cf618a439d710884'

     and '3e5f187370604cf4577025ebc49d90ca52a72d4d'

44 files changed, 1542 insertions, 471 deletions

diff --git a/packages/midpath/files/0.2+0.3rc1-fix-crlf.patch b/packages/midpath/files/0.2+0.3rc1-fix-crlf.patch
new file mode 100644
index 0000000000..7e763bd587
--- /dev/null
+++ b/packages/midpath/files/0.2+0.3rc1-fix-crlf.patch
@@ -0,0 +1,87 @@
+Index: configuration/com/sun/midp/configuration/system_properties
+===================================================================
+--- configuration/com/sun/midp/configuration/system_properties	(Revision 290)
++++ configuration/com/sun/midp/configuration/system_properties	(Revision 291)
+@@ -1,47 +1,47 @@
+ javax.microedition.io.Connector.protocolpath=com.sun.midp.io
+-microedition.profiles=MIDP-2.0 
+-microedition.configuration=CLDC-1.1 
+-microedition.locale=en-US 
++microedition.profiles=MIDP-2.0
++microedition.configuration=CLDC-1.1
++microedition.locale=en-US
+ microedition.platform=j2me
+-microedition.encoding=ISO8859_1 
+-microedition.hostname=localhost 
++microedition.encoding=ISO8859_1
++microedition.hostname=localhost
+ microedition.commports= 
+-microedition.jtwi.version=1.0 
+-microedition.media.version=1.1 
+-supports.mixing=true 
+-supports.audio.capture=false 
+-supports.video.capture=false 
+-supports.recording=false 
++microedition.jtwi.version=1.0
++microedition.media.version=1.1
++supports.mixing=true
++supports.audio.capture=false
++supports.video.capture=false
++supports.recording=false
+ audio.encodings=encoding=audio/wav encoding=audio/x-wav encoding=pcm encoding=audio/mp3 encoding=audio/ogg
+ video.snapshot.encodings=encoding=png encoding=image/png
+ video.encodings= 
+-streamable.contents=encoding=audio/wav encoding=audio/x-wav encoding=pcm encoding=audio/mp3 encoding=audio/ogg 
+-microedition.io.file.FileConnection.version=1.0 
+-Bluetooth.api.version=1.1 
+-obex.api.version=1.1 
+-bluetooth.l2cap.receiveMTU.max=1024 
+-bluetooth.master.switch=true 
+-bluetooth.connected.devices.max=6 
+-bluetooth.sd.trans.max=8 
+-bluetooth.sd.attr.retrievable.max=16 
+-bluetooth.connected.inquiry=true 
+-bluetooth.connected.inquiry.scan=true 
+-bluetooth.connected.page=true 
+-bluetooth.connected.page.scan=true 
+-microedition.m3g.version=1.1 
+-microedition.location.version=1.1 
+-microedition.m2g.version=1.1 
+-microedition.m2g.svg.version=1.1 
+-microedition.m2g.svg.baseProfile=tiny 
+-xml.jaxp.subset.version=1.0 
+-xml.rpc.subset.version=1.0 
+-wireless.messaging.version=2.0 
+-wireless.messaging.sms.smsc=+17815511212 
+-wireless.messaging.mms.mmsc=+17815511212 
++streamable.contents=encoding=audio/wav encoding=audio/x-wav encoding=pcm encoding=audio/mp3 encoding=audio/ogg
++microedition.io.file.FileConnection.version=1.0
++Bluetooth.api.version=1.1
++obex.api.version=1.1
++bluetooth.l2cap.receiveMTU.max=1024
++bluetooth.master.switch=true
++bluetooth.connected.devices.max=6
++bluetooth.sd.trans.max=8
++bluetooth.sd.attr.retrievable.max=16
++bluetooth.connected.inquiry=true
++bluetooth.connected.inquiry.scan=true
++bluetooth.connected.page=true
++bluetooth.connected.page.scan=true
++microedition.m3g.version=1.1
++microedition.location.version=1.1
++microedition.m2g.version=1.1
++microedition.m2g.svg.version=1.1
++microedition.m2g.svg.baseProfile=tiny
++xml.jaxp.subset.version=1.0
++xml.rpc.subset.version=1.0
++wireless.messaging.version=2.0
++wireless.messaging.sms.smsc=+17815511212
++wireless.messaging.mms.mmsc=+17815511212
+ 
+ # microedition.pim.version=
+ # microedition.global.version=
+-# microedition.sip.version=1.0.1 
++# microedition.sip.version=1.0.1
+ # 
+ # com.sun.midp.io.http.proxy=
+ # com.sun.midp.io.http.force_non_persistent=
diff --git a/packages/midpath/files/configuration_maemo.cfg b/packages/midpath/files/configuration_maemo.cfg
new file mode 100644
index 0000000000..441a9cdfc5
--- /dev/null
+++ b/packages/midpath/files/configuration_maemo.cfg
@@ -0,0 +1,123 @@
+##========================================
+## Graphics parameters
+##========================================
+javax.microedition.lcdui.screenWidth:600
+javax.microedition.lcdui.screenHeight:400
+# Toolkit configuration (possible values: SDL, virtual)
+# The toolkit parameter should be set to "virtual" unless you know what you do.
+# (to change the UI backend, see the backend parameter of the virtual toolkit below)
+javax.microedition.lcdui.toolkit:virtual
+
+##======================================
+## Parameters for the Virtual UI Toolkit
+##======================================
+# Possible backend values: NULL, SDL, AWT, AWTGRABBER, SWT, X11, GTK, QT, FB
+org.thenesis.microbackend.ui.backend:SWT
+# SDL backend configuration.
+# Possible bitsPerPixels values: 8, 16, 32
+# Possible video mode values: SW, HW (i.e software, hardware)
+org.thenesis.microbackend.ui.sdl.bitsPerPixel:32
+org.thenesis.microbackend.ui.sdl.videoMode:SW
+# X11 backend configuration.
+# Display value examples: :0.0, 192.168.0.1:1.0
+org.thenesis.microbackend.ui.x11.Display::0.0
+# Linux Framebuffer (FB) backend configuration 
+# (see /proc/bus/input/devices to know which special files are  
+# associated with your mouse or touchscreen)
+org.thenesis.microbackend.ui.fb.framebufferDevice:/dev/fb0
+org.thenesis.microbackend.ui.fb.keyboardDevice:/dev/tty
+org.thenesis.microbackend.ui.fb.mouseDevice:/dev/input/event1
+org.thenesis.microbackend.ui.fb.touchscreenDevice:/dev/input/event2
+# Possible fontRenderer values: raw, BDF
+org.thenesis.midpath.ui.fontRenderer:raw
+org.thenesis.midpath.font.bdf.filename:VeraMono-12-8.bdf
+
+##==========================
+## Parameters for the sound
+##==========================
+# Sound configuration (possible values: SDL, virtual)
+# The "player" parameter should be set to "virtual" unless you know what you do.
+# The virtual engine requires this hardware configuration: 16 bits, stereo, little endian
+org.thenesis.midpath.sound.engine:virtual
+# Possible sound backend values: NULL, ALSA, ESD, PulseAudio
+org.thenesis.midpath.sound.backend:NULL
+org.thenesis.midpath.sound.device:default
+org.thenesis.midpath.sound.sampleRate:44100
+# Buffer size MUST be a power of two
+org.thenesis.midpath.sound.bufferSize:8192
+
+##======================================
+## IO parameters
+##======================================
+# IO (file, socket) backends (possible values: J2SE, CLDC)
+com.sun.midp.io.backend:J2SE
+# The RMS root path (if not defined, records are read/written in the current directory)
+com.sun.midp.rms.rootPath:/home/user/
+
+##======================================
+## Location (JSR179)
+##======================================
+# Location mode (possible values: GPS, KML, LMS, NMEA)
+org.thenesis.midpath.location.mode:GPS
+# Resource file URI (KML and NMEA mode only)
+# Examples:
+# -Load a KML file in the "res" package from the java classloader:
+#  org.thenesis.midpath.location.resource.uri:/res/location.kml 
+# -Load a NMEA file from the file system:
+#  org.thenesis.midpath.location.resource.uri:file:////absolute/path/to/location.kml
+org.thenesis.midpath.location.resource.uri:
+# Resource poll interval in milliseconds (KML, LMS, NMEA mode only)
+org.thenesis.midpath.location.resource.pollInterval:5000
+
+##======================================
+## Messaging (JSR120, JSR205)
+##======================================
+# SMS backend (possible values: NULL)
+org.thenesis.midpath.messaging.backend:NULL
+
+##======================================
+## MIDlet Suite Manager (J2SE only)
+##======================================
+# The MIDlet repository path (if not defined, MIDlets are searched in the current directory)
+org.thenesis.midpath.main.repositoryPath:/usr/share/midpath/repository
+
+##======================================
+## Event parameters
+##======================================
+javax.microedition.lcdui.pointerSupported:true
+javax.microedition.lcdui.pointerMotionSupported:true
+
+##======================================
+## Key mapping 
+## (AWT codes are used by convention - see java.awt.event.KeyEvent javadocs)
+##======================================
+# Cursor left
+org.thenesis.midpath.ui.keys.LEFT:37
+# Cursor up
+org.thenesis.midpath.ui.keys.UP:38
+# Cursor right
+org.thenesis.midpath.ui.keys.RIGHT:39
+# Cursor down
+org.thenesis.midpath.ui.keys.DOWN:40
+
+# Zoom -
+org.thenesis.midpath.ui.keys.GAME_A:119
+# Minimize/Maximize
+org.thenesis.midpath.ui.keys.GAME_B:117
+# Zoom +
+org.thenesis.midpath.ui.keys.GAME_C:118
+# Cursor button
+org.thenesis.midpath.ui.keys.FIRE:10
+
+# Back button
+org.thenesis.midpath.ui.keys.SOFT_BUTTON1:27
+# Menu button
+org.thenesis.midpath.ui.keys.SOFT_BUTTON2:115
+
+# unmapped
+org.thenesis.midpath.ui.keys.STAR:0  
+org.thenesis.midpath.ui.keys.POUND:0
+org.thenesis.midpath.ui.keys.DELETE:8
+org.thenesis.midpath.ui.keys.END:39
+org.thenesis.midpath.ui.keys.POWER:0
+org.thenesis.midpath.ui.keys.GAME_D:0
diff --git a/packages/midpath/files/configuration_openmoko.cfg b/packages/midpath/files/configuration_openmoko.cfg
new file mode 100644
index 0000000000..0691dca561
--- /dev/null
+++ b/packages/midpath/files/configuration_openmoko.cfg
@@ -0,0 +1,124 @@
+##========================================
+## Graphics parameters
+##========================================
+javax.microedition.lcdui.screenWidth:480
+javax.microedition.lcdui.screenHeight:330
+# Toolkit configuration (possible values: SDL, virtual)
+# The toolkit parameter should be set to "virtual" unless you know what you do.
+# (to change the UI backend, see the backend parameter of the virtual toolkit below)
+javax.microedition.lcdui.toolkit:virtual
+
+##======================================
+## Parameters for the Virtual UI Toolkit
+##======================================
+# Possible backend values: NULL, SDL, AWT, AWTGRABBER, SWT, X11, GTK, QT, FB
+org.thenesis.microbackend.ui.backend:SWT
+# SDL backend configuration.
+# Possible bitsPerPixels values: 8, 16, 32
+# Possible video mode values: SW, HW (i.e software, hardware)
+org.thenesis.microbackend.ui.sdl.bitsPerPixel:32
+org.thenesis.microbackend.ui.sdl.videoMode:SW
+# X11 backend configuration.
+# Display value examples: :0.0, 192.168.0.1:1.0
+org.thenesis.microbackend.ui.x11.Display::0.0
+# Linux Framebuffer (FB) backend configuration 
+# (see /proc/bus/input/devices to know which special files are  
+# associated with your mouse or touchscreen)
+org.thenesis.microbackend.ui.fb.framebufferDevice:/dev/fb0
+org.thenesis.microbackend.ui.fb.keyboardDevice:/dev/tty
+org.thenesis.microbackend.ui.fb.mouseDevice:/dev/input/event1
+org.thenesis.microbackend.ui.fb.touchscreenDevice:/dev/input/event2
+# Possible fontRenderer values: raw, BDF
+org.thenesis.midpath.ui.fontRenderer:raw
+org.thenesis.midpath.font.bdf.filename:VeraMono-12-8.bdf
+
+##==========================
+## Parameters for the sound
+##==========================
+# Sound configuration (possible values: SDL, virtual)
+# The "player" parameter should be set to "virtual" unless you know what you do.
+# The virtual engine requires this hardware configuration: 16 bits, stereo, little endian
+org.thenesis.midpath.sound.engine:virtual
+# Possible sound backend values: NULL, ALSA, ESD, PulseAudio
+org.thenesis.midpath.sound.backend:PulseAudio
+org.thenesis.midpath.sound.device:default
+org.thenesis.midpath.sound.sampleRate:44100
+# Buffer size MUST be a power of two
+org.thenesis.midpath.sound.bufferSize:8192
+
+##======================================
+## IO parameters
+##======================================
+# IO (file, socket) backends (possible values: J2SE, CLDC)
+com.sun.midp.io.backend:J2SE
+# The RMS root path (if not defined, records are read/written in the current directory)
+com.sun.midp.rms.rootPath:/home/root/
+
+##======================================
+## Location (JSR179)
+##======================================
+# Location mode (possible values: GPS, KML, LMS, NMEA)
+org.thenesis.midpath.location.mode:GPS
+# Resource file URI (KML and NMEA mode only)
+# Examples:
+# -Load a KML file in the "res" package from the java classloader:
+#  org.thenesis.midpath.location.resource.uri:/res/location.kml 
+# -Load a NMEA file from the file system:
+#  org.thenesis.midpath.location.resource.uri:file:////absolute/path/to/location.kml
+org.thenesis.midpath.location.resource.uri:
+# Resource poll interval in milliseconds (KML, LMS, NMEA mode only)
+org.thenesis.midpath.location.resource.pollInterval:5000
+
+##======================================
+## Messaging (JSR120, JSR205)
+##======================================
+# SMS backend (possible values: NULL)
+org.thenesis.midpath.messaging.backend:NULL
+
+##======================================
+## MIDlet Suite Manager (J2SE only)
+##======================================
+# The MIDlet repository path (if not defined, MIDlets are searched in the current directory)
+org.thenesis.midpath.main.repositoryPath:/usr/share/midpath/repository
+
+##======================================
+## Event parameters
+##======================================
+javax.microedition.lcdui.pointerSupported:true
+javax.microedition.lcdui.pointerMotionSupported:true
+
+##======================================
+## Key mapping 
+## (AWT codes are used by convention - see java.awt.event.KeyEvent javadocs)
+##======================================
+# 4
+org.thenesis.midpath.ui.keys.LEFT:52
+# 2
+org.thenesis.midpath.ui.keys.UP:50
+# 6
+org.thenesis.midpath.ui.keys.RIGHT:54
+# 8
+org.thenesis.midpath.ui.keys.DOWN:56
+
+# 1
+org.thenesis.midpath.ui.keys.GAME_A:49
+# 3
+org.thenesis.midpath.ui.keys.GAME_B:51
+# 7
+org.thenesis.midpath.ui.keys.GAME_C:55
+# 9
+org.thenesis.midpath.ui.keys.GAME_D:57
+# 5
+org.thenesis.midpath.ui.keys.FIRE:53
+
+# 0
+org.thenesis.midpath.ui.keys.SOFT_BUTTON1:48
+# pound/sign/#
+org.thenesis.midpath.ui.keys.SOFT_BUTTON2:520
+
+# unmapped
+org.thenesis.midpath.ui.keys.STAR:0  
+org.thenesis.midpath.ui.keys.POUND:0
+org.thenesis.midpath.ui.keys.DELETE:8
+org.thenesis.midpath.ui.keys.END:39
+org.thenesis.midpath.ui.keys.POWER:0
diff --git a/packages/midpath/files/midpath-launcher-j2se b/packages/midpath/files/midpath-launcher-j2se
new file mode 100644
index 0000000000..22928a0e1e
--- /dev/null
+++ b/packages/midpath/files/midpath-launcher-j2se
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+if [ ! $LAUNCHER_CLASS ]; then
+  LAUNCHER_CLASS=org.thenesis.midpath.main.MIDletLauncher
+fi
+
+if [ ! $JAVA ]; then
+  JAVA=java
+fi
+
+JAR_HOME=/usr/share/java
+
+MIDPATH_HOME=/usr/share/midpath
+
+JLP=/usr/lib/jni
+
+# Set the classpath
+CP=\
+$MIDPATH_HOME/configuration:\
+$MIDPATH_HOME/midpath.jar:\
+$MIDPATH_HOME/microbackend.jar:\
+$MIDPATH_HOME/sdljava-cldc.jar:\
+$MIDPATH_HOME/escher-cldc.jar:\
+$MIDPATH_HOME/jlayerme-cldc.jar:\
+$MIDPATH_HOME/jorbis-cldc.jar:\
+$MIDPATH_HOME/avetanabt-cldc.jar:\
+$MIDPATH_HOME/jgl-cldc.jar:\
+$MIDPATH_HOME/jsr239-opengles-jgl.jar:\
+$MIDPATH_HOME/jsr239-opengles-core.jar:\
+$MIDPATH_HOME/jsr239-opengles-nio.jar:\
+$MIDPATH_HOME/jsr184-m3g.jar:\
+$MIDPATH_HOME/jsr205-messaging.jar:\
+$MIDPATH_HOME/jsr179-location.jar:\
+$MIDPATH_HOME/jsr226-svg-core.jar:\
+$MIDPATH_HOME/jsr226-svg-midp2.jar:\
+$JAR_HOME/kxml2.jar:\
+$JAR_HOME/xmlpull.jar:\
+$JAR_HOME/swt.jar
+
+# Add whatever is mentioned in the CLASSPATH environment variable
+if [ $CLASSPATH ]
+then
+  CP=$CP:$CLASSPATH
+fi
+
+# Add the MIDlet jar to the classpath  (must be loaded by the main classloader)
+CP=$CP:$MIDPATH_HOME/repository/midpath-demos.jar
+
+$JAVA -cp $CP -Djava.library.path=$JLP $LAUNCHER_CLASS "$@"
+
diff --git a/packages/midpath/files/midpath-suitemanager b/packages/midpath/files/midpath-suitemanager
new file mode 100644
index 0000000000..41ccd5fcb6
--- /dev/null
+++ b/packages/midpath/files/midpath-suitemanager
@@ -0,0 +1,2 @@
+#!/bin/sh
+LAUNCHER_CLASS=org.thenesis.midpath.main.SuiteManager midpath-launcher-j2se "$@"
diff --git a/packages/midpath/files/midpath-suitemanager.desktop b/packages/midpath/files/midpath-suitemanager.desktop
new file mode 100644
index 0000000000..3d7833e74e
--- /dev/null
+++ b/packages/midpath/files/midpath-suitemanager.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=MIDPath SuiteManager
+Comment=Manage MIDlets
+Exec=midpath-suitemanager
+Icon=midpath
+Terminal=false
+Type=Application
+Categories=GTK;Office;
+X-SingleInstance=true
+StartupNotify=true
+
diff --git a/packages/midpath/files/midpath.png b/packages/midpath/files/midpath.png
new file mode 100644
index 0000000000..0066fe4f29
--- /dev/null
+++ b/packages/midpath/files/midpath.png
diff --git a/packages/midpath/files/shellscript.patch b/packages/midpath/files/shellscript.patch
deleted file mode 100644
index 17c39d0810..0000000000
--- a/packages/midpath/files/shellscript.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: midpath-0.1/bin/midpath-test-cacao-cldc.sh
-===================================================================
---- midpath-0.1.orig/bin/midpath-test-cacao-cldc.sh	2007-07-03 22:09:33.000000000 +0200
-+++ midpath-0.1/bin/midpath-test-cacao-cldc.sh	2007-08-24 22:31:32.000000000 +0200
-@@ -3,19 +3,13 @@
- # Adapt the next line to your environment
- JAVA_CMD=cacao
- 
--if [ "$MIDPATH_HOME" = "" ]; then
--  MIDPATH_HOME=$(pwd)/..
--fi
-+MIDPATH_HOME=
- 
- # Set the classpath
--BCP=$MIDPATH_HOME/dist/cldc1.1.jar:$MIDPATH_HOME/dist/midpath.jar:$MIDPATH_HOME/resources-embedded:$MIDPATH_HOME/dist/sdljava-cldc.jar:$MIDPATH_HOME/dist/escher-x11-cldc.jar:$MIDPATH_HOME/dist/kxml2-2.3.0.jar
-+BCP=$MIDPATH_HOME/cldc1.1.jar:$MIDPATH_HOME/midpath.jar:$MIDPATH_HOME/resources-embedded:$MIDPATH_HOME/sdljava-cldc.jar:$MIDPATH_HOME/escher-x11-cldc.jar:$MIDPATH_HOME/kxml2-2.3.0.jar
- # Add the  MIDlet jar to the classpath  (must be loaded by the main 
- # classloader yet)
--BCP=$BCP:$MIDPATH_HOME/dist/midpath-tests.jar
--
--# Path of the native libraries
--JLP=$MIDPATH_HOME/dist
--export LD_LIBRARY_PATH=$JLP 
-+BCP=$BCP:$MIDPATH_HOME/midpath-tests.jar
- 
- CLASS=org.thenesis.midpath.main.StandardMIDletLauncher
- # The classname of the MIDlet (we have to set it manually yet)
diff --git a/packages/midpath/midpath-alsa_0.1.bb b/packages/midpath/midpath-alsa_0.1.bb
deleted file mode 100644
index 1ccace8500..0000000000
--- a/packages/midpath/midpath-alsa_0.1.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-
-require midpath_${PV}.bb
-
-DEPENDS += "alsa-lib"
-RDEPENDS = "alsa-lib"
-
-do_configure() {
-	cd ${S}/native/alsa
-	sed -i -e "s|\-I/usr/include/classpath|\-I${STAGING_INCDIR}/classpath-minimal|" Makefile
-	cd ${S}/resources-embedded/com/sun/midp/configuration
-	sed -i -e "s|sound.backend:NULL|sound.backend:ALSA|" configuration.cfg
-}
-
-do_compile() {
-
-# Build the ALSA native part
-cd ${S}/native/alsa
-make || exit 1
-
-}
-
-do_install() {
-	install -d ${D}${libdir}
-	install -m 0644 ${S}/native/alsa/libmidpathalsa.so ${D}${libdir}
-	install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration
-	install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/
-}
-
-do_stage() {
-	:
-}
-	
-
-FILES_${PN}  = "${libdir}/libmidpathalsa.so \
-                ${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
-	       "
-
-CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg"
diff --git a/packages/midpath/midpath-backend-alsa_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-alsa_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..664fb242e1
--- /dev/null
+++ b/packages/midpath/midpath-backend-alsa_0.2+0.3rc1.bb
@@ -0,0 +1,43 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS = "classpath linux-libc-headers"
+
+do_compile() {
+  # Only ALSA backend library is enabled
+  midpath_build \
+    --disable-cldc \
+    --disable-midpath \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --alsa
+}
+
+do_install() {
+	oe_libinstall -C dist -so libmidpathalsa ${D}${libdir_jni}
+}
+
+do_stage() {
+  :
+}
+	
+PACKAGES = "${PN} ${PN}-dbg"
+
+FILES_${PN} = "${libdir_jni}/lib*.so"
+FILES_${PN}-dbg  = "${libdir_jni}/.debug/lib*.so"
diff --git a/packages/midpath/midpath-backend-escher_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-escher_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..18f448c1ec
--- /dev/null
+++ b/packages/midpath/midpath-backend-escher_0.2+0.3rc1.bb
@@ -0,0 +1,42 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS += "midpath-cldc"
+
+do_compile() {
+  # Only escher-cldc is enabled
+  midpath_build \
+    --disable-cldc \
+    --disable-midpath \
+    --disable-sdljava-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+}
+
+do_install() {
+	install -d ${D}${datadir}/midpath
+	install -m 0644 dist/escher-cldc.jar ${D}${datadir}/midpath
+}
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/escher-cldc.jar ${STAGING_DATADIR}/midpath
+}
+	
+PACKAGES = "${PN}"
+
+FILES_${PN}  = "${datadir}/midpath/escher-cldc.jar"
diff --git a/packages/midpath/midpath-backend-esd_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-esd_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..79994d1395
--- /dev/null
+++ b/packages/midpath/midpath-backend-esd_0.2+0.3rc1.bb
@@ -0,0 +1,44 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS = "classpath esound"
+
+do_compile() {
+  # Only native esd backend library is enabled
+  midpath_build \
+    --disable-cldc \
+    --disable-midpath \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --esd
+}
+
+do_install() {
+	oe_libinstall -C dist -so libmidpathesd ${D}${libdir_jni}
+}
+
+do_stage() {
+  :
+}
+	
+PACKAGES = "${PN} ${PN}-dbg"
+
+FILES_${PN} = "${libdir_jni}/lib*.so"
+FILES_${PN}-dbg  = "${libdir_jni}/.debug/lib*.so"
+
diff --git a/packages/midpath/midpath-backend-fb_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-fb_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..c2fd6376a3
--- /dev/null
+++ b/packages/midpath/midpath-backend-fb_0.2+0.3rc1.bb
@@ -0,0 +1,43 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS = "classpath linux-libc-headers"
+
+do_compile() {
+  # Only native framebuffer backend library is enabled
+  midpath_build \
+    --disable-cldc \
+    --disable-midpath \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --fb
+}
+
+do_install() {
+	oe_libinstall -C dist -so libmicrobackendfb ${D}${libdir_jni}
+}
+
+do_stage() {
+  :
+}
+	
+PACKAGES = "${PN} ${PN}-dbg"
+
+FILES_${PN} = "${libdir_jni}/lib*.so"
+FILES_${PN}-dbg  = "${libdir_jni}/.debug/lib*.so"
diff --git a/packages/midpath/midpath-backend-gtk-hildon_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-gtk-hildon_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..2e7c8bb53b
--- /dev/null
+++ b/packages/midpath/midpath-backend-gtk-hildon_0.2+0.3rc1.bb
@@ -0,0 +1,34 @@
+require midpath-backend-gtk_${PV}.bb
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+PROVIDES = "midpath-backend-gtk"
+
+DEPENDS += "libhildon libhildonfm"
+
+do_compile() {
+  # Only native gtk backend library is enabled
+  midpath_build \
+    --disable-cldc \
+    --disable-midpath \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --gtk \
+    --enable-hildon
+}
+
diff --git a/packages/midpath/midpath-backend-gtk_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-gtk_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..619f56ffa7
--- /dev/null
+++ b/packages/midpath/midpath-backend-gtk_0.2+0.3rc1.bb
@@ -0,0 +1,44 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS = "classpath gtk+"
+
+do_compile() {
+  # Only native gtk backend library is enabled
+  midpath_build \
+    --disable-cldc \
+    --disable-midpath \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --gtk
+}
+
+do_install() {
+	oe_libinstall -C dist -so libmicrobackendgtk ${D}${libdir_jni}
+}
+
+do_stage() {
+  :
+}
+	
+PACKAGES = "${PN} ${PN}-dbg"
+
+FILES_${PN} = "${libdir_jni}/lib*.so"
+FILES_${PN}-dbg  = "${libdir_jni}/.debug/lib*.so"
+
diff --git a/packages/midpath/midpath-backend-pulseaudio_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-pulseaudio_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..9f169c652e
--- /dev/null
+++ b/packages/midpath/midpath-backend-pulseaudio_0.2+0.3rc1.bb
@@ -0,0 +1,44 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS = "classpath pulseaudio"
+
+do_compile() {
+  # Only native pulseaudio backend library is enabled
+  midpath_build \
+    --disable-cldc \
+    --disable-midpath \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --pulse
+}
+
+do_install() {
+	oe_libinstall -C dist -so libmidpathpulse ${D}${libdir_jni}
+}
+
+do_stage() {
+  :
+}
+	
+PACKAGES = "${PN} ${PN}-dbg"
+
+FILES_${PN} = "${libdir_jni}/lib*.so"
+FILES_${PN}-dbg  = "${libdir_jni}/.debug/lib*.so"
+
diff --git a/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..3f1c0e594f
--- /dev/null
+++ b/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb
@@ -0,0 +1,47 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS = "classpath qt-mt"
+RCONFLICTS = "midpath-backend-qte"
+
+inherit qt3x11
+
+do_compile() {
+  # Only native qt3 backend library is enabled
+  midpath_build \
+    --disable-cldc \
+    --disable-midpath \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --qt3
+}
+
+do_install() {
+	oe_libinstall -C dist -so libmidpathqt ${D}${libdir_jni}
+}
+
+do_stage() {
+  :
+}
+	
+PACKAGES = "${PN} ${PN}-dbg"
+
+FILES_${PN} = "${libdir_jni}/lib*.so"
+FILES_${PN}-dbg  = "${libdir_jni}/.debug/lib*.so"
+
diff --git a/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..ba12796d28
--- /dev/null
+++ b/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb
@@ -0,0 +1,46 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS = "classpath qt-mt"
+
+inherit qt4x11
+
+do_compile() {
+  # Only native qt4 backend library is enabled
+  midpath_build \
+    --disable-cldc \
+    --disable-midpath \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --qt4
+}
+
+do_install() {
+	oe_libinstall -C dist -so libmidpathqt4 ${D}${libdir_jni}
+}
+
+do_stage() {
+  :
+}
+	
+PACKAGES = "${PN} ${PN}-dbg"
+
+FILES_${PN} = "${libdir_jni}/lib*.so"
+FILES_${PN}-dbg  = "${libdir_jni}/.debug/lib*.so"
+
diff --git a/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..c812b34234
--- /dev/null
+++ b/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb
@@ -0,0 +1,47 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS = "classpath qt-mt"
+RCONFLICTS = "midpath-backend-qt3"
+
+inherit qt3e
+
+do_compile() {
+  # Only native qt3 backend library is enabled
+  midpath_build \
+    --disable-cldc \
+    --disable-midpath \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --qte
+}
+
+do_install() {
+	oe_libinstall -C dist -so libmidpathqt ${D}${libdir_jni}
+}
+
+do_stage() {
+  :
+}
+	
+PACKAGES = "${PN} ${PN}-dbg"
+
+FILES_${PN} = "${libdir_jni}/lib*.so"
+FILES_${PN}-dbg  = "${libdir_jni}/.debug/lib*.so"
+
diff --git a/packages/midpath/midpath-backend-sdl_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-sdl_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..723fd41e43
--- /dev/null
+++ b/packages/midpath/midpath-backend-sdl_0.2+0.3rc1.bb
@@ -0,0 +1,59 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS += "midpath-cldc virtual/libsdl libsdl-mixer libsdl-ttf libsdl-image libsdl-gfx"
+
+RDEPENDS_${PN} = "${PN}-jni"
+
+do_compile() {
+  # Only sdljava-cldc and native SDL backend library is enabled
+  midpath_build \
+    --disable-cldc \
+    --disable-midpath \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --sdl \
+    --with-sdl-include="`sdl-config --cflags`"
+}
+
+do_install() {
+	install -d ${D}${datadir}/midpath
+	install -m 0644 dist/sdljava-cldc.jar ${D}${datadir}/midpath
+
+	install -d ${D}${libdir_jni}
+	oe_libinstall -C dist -so libsdljava ${D}${libdir_jni}
+	oe_libinstall -C dist -so libsdljava_mixer ${D}${libdir_jni}
+	oe_libinstall -C dist -so libsdljava_ttf ${D}${libdir_jni}
+	oe_libinstall -C dist -so libsdljava_image ${D}${libdir_jni}
+	oe_libinstall -C dist -so libsdljava_gfx ${D}${libdir_jni}
+}
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/sdljava-cldc.jar ${STAGING_DATADIR}/midpath
+}
+	
+PACKAGES = "${PN} ${PN}-jni ${PN}-jni-dbg"
+
+FILES_${PN}  = "\
+		${datadir}/midpath/sdljava-cldc.jar \
+		"
+
+FILES_${PN}-jni  = "${libdir_jni}/lib*.so"
+FILES_${PN}-jni-dbg  = "${libdir_jni}/.debug/lib*.so"
+
diff --git a/packages/midpath/midpath-cldc-native_0.1.bb b/packages/midpath/midpath-cldc-native_0.1.bb
deleted file mode 100644
index 4e54497bde..0000000000
--- a/packages/midpath/midpath-cldc-native_0.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-
-inherit native
-
-require midpath-cldc_${PV}.bb
-
-
-PACKAGES = "${PN}-dbg  "
-
-do_install() {
-	:
-}
diff --git a/packages/midpath/midpath-cldc-sdl_0.1.bb b/packages/midpath/midpath-cldc-sdl_0.1.bb
deleted file mode 100644
index 6d777f6e8c..0000000000
--- a/packages/midpath/midpath-cldc-sdl_0.1.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-
-require midpath.inc
-
-do_configure() {
-        
-        cd ${S}/resources-embedded/com/sun/midp/configuration
-        sed -i -e "s|ui.backend:AWT|ui.backend:SDL|" \
-	       -e "s|bitsPerPixel:32|bitsPerPixel:16|" \
-	       configuration.cfg
-
-}
-
-
-do_compile() {
-
-# Build SDLJava for CLDC
-cd ${S}/external/sdljava-cldc
-make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH}:${GNU_CLASSPATH_PATH} -sourcepath ${S}/external/sdljava-cldc -source 1.3 -target 1.1" || exit 1
-make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH}:${GNU_CLASSPATH_PATH} -source 1.3 -target 1.1" JAR_FILE="sdljava-cldc.jar" JAR_FLAGS="cvf" || exit 1
-
-}
-
-do_install() {
-	install -d ${D}${datadir}/java
-	install -m 0644 ${S}/external/sdljava-cldc/sdljava-cldc.jar ${D}${datadir}/java
-	install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration
-        install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/
-}
-
-do_stage() {
-	install -d ${STAGING_DATADIR}/java
-	install -m 0644 ${S}/external/sdljava-cldc/sdljava-cldc.jar ${STAGING_DATADIR}/java
-}
-	
-
-FILES_${PN}  = "${datadir}/java/sdljava-cldc.jar \
-		${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
-	       "
-
-CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg"
diff --git a/packages/midpath/midpath-cldc-x11_0.1.bb b/packages/midpath/midpath-cldc-x11_0.1.bb
deleted file mode 100644
index 7aa8e9c6d9..0000000000
--- a/packages/midpath/midpath-cldc-x11_0.1.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-
-require midpath.inc
-
-DEPENDS += "virtual/libx11 midpath-cldc"
-
-do_configure() {
-	
-	cd ${S}/resources-embedded/com/sun/midp/configuration
-	sed -i -e "s|ui.backend:AWT|ui.backend:X11|" configuration.cfg
-
-}
-
-do_compile() {
-
-# Build Escher X11 library
-cd ${S}/external/escher-cldc/core
-make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -sourcepath ${S}/external/escher-cldc/core -source 1.3 -target 1.1" || exit 1
-make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -source 1.3 -target 1.1" JAR_FILE="escher-x11-cldc.jar" JAR_FLAGS="cvf" || exit 1
-
-}
-
-do_install() {
-	install -d ${D}${datadir}
-	install -m 0644 ${S}/external/escher-cldc/core/escher-x11-cldc.jar ${D}${datadir}
-	install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration
-	install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/
-}
-
-do_stage() {
-        install -d ${STAGING_DATADIR}/java
-        install -m 0644 ${S}/external/escher-cldc/core/escher-x11-cldc.jar ${STAGING_DATADIR}/java
-}
-	
-
-FILES_${PN}  = "${datadir}/java/escher-x11-cldc.jar \
-		${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
-	       "
diff --git a/packages/midpath/midpath-cldc_0.1.bb b/packages/midpath/midpath-cldc_0.1.bb
deleted file mode 100644
index e18d42781d..0000000000
--- a/packages/midpath/midpath-cldc_0.1.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-
-require midpath.inc
-
-do_compile() {
-
-mkdir -p ${S}/dist
-
-# Build CLDC1.1
-# Build base classes
-cd ${S}/external/cldc1.1/src
-make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath . -source 1.3 -target 1.1" || exit 1
-make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath . -source 1.3 -target 1.1" CLASS_DIR=${S}/external/cldc1.1/classes || exit 1
-# Build CLDC extra classes for MIDP2
-cd ${S}/src/cldc-glue
-make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -sourcepath ${S}/src/cldc-glue -source 1.3 -target 1.1"
-make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -source 1.3 -target 1.1" CLASS_DIR=${S}/external/cldc1.1/classes
-# Make a jar
-${FASTJAR_CMD} cvf  ${S}/dist/midpath-cldc1.1.jar -C ${S}/external/cldc1.1/classes .
-
-
-}
-
-do_install() {
-	install -d ${D}${datadir}/midpath-cldc
-	install -m 0644 dist/midpath-cldc1.1.jar ${D}${datadir}/midpath-cldc
-}
-
-do_stage() {
-	install -d ${STAGING_DATADIR}/midpath-cldc
-	install -m 0644 dist/midpath-cldc1.1.jar ${STAGING_DATADIR}/midpath-cldc
-}
-	
-
-FILES_${PN}  = "${datadir}/midpath-cldc/midpath-cldc1.1.jar"
diff --git a/packages/midpath/midpath-cldc_0.2+0.3rc1.bb b/packages/midpath/midpath-cldc_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..f8dd8e6e22
--- /dev/null
+++ b/packages/midpath/midpath-cldc_0.2+0.3rc1.bb
@@ -0,0 +1,45 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DESCRIPTION = "Implementation of the CLDC profile for use in the MIDPath library"
+RPROVIDES  = "midpath-cldc java-cldc1.1"
+
+JAR = "midpath-cldc1.1.jar"
+
+do_compile() {
+  midpath_build \
+    --disable-midpath \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --with-cldc-jar=dist/${JAR}
+}
+
+do_install() {
+	install -d ${D}${datadir}/midpath-cldc
+	install -m 0644 dist/${JAR} ${D}${datadir}/midpath-cldc
+}
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/midpath-cldc
+	install -m 0644 dist/${JAR} ${STAGING_DATADIR}/midpath-cldc
+}
+	
+PACKAGES = "${PN}"
+
+FILES_${PN}  = "${datadir}/midpath-cldc/${JAR}"
diff --git a/packages/midpath/midpath-common.inc b/packages/midpath/midpath-common.inc
new file mode 100644
index 0000000000..1690b4fc44
--- /dev/null
+++ b/packages/midpath/midpath-common.inc
@@ -0,0 +1,33 @@
+inherit java
+
+HOMEPAGE = "http://midpath.thenesis.org/"
+LICENSE  = "GPL"
+PRIORITY = "optional"
+SECTION  = "interpreters"
+
+DEPENDS = "virtual/javac-native classpath-native classpath fastjar-native"
+
+GLIBJ_ZIP = "${STAGING_DATADIR}/classpath/glibj.zip"
+
+CLDC_JAR = "${STAGING_DATADIR}/midpath-cldc/midpath-cldc1.1.jar"
+
+do_unpackpost() {
+	# Remove unneccessary binary bits.
+  find lib -name "*.jar" -exec rm \{\} \;
+}
+
+addtask unpackpost after do_unpack before do_patch
+
+midpath_build() {
+  sh build.sh \
+    --enable-fastjar \
+    --with-j2se-jar ${GLIBJ_ZIP} \
+    --with-jar=fastjar \
+    --with-javac=javac \
+    --with-cldc-jar=${CLDC_JAR} \
+    --with-midpath-jar=${STAGING_DATADIR}/midpath/midpath.jar \
+    --with-kxml="${STAGING_DATADIR_JAVA}/kxml2.jar:${STAGING_DATADIR_JAVA}/xmlpull.jar" \
+    --with-jni-include="-I${STAGING_INCDIR}/classpath" \
+    "$@"
+
+}
diff --git a/packages/midpath/midpath-core_0.2+0.3rc1.bb b/packages/midpath/midpath-core_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..d0ba53bfbd
--- /dev/null
+++ b/packages/midpath/midpath-core_0.2+0.3rc1.bb
@@ -0,0 +1,90 @@
+DESCRIPTION = "MIDPath is a Java library which provides a MIDP2 implementation"
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+require midpath-common.inc
+
+SRC_URI += "\
+  file://midpath-suitemanager \
+  file://midpath-launcher-j2se \
+  file://midpath-suitemanager.desktop \
+  file://midpath.png \
+  "
+
+PROVIDES = "java-midp2.0"
+DEPENDS += "midpath-cldc midpath-backend-sdl midpath-backend-escher swt3.4-gtk kxml2 bluez-libs"
+
+RDEPENDS += "libkxml2-java"
+
+JAR = "midpath.jar"
+
+do_compile() {
+  midpath_build \
+    --disable-cldc \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --with-sdljava-cldc=${STAGING_DATADIR}/midpath/sdljava-cldc.jar \
+    --with-escher-cldc=${STAGING_DATADIR}/midpath/escher-cldc.jar \
+    --with-swt-jar=${STAGING_DATADIR_JAVA}/swt.jar \
+    --with-midpath-jar=${S}/dist/midpath.jar \
+    --bt
+}
+
+do_install() {
+  oe_libinstall -C dist -so libavetanabtcldc ${D}${libdir_jni}
+
+	install -d ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR} ${D}${datadir}/midpath
+	install -m 0644 dist/microbackend.jar ${D}${datadir}/midpath
+	install -m 0644 dist/avetanabt-cldc.jar ${D}${datadir}/midpath
+	install -m 0644 dist/jorbis-cldc.jar ${D}${datadir}/midpath
+	install -m 0644 dist/jlayerme-cldc.jar ${D}${datadir}/midpath
+
+  install -d ${D}${bindir}
+  install -m 0755 ${WORKDIR}/midpath-launcher-j2se ${D}${bindir}
+  install -m 0755 ${WORKDIR}/midpath-suitemanager ${D}${bindir}
+
+  install -d ${D}${datadir}/applications
+  install -m 0644 ${WORKDIR}/midpath-suitemanager.desktop ${D}${datadir}/applications
+
+  install -d ${D}${datadir}/pixmaps
+  install -m 0644 ${WORKDIR}/midpath.png ${D}${datadir}/pixmaps
+}
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR} ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/microbackend.jar ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/avetanabt-cldc.jar ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/jorbis-cldc.jar ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/jlayerme-cldc.jar ${STAGING_DATADIR}/midpath
+}
+
+PACKAGES = "${PN}-bluetooth ${PN}-bluetooth-jni ${PN}-bluetooth-jni-dbg ${PN}-mp3 ${PN}-ogg ${PN}"
+RDEPENDS_${PN}-bluetooth = "${PN}-bluetooth-jni"
+
+FILES_${PN}-bluetooth = "${datadir}/midpath/avetanabt-cldc.jar"
+FILES_${PN}-bluetooth-jni = "${libdir_jni}/lib*.so"
+FILES_${PN}-bluetooth-jni-dbg = "${libdir_jni}/.debug/lib*.so"
+FILES_${PN}-mp3 = "${datadir}/midpath/jlayerme-cldc.jar"
+FILES_${PN}-ogg = "${datadir}/midpath/jorbis-cldc.jar"
+
+FILES_${PN} = "\
+  ${datadir}/midpath/*.jar \
+  ${datadir}/applications \
+  ${datadir}/pixmaps \
+  ${bindir} \
+	"
+
diff --git a/packages/midpath/midpath-demos_0.2+0.3rc1.bb b/packages/midpath/midpath-demos_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..1a2f690bf1
--- /dev/null
+++ b/packages/midpath/midpath-demos_0.2+0.3rc1.bb
@@ -0,0 +1,53 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS = "midpath-core midpath-location midpath-messaging midpath-svg midpath-opengles midpath-m3g"
+RDEPENDS = "midpath midpath-location midpath-messaging midpath-svg-midp midpath-opengles midpath-m3g"
+
+DESCRIPTION = "Demonstration programs of the MIDPath library"
+
+JAR = "midpath-demos.jar"
+
+do_compile() {
+  # Only Demos enabled.
+  midpath_build \
+    --disable-midpath \
+    --disable-cldc \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --with-location-jar=${STAGING_DATADIR}/midpath/jsr179-location.jar \
+    --with-messaging-jar=${STAGING_DATADIR}/midpath/jsr205-messaging.jar \
+    --with-svg-core-jar=${STAGING_DATADIR}/midpath/jsr226-svg-core.jar \
+    --with-opengles-core-jar=${STAGING_DATADIR}/midpath/jsr239-opengles-core.jar \
+    --with-opengles-nio-jar=${STAGING_DATADIR}/midpath/jsr239-opengles-nio.jar \
+    --with-m3g-jar=${STAGING_DATADIR}/midpath/jsr184-m3g.jar \
+    --with-avetanabt-cldc-jar=${STAGING_DATADIR}/midpath/avetanabt-cldc.jar
+}
+
+do_install() {
+	install -d ${D}${datadir}/midpath/repository
+	install -m 0644 dist/${JAR} ${D}${datadir}/midpath/repository
+}
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/midpath/repository
+	install -m 0644 dist/${JAR} ${STAGING_DATADIR}/midpath/repository
+}
+	
+PACKAGES = "${PN}"
+
+FILES_${PN} = "${datadir}/midpath/repository/${JAR}"
diff --git a/packages/midpath/midpath-gtk_0.1.bb b/packages/midpath/midpath-gtk_0.1.bb
deleted file mode 100644
index 42f6325efa..0000000000
--- a/packages/midpath/midpath-gtk_0.1.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-
-require midpath.inc
-
-DEPENDS += "gtk+"
-
-do_configure() {
-	
-	cd ${S}/resources-embedded/com/sun/midp/configuration
-	sed -i -e "s|ui.backend:AWT|ui.backend:GTK|" configuration.cfg
-
-	cd ${S}/native/gtk
-        sed -i -e "s|\-I/usr/include/classpath|\-I${STAGING_INCDIR}/classpath-minimal|" Makefile
-
-}
-
-do_compile() {
-
-# Build the GTK native part
-cd ${S}/native/gtk
-make || exit 1
-
-}
-
-do_install() {
-	install -d ${D}${libdir}
-	install -m 0644 ${S}/native/gtk/libmidpathgtk.so ${D}${libdir}
-	install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration
-	install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/
-}
-
-do_stage() {
-	:
-}
-	
-
-FILES_${PN}  = "${libdir}/libmidpathgtk.so \
-		${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
-	       "
-CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg"
diff --git a/packages/midpath/midpath-jgl_0.2+0.3rc1.bb b/packages/midpath/midpath-jgl_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..e003fe9bdb
--- /dev/null
+++ b/packages/midpath/midpath-jgl_0.2+0.3rc1.bb
@@ -0,0 +1,46 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS += "midpath-core"
+
+DESCRIPTION = "JGL CLDC API for use in the MIDPath library"
+
+JAR = "jgl-cldc.jar"
+
+do_compile() {
+  # Only JGL CLDC is enabled.
+  midpath_build \
+    --disable-midpath \
+    --disable-cldc \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos
+}
+
+do_install() {
+	install -d ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR} ${D}${datadir}/midpath
+}
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR} ${STAGING_DATADIR}/midpath
+}
+	
+PACKAGES = "${PN}"
+
+FILES_${PN}  = "${datadir}/midpath/${JAR}"
diff --git a/packages/midpath/midpath-location_0.2+0.3rc1.bb b/packages/midpath/midpath-location_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..349356fa65
--- /dev/null
+++ b/packages/midpath/midpath-location_0.2+0.3rc1.bb
@@ -0,0 +1,45 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DESCRIPTION = "Implementation of the JSR179 Location API for use in the MIDPath library"
+
+JAR = "jsr179-location.jar"
+
+do_compile() {
+  # Only location API is enabled.
+  midpath_build \
+    --disable-midpath \
+    --disable-cldc \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --with-avetanabt-cldc-jar=${STAGING_DATADIR}/midpath/avetanabt-cldc.jar
+}
+
+do_install() {
+	install -d ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR} ${D}${datadir}/midpath
+}
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR} ${STAGING_DATADIR}/midpath
+}
+	
+PACKAGES = "${PN}"
+
+FILES_${PN}  = "${datadir}/midpath/${JAR}"
diff --git a/packages/midpath/midpath-m3g_0.2+0.3rc1.bb b/packages/midpath/midpath-m3g_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..a0a1c42dd4
--- /dev/null
+++ b/packages/midpath/midpath-m3g_0.2+0.3rc1.bb
@@ -0,0 +1,48 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS += "midpath-core midpath-opengles"
+
+DESCRIPTION = "Implementation of the JSR184 Mobile 3D Graphics API for use in the MIDPath library"
+
+JAR = "jsr184-m3g.jar"
+
+do_compile() {
+  # Only M3G API is enabled.
+  midpath_build \
+    --disable-midpath \
+    --disable-cldc \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-demos \
+    --with-opengles-core-jar=${STAGING_DATADIR}/midpath/jsr239-opengles-core.jar \
+    --with-opengles-nio-jar=${STAGING_DATADIR}/midpath/jsr239-opengles-nio.jar
+}
+
+do_install() {
+	install -d ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR} ${D}${datadir}/midpath
+}
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR} ${STAGING_DATADIR}/midpath
+}
+	
+PACKAGES = "${PN}"
+
+FILES_${PN}  = "${datadir}/midpath/${JAR}"
diff --git a/packages/midpath/midpath-maemo_0.2+0.3rc1.bb b/packages/midpath/midpath-maemo_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..10fcf6681d
--- /dev/null
+++ b/packages/midpath/midpath-maemo_0.2+0.3rc1.bb
@@ -0,0 +1,19 @@
+require midpath.inc
+
+PR = "r0"
+
+# The patch fixes the system_properties file only deployed in this recipe.
+SRC_URI = "\
+  ${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz \
+  file://0.2+0.3rc1-fix-crlf.patch;patch=1;pnum=0 \
+  "
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+PR = "r0"
+
+SRC_URI += "file://configuration_maemo.cfg"
+
+RDEPENDS += "java2-runtime libswt3.4-gtk-java midpath-core-bluetooth"
+
+CONFIGURATION = "configuration_maemo.cfg"
diff --git a/packages/midpath/midpath-messaging_0.2+0.3rc1.bb b/packages/midpath/midpath-messaging_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..554f864491
--- /dev/null
+++ b/packages/midpath/midpath-messaging_0.2+0.3rc1.bb
@@ -0,0 +1,46 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS += "midpath-core"
+
+DESCRIPTION = "Implementation of the JSR205 Wireless Messaging API for use in the MIDPath library"
+
+JAR = "jsr205-messaging.jar"
+
+do_compile() {
+  # Only location API is enabled.
+  midpath_build \
+    --disable-midpath \
+    --disable-cldc \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos
+}
+
+do_install() {
+	install -d ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR} ${D}${datadir}/midpath
+}
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR} ${STAGING_DATADIR}/midpath
+}
+	
+PACKAGES = "${PN}"
+
+FILES_${PN}  = "${datadir}/midpath/${JAR}"
diff --git a/packages/midpath/midpath-opengles_0.2+0.3rc1.bb b/packages/midpath/midpath-opengles_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..b5b7d67954
--- /dev/null
+++ b/packages/midpath/midpath-opengles_0.2+0.3rc1.bb
@@ -0,0 +1,56 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS += "midpath-core midpath-jgl"
+RDEPENDS_${PN} = "midpath-core midpath-jgl ${PN}-core ${PN}-nio"
+
+DESCRIPTION = "Implementation of the JSR239 OpenGL ES API for use in the MIDPath library"
+
+JAR = "jsr239-opengles-jgl.jar"
+JAR2 = "jsr239-opengles-core.jar"
+JAR3 = "jsr239-opengles-nio.jar"
+
+do_compile() {
+  # Only OpenGL ES API is enabled.
+  midpath_build \
+    --disable-midpath \
+    --disable-cldc \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-jgl-cldc \
+    --disable-avetanabt-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --with-jgl-cldc-jar=${STAGING_DATADIR}/midpath/jgl-cldc.jar
+}
+
+do_install() {
+	install -d ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR} ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR2} ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR3} ${D}${datadir}/midpath
+}
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR} ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR2} ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR3} ${STAGING_DATADIR}/midpath
+}
+	
+PACKAGES = "${PN} ${PN}-core ${PN}-nio"
+
+FILES_${PN} = "${datadir}/midpath/${JAR}"
+FILES_${PN}-core = "${datadir}/midpath/${JAR2}"
+FILES_${PN}-nio = "${datadir}/midpath/${JAR3}"
diff --git a/packages/midpath/midpath-openmoko_0.2+0.3rc1.bb b/packages/midpath/midpath-openmoko_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..edb20af441
--- /dev/null
+++ b/packages/midpath/midpath-openmoko_0.2+0.3rc1.bb
@@ -0,0 +1,19 @@
+require midpath.inc
+
+PR = "r0"
+
+# The patch fixes the system_properties file only deployed in this recipe.
+SRC_URI = "\
+  ${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz \
+  file://0.2+0.3rc1-fix-crlf.patch;patch=1;pnum=0 \
+  "
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+PR = "r0"
+
+SRC_URI += "file://configuration_openmoko.cfg"
+
+RDEPENDS += "java2-runtime midpath-backend-pulseaudio libswt3.4-gtk-java midpath-core-bluetooth"
+
+CONFIGURATION = "configuration_openmoko.cfg"
diff --git a/packages/midpath/midpath-pulseaudio_0.1.bb b/packages/midpath/midpath-pulseaudio_0.1.bb
deleted file mode 100644
index 1a8c44d38c..0000000000
--- a/packages/midpath/midpath-pulseaudio_0.1.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-
-require midpath_${PV}.bb
-
-DEPENDS = "pulseaudio"
-RDEPENDS = "pulseaudio"
-
-do_configure() {
-	cd ${S}/native/pulseaudio
-	sed -i -e "s|\-I/usr/include/classpath|\-I${STAGING_INCDIR}/classpath-minimal|" Makefile
-	cd ${S}/resources-embedded/com/sun/midp/configuration
-	sed -i -e "s|sound.backend:NULL|sound.backend:PulseAudio|" configuration.cfg
-}
-
-do_compile() {
-
-# Build the PulseAudio native part
-cd ${S}/native/pulseaudio
-make || exit 1
-
-}
-
-do_install() {
-	install -d ${D}${libdir}
-	install -m 0644 ${S}/native/pulseaudio/libmidpathpulse.so ${D}${libdir}
-	install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration
-	install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/
-}
-
-do_stage() {
-	:
-}
-	
-
-FILES_${PN}  = "${libdir}/libmidpathpulse.so \
-                ${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
-	       "
-
-CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg"
diff --git a/packages/midpath/midpath-qt3x11_0.1.bb b/packages/midpath/midpath-qt3x11_0.1.bb
deleted file mode 100644
index 7ad9af9991..0000000000
--- a/packages/midpath/midpath-qt3x11_0.1.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-
-require midpath.inc
-
-DEPENDS += " qt-mt"
-RCONFILCTS = "midpath-qte"
-
-inherit qt3x11
-
-do_configure() {
-	
-	cd ${S}/resources-embedded/com/sun/midp/configuration
-	sed -i -e "s|ui.backend:AWT|ui.backend:QT|" configuration.cfg
-
-	cd ${S}/native/qt
-        sed -i -e "s|\-I/usr/include/classpath|\-I${STAGING_INCDIR}/classpath-minimal|" \
-               -e "s|\`pkg\-config \-\-cflags qt\-mt\`|\-I${QTDIR}/include/ -DQT_THREAD_SUPPORT|" \
-               -e "s|\`pkg\-config \-\-libs qt\-mt\`|\-L${QTDIR}/lib \-lqt-mt -lsupc++|" \
-               Makefile
-}
-
-do_compile() {
-
-# Build the QT native part
-cd ${S}/native/qt
-make || exit 1
-
-}
-
-do_install() {
-	install -d ${D}${libdir}
-	install -m 0644 ${S}/native/qt/libmidpathqt.so ${D}${libdir}
-	install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration
-	install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/
-}
-
-do_stage() {
-	:
-}
-	
-
-FILES_${PN}  = "${libdir}/libmidpathqt.so \
-		${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
-	       "
-
-CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg"
diff --git a/packages/midpath/midpath-qte_0.1.bb b/packages/midpath/midpath-qte_0.1.bb
deleted file mode 100644
index 4b7144722f..0000000000
--- a/packages/midpath/midpath-qte_0.1.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-
-require midpath.inc
-
-DEPENDS += " qte-mt"
-RCONFLICTS = "midpath-qt3x11"
-
-do_configure() {
-	
-	cd ${S}/resources-embedded/com/sun/midp/configuration
-	sed -i -e "s|ui.backend:AWT|ui.backend:QT|" configuration.cfg
-
-	cd ${S}/native/qt
-        sed -i -e "s|\-I/usr/include/classpath|\-I${STAGING_INCDIR}/classpath-minimal -DQWS|" \
-               -e "s|\`pkg\-config \-\-cflags qt\-mt\`|\-I${QTDIR}/include/ -DQWS -DQT_THREAD_SUPPORT|" \
-               -e "s|\`pkg\-config \-\-libs qt\-mt\`|\-L${QTDIR}/lib \-lqte-mt -lsupc++|" \
-               Makefile
-}
-
-do_compile() {
-
-# Build the QT native part
-cd ${S}/native/qt
-make || exit 1
-
-}
-
-do_install() {
-	install -d ${D}${libdir}
-	install -m 0644 ${S}/native/qt/libmidpathqt.so ${D}${libdir}
-	install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration
-	install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/
-}
-
-do_stage() {
-	:
-}
-	
-
-FILES_${PN}  = "${libdir}/libmidpathqt.so \
-		${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
-	       "
-
-CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg"
diff --git a/packages/midpath/midpath-svg_0.2+0.3rc1.bb b/packages/midpath/midpath-svg_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..d63caa5363
--- /dev/null
+++ b/packages/midpath/midpath-svg_0.2+0.3rc1.bb
@@ -0,0 +1,60 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS += "midpath-core midpath-webservices"
+RDEPENDS_${PN}-midp = "${PN}"
+RDEPENDS_${PN}-awt = "${PN}"
+
+DESCRIPTION = "Implementation of the JSR226 SVG API for use in the MIDPath library"
+
+JAR = "jsr226-svg-core.jar"
+JAR2 = "jsr226-svg-midp2.jar"
+JAR3 = "jsr226-svg-core.jar"
+
+do_compile() {
+  # Only SVG API is enabled.
+  midpath_build \
+    --disable-midpath \
+    --disable-cldc \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --enable-svg-api-awt \
+    --with-jaxp-jar=${STAGING_DATADIR}/midpath/jsr172-jaxp.jar
+}
+
+do_install() {
+	install -d ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR} ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR2} ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR3} ${D}${datadir}/midpath
+}
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR} ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR2} ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR3} ${STAGING_DATADIR}/midpath
+}
+	
+PACKAGES = "${PN} ${PN}-midp ${PN}-awt"
+
+FILES_${PN}  = "${datadir}/midpath/${JAR}"
+
+FILES_${PN}-midp  = "${datadir}/midpath/${JAR2}"
+
+FILES_${PN}-awt  = "${datadir}/midpath/${JAR3}"
diff --git a/packages/midpath/midpath-test_0.1.bb b/packages/midpath/midpath-test_0.1.bb
deleted file mode 100644
index 3d06e80797..0000000000
--- a/packages/midpath/midpath-test_0.1.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-
-require midpath.inc
-
-SRC_URI += "file://shellscript.patch;patch=1"
-
-DEPENDS += " midpath"
-RDEPENDS += " midpath"
-
-CLDC_PATH = ${STAGING_DATADIR}/java/cldc1.1.jar
-
-do_configure() {
-        
-        cd ${S}/bin
-        sed -i -e "s|MIDPATH_HOME=|MIDPATH_HOME=${datadir}/java|" \
-		   midpath-test-cacao-cldc.sh
-
-}
-
-do_compile() {
-
-cd ${S}/tests
-make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${STAGING_DATADIR}/java/midpath.jar:${CLDC_PATH} -sourcepath ${S}/tests -source 1.3 -target 1.1" || exit 1
-make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${STAGING_DATADIR}/java/midpath.jar:${CLDC_PATH} -source 1.3 -target 1.1" JAR_FILE="midpath-tests.jar" JAR_FLAGS="cvf" || exit 1
-
-}
-
-do_install() {
-	install -d ${D}${bindir}
-#	install -m 0755 bin/graphical_launcher-j2se.sh ${D}${bindir}
-#	install -m 0755 bin/midpath-test.sh ${D}${bindir}
-	install -m 0755 bin/midpath-test-cacao-cldc.sh ${D}${bindir}
-	install -d ${D}${datadir}/java
-	install -m 0644 ${S}/tests/midpath-tests.jar ${D}${datadir}/java
-}
-
-do_stage() {
-	:
-}
-	
-
-FILES_${PN}  = "${datadir}/java/midpath-tests.jar \
-#		${bindir}/graphical_launcher-j2se.sh \
-#		${bindir}/midpath-test.sh \
-		${bindir}/midpath-test-cacao-cldc.sh \
-	       "
diff --git a/packages/midpath/midpath-webservices_0.2+0.3rc1.bb b/packages/midpath/midpath-webservices_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..7f2f197cc1
--- /dev/null
+++ b/packages/midpath/midpath-webservices_0.2+0.3rc1.bb
@@ -0,0 +1,51 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS += "midpath-core"
+RSUGGESTS_${PN} = "${PN}-jaxp"
+
+DESCRIPTION = "Implementation of the JSR172 J2ME Web Services API for use in the MIDPath library"
+
+JAR = "jsr172-jaxp.jar"
+JAR2 = "jsr172-jaxrpc.jar"
+
+do_compile() {
+  # Only web services API is enabled.
+  midpath_build \
+    --disable-midpath \
+    --disable-cldc \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos
+}
+
+do_install() {
+	install -d ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR} ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR2} ${D}${datadir}/midpath
+}
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR} ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR2} ${STAGING_DATADIR}/midpath
+}
+	
+PACKAGES = "${PN} ${PN}-jaxp"
+
+FILES_${PN}-jaxp  = "${datadir}/midpath/${JAR}"
+FILES_${PN}  = "${datadir}/midpath/${JAR2}"
diff --git a/packages/midpath/midpath.inc b/packages/midpath/midpath.inc
index 4bc3b71598..703d9bdd3c 100644
--- a/packages/midpath/midpath.inc
+++ b/packages/midpath/midpath.inc
@@ -1,22 +1,49 @@
-DESCRIPTION = "MIDPath is a Java library which provides a MIDP2 implementation"
-HOMEPAGE = "http://midpath.thenesis.org/"
-LICENSE  = "GPL"
-PRIORITY = "optional"
-SECTION  = "interpreters"
-PR = "r1"
+# This is the include recipe for the midpath recipes for your platform.
+#
+# To support your particular platform, write a proper configuration, add
+# a new recipe and decided which components it should install by modifying
+# RDEPENDS.
+require midpath-common.inc
 
-SRC_URI = "http://downloads.sourceforge.net/midpath/midpath-${PV}.tar.gz"
+RDEPENDS = "midpath-core midpath-core-bluetooth midpath-core-ogg midpath-core-mp3"
 
-S = "${WORKDIR}/midpath-${PV}"
+PROVIDES = "midpath"
+RPROVIDES = "midpath"
 
-DEPENDS = "virtual/javac-native fastjar-native classpath"
+CONFIGURATION = "${@bb.fatal('Variable CONFIGURATION is not set in your midpath.inc-based recipe.')}"
 
-JAVAC_CMD = "${STAGING_BINDIR_NATIVE}/javac"
+do_compile() {
+  :
+}
 
-FASTJAR_CMD = "${STAGING_BINDIR_NATIVE}/fastjar"
+do_install() {
+	# Installation of configuration.cfg:
+  # Creates a symbolic link at ${datadir}/midpath which points to ${sysconfdir}/midpath
+  install -d ${D}${datadir}/midpath/configuration/com/sun/midp/configuration
+  ln -sf ${sysconfdir}/midpath/configuration.cfg ${D}${datadir}/midpath/configuration/com/sun/midp/configuration/configuration.cfg
 
-JAVA_PATH = "${STAGING_DATADIR}/java"
+  # Put the file itself into ${sysconfdir}/midpath
+  install -d ${D}${sysconfdir}/midpath
+  install -m 0644 ${WORKDIR}/${CONFIGURATION} ${D}${sysconfdir}/midpath/configuration.cfg
 
-GNU_CLASSPATH_PATH = "${JAVA_PATH}/classpath/glibj.zip"
+  # Same procedure for MIDP2.0 required system properties
+  ln -sf ${sysconfdir}/midpath/system_properties ${D}${datadir}/midpath/configuration/com/sun/midp/configuration/system_properties
+  install -m 0644 configuration/com/sun/midp/configuration/system_properties ${D}${sysconfdir}/midpath
+
+  # Put l10n data into $datadir
+  install -d ${D}${datadir}/midpath/configuration/com/sun/midp/configuration/l10n
+  install -m 0644 configuration/com/sun/midp/configuration/l10n/en-US.xml ${D}${datadir}/midpath/configuration/com/sun/midp/configuration/l10n
+}
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = "\
+	${datadir}/midpath/configuration \
+  ${sysconfdir}/midpath \
+	"
+
+CONFFILES_${PN} = "\
+  ${sysconfdir}/midpath/system_properties \
+  ${sysconfdir}/midpath/configuration.cfg \
+  "
 
-CLDC_PATH = ${STAGING_DATADIR}/midpath-cldc/midpath-cldc1.1.jar
diff --git a/packages/midpath/midpath_0.1.bb b/packages/midpath/midpath_0.1.bb
deleted file mode 100644
index e787b053be..0000000000
--- a/packages/midpath/midpath_0.1.bb
+++ /dev/null
@@ -1,60 +0,0 @@
-
-require midpath.inc
-
-DEPENDS += " kxml2 midpath-cldc midpath-cldc-x11 midpath-cldc-sdl"
-RSUGGESTS += " kxml2"
-
-do_compile() {
-
-mkdir -p ${S}/dist
-
-# Build MP3 library
-cd ${S}/external/jlayerme-cldc/src
-make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -sourcepath ${S}/external/jlayerme-cldc/src -source 1.3 -target 1.1" || exit 1
-make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -source 1.3 -target 1.1" JAR_FILE="jlayerme-cldc.jar" JAR_FLAGS="cvf" || exit 1
-cp ${S}/external/jlayerme-cldc/src/jlayerme-cldc.jar ${S}/dist
-
-# Build OGG library
-cd ${S}/external/jorbis-cldc/src
-make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -sourcepath ${S}/external/jorbis-cldc/src -source 1.3 -target 1.1" || exit 1
-make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -source 1.3 -target 1.1" JAR_FILE="jorbis-cldc.jar" JAR_FLAGS="cvf" || exit 1
-cp ${S}/external/jorbis-cldc/src/jorbis-cldc.jar ${S}/dist
-
-# Build Bluetooth library
-cd ${S}/external/javabluetooth/src
-make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${GNU_CLASSPATH_PATH}:${CLDC_PATH}:${S}/lib/RXTXcomm.jar -sourcepath ${S}/external/javabluetooth/src -source 1.3 -target 1.1" || exit 1
-make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${GNU_CLASSPATH_PATH}:${CLDC_PATH}:${S}/lib/RXTXcomm.jar -source 1.3 -target 1.1" JAR_FILE="jsr82-bluetooth.jar" JAR_FLAGS="cvf" || exit 1
-cp ${S}/external/javabluetooth/src/jsr82-bluetooth.jar ${S}/dist
-
-# Build MIDPath
-cd ${S}/src/core
-make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH}:${GNU_CLASSPATH_PATH}:${JAVA_PATH}/sdljava-cldc.jar:${JAVA_PATH}/escher-x11-cldc.jar:${S}/dist/jlayerme-cldc.jar:${S}/dist/jorbis-cldc.jar:${S}/dist/jsr82-bluetooth.jar:${JAVA_PATH}/kxml2-2.3.0.jar:${S}/lib/swt.jar -sourcepath ${S}/src/core -source 1.3 -target 1.1" || exit 1
-make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH}:${GNU_CLASSPATH_PATH}:${JAVA_PATH}/sdljava-cldc.jar:${JAVA_PATH}/dist/escher-x11-cldc.jar:${S}/dist/jlayerme-cldc.jar:${S}/dist/jorbis-cldc.jar:${S}/dist/jsr82-bluetooth.jar:${JAVA_PATH}/lib/kxml2-2.3.0.jar:${S}/lib/swt.jar -source 1.3 -target 1.1" CLASS_DIR=${S}/src/core/classes || exit 1
-# Compile JVM.java separately as it can't be compiled against cldc.jar
-${JAVAC_CMD} -bootclasspath ${GNU_CLASSPATH_PATH} -source 1.3 -target 1.1 -d ${S}/src/core/classes com/sun/cldchi/jvm/JVM.java
-${FASTJAR_CMD} cvf ${S}/dist/midpath.jar -C ${S}/src/core/classes .
-
-}
-
-do_install() {
-	install -d ${D}${datadir}/java
-	install -m 0644 dist/midpath.jar ${D}${datadir}/java
-	install -d ${D}${datadir}/java/resources-embedded
-	cp -rf resources-embedded/ ${D}${datadir}/java/
-}
-
-do_stage() {
-	install -d ${STAGING_DATADIR}/java
-	install -m 0644 dist/midpath.jar ${STAGING_DATADIR}/java
-}
-
-
-FILES_${PN} = "${datadir}/java/midpath.jar \
-	       ${datadir}/java/resources-embedded/com/sun/midp/configuration/ \
-	       ${datadir}/java/resources-embedded/com/sun/midp/configuration/chameleon/ \
-	       ${datadir}/java/resources-embedded/com/sun/midp/configuration/l10n/ \
-	       ${datadir}/java/resources-embedded/com/sun/midp/chameleon/skins/resources/images/ \
-
-	       ${datadir}/java/resources-embedded/org/thenesis/midpath/font/bdf/ \
-	      " 
-CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg"