[oe-commits] org.oe.dev merge of '1d51291e2946f8f88897f24b6db6c2e9f0c5bcec'
crofton commit
oe at amethyst.openembedded.net
Mon Sep 1 18:15:14 UTC 2008
merge of '1d51291e2946f8f88897f24b6db6c2e9f0c5bcec'
and 'cc2c069fffc980b5b6a0eb9cddd44f04d367dd25'
Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: 45717dd378e89bf7ba418cac08db57a5e7a55474
ViewMTN: http://monotone.openembedded.org/revision/info/45717dd378e89bf7ba418cac08db57a5e7a55474
Files:
1
packages/dbus-java/dbus-java_2.5.bb
packages/gstreamer/gst-ffmpeg/autotools.patch
packages/cacao/cacaoh-cldc-native_0.98.bb
packages/dbus-java/dbus-java_2.3.bb
packages/dbus-java/dbus-java_2.4.bb
packages/gstreamer/gst-ffmpeg_0.10.2.bb
packages/openjade/openjade-native_1.3.2.bb
packages/openjade/openjade_1.3.2.bb
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/openmoko.conf
packages/python/python-pygame_1.8.1.bb
packages/tasks/task-openmoko-feed.bb
Diffs:
#
# mt diff -r1d51291e2946f8f88897f24b6db6c2e9f0c5bcec -r45717dd378e89bf7ba418cac08db57a5e7a55474
#
#
#
# add_file "packages/dbus-java/dbus-java_2.5.bb"
# content [086dc07a09255825ba9edd8b9bab5b2df169cc09]
#
# add_file "packages/gstreamer/gst-ffmpeg/autotools.patch"
# content [26e0e0b7ba6e33eab90fc6305cfdd9f90dcb2ebb]
#
# patch "packages/cacao/cacaoh-cldc-native_0.98.bb"
# from [cc2ee6f43a136dc2ba76ed7bea4fec2f935c6fdb]
# to [21799fcb0417b38523f83c803b588582ad360d24]
#
# patch "packages/dbus-java/dbus-java_2.3.bb"
# from [575d1bce4f960e8739b07964559e58e5768379d1]
# to [061fae181a63b2fd115413ac49ae154b1e460c30]
#
# patch "packages/dbus-java/dbus-java_2.4.bb"
# from [3be815bf6755338045753a524ff10c510c2494e9]
# to [3f5fc4bd6d7ad822cbce130de00dc47d49b71806]
#
# patch "packages/gstreamer/gst-ffmpeg_0.10.2.bb"
# from [e0e185738811f0607a57b4d5b4948e0b92301af6]
# to [907ebdb116c5b75cda56d4b12d53ca1f6d6a8ba9]
#
# patch "packages/openjade/openjade-native_1.3.2.bb"
# from [fe4d7272d3a91055775804bedf2ab7af3fcc45f2]
# to [71010dc2c983fe59f78867b3ee655ce1f89d7baa]
#
# patch "packages/openjade/openjade_1.3.2.bb"
# from [76bc945ead3da7d2228e8c419c0a3fa3f1fd193e]
# to [d3a31831d26d84480a79570ca2fb3c0d309d1459]
#
============================================================
--- packages/dbus-java/dbus-java_2.5.bb 086dc07a09255825ba9edd8b9bab5b2df169cc09
+++ packages/dbus-java/dbus-java_2.5.bb 086dc07a09255825ba9edd8b9bab5b2df169cc09
@@ -0,0 +1,87 @@
+DESCRIPTION = "A pure Java D-Bus Implementation"
+DESCRIPTION_dbus-java-viewer = "${DESCRIPTION} (DBusViewer Binary)"
+DESCRIPTION_dbus-java-bin = "${DESCRIPTION} (Binaries)"
+AUTHOR = "Matthew Johnson <dbus at matthew.ath.cx>"
+HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java"
+SECTION = "libs"
+LICENSE = "LGPLv2 AFL"
+DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native"
+RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java ${JPN}"
+RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java ${JPN}"
+RSUGGESTS_libdbus-java = "libunixsocket-java dbus"
+PR = "r0"
+
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz"
+
+S = "${WORKDIR}/dbus-java-${PV}"
+
+inherit java-library
+
+# jamvm-native unfortunately contains non-generificed java/lang/reflect classes
+# which are accessed in this package. Work around this by setting the bootclasspath
+# explicitly.
+JCFLAGS = "-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip"
+
+do_compile () {
+ oe_runmake \
+ JCFLAGS="-source 1.5 ${JCFLAGS}" \
+ JAVAC="javac" \
+ JARPREFIX="${STAGING_DATADIR_JAVA}" \
+ JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
+ CLASSPATH="${S}/classes" \
+ JAR="fastjar" \
+ bin
+
+ # Generated shell scripts will have staging paths inside them.
+ rm bin/*
+
+ # Generate them again with target paths.
+ oe_runmake \
+ JAVAC="oefatal \"No Java compilation expected here.\"" \
+ JAR="oefatal \"No jar invocation expected here.\"" \
+ JARPREFIX=${datadir_java} \
+ JAVAUNIXPATH=${datadir_java} \
+ bin
+
+ # Generate man pages.
+ oe_runmake \
+ JAVAC="oefatal \"No Java compilation expected here.\"" \
+ JAR="oefatal \"No jar invocation expected here.\"" \
+ JARPREFIX=${datadir_java} \
+ JAVAUNIXPATH=${datadir_java} \
+ man
+}
+
+do_install () {
+ oe_jarinstall ${JPN}-${PV}.jar ${JPN}.jar
+ oe_jarinstall dbus-java-viewer-${PV}.jar dbus-java-viewer.jar
+ oe_jarinstall dbus-java-bin-${PV}.jar dbus-java-bin.jar
+
+ install -d ${D}${bindir}
+ install bin/DBusViewer ${D}${bindir}
+ install bin/DBusCall ${D}${bindir}
+ install bin/CreateInterface ${D}${bindir}
+ install bin/ListDBus ${D}${bindir}
+ install bin/DBusDaemon ${D}${bindir}
+
+ oe_runmake \
+ JAVAC="oefatal \"No Java compilation expected here.\"" \
+ JAR="oefatal \"No jar invocation expected here.\"" \
+ MANPREFIX=${D}${mandir} \
+ DOCPREFIX=${D}${docdir}/${JPN} \
+ install-man
+}
+
+do_stage () {
+ oe_jarinstall -s ${JPN}-${PV}.jar ${JPN}.jar
+}
+
+PACKAGE_ARCH = "all"
+# ${JPN} must be last otherwise it would pick up dbus-viewer*.jar
+# and dbus-bin*.jar
+PACKAGES = "dbus-java-viewer dbus-java-viewer-doc dbus-java-bin dbus-java-bin-doc ${JPN}"
+
+FILES_dbus-java-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer"
+FILES_dbus-java-viewer-doc = "${mandir}/DBusViewer*"
+FILES_dbus-java-bin = "${datadir}/java/dbus-java-bin*.jar ${bindir}"
+FILES_dbus-java-bin-doc = "${mandir} ${docdir}/${JPN}"
============================================================
--- packages/gstreamer/gst-ffmpeg/autotools.patch 26e0e0b7ba6e33eab90fc6305cfdd9f90dcb2ebb
+++ packages/gstreamer/gst-ffmpeg/autotools.patch 26e0e0b7ba6e33eab90fc6305cfdd9f90dcb2ebb
@@ -0,0 +1,21 @@
+Index: gst-ffmpeg-0.10.2/gst-libs/ext/ffmpeg/configure.ac
+===================================================================
+--- gst-ffmpeg-0.10.2.orig/gst-libs/ext/ffmpeg/configure.ac 2008-08-20 00:20:19.177850039 +0200
++++ gst-ffmpeg-0.10.2/gst-libs/ext/ffmpeg/configure.ac 2008-08-20 00:26:24.567809464 +0200
+@@ -27,13 +27,15 @@
+
+ AM_MAINTAINER_MODE
+ AC_GNU_SOURCE
++
++AC_PROG_LIBTOOL
+ AM_PROG_AS
+ AC_PROG_CC
++AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_SYS_LARGEFILE
+ AC_STDC_HEADERS
+ AM_DISABLE_STATIC
+-AC_PROG_LIBTOOL
+
+ dnl Warning for anyone using these custom macros.
+ dnl before asking me questions on why it doesn't work and why you
============================================================
--- packages/cacao/cacaoh-cldc-native_0.98.bb cc2ee6f43a136dc2ba76ed7bea4fec2f935c6fdb
+++ packages/cacao/cacaoh-cldc-native_0.98.bb 21799fcb0417b38523f83c803b588582ad360d24
@@ -1,19 +1,9 @@ require cacaoh-native.inc
require cacaoh-native.inc
-DEPENDS += "midpath-cldc-native"
-
SRC_URI = "\
http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=8b8907c8b925761c9410bcadb9705346 \
"
-EXTRA_OECONF += "\
- --with-classpath-includedir=${STAGING_INCDIR}/classpath \
- --enable-jni \
- --enable-java=cldc1.1 \
- --with-classpath=cldc1.1 \
- --with-classpath-classes=${STAGING_DATADIR}/midpath-cldc/midpath-cldc1.1.jar \
-"
-
do_stage() {
install -m 0755 src/cacaoh/.libs/cacaoh ${STAGING_BINDIR}/cacaoh-cldc-${PV}
}
============================================================
--- packages/dbus-java/dbus-java_2.3.bb 575d1bce4f960e8739b07964559e58e5768379d1
+++ packages/dbus-java/dbus-java_2.3.bb 061fae181a63b2fd115413ac49ae154b1e460c30
@@ -20,10 +20,15 @@ RDEPENDS_dbus-java-bin = "java2-runtime
RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java ${JPN}"
RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java ${JPN}"
+# jamvm-native unfortunately contains non-generificed java/lang/reflect classes
+# which are accessed in this package. Work around this by setting the bootclasspath
+# explicitly.
+JCFLAGS = "-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip"
+
do_compile () {
# run target .binclasses first to fix a brokenness in the Makefile
oe_runmake \
- JCFLAGS="-source 1.5" \
+ JCFLAGS="-source 1.5 ${JCFLAGS}" \
JAVAC="javac" \
JARPREFIX="${STAGING_DATADIR_JAVA}" \
JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
@@ -32,7 +37,7 @@ do_compile () {
.binclasses
oe_runmake \
- JCFLAGS="-source 1.5" \
+ JCFLAGS="-source 1.5 ${JCFLAGS}" \
JAVAC="javac" \
JARPREFIX="${STAGING_DATADIR_JAVA}" \
JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
============================================================
--- packages/dbus-java/dbus-java_2.4.bb 3be815bf6755338045753a524ff10c510c2494e9
+++ packages/dbus-java/dbus-java_2.4.bb 3f5fc4bd6d7ad822cbce130de00dc47d49b71806
@@ -17,10 +17,15 @@ inherit java-library
inherit java-library
+# jamvm-native unfortunately contains non-generificed java/lang/reflect classes
+# which are accessed in this package. Work around this by setting the bootclasspath
+# explicitly.
+JCFLAGS = "-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip"
+
do_compile () {
# run target .binclasses first to fix a brokenness in the Makefile
oe_runmake \
- JCFLAGS="-source 1.5" \
+ JCFLAGS="-source 1.5 ${JCFLAGS}" \
JAVAC="javac" \
JARPREFIX="${STAGING_DATADIR_JAVA}" \
JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
@@ -28,7 +33,7 @@ do_compile () {
JAR="fastjar" \
.binclasses
oe_runmake \
- JCFLAGS="-source 1.5" \
+ JCFLAGS="-source 1.5 ${JCFLAGS}" \
JAVAC="javac" \
JARPREFIX="${STAGING_DATADIR_JAVA}" \
JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
============================================================
--- packages/gstreamer/gst-ffmpeg_0.10.2.bb e0e185738811f0607a57b4d5b4948e0b92301af6
+++ packages/gstreamer/gst-ffmpeg_0.10.2.bb 907ebdb116c5b75cda56d4b12d53ca1f6d6a8ba9
@@ -4,12 +4,14 @@ DEPENDS = "gstreamer zlib"
LICENSE = "LGPL"
HOMEPAGE = "http://www.gstreamer.net/"
DEPENDS = "gstreamer zlib"
-PR = "r1"
+PR = "r2"
inherit autotools pkgconfig
SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \
- file://armv5.patch;patch=1"
+ file://armv5.patch;patch=1 \
+ file://autotools.patch;patch=1 \
+ "
FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
============================================================
--- packages/openjade/openjade-native_1.3.2.bb fe4d7272d3a91055775804bedf2ab7af3fcc45f2
+++ packages/openjade/openjade-native_1.3.2.bb 71010dc2c983fe59f78867b3ee655ce1f89d7baa
@@ -15,9 +15,13 @@ EXTRA_OECONF = "--enable-spincludedir=${
--enable-splibdir=${STAGING_LIBDIR} \
--enable-default-catalog=${sysconfdir}/sgml/catalog \
--enable-default-search-path=${datadir}/sgml"
+
acpaths = "-I ${S}/config"
-CFLAGS_prepend = "-I${S}/include"
+# Trailing whitespace is important. Otherwise compiler arguments will be messed
+# up, resulting in a fail in do_configure.
+CFLAGS_prepend = "-I${S}/include "
+
do_configure () {
mv config/configure.in .
gnu-configize
============================================================
--- packages/openjade/openjade_1.3.2.bb 76bc945ead3da7d2228e8c419c0a3fa3f1fd193e
+++ packages/openjade/openjade_1.3.2.bb d3a31831d26d84480a79570ca2fb3c0d309d1459
@@ -12,9 +12,13 @@ EXTRA_OECONF = "--enable-spincludedir=${
EXTRA_OECONF = "--enable-spincludedir=${STAGING_INCDIR}/OpenSP \
--enable-splibdir=${STAGING_LIBDIR}"
+
acpaths = "-I ${S}/config"
-CFLAGS_prepend = "-I${S}/include"
+# Trailing whitespace is important. Otherwise compiler arguments will be messed
+# up, resulting in a fail in do_configure.
+CFLAGS_prepend = "-I${S}/include "
+
do_configure_prepend () {
mv config/configure.in .
}
#
# mt diff -rcc2c069fffc980b5b6a0eb9cddd44f04d367dd25 -r45717dd378e89bf7ba418cac08db57a5e7a55474
#
#
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [cbbb69b48411373416615825a20788cb411d02dc]
# to [66484fcb20f6be9d0766c53ceab7a0413c0f7716]
#
# patch "conf/distro/openmoko.conf"
# from [ee68bedb7c293916d63371c4a1679786be088e72]
# to [845d053d36e06e4f45e2a0a870e3ebb6acb37b74]
#
# patch "packages/python/python-pygame_1.8.1.bb"
# from [d20237c5870066d97af5c40249900e87c039beda]
# to [7c06795fb776e2174fb4c60091adb29c826fe448]
#
# patch "packages/tasks/task-openmoko-feed.bb"
# from [baa4e904acab8916566bec7f5b14359d063354e9]
# to [345793ec80e845a64c70bf2240df3b6e604bbebe]
#
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc cbbb69b48411373416615825a20788cb411d02dc
+++ conf/distro/include/preferred-om-2008-versions.inc 66484fcb20f6be9d0766c53ceab7a0413c0f7716
@@ -202,7 +202,7 @@ PREFERRED_VERSION_curl ?= "7.18.2"
PREFERRED_VERSION_cumulus ?= "1.2.1"
PREFERRED_VERSION_cups ?= "1.2.12"
PREFERRED_VERSION_curl ?= "7.18.2"
-PREFERRED_VERSION_curl-native ?= "7.18.0"
+PREFERRED_VERSION_curl-native ?= "7.18.2"
PREFERRED_VERSION_custominput ?= "1.1.0"
PREFERRED_VERSION_cvs ?= "1.12.9"
PREFERRED_VERSION_cxcrypt ?= "1.0"
@@ -323,7 +323,8 @@ PREFERRED_VERSION_evince ?= "2.20.0"
PREFERRED_VERSION_eventlog ?= "0.2.5"
PREFERRED_VERSION_evieext ?= "1.0.2"
PREFERRED_VERSION_evince ?= "2.20.0"
-PREFERRED_VERSION_e-wm ?= "0.16.999.041"
+# The only e-wm recipe is a cvs one with SRCDATE floating!
+# PREFERRED_VERSION_e-wm ?= "0.16.999.042"
PREFERRED_VERSION_exiv2 ?= "0.15"
PREFERRED_VERSION_exmap-console ?= "0.4.1"
PREFERRED_VERSION_exml ?= "cvs"
@@ -1107,7 +1108,7 @@ PREFERRED_VERSION_libxslt ?= "1.1.22"
PREFERRED_VERSION_libxsettings ?= "0.11"
PREFERRED_VERSION_libxsettings-client ?= "0.17"
PREFERRED_VERSION_libxslt ?= "1.1.22"
-PREFERRED_VERSION_libxslt-native ?= "1.1.22"
+PREFERRED_VERSION_libxslt-native ?= "1.1.21"
PREFERRED_VERSION_libxt ?= "1.0.5"
PREFERRED_VERSION_libxtrap ?= "1.0.0"
PREFERRED_VERSION_libxtst ?= "1.0.3"
@@ -1538,7 +1539,7 @@ PREFERRED_VERSION_python-pyflakes ?= "0.
PREFERRED_VERSION_python-pyephem ?= "3.7.2a"
PREFERRED_VERSION_python-pyfits ?= "1.1"
PREFERRED_VERSION_python-pyflakes ?= "0.2.1"
-PREFERRED_VERSION_python-pygame ?= "1.7.1"
+PREFERRED_VERSION_python-pygame ?= "1.8.1"
PREFERRED_VERSION_python-pygnome ?= "2.16.2"
PREFERRED_VERSION_python-pygobject ?= "2.14.2"
PREFERRED_VERSION_python-pygobject-native ?= "2.14.2"
@@ -1892,7 +1893,7 @@ PREFERRED_VERSION_u-boot-utils ?= "1.2.0
PREFERRED_VERSION_u-boot ?= "1.2.0"
PREFERRED_VERSION_u-boot-omap2430sdp ?= "1.1.4"
PREFERRED_VERSION_u-boot-utils ?= "1.2.0"
-PREFERRED_VERSION_udev ?= "115"
+PREFERRED_VERSION_udev ?= "092"
PREFERRED_VERSION_udev-hostap-cs-vcc-workaround ?= "1.0"
PREFERRED_VERSION_udhcp ?= "0.9.8"
PREFERRED_VERSION_ufraw ?= "0.12"
============================================================
--- conf/distro/openmoko.conf ee68bedb7c293916d63371c4a1679786be088e72
+++ conf/distro/openmoko.conf 845d053d36e06e4f45e2a0a870e3ebb6acb37b74
@@ -65,6 +65,9 @@ PREFERRED_PROVIDER_midpath = "midpath-op
PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk"
PREFERRED_PROVIDER_midpath = "midpath-openmoko"
+# We don't use this, but select one to shut bitbake up.
+PREFERRED_PROVIDER_virtual/libqte2 = "qte"
+
# deploy gta01 and gta02 in ${MACHINE_CLASS} directory
DEPLOY_DIR_IMAGE_om-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
DEPLOY_DIR_IMAGE_om-gta02 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
============================================================
--- packages/python/python-pygame_1.8.1.bb d20237c5870066d97af5c40249900e87c039beda
+++ packages/python/python-pygame_1.8.1.bb 7c06795fb776e2174fb4c60091adb29c826fe448
@@ -8,7 +8,7 @@ SRC_URI = "\
PR = "ml0"
SRC_URI = "\
- ftp://ftp.pyganem.org/pygame/${SRCNAME}-${PV}release.tar.gz \
+ ftp://ftp.pygame.org/pub/pygame/${SRCNAME}-${PV}release.tar.gz \
file://Setup"
S = "${WORKDIR}/${SRCNAME}-${PV}release"
============================================================
--- packages/tasks/task-openmoko-feed.bb baa4e904acab8916566bec7f5b14359d063354e9
+++ packages/tasks/task-openmoko-feed.bb 345793ec80e845a64c70bf2240df3b6e604bbebe
@@ -1,7 +1,7 @@ LICENSE = "MIT"
DESCRIPTION = "Openmoko: Misc. Feed Items"
SECTION = "openmoko/base"
LICENSE = "MIT"
-PR = "r33"
+PR = "r34"
inherit task
@@ -89,4 +89,6 @@ RDEPENDS_task-openmoko-feed = "\
# subversion \
task-openmoko-games \
xournal \
+ openvpn \
+ python-pygame \
"
More information about the Openembedded-commits
mailing list