[oe-commits] org.oe.dev merge of '1eb402d65c65c017f7fabfc389de63084c25dfc6'
crofton commit
openembedded-commits at lists.openembedded.org
Sun Aug 26 12:28:45 UTC 2007
merge of '1eb402d65c65c017f7fabfc389de63084c25dfc6'
and 'ae2a216bbda2ece2aa59f605c5345f7c13121c4e'
Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: 914da41cd2443e235ef11802d112b1bf24220639
ViewMTN: http://monotone.openembedded.org/revision.psp?id=914da41cd2443e235ef11802d112b1bf24220639
Files:
1
packages/libnetfilter-queue
packages/libnetfilter-queue/libnetfilter-queue_0.0.13.bb
packages/less/less-381
packages/less/less-381/configure.patch
packages/less/less-382
packages/less/less-382/configure.patch
packages/less/less_381.bb
packages/gnome/libsoup_2.2.98.bb
packages/gnome/libsoup_2.2.100.bb
packages/midpath/midpath-alsa_svn.bb
packages/midpath/midpath-alsa_0.1.bb
packages/midpath/midpath-cldc-x11_svn.bb
packages/midpath/midpath-cldc-x11_0.1.bb
packages/midpath/midpath-gtk_svn.bb
packages/midpath/midpath-gtk_0.1.bb
packages/midpath/midpath-native_svn.bb
packages/midpath/midpath-cldc-native_0.1.bb
packages/midpath/midpath-qt3x11_svn.bb
packages/midpath/midpath-qt3x11_0.1.bb
packages/midpath/midpath-qte_svn.bb
packages/midpath/midpath-qte_0.1.bb
packages/midpath/midpath_svn.bb
packages/midpath/midpath_0.1.bb
packages/powertop/powertop_1.5.bb
packages/powertop/powertop_1.8.bb
packages/libspiff
packages/libspiff/files
packages/liburiparser
packages/liburiparser/files
packages/midpath/files
packages/openmoko2/openmoko-mediaplayer2
conf/machine/include/tune-x86-nocona.conf
conf/machine/x86-32-nocona.conf
packages/gimp/gimp.inc
packages/gimp/gimp_2.3.19.bb
packages/less/less_406.bb
packages/libspiff/files/autofoo.patch
packages/libspiff/libspiff_0.7.2.bb
packages/liburiparser/files/autofoo.patch
packages/liburiparser/liburiparser_0.5.1.bb
packages/midpath/files/shellscript.patch
packages/midpath/midpath-cldc-sdl_0.1.bb
packages/midpath/midpath-cldc_0.1.bb
packages/midpath/midpath-test_0.1.bb
packages/midpath/midpath.inc
packages/openmoko2/openmoko-mediaplayer2/autofoo.patch
packages/openmoko2/openmoko-mediaplayer2/missing-images.patch
packages/openmoko2/openmoko-mediaplayer2_svn.bb
classes/rm_work.bbclass
conf/bitbake.conf
conf/distro/include/angstrom-eglibc.inc
conf/distro/include/angstrom-glibc.inc
conf/machine/x86-prescott.conf
packages/gimp/gimp_2.2.10.bb
packages/gimp/gimp_2.3.10.bb
packages/gimp/gimp_2.3.7.bb
packages/gimp/gimp_2.3.8.bb
packages/glibc/glibc-package.bbclass
packages/images/helloworld-image.bb
packages/linux/linux-x86_2.6.20.bb
packages/linux/linux.inc
packages/maemo3/libhildonmime_1.9.5.bb
packages/meta/slugos-packages.bb
packages/xorg-xserver/xorg-xserver-common.inc
packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
Diffs:
#
# mt diff -r1eb402d65c65c017f7fabfc389de63084c25dfc6 -r914da41cd2443e235ef11802d112b1bf24220639
#
#
#
# add_dir "packages/libnetfilter-queue"
#
# add_file "packages/libnetfilter-queue/libnetfilter-queue_0.0.13.bb"
# content [04a37192b82f73eec2eb554a8eaea7576453863a]
#
============================================================
--- packages/libnetfilter-queue/libnetfilter-queue_0.0.13.bb 04a37192b82f73eec2eb554a8eaea7576453863a
+++ packages/libnetfilter-queue/libnetfilter-queue_0.0.13.bb 04a37192b82f73eec2eb554a8eaea7576453863a
@@ -0,0 +1,30 @@
+DESCRIPTION = "libnetfilter_queue is a userspace library providing an API to \
+packets that have been queued by the kernel packet filter. It is is part of a \
+system that deprecates the old ip_queue / libipq mechanism."
+
+SECTION = "devel/libs"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.netfilter.org/projects/libnetfilter_queue/index.html"
+PR = "r0"
+
+
+# This package requires libtool-cross-1.5.24 which is not the default libtool
+# used by OE (25AUG2007)
+DEPENDS = "libnfnetlink"
+
+SRC_URI = "http://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-${PV}.tar.bz2"
+
+S = "${WORKDIR}/libnetfilter_queue-${PV}"
+
+inherit autotools pkgconfig
+
+do_configure() {
+ gnu-configize
+ libtoolize --force
+ oe_runconf
+}
+
+do_stage() {
+ autotools_stage_all
+}
+
#
# mt diff -rae2a216bbda2ece2aa59f605c5345f7c13121c4e -r914da41cd2443e235ef11802d112b1bf24220639
#
#
#
# delete "packages/less/less-381"
#
# delete "packages/less/less-381/configure.patch"
#
# delete "packages/less/less-382"
#
# delete "packages/less/less-382/configure.patch"
#
# delete "packages/less/less_381.bb"
#
# rename "packages/gnome/libsoup_2.2.98.bb"
# to "packages/gnome/libsoup_2.2.100.bb"
#
# rename "packages/midpath/midpath-alsa_svn.bb"
# to "packages/midpath/midpath-alsa_0.1.bb"
#
# rename "packages/midpath/midpath-cldc-x11_svn.bb"
# to "packages/midpath/midpath-cldc-x11_0.1.bb"
#
# rename "packages/midpath/midpath-gtk_svn.bb"
# to "packages/midpath/midpath-gtk_0.1.bb"
#
# rename "packages/midpath/midpath-native_svn.bb"
# to "packages/midpath/midpath-cldc-native_0.1.bb"
#
# rename "packages/midpath/midpath-qt3x11_svn.bb"
# to "packages/midpath/midpath-qt3x11_0.1.bb"
#
# rename "packages/midpath/midpath-qte_svn.bb"
# to "packages/midpath/midpath-qte_0.1.bb"
#
# rename "packages/midpath/midpath_svn.bb"
# to "packages/midpath/midpath_0.1.bb"
#
# rename "packages/powertop/powertop_1.5.bb"
# to "packages/powertop/powertop_1.8.bb"
#
# add_dir "packages/libspiff"
#
# add_dir "packages/libspiff/files"
#
# add_dir "packages/liburiparser"
#
# add_dir "packages/liburiparser/files"
#
# add_dir "packages/midpath/files"
#
# add_dir "packages/openmoko2/openmoko-mediaplayer2"
#
# add_file "conf/machine/include/tune-x86-nocona.conf"
# content [e3055e1b7d16571baa2b5057e57bea5bafce0eff]
#
# add_file "conf/machine/x86-32-nocona.conf"
# content [b522dc4b9b621d931cd9f477e2bcf5a9797b1184]
#
# add_file "packages/gimp/gimp.inc"
# content [e57e9874a5da57b97e12d50c9ee4d615f3329bb2]
#
# add_file "packages/gimp/gimp_2.3.19.bb"
# content [ec38ec44622b7abfcc1305f6297cb1ebc9fce156]
#
# add_file "packages/less/less_406.bb"
# content [d956d9d1d4d67852b26b16d84e31d4a017470f9a]
#
# add_file "packages/libspiff/files/autofoo.patch"
# content [7f9c81a548b9ebb333e7bc7e2031d731483b3377]
#
# add_file "packages/libspiff/libspiff_0.7.2.bb"
# content [ef70730dd8ab4a23e03e830936613c707dbc2ec9]
#
# add_file "packages/liburiparser/files/autofoo.patch"
# content [39dede97db097f7a997d5ee9abac8c2e12f9a5f4]
#
# add_file "packages/liburiparser/liburiparser_0.5.1.bb"
# content [3cb05d7529e2f1f4f5b93c72efade949c73cbd5f]
#
# add_file "packages/midpath/files/shellscript.patch"
# content [ac9b3b66a149945556438fedc9c5c8005c4e2463]
#
# add_file "packages/midpath/midpath-cldc-sdl_0.1.bb"
# content [d4c391082d12422464fa05d027053d80e72073de]
#
# add_file "packages/midpath/midpath-cldc_0.1.bb"
# content [5f4356e7b663f2921a4419a7443a72987f557805]
#
# add_file "packages/midpath/midpath-test_0.1.bb"
# content [9086208d53ee5c8a8eafe4d13de2580741d16a60]
#
# add_file "packages/midpath/midpath.inc"
# content [0deb1420f019591c182424d43dc6670bda6274ec]
#
# add_file "packages/openmoko2/openmoko-mediaplayer2/autofoo.patch"
# content [35f24d6a1124f6f003e9c363b1eaba5df6dc1990]
#
# add_file "packages/openmoko2/openmoko-mediaplayer2/missing-images.patch"
# content [77904ad441581958fac3b66e0a2e8d329d89da7e]
#
# add_file "packages/openmoko2/openmoko-mediaplayer2_svn.bb"
# content [84f7b52cde34d39d88f37e49b600cd1da90c9ee8]
#
# patch "classes/rm_work.bbclass"
# from [512e310e8d6f9470aa971cd1e93948fdbdd80492]
# to [ee47e8ab4e8989bafbb4ab34525d27fa9ea12103]
#
# patch "conf/bitbake.conf"
# from [6eb2dc8d0201f633066436d2ca7e95bb6959844f]
# to [52316e1f1fa41334c7f484d03268cc7c2ae75f0f]
#
# patch "conf/distro/include/angstrom-eglibc.inc"
# from [4e302c110a6fbfde708303672e19e149984c7108]
# to [58bb03f9d2c14cb37e201fb02fbd7f20e95a164e]
#
# patch "conf/distro/include/angstrom-glibc.inc"
# from [ec0e25a8758fde2b684a43cc8fb0b55d7c3a27cc]
# to [b16bd6ee43f9f951b39d8fac7fa1e4c463d709e3]
#
# patch "conf/machine/x86-prescott.conf"
# from [b8d329ec5b9571027699938a2c508f2cbe3b7859]
# to [4dfd059cbf58a8516ce7da5aac28fa268f23eb8e]
#
# patch "packages/gimp/gimp_2.2.10.bb"
# from [9660e5e4d735fbd979368680c33c9b2c0d97ead0]
# to [818b7b89ebb9ff79ccd0a3831f4b5ea293e459dd]
#
# patch "packages/gimp/gimp_2.3.10.bb"
# from [4d162357dd39d36f2015b0c347cf9f836ca0a059]
# to [88a30520116f72eee4fec415c02b4cfb382d6ad3]
#
# patch "packages/gimp/gimp_2.3.7.bb"
# from [f222b714a4ed64a62131d19bfc80923cf5d2b838]
# to [93a9d2d27856f5b1f3fe13a84479f3cd910755ad]
#
# patch "packages/gimp/gimp_2.3.8.bb"
# from [e1e9b4eb4b2aa80b2da934c5d49a8dd0ac6282f8]
# to [93a9d2d27856f5b1f3fe13a84479f3cd910755ad]
#
# patch "packages/glibc/glibc-package.bbclass"
# from [2529c6468fce1e1b9ff4d39758addca2534e19fb]
# to [9dba580dba140e0ac409182fb8682f99d79b11f6]
#
# patch "packages/gnome/libsoup_2.2.100.bb"
# from [f25cbdad99a05dd98331cd9a1a4792ae7661ef25]
# to [42622e2e11666cee24fce98545e6b2ececc58a0d]
#
# patch "packages/images/helloworld-image.bb"
# from [9af31161384a1629809fec960cae7439f031a632]
# to [62d0dfb6cdd494db5b4731b74f5f3a4a92f0a119]
#
# patch "packages/linux/linux-x86_2.6.20.bb"
# from [51976b5e538dd765ee4a066c915c690bd1869f13]
# to [1ec1b9a76c2062759fdebb2638ac4f3550e1727a]
#
# patch "packages/linux/linux.inc"
# from [dc3b9967453c0f1b6a4df03cd2af7dcb8f517b02]
# to [acd09fd5582e642f6a65a35eceb99a809355eb33]
#
# patch "packages/maemo3/libhildonmime_1.9.5.bb"
# from [0215eb834a97761c336d556905576dd4882bc798]
# to [bee736d32a41ff42806e5b50c9f6e17f193394b2]
#
# patch "packages/meta/slugos-packages.bb"
# from [0cce69bb0cbc207a39fab77c3054e03e4eb02abc]
# to [738a66a4cd05dd74381dce0949ddcd547be2497f]
#
# patch "packages/midpath/midpath-alsa_0.1.bb"
# from [fb00f08dd7e21b0915d61bc4f5da08d449c042dd]
# to [3b9cd6ad01860aa9c6ef173017b41052d720e9ad]
#
# patch "packages/midpath/midpath-cldc-native_0.1.bb"
# from [475af2536e2be424a741fb3fb8474bc922661dbb]
# to [876ed1db01ef361d0403dfa49aa970522a41661d]
#
# patch "packages/midpath/midpath-cldc-x11_0.1.bb"
# from [4508d47ae521121138c38ca1c627bbe1b03a38b0]
# to [32a005bc8c128bb381ac3e795e9efea897db125f]
#
# patch "packages/midpath/midpath-gtk_0.1.bb"
# from [8b8dbd9444e83c2f45d5646af02cfd5654a87113]
# to [aa5d09aafbc3d8a7fd37a4629dc7e86da0bcf8b4]
#
# patch "packages/midpath/midpath-qt3x11_0.1.bb"
# from [ae69b147de0f7b04618b3b2d35131bc7ce9c9adc]
# to [3f1384df13f5a0dbd7cea235b83e4fcb840c0c85]
#
# patch "packages/midpath/midpath-qte_0.1.bb"
# from [3712d85d8c5ae1385fb2ed8a6b0631a4fbac2839]
# to [31c329b1caef113ff5b380787e4960b5a61d8049]
#
# patch "packages/midpath/midpath_0.1.bb"
# from [1b064ce492cfa8ba318e23f4a4af8ab1b0bc8184]
# to [d2d43501642415ee4c61b8e8ae4fe885f928f74c]
#
# patch "packages/xorg-xserver/xorg-xserver-common.inc"
# from [9a281ac539ce984563ccaec7aa10f8986035f896]
# to [d7927a38279c7fbe878213f5202b53a6ddf15e5f]
#
# patch "packages/xorg-xserver/xserver-xorg_1.3.0.0.bb"
# from [c33cdc04da5f76dfa5814af63e8f55d82464ae61]
# to [83821cae2d04859956a2731b1ef613f9fc0d13b2]
#
============================================================
--- conf/machine/include/tune-x86-nocona.conf e3055e1b7d16571baa2b5057e57bea5bafce0eff
+++ conf/machine/include/tune-x86-nocona.conf e3055e1b7d16571baa2b5057e57bea5bafce0eff
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-march=nocona"
+TARGET_CC_KERNEL_ARCH = "-march=nocona"
============================================================
--- conf/machine/x86-32-nocona.conf b522dc4b9b621d931cd9f477e2bcf5a9797b1184
+++ conf/machine/x86-32-nocona.conf b522dc4b9b621d931cd9f477e2bcf5a9797b1184
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: x86-nocona
+#@DESCRIPTION: Machine configuration for Intel 'Nocona' processor in 32-bit mode
+#
+
+TARGET_ARCH = "i686"
+MACHINE_ARCH = "x86-32-nocona"
+PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686"
+
+require conf/machine/include/tune-x86-nocona.conf
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
+OLDEST_KERNEL = "2.6.20"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+IMAGE_FSTYPES = "ext2.gz"
+
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2"
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+MACHINE_TASK_PROVIDER = "task-base"
+
============================================================
--- packages/gimp/gimp.inc e57e9874a5da57b97e12d50c9ee4d615f3329bb2
+++ packages/gimp/gimp.inc e57e9874a5da57b97e12d50c9ee4d615f3329bb2
@@ -0,0 +1,38 @@
+DESCRIPTION = "The GIMP is the GNU Image Manipulation Program."
+HOMEPAGE = "http://www.gimp.org"
+SECTION = "x11/graphics"
+LICENSE = "GPL"
+
+DEPENDS = "sed-native libart-lgpl gtk+ jpeg libpng libexif tiff"
+
+SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \
+ file://configure-libwmf.patch;patch=1"
+
+inherit autotools pkgconfig
+
+FILES_gimp-dbg =+ "${libdir}/gimp/2.0/modules/.debug \
+ ${libdir}/gimp/2.0/plug-ins/.debug"
+
+#Don't laugh, this just builds a threaded gimp
+EXTRA_OECONF = " --disable-gtktest \
+ --disable-print \
+ --disable-python \
+ --enable-mp \
+ --without-libwmf"
+
+do_configure_append() {
+ find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
+}
+
+
+do_stage() {
+ autotools_stage_all
+}
+
+FILES_${PN} += "${datadir}/icons \
+ ${datadir}/mime-info \
+ ${datadir}/application-registry "
+
+FILES_${PN}-dbg += "${libdir}/gimp/2.0/plug-ins/.debug \
+ ${libdir}/gimp/2.0/modules/.debug"
+
============================================================
--- packages/gimp/gimp_2.3.19.bb ec38ec44622b7abfcc1305f6297cb1ebc9fce156
+++ packages/gimp/gimp_2.3.19.bb ec38ec44622b7abfcc1305f6297cb1ebc9fce156
@@ -0,0 +1,2 @@
+require gimp.inc
+
============================================================
--- packages/less/less_406.bb d956d9d1d4d67852b26b16d84e31d4a017470f9a
+++ packages/less/less_406.bb d956d9d1d4d67852b26b16d84e31d4a017470f9a
@@ -0,0 +1,20 @@
+DESCRIPTION = "Less is a program similar to more, i.e. a terminal \
+based program for viewing text files and the output from other \
+programs. Less offers many features beyond those that more does."
+HOMEPAGE = "http://www.greenwoodsoftware.com/"
+SECTION = "console/utils"
+LICENSE = "BSD"
+DEPENDS = "ncurses"
+
+SRC_URI = "http://www.greenwoodsoftware.com/less/less-406.tar.gz "
+
+inherit autotools update-alternatives
+
+do_install () {
+ oe_runmake 'bindir=${D}${bindir}' 'mandir=${D}${mandir}' install
+ mv ${D}${bindir}/less ${D}${bindir}/less.${PN}
+}
+
+ALTERNATIVE_NAME = "less"
+ALTERNATIVE_PATH = "less.${PN}"
+ALTERNATIVE_PRIORITY = "100"
============================================================
--- packages/libspiff/files/autofoo.patch 7f9c81a548b9ebb333e7bc7e2031d731483b3377
+++ packages/libspiff/files/autofoo.patch 7f9c81a548b9ebb333e7bc7e2031d731483b3377
@@ -0,0 +1,31 @@
+Index: libspiff-0.7.2/configure.in
+===================================================================
+--- libspiff-0.7.2.orig/configure.in 2007-08-25 15:47:29.000000000 +0000
++++ libspiff-0.7.2/configure.in 2007-08-25 15:47:48.000000000 +0000
+@@ -78,26 +78,6 @@
+ LDFLAGS="-L${withval} ${LDFLAGS}"
+ ], [])
+
+-
+-
+-# Local headers must come very first. Otherwise we
+-# risk including headers of an already installed
+-# libSpiff version if its path is in CPPFLAGS
+-CPPFLAGS="-Iinclude ${CPPFLAGS}"
+-
+-
+-
+-# Append $prefix as a fallback at the very end
+-if test "x${prefix}" != "xNONE"; then
+- WORKING_PREFIX=${prefix}
+-else
+- WORKING_PREFIX=${ac_default_prefix}
+-fi
+-LDFLAGS="${LDFLAGS} -L${WORKING_PREFIX}/lib"
+-CPPFLAGS="${CPPFLAGS} -I${WORKING_PREFIX}/include"
+-
+-
+-
+ # Check presence
+ EXPAT_MISSING="Please install libexpat 1.95.8 or later.
+ On Ubuntu enter 'sudo apt-get install libexpat-dev'."
============================================================
--- packages/libspiff/libspiff_0.7.2.bb ef70730dd8ab4a23e03e830936613c707dbc2ec9
+++ packages/libspiff/libspiff_0.7.2.bb ef70730dd8ab4a23e03e830936613c707dbc2ec9
@@ -0,0 +1,23 @@
+DESCRIPTION = "libSpiff brings XSPF playlist reading and writing support to your C++ application."
+HOMEPAGE = "http://libspiff.sf.net"
+SECTION = "libs"
+LICENSE = "BSD"
+DEPENDS = "expat liburiparser"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libspiff/libspiff-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libspiff-${PV}"
+
+inherit autotools pkgconfig lib_package
+
+EXTRA_OECONF = "\
+ --with-expat=${STAGING_LIBDIR}/.. \
+ --with-uriparser=${STAGING_LIBDIR}/.. \
+"
+
+CPPFLAGS += "-I${S}/include"
+
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/liburiparser/files/autofoo.patch 39dede97db097f7a997d5ee9abac8c2e12f9a5f4
+++ packages/liburiparser/files/autofoo.patch 39dede97db097f7a997d5ee9abac8c2e12f9a5f4
@@ -0,0 +1,21 @@
+Index: uriparser-0.5.1/configure.in
+===================================================================
+--- uriparser-0.5.1.orig/configure.in 2007-08-25 15:32:52.000000000 +0000
++++ uriparser-0.5.1/configure.in 2007-08-25 15:34:56.000000000 +0000
+@@ -2,7 +2,7 @@
+ AC_INIT([uriparser], [0.5.1])
+ AM_INIT_AUTOMAKE([1.9 foreign])
+ AM_CONFIG_HEADER(test/CppTest/config.h)
+-
++AM_PROG_CC_C_O
+
+ AC_PROG_CC
+ AC_PROG_CXX
+@@ -10,7 +10,6 @@
+ AC_HEADER_STDC
+
+
+-
+ # URI_SIZEDOWN
+ AC_ARG_ENABLE(sizedown, [
+ Extra options:
============================================================
--- packages/liburiparser/liburiparser_0.5.1.bb 3cb05d7529e2f1f4f5b93c72efade949c73cbd5f
+++ packages/liburiparser/liburiparser_0.5.1.bb 3cb05d7529e2f1f4f5b93c72efade949c73cbd5f
@@ -0,0 +1,15 @@
+DESCRIPTION = "uriparser is a strictly RFC 3986 compliant URI parsing library."
+HOMEPAGE = "http://uriparser.sf.net"
+SECTION = "libs"
+LICENSE = "BSD"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/uriparser/uriparser-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/uriparser-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/midpath/files/shellscript.patch ac9b3b66a149945556438fedc9c5c8005c4e2463
+++ packages/midpath/files/shellscript.patch ac9b3b66a149945556438fedc9c5c8005c4e2463
@@ -0,0 +1,27 @@
+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)
============================================================
--- packages/midpath/midpath-cldc-sdl_0.1.bb d4c391082d12422464fa05d027053d80e72073de
+++ packages/midpath/midpath-cldc-sdl_0.1.bb d4c391082d12422464fa05d027053d80e72073de
@@ -0,0 +1,43 @@
+
+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() {
+
+mkdir -p ${S}/dist
+
+# 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=%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list