[oe-commits] org.oe.dev merge of 'c3c2fc52f60e174bdf9d1f52c795dc0bdcfb0958'

[oe commit]

merge of 'c3c2fc52f60e174bdf9d1f52c795dc0bdcfb0958'
     and 'd07d8aef4aa26afe6c43c94383a0a14d31ed5c54'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: e2e59b45a03f1637e6bf0cad4600d28feda339ae
ViewMTN: http://monotone.openembedded.org/revision/info/e2e59b45a03f1637e6bf0cad4600d28feda339ae
Files:
1
conf/distro/include/angstrom-glibc.inc
packages/ffmpeg/omapfbplay_git.bb
packages/freesmartphone/zhone/80zhone
packages/freesmartphone/zhone_git.bb
packages/images/fso-image.bb
packages/classpath/classpath-native_0.97.2.bb
packages/cacao/cacao-native.inc
packages/jamvm/jamvm-initial_1.5.0.bb
Diffs:

#
# mt diff -rc3c2fc52f60e174bdf9d1f52c795dc0bdcfb0958 -re2e59b45a03f1637e6bf0cad4600d28feda339ae
#
#
#
# patch "conf/distro/include/angstrom-glibc.inc"
#  from [3713139bc7b46ff4bc175e324f936414dd660e59]
#    to [62520e6f06c372811a13891d31a33e8723a29d92]
# 
# patch "packages/ffmpeg/omapfbplay_git.bb"
#  from [0480261a94ed82d3ec30fd7677c8775310776eb2]
#    to [e838774e7bfaed7364dbfcdfa26af48a333e9eaf]
# 
# patch "packages/freesmartphone/zhone/80zhone"
#  from [43dab662e1e74efbb2cef5e105862517a274e13b]
#    to [6c327481cd6f37425767d829d37ba75bd4ef7490]
# 
# patch "packages/freesmartphone/zhone_git.bb"
#  from [7e10cc3a3a4d6766da632530801d16417495bbff]
#    to [a7c3f434ee7bee53eea765eab5e7cd972ac50362]
# 
# patch "packages/images/fso-image.bb"
#  from [ed48a221328cfc4e99587341b1139811a37425d9]
#    to [0145db2bc64800d30a356637950a2d66daa6b503]
#
============================================================
--- conf/distro/include/angstrom-glibc.inc	3713139bc7b46ff4bc175e324f936414dd660e59
+++ conf/distro/include/angstrom-glibc.inc	62520e6f06c372811a13891d31a33e8723a29d92
@@ -29,6 +29,7 @@ FULL_OPTIMIZATION_sparc = "-fexpensive-o
 FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2"
 FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
 
+FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -ftree-vectorize -O2"
 FULL_OPTIMIZATION_pn-glibc_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -ftree-vectorize -O3"
 
 BUILD_OPTIMIZATION = "-Os"
============================================================
--- packages/ffmpeg/omapfbplay_git.bb	0480261a94ed82d3ec30fd7677c8775310776eb2
+++ packages/ffmpeg/omapfbplay_git.bb	e838774e7bfaed7364dbfcdfa26af48a333e9eaf
@@ -1,8 +1,8 @@ DESCRIPTION = "Simple ffmpeg-based playe
 DESCRIPTION = "Simple ffmpeg-based player that uses the omapfb overlays"
-DEPENDS = "ffmpeg virtual/kernel"
+DEPENDS = "bzip2 libmp3lame ffmpeg virtual/kernel"
 LICENSE = "MIT"
 
-PR = "r2"
+PR = "r3"
 
 inherit module-base
 
============================================================
--- packages/freesmartphone/zhone/80zhone	43dab662e1e74efbb2cef5e105862517a274e13b
+++ packages/freesmartphone/zhone/80zhone	6c327481cd6f37425767d829d37ba75bd4ef7490
@@ -1,4 +1,4 @@
 #!/bin/sh -e
-zhone --fullscreen > /tmp/zhone.log 2>&1 &
+zhone > /tmp/zhone.log 2>&1 &
 renice -3 $!
 exit 0
============================================================
--- packages/freesmartphone/zhone_git.bb	7e10cc3a3a4d6766da632530801d16417495bbff
+++ packages/freesmartphone/zhone_git.bb	a7c3f434ee7bee53eea765eab5e7cd972ac50362
@@ -4,7 +4,7 @@ PV = "0.0.0+gitr${SRCREV}"
 DEPENDS = "edje-native python-pyrex-native python-cython-native"
 RDEPENDS = "task-python-efl python-textutils python-dbus"
 PV = "0.0.0+gitr${SRCREV}"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/zhone.git;protocol=git;branch=master \
            file://80zhone"
