summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packages/cacao/cacaoh-cldc-native_0.98.bb10
-rw-r--r--packages/dbus-java/dbus-java_2.3.bb9
-rw-r--r--packages/dbus-java/dbus-java_2.4.bb9
-rw-r--r--packages/dbus-java/dbus-java_2.5.bb87
-rw-r--r--packages/gstreamer/gst-ffmpeg/autotools.patch21
-rw-r--r--packages/gstreamer/gst-ffmpeg_0.10.2.bb6
-rw-r--r--packages/openjade/openjade-native_1.3.2.bb6
-rw-r--r--packages/openjade/openjade_1.3.2.bb6
8 files changed, 136 insertions, 18 deletions
diff --git a/packages/cacao/cacaoh-cldc-native_0.98.bb b/packages/cacao/cacaoh-cldc-native_0.98.bb
index e2c92cc328..eac95b8ace 100644
--- a/packages/cacao/cacaoh-cldc-native_0.98.bb
+++ b/packages/cacao/cacaoh-cldc-native_0.98.bb
@@ -1,19 +1,9 @@
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}
}
diff --git a/packages/dbus-java/dbus-java_2.3.bb b/packages/dbus-java/dbus-java_2.3.bb
index 756dd9ffe9..8ed5c44d94 100644
--- a/packages/dbus-java/dbus-java_2.3.bb
+++ b/packages/dbus-java/dbus-java_2.3.bb
@@ -20,10 +20,15 @@ RSUGGESTS_libdbus-java = "libunixsocket-java dbus"
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}" \
diff --git a/packages/dbus-java/dbus-java_2.4.bb b/packages/dbus-java/dbus-java_2.4.bb
index 17b7ccec68..37c539b20e 100644
--- a/packages/dbus-java/dbus-java_2.4.bb
+++ b/packages/dbus-java/dbus-java_2.4.bb
@@ -17,10 +17,15 @@ 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 () {
# 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}" \
diff --git a/packages/dbus-java/dbus-java_2.5.bb b/packages/dbus-java/dbus-java_2.5.bb
new file mode 100644
index 0000000000..ef783c905d
--- /dev/null
+++ b/packages/dbus-java/dbus-java_2.5.bb
@@ -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@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}"
diff --git a/packages/gstreamer/gst-ffmpeg/autotools.patch b/packages/gstreamer/gst-ffmpeg/autotools.patch
new file mode 100644
index 0000000000..76e7ac6486
--- /dev/null
+++ b/packages/gstreamer/gst-ffmpeg/autotools.patch
@@ -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
diff --git a/packages/gstreamer/gst-ffmpeg_0.10.2.bb b/packages/gstreamer/gst-ffmpeg_0.10.2.bb
index e4dfb0b701..2cad978a16 100644
--- a/packages/gstreamer/gst-ffmpeg_0.10.2.bb
+++ b/packages/gstreamer/gst-ffmpeg_0.10.2.bb
@@ -4,12 +4,14 @@ PRIORITY = "optional"
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"
diff --git a/packages/openjade/openjade-native_1.3.2.bb b/packages/openjade/openjade-native_1.3.2.bb
index 11a3ca8525..822c47dd3b 100644
--- a/packages/openjade/openjade-native_1.3.2.bb
+++ b/packages/openjade/openjade-native_1.3.2.bb
@@ -15,8 +15,12 @@ EXTRA_OECONF = "--enable-spincludedir=${STAGING_INCDIR}/OpenSP \
--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 .
diff --git a/packages/openjade/openjade_1.3.2.bb b/packages/openjade/openjade_1.3.2.bb
index 7b1272ba4f..dcbfd886a0 100644
--- a/packages/openjade/openjade_1.3.2.bb
+++ b/packages/openjade/openjade_1.3.2.bb
@@ -12,8 +12,12 @@ inherit autotools
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 .
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 07:25:03 +0000