[oe-commits] org.oe.dev merge of 'dea5fd7f1b27baf261b5d668733d4ab001554649'
koen commit
oe at amethyst.openembedded.net
Sun Jul 13 13:13:06 UTC 2008
merge of 'dea5fd7f1b27baf261b5d668733d4ab001554649'
and 'e0f1f9bc5dd648488bd0c935a9b9ee33a518f15d'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 2f187f3aefd5783137489ac83567e80296d3e37b
ViewMTN: http://monotone.openembedded.org/revision/info/2f187f3aefd5783137489ac83567e80296d3e37b
Files:
1
packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch
packages/cacao/cacao-native_0.99.1.bb
packages/cacao/cacao-native_0.99.2.bb
packages/cacao/cacao_0.99.1.bb
packages/cacao/cacao_0.99.2.bb
packages/cacao/cacaoh-native_0.99.1.bb
packages/cacao/cacaoh-native_0.99.2.bb
packages/cacao/cacao-native.inc
packages/cacao/cacao-native_0.98+hg20071001.bb
packages/classpath/classpath_0.97.2.bb
packages/evince/evince_2.23.4.bb
packages/ffmpeg/ffmpeg_git.bb
packages/lcd4linux/files/lcd4linux.init
packages/lcd4linux/lcd4linux_0.10.0.bb
Diffs:
#
# mt diff -rdea5fd7f1b27baf261b5d668733d4ab001554649 -r2f187f3aefd5783137489ac83567e80296d3e37b
#
#
#
# delete "packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch"
#
# rename "packages/cacao/cacao-native_0.99.1.bb"
# to "packages/cacao/cacao-native_0.99.2.bb"
#
# rename "packages/cacao/cacao_0.99.1.bb"
# to "packages/cacao/cacao_0.99.2.bb"
#
# rename "packages/cacao/cacaoh-native_0.99.1.bb"
# to "packages/cacao/cacaoh-native_0.99.2.bb"
#
# patch "packages/cacao/cacao-native.inc"
# from [07b702fccb42b3216ccbc83f1e71c7ef63a0c5bc]
# to [01518adc1a5be594a1b7a0745fbe809fe9c32e37]
#
# patch "packages/cacao/cacao-native_0.98+hg20071001.bb"
# from [b087b9a24b9593dfff241d8dbafef831492c316b]
# to [8929611fd90eb4fdcb23fe53d68ecbb8c33008a2]
#
# patch "packages/cacao/cacao-native_0.99.2.bb"
# from [99b2a0554ed0083d21e60e8b10e7d9bf9f96ea22]
# to [ec6694c3440d7213e55f7fc7aa9401c8252419a2]
#
# patch "packages/cacao/cacao_0.99.2.bb"
# from [77d2dd2b46672fce71c875cb18b3294166d240cd]
# to [c37006a6c2daf29f28f7a3af6c18f2546da63545]
#
# patch "packages/classpath/classpath_0.97.2.bb"
# from [278cb300abf8c1fd2c84992aad5b9a71d2f050e5]
# to [950979b9546b09b411c3a41c14bf06b8450bd8bd]
#
============================================================
--- packages/cacao/cacao-native.inc 07b702fccb42b3216ccbc83f1e71c7ef63a0c5bc
+++ packages/cacao/cacao-native.inc 01518adc1a5be594a1b7a0745fbe809fe9c32e37
@@ -17,13 +17,13 @@ EXTRA_OECONF = "\
--with-vm-zip=${datadir}/cacao/vm.zip \
\
--with-classpath-libdir=${libdir_jni}:${libdir} \
- --with-classpath-includedir=${incdir}/classpath \
+ --with-classpath-includedir=${includedir}/classpath \
--with-classpath-classes=${datadir}/classpath/glibj.zip \
\
--with-java-runtime-library-classes=${datadir}/classpath/glibj.zip \
--with-java-runtime-library-libdir=${libdir_jni}:${libdir} \
- --with-jni_md_h=${incdir}/classpath \
- --with-jni_h=${incdir}/classpath \
+ --with-jni_md_h=${includedir}/classpath \
+ --with-jni_h=${includedir}/classpath \
"
# force usage of ecj-initial
============================================================
--- packages/cacao/cacao-native_0.98+hg20071001.bb b087b9a24b9593dfff241d8dbafef831492c316b
+++ packages/cacao/cacao-native_0.98+hg20071001.bb 8929611fd90eb4fdcb23fe53d68ecbb8c33008a2
@@ -3,3 +3,7 @@ SRC_URI = "http://jalimo.evolvis.org/rep
PR = "r1"
SRC_URI = "http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518"
+
+# force usage of ecj-initial (but Java5-compatible class library)
+export JAVAC = "${STAGING_BINDIR_NATIVE}/ecj-initial -bootclasspath ${STAGING_DATADIR_NATIVE}/classpath/glibj.zip"
+
============================================================
--- packages/cacao/cacao-native_0.99.1.bb 99b2a0554ed0083d21e60e8b10e7d9bf9f96ea22
+++ packages/cacao/cacao-native_0.99.2.bb ec6694c3440d7213e55f7fc7aa9401c8252419a2
@@ -2,6 +2,6 @@ PR = "r0"
PR = "r0"
-SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d \
- "
+SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d"
+
============================================================
--- packages/cacao/cacao_0.99.1.bb 77d2dd2b46672fce71c875cb18b3294166d240cd
+++ packages/cacao/cacao_0.99.2.bb c37006a6c2daf29f28f7a3af6c18f2546da63545
@@ -3,7 +3,6 @@ SRC_URI = "http://www.complang.tuwien.ac
PR = "r0"
SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d \
- file://cacao-${PV}-build-java-runtime-library-classes.patch;patch=1 \
"
# Quirks for Nokia N800:
============================================================
--- packages/classpath/classpath_0.97.2.bb 278cb300abf8c1fd2c84992aad5b9a71d2f050e5
+++ packages/classpath/classpath_0.97.2.bb 950979b9546b09b411c3a41c14bf06b8450bd8bd
@@ -3,7 +3,7 @@ SRC_URI += "\
SRC_URI += "\
file://netif_16.patch;patch=1;pnum=0 \
file://SimpleName.diff;patch=1;pnum=0 \
- file://javanet-local;patch=1;pnum=0 \
+ file://javanet-local.patch;patch=1;pnum=0 \
"
PR = "r1"
#
# mt diff -re0f1f9bc5dd648488bd0c935a9b9ee33a518f15d -r2f187f3aefd5783137489ac83567e80296d3e37b
#
#
#
# add_file "packages/evince/evince_2.23.4.bb"
# content [5f5e5c4d137be729191614e2f6a498f062401264]
#
# patch "packages/ffmpeg/ffmpeg_git.bb"
# from [6595b7db30a4c0aa450baa53b7c03f70acc8211b]
# to [ca93a225f546068e1e43b3ca41b56423d06c7b75]
#
# patch "packages/lcd4linux/files/lcd4linux.init"
# from [83848ea064a0946e3a7921d51cfea062858be9e2]
# to [491daa80397dc689b2de379e45f1d1012eeff65b]
#
# patch "packages/lcd4linux/lcd4linux_0.10.0.bb"
# from [88dad79f87ed32ec0895aa8c75781aea20ad1307]
# to [5d3cf9afec0757a742e933264ff87db21986d225]
#
============================================================
--- packages/evince/evince_2.23.4.bb 5f5e5c4d137be729191614e2f6a498f062401264
+++ packages/evince/evince_2.23.4.bb 5f5e5c4d137be729191614e2f6a498f062401264
@@ -0,0 +1,19 @@
+DESCRIPTION = "Evince is a document viewer for document formats like pdf, ps, djvu."
+LICENSE = "GPL"
+SECTION = "x11/office"
+DEPENDS = "gnome-icon-theme tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring "
+RDEPENDS = "espgs gnome-icon-theme"
+RRECOMMENDS = "gnome-vfs-plugin-file"
+PR = "r2"
+
+inherit gnome pkgconfig gtk-icon-cache
+
+SRC_URI += " file://no-help-dir.patch;patch=1"
+
+EXTRA_OECONF = " --without-libgnome \
+ --disable-thumbnailer \
+ --disable-scrollkeeper \
+ --enable-djvu \
+ "
+FILES_${PN}-dbg = "${libdir}/evince/backends/.debug"
+
============================================================
--- packages/ffmpeg/ffmpeg_git.bb 6595b7db30a4c0aa450baa53b7c03f70acc8211b
+++ packages/ffmpeg/ffmpeg_git.bb ca93a225f546068e1e43b3ca41b56423d06c7b75
@@ -3,7 +3,7 @@ PV = "0.4.9+${PR}+gitr${SRCREV}"
DEPENDS += "libgsm"
PV = "0.4.9+${PR}+gitr${SRCREV}"
-PR = "r12"
+PR = "r13"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_armv7a = "1"
@@ -12,7 +12,7 @@ SRCREV = "1e8300e71f79963eacdad6b180d9a1
FFBRANCH ?= "master"
SRCREV = "1e8300e71f79963eacdad6b180d9a12c4f56318d"
-SRCREV_arm = "749766cea9969418633abb77b6c8677a884dfcb9"
+SRCREV_arm = "d0e4a018bb80814e4aee450ddf9b4f6d3cb97064"
SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \
"
============================================================
--- packages/lcd4linux/files/lcd4linux.init 83848ea064a0946e3a7921d51cfea062858be9e2
+++ packages/lcd4linux/files/lcd4linux.init 491daa80397dc689b2de379e45f1d1012eeff65b
@@ -13,7 +13,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbi
### END INIT INFO
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/lcd4linux
+DAEMON=/usr/bin/lcd4linux
NAME=lcd4linux
DESC=lcd4linux
============================================================
--- packages/lcd4linux/lcd4linux_0.10.0.bb 88dad79f87ed32ec0895aa8c75781aea20ad1307
+++ packages/lcd4linux/lcd4linux_0.10.0.bb 5d3cf9afec0757a742e933264ff87db21986d225
@@ -4,7 +4,7 @@ PV = "0.10.0+0.10.1-RC2"
DEPENDS = "libusb-compat ncurses readline virtual/libx11"
PV = "0.10.0+0.10.1-RC2"
-PR = "r3"
+PR = "r4"
SRC_URI = "http://ssl.bulix.org/projects/lcd4linux/raw-attachment/wiki/Download/lcd4linux-0.10.1-RC2.tar.gz \
file://libusb-compat.diff;patch=1 \
More information about the Openembedded-commits
mailing list