============================================================
--- packages/images/fso-image.bb	ed48a221328cfc4e99587341b1139811a37425d9
+++ packages/images/fso-image.bb	0145db2bc64800d30a356637950a2d66daa6b503
@@ -18,7 +18,9 @@ X_INSTALL = "\
 
 # getting an X window system up
 X_INSTALL = "\
-  matchbox-wm \
+  e-wm \
+  illume \
+  illume-theme \
   ${XSERVER} \
   xserver-kdrive-common \
   xserver-nodm-init \


#
# mt diff -rd07d8aef4aa26afe6c43c94383a0a14d31ed5c54 -re2e59b45a03f1637e6bf0cad4600d28feda339ae
#
#
#
# add_file "packages/classpath/classpath-native_0.97.2.bb"
#  content [00c39f7324532c966c52166a21c322312b678fb2]
# 
# patch "packages/cacao/cacao-native.inc"
#  from [32a14daad8bfa543857bf859355a62c3f31fb623]
#    to [07b702fccb42b3216ccbc83f1e71c7ef63a0c5bc]
# 
# patch "packages/jamvm/jamvm-initial_1.5.0.bb"
#  from [08d6c4fd24b6e2bf4ac4e75a896b575f9431bfa4]
#    to [26cbc2490a0489f6e819962e91a7b3818413106a]
#
============================================================
--- packages/classpath/classpath-native_0.97.2.bb	00c39f7324532c966c52166a21c322312b678fb2
+++ packages/classpath/classpath-native_0.97.2.bb	00c39f7324532c966c52166a21c322312b678fb2
@@ -0,0 +1,13 @@
+require classpath-native.inc
+
+PR = "r0"
+
+# The code affected by the javanet-local patch
+# is usually not compiled. However if someone changes
+# to --enable-local-sockets it will.
+SRC_URI += "\
+  file://netif_16.patch;patch=1;pnum=0 \
+  file://SimpleName.diff;patch=1;pnum=0 \
+  file://javanet-local.patch;patch=1;pnum=0 \
+  "
+
============================================================
--- packages/cacao/cacao-native.inc	32a14daad8bfa543857bf859355a62c3f31fb623
+++ packages/cacao/cacao-native.inc	07b702fccb42b3216ccbc83f1e71c7ef63a0c5bc
@@ -17,7 +17,7 @@ EXTRA_OECONF = "\
   --with-vm-zip=${datadir}/cacao/vm.zip \
   \
   --with-classpath-libdir=${libdir_jni}:${libdir} \
-  --with-classpath-includedir=${includedir}/classpath \
+  --with-classpath-includedir=${incdir}/classpath \
   --with-classpath-classes=${datadir}/classpath/glibj.zip \
   \
   --with-java-runtime-library-classes=${datadir}/classpath/glibj.zip \
@@ -26,8 +26,11 @@ EXTRA_OECONF = "\
   --with-jni_h=${incdir}/classpath \
   "
 
-# force usage of ecj-initial (but Java5-compatible class library)
-export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial -bootclasspath ${STAGING_DATADIR_NATIVE}/classpath/glibj.zip"
+# force usage of ecj-initial
+# Important: Not specifying the bootclasspath argument here is only supported
+# for Cacao >= 0.99. Earlier Cacao may need the BCP set to a Java5-capable
+# class library.
+export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial"
 
 # force usage of fastjar
+export JAR="fastjar"
-export JAR=fastjar
============================================================
--- packages/jamvm/jamvm-initial_1.5.0.bb	08d6c4fd24b6e2bf4ac4e75a896b575f9431bfa4
+++ packages/jamvm/jamvm-initial_1.5.0.bb	26cbc2490a0489f6e819962e91a7b3818413106a
@@ -4,6 +4,8 @@ DEPENDS = "zlib-native classpath-initial
 
 DEPENDS = "zlib-native classpath-initial jikes-initial"
 
+PR = "r1"
+
 PROVIDES = "virtual/java-initial"
 
 S = "${WORKDIR}/jamvm-${PV}"
@@ -18,7 +20,7 @@ EXTRA_OECONF = "\
 inherit native autotools
 
 EXTRA_OECONF = "\
-  --with-classpath-install-dir=${STAGING_DIR_NATIVE}\
+  --with-classpath-install-dir=${prefix} \
   --program-suffix=-initial \
   "