[oe-commits] org.oe.dev merge of '43c09a2a2c1a6b190622823b1298024c62058416'
oe commit
oe at amethyst.openembedded.net
Mon Sep 1 18:14:22 UTC 2008
merge of '43c09a2a2c1a6b190622823b1298024c62058416'
and 'dc62072795a21ec814639f0740549640b9b471a4'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 96bb50b900f61d2cb575adb3ca0b6db5a6694ee2
ViewMTN: http://monotone.openembedded.org/revision/info/96bb50b900f61d2cb575adb3ca0b6db5a6694ee2
Files:
1
packages/proxy-libintl
packages/proxy-libintl/proxy-libintl-20080418
packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch
packages/proxy-libintl/proxy-libintl_20080418.bb
packages/flumotion/flumotion_0.4.1.bb
packages/gnash/gnash-minimal.inc
packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb
packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb
packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb
packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
packages/dbus-java/dbus-java_2.5.bb
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/openjade/openjade-native_1.3.2.bb
packages/openjade/openjade_1.3.2.bb
Diffs:
#
# mt diff -r43c09a2a2c1a6b190622823b1298024c62058416 -r96bb50b900f61d2cb575adb3ca0b6db5a6694ee2
#
#
#
# add_dir "packages/proxy-libintl"
#
# add_dir "packages/proxy-libintl/proxy-libintl-20080418"
#
# add_file "packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch"
# content [cd5a6eadb3df3174fd8fb17a1a794e0f11573a03]
#
# add_file "packages/proxy-libintl/proxy-libintl_20080418.bb"
# content [5f098356ea6c56a4a64655b7ed87cc62a7afed12]
#
# patch "packages/flumotion/flumotion_0.4.1.bb"
# from [888ee41205578b445b00295429cddc535e80a0f3]
# to [9674eb392f880147b7136e7db7db37ac7e9fa7af]
#
# patch "packages/gnash/gnash-minimal.inc"
# from [8dabbe35069c1d216e834268bca9dfc522bdea92]
# to [1d97af65dabb8f2af969bd858ef3578a722d92d2]
#
# patch "packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb"
# from [3973ded34b696092b34b03f4883501088965b583]
# to [d52dd9d399e3ae8b6c66f999229e5f797d319665]
#
# patch "packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb"
# from [b41941b0d420980c4211a1fa04fd53db33d07f92]
# to [098380e73ab98a0ac07f4437a937edd32324eea7]
#
# patch "packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb"
# from [966b5d88b9928c4b7654a06ca0c5250612b72485]
# to [0dd83a30378cbd321e2891c6fdce475de1149853]
#
# patch "packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb"
# from [3c5864ec8c49138cc893c47ab0e73877b04d0783]
# to [458508adc8e06b4cf1c7cf861dfebd603b5f58c8]
#
============================================================
--- packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch cd5a6eadb3df3174fd8fb17a1a794e0f11573a03
+++ packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch cd5a6eadb3df3174fd8fb17a1a794e0f11573a03
@@ -0,0 +1,72 @@
+Index: proxy-libintl/src/proxy-libintl/libintl.c
+===================================================================
+--- proxy-libintl.orig/src/proxy-libintl/libintl.c
++++ proxy-libintl/src/proxy-libintl/libintl.c
+@@ -18,9 +18,12 @@
+ */
+
+ #ifdef _WIN32
+-#include <windows.h>
++# include <windows.h>
+ #else
+-#include <dlfcn.h>
++# include <stddef.h>
++# if !STUB_ONLY
++# include <dlfcn.h>
++# endif
+ typedef void* HMODULE;
+ #endif
+
+@@ -65,11 +68,13 @@ static char * (*p_bind_textdomain_codese
+ static int
+ use_intl_dll (HMODULE dll)
+ {
+-#ifdef _WIN32
+-#define LOOKUP(fn) p_##fn = (void *) GetProcAddress (dll, #fn); if (p_##fn == NULL) return 0
+-#else
+-#define LOOKUP(fn) p_##fn = (void *) dlsym (dll, #fn); if (p_##fn == NULL) return 0
+-#endif
++#if !STUB_ONLY
++# ifdef _WIN32
++# define LOOKUP(fn) p_##fn = (void *) GetProcAddress (dll, #fn); if (p_##fn == NULL) return 0
++# else
++# define LOOKUP(fn) p_##fn = (void *) dlsym (dll, #fn); if (p_##fn == NULL) return 0
++# endif /* _WIN32 */
++
+
+ LOOKUP (gettext);
+ LOOKUP (dgettext);
+@@ -82,7 +87,7 @@ use_intl_dll (HMODULE dll)
+ LOOKUP (bind_textdomain_codeset);
+
+ #undef LOOKUP
+-
++#endif /* !STUB_ONLY */
+ return 1;
+ }
+
+@@ -171,13 +176,17 @@ setup (void)
+
+ if (!beenhere)
+ {
+-#ifdef _WIN32
+- HMODULE intl_dll = LoadLibrary ("intl.dll");
+-#elif defined(__APPLE__) && defined(__MACH__)
+- HMODULE intl_dll = dlopen ("libintl.dylib", RTLD_LAZY);
+-#else
+- HMODULE intl_dll = dlopen ("libintl.so", RTLD_LAZY);
+-#endif
++#if !STUB_ONLY
++# ifdef _WIN32
++ HMODULE intl_dll = LoadLibrary ("intl.dll");
++# elif defined(__APPLE__) && defined(__MACH__)
++ HMODULE intl_dll = dlopen ("libintl.dylib", RTLD_LAZY);
++# else
++ HMODULE intl_dll = dlopen ("libintl.so", RTLD_LAZY);
++# endif
++#else /* !STUB_ONLY */
++ HMODULE intl_dll = NULL;
++#endif /* STUB_ONLY */
+
+ if (intl_dll != NULL &&
+ use_intl_dll (intl_dll))
============================================================
--- packages/proxy-libintl/proxy-libintl_20080418.bb 5f098356ea6c56a4a64655b7ed87cc62a7afed12
+++ packages/proxy-libintl/proxy-libintl_20080418.bb 5f098356ea6c56a4a64655b7ed87cc62a7afed12
@@ -0,0 +1,46 @@
+DESCRIPTION = "Proxy libintl"
+HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/"
+SECTION = "libs"
+LICENSE = "LGPL"
+
+PR = "r1"
+PROVIDES = "virtual/libintl"
+
+
+SRC_URI = " \
+ http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/${PN}-${PV}.zip \
+ file://stub-only.patch;patch=1 \
+"
+
+
+S = "${WORKDIR}"
+FILES_${PN}-dev = "${includedir} ${libdir}"
+
+
+CFLAGS_append = " -Wall -I ../../include ${@['-DSTUB_ONLY', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']}"
+
+do_compile() {
+ cd ${WORKDIR}/src/proxy-libintl
+ oe_runmake
+}
+
+
+
+
+do_install() {
+ install -d ${D}/usr/include
+ install -d ${D}/usr/lib
+
+ install -m 0644 ${WORKDIR}/include/libintl.h ${D}/${includedir}
+ install -m 0644 ${WORKDIR}/lib/libintl.a ${D}/${libdir}
+}
+
+
+
+do_stage() {
+ install -m 0644 ${WORKDIR}/include/libintl.h ${STAGING_INCDIR}/
+ oe_libinstall -a -C lib libintl ${STAGING_LIBDIR}/
+}
+
+
+
============================================================
--- packages/flumotion/flumotion_0.4.1.bb 888ee41205578b445b00295429cddc535e80a0f3
+++ packages/flumotion/flumotion_0.4.1.bb 9674eb392f880147b7136e7db7db37ac7e9fa7af
@@ -1,6 +1,6 @@ LICENSE = "GPL"
DESCRIPTION = "Fluendo Streaming Server"
LICENSE = "GPL"
-DEPENDS = "gstreamer python-imaging python-gst twisted python-pygtk"
+DEPENDS = "gstreamer python-imaging python-gst python-twisted python-pygtk"
RDEPENDS = "python-resource python-pprint python-threading \
python-imaging python-xml python-curses \
python-compression python-fcntl python-pygobject \
============================================================
--- packages/gnash/gnash-minimal.inc 8dabbe35069c1d216e834268bca9dfc522bdea92
+++ packages/gnash/gnash-minimal.inc 1d97af65dabb8f2af969bd858ef3578a722d92d2
@@ -1,7 +1,7 @@ LICENSE = "GPL-2"
DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"
HOMEPAGE = "http://www.gnu.org/software/gnash"
LICENSE = "GPL-2"
-DEPENDS = "virtual/libiconv virtual/libintl libtool agg libxml2 libmad zlib boost jpeg pango curl freetype"
+DEPENDS = "virtual/libiconv virtual/libintl libltdl libtool agg libxml2 libmad zlib boost jpeg pango curl freetype"
SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2"
S = ${WORKDIR}/gnash-${PV}
============================================================
--- packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb 3973ded34b696092b34b03f4883501088965b583
+++ packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb d52dd9d399e3ae8b6c66f999229e5f797d319665
@@ -6,7 +6,7 @@ S = "${WORKDIR}/midpath-0.3rc1"
S = "${WORKDIR}/midpath-0.3rc1"
-DEPENDS = "classpath qt-mt"
+DEPENDS = "classpath qte-mt"
RCONFLICTS = "midpath-backend-qte"
inherit qt3x11
============================================================
--- packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb b41941b0d420980c4211a1fa04fd53db33d07f92
+++ packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb 098380e73ab98a0ac07f4437a937edd32324eea7
@@ -6,7 +6,7 @@ S = "${WORKDIR}/midpath-0.3rc1"
S = "${WORKDIR}/midpath-0.3rc1"
-DEPENDS = "classpath qt-mt"
+DEPENDS = "classpath qte-mt"
inherit qt4x11
============================================================
--- packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb 966b5d88b9928c4b7654a06ca0c5250612b72485
+++ packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb 0dd83a30378cbd321e2891c6fdce475de1149853
@@ -6,7 +6,7 @@ S = "${WORKDIR}/midpath-0.3rc1"
S = "${WORKDIR}/midpath-0.3rc1"
-DEPENDS = "classpath qt-mt"
+DEPENDS = "classpath qte-mt"
RCONFLICTS = "midpath-backend-qt3"
inherit qt3e
============================================================
--- packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb 3c5864ec8c49138cc893c47ab0e73877b04d0783
+++ packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb 458508adc8e06b4cf1c7cf861dfebd603b5f58c8
@@ -4,6 +4,8 @@ PR = "r2"
PV = "0.1.0+svnr${SRCREV}"
PR = "r2"
+EXCLUDE_FROM_WORLD = "1"
+
inherit openmoko2
SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/;module=icons;proto=http"
#
# mt diff -rdc62072795a21ec814639f0740549640b9b471a4 -r96bb50b900f61d2cb575adb3ca0b6db5a6694ee2
#
#
#
# add_file "packages/dbus-java/dbus-java_2.5.bb"
# content [086dc07a09255825ba9edd8b9bab5b2df169cc09]
#
# 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/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/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/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 .
}
More information about the Openembedded-commits
mailing list