midpath: Updated all recipes to rc2.

midpath-openmoko: Use alsa backend.

3 files changed, 24 insertions, 94 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
deleted file mode 100644
index 7e763bd587..0000000000
--- a/packages/midpath/files/0.2+0.3rc1-fix-crlf.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-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_openmoko.cfg b/packages/midpath/files/configuration_openmoko.cfg
index 0691dca561..bb413e4548 100644
--- a/packages/midpath/files/configuration_openmoko.cfg
+++ b/packages/midpath/files/configuration_openmoko.cfg
@@ -40,7 +40,7 @@ org.thenesis.midpath.font.bdf.filename:VeraMono-12-8.bdf
 # 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.backend:ALSA
 org.thenesis.midpath.sound.device:default
 org.thenesis.midpath.sound.sampleRate:44100
 # Buffer size MUST be a power of two
diff --git a/packages/midpath/files/midpath-launcher-j2se b/packages/midpath/files/midpath-launcher-j2se
index 22928a0e1e..49f074f7ab 100644
--- a/packages/midpath/files/midpath-launcher-j2se
+++ b/packages/midpath/files/midpath-launcher-j2se
@@ -1,7 +1,25 @@
 #!/bin/sh
 
 if [ ! $LAUNCHER_CLASS ]; then
-  LAUNCHER_CLASS=org.thenesis.midpath.main.MIDletLauncher
+  if [ $# -lt 2 ]; then
+    echo "Usage :"
+    echo "  $(basename $0) <classpath> <midlet-class> [midlet-name]"
+    echo "  $(basename $0) -jar <jar-file>"
+    exit 1
+  fi
+
+  LAUNCHER_CLASS=org.thenesis.midpath.main.MIDletLauncherSE
+
+  # Add the MIDlet jar to the classpath  (must be loaded by the main classloader)
+  if [ $1 = "-jar" ]; then
+    CP=$2
+    ARGS="$1 $2"
+  else
+    CP=$1
+    ARGS="$2 $3"
+  fi
+else
+  ARGS="$@"
 fi
 
 if [ ! $JAVA ]; then
@@ -15,7 +33,7 @@ MIDPATH_HOME=/usr/share/midpath
 JLP=/usr/lib/jni
 
 # Set the classpath
-CP=\
+CP=$CP:\
 $MIDPATH_HOME/configuration:\
 $MIDPATH_HOME/midpath.jar:\
 $MIDPATH_HOME/microbackend.jar:\
@@ -25,6 +43,8 @@ $MIDPATH_HOME/jlayerme-cldc.jar:\
 $MIDPATH_HOME/jorbis-cldc.jar:\
 $MIDPATH_HOME/avetanabt-cldc.jar:\
 $MIDPATH_HOME/jgl-cldc.jar:\
+$MIDPATH_HOME/jsr172-jaxp.jar:\
+$MIDPATH_HOME/jsr172-jaxrpc.jar:\
 $MIDPATH_HOME/jsr239-opengles-jgl.jar:\
 $MIDPATH_HOME/jsr239-opengles-core.jar:\
 $MIDPATH_HOME/jsr239-opengles-nio.jar:\
@@ -43,8 +63,5 @@ 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 "$@"
+$JAVA -cp $CP -Djava.library.path=$JLP $LAUNCHER_CLASS $ARGS