[oe-commits] org.oe.dev merge of '09258eafc3e7182a15978e372af12800698031ce'
mickeyl commit
oe at amethyst.openembedded.net
Mon Jul 28 16:40:14 UTC 2008
merge of '09258eafc3e7182a15978e372af12800698031ce'
and '96d88977407dc82a4987de86d47802dd8322556f'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: e94be71f67802dbc7c4a7111d801cdfb0a05e3fb
ViewMTN: http://monotone.openembedded.org/revision/info/e94be71f67802dbc7c4a7111d801cdfb0a05e3fb
Files:
1
packages/libmatthew/libmatthew_0.5.bb
packages/libmatthew/libmatthew.inc
packages/libmatthew/libmatthew_0.7.1.bb
packages/dbus-java/dbus-java_2.3.bb
packages/dbus-java/dbus-java_2.4.bb
packages/imagemagick/imagemagick_6.3.5-10.bb
packages/kxml2/kxml2_2.3.0.bb
packages/libmatthew/libmatthew_0.7.bb
packages/vte/vte_0.16.8.bb
packages/vte/vte_0.16.9.bb
packages/meta/distro-feed-configs.bb
conf/distro/include/preferred-om-2008-versions.inc
packages/vte/vte.inc
Diffs:
#
# mt diff -r09258eafc3e7182a15978e372af12800698031ce -re94be71f67802dbc7c4a7111d801cdfb0a05e3fb
#
#
#
# delete "packages/libmatthew/libmatthew_0.5.bb"
#
# add_file "packages/libmatthew/libmatthew.inc"
# content [58194bd41e566922cfbe447117b8251be5c758ec]
#
# add_file "packages/libmatthew/libmatthew_0.7.1.bb"
# content [5368e855e8426080e396ce1d0f8a17faaf843d95]
#
# patch "packages/dbus-java/dbus-java_2.3.bb"
# from [815714e636ac18cc91f38966a30a02df3057e1ef]
# to [575d1bce4f960e8739b07964559e58e5768379d1]
#
# patch "packages/dbus-java/dbus-java_2.4.bb"
# from [9e606b58fa7b7996d5de35d17f5c373e5ed79c01]
# to [3be815bf6755338045753a524ff10c510c2494e9]
#
# patch "packages/imagemagick/imagemagick_6.3.5-10.bb"
# from [1d2ed3471deb4e336d60cf64a0fd08aa576337bc]
# to [214cf6cb6a05d8f49b255817a611d2dd2537a853]
#
# patch "packages/kxml2/kxml2_2.3.0.bb"
# from [49eb78153e98183b46a2f235e46470bfde9c4547]
# to [c71fddf2204b8e7fc0463810746d9ae54af3ffa4]
#
# patch "packages/libmatthew/libmatthew_0.7.bb"
# from [14a246a8f48391ed663d6bc440b6c11579d2bf16]
# to [fe9e94b1bca7f5fcf2d32b747ffbf8315fc7dd84]
#
============================================================
--- packages/libmatthew/libmatthew.inc 58194bd41e566922cfbe447117b8251be5c758ec
+++ packages/libmatthew/libmatthew.inc 58194bd41e566922cfbe447117b8251be5c758ec
@@ -0,0 +1,71 @@
+DESCRIPTION = "Unix socket, debug and hexdump libraries"
+AUTHOR = "Matthew Johnson <web at matthew.ath.cx>"
+HOMEPAGE = "http://www.matthew.ath.cx/projects/java"
+SECTION = "libs"
+LICENSE = "LGPL"
+DEPENDS = "classpath-native classpath fastjar-native virtual/javac-native"
+
+S = "${WORKDIR}/libmatthew-java-${PV}"
+
+inherit java-library
+
+# Some internal version numbers which change from time to time.
+# Allowing to override them makes this include file more
+# versatile.
+VER_CGI ?= "0.5"
+VER_DEBUG ?= "1.1"
+VER_HEXDUMP ?= "0.2"
+VER_IO ?= "0.1"
+VER_UNIX ?= "0.5"
+
+do_compile() {
+ oe_runmake \
+ JCFLAGS="-source 1.5" \
+ JAVAC="javac" \
+ JAR="fastjar" \
+ JAVAH="gjavah" \
+ INCLUDES="-I${STAGING_INCDIR}/classpath" \
+ LDFLAGS="-fpic -shared -lc ${LDFLAGS}" \
+ LD="${CC}" \
+ CFLAGS="-fpic -Wall -Os -pedantic -std=c99 -Werror"
+}
+do_install() {
+ oe_jarinstall cgi-${VER_CGI}.jar cgi.jar
+ oe_jarinstall debug-disable-${VER_DEBUG}.jar debug-disable.jar
+ oe_jarinstall debug-enable-${VER_DEBUG}.jar debug-enable.jar
+ oe_jarinstall hexdump-${VER_HEXDUMP}.jar hexdump.jar
+ oe_jarinstall io-${VER_IO}.jar io.jar
+ oe_jarinstall unix-${VER_UNIX}.jar unix.jar
+ oe_libinstall -so libcgi-java ${D}${libdir_jni}
+ oe_libinstall -so libunix-java ${D}${libdir_jni}
+}
+
+do_stage() {
+ oe_jarinstall -s cgi-${VER_CGI}.jar cgi.jar
+ oe_jarinstall -s debug-disable-${VER_DEBUG}.jar debug-disable.jar
+ oe_jarinstall -s debug-enable-${VER_DEBUG}.jar debug-enable.jar
+ oe_jarinstall -s hexdump-${VER_HEXDUMP}.jar hexdump.jar
+ oe_jarinstall -s io-${VER_IO}.jar io.jar
+ oe_jarinstall -s unix-${VER_UNIX}.jar unix.jar
+}
+
+PACKAGES = "\
+ libcgi-java libcgi-jni libcgi-jni-dbg \
+ libunixsocket-java libunixsocket-jni libunixsocket-jni-dbg \
+ ${PN}-io-java ${PN}-debug-java \
+"
+
+FILES_libcgi-java = "${datadir_java}/cgi*.jar"
+FILES_libcgi-jni = "${libdir_jni}/libcgi-java.so"
+FILES_libcgi-jni-dbg = "${libdir_jni}/.debug/libcgi-java.so"
+RDEPENDS_libcgi-java = "libcgi-jni"
+
+FILES_libunixsocket-java = "${datadir_java}/unix*.jar"
+FILES_libunixsocket-jni = "${libdir_jni}/libunix-java.so"
+FILES_libunixsocket-jni-dbg = "${libdir_jni}/.debug/libunix-java.so"
+RDEPENDS_libunixsocket-java = "libunixsocket-jni"
+
+FILES_${PN}-io-java = "${datadir_java}/io*.jar"
+
+FILES_${PN}-debug-java = "${datadir_java}/debug-*.jar ${datadir_java}/hexdump*.jar"
+
============================================================
--- packages/libmatthew/libmatthew_0.7.1.bb 5368e855e8426080e396ce1d0f8a17faaf843d95
+++ packages/libmatthew/libmatthew_0.7.1.bb 5368e855e8426080e396ce1d0f8a17faaf843d95
@@ -0,0 +1,8 @@
+require libmatthew.inc
+
+PR = "r0"
+
+SRC_URI = "http://www.matthew.ath.cx/projects/java/libmatthew-java-${PV}.tar.gz \
+ file://Makefile-0.7.patch;patch=1"
+
+
============================================================
--- packages/dbus-java/dbus-java_2.3.bb 815714e636ac18cc91f38966a30a02df3057e1ef
+++ packages/dbus-java/dbus-java_2.3.bb 575d1bce4f960e8739b07964559e58e5768379d1
@@ -7,7 +7,7 @@ AUTHOR = "Matthew Johnson <dbus at matthew.
HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java"
AUTHOR = "Matthew Johnson <dbus at matthew.ath.cx>"
-PR = "r3"
+PR = "r4"
inherit java-library
@@ -16,9 +16,9 @@ DEPENDS = "libmatthew docbook-utils-nati
S = "${WORKDIR}/dbus-java-${PV}"
DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native"
-RSUGGESTS_libdbus-java = "libmatthew-java dbus"
-RDEPENDS_dbus-java-viewer = "java2-runtime libmatthew-java ${JPN}"
-RDEPENDS_dbus-java-bin = "java2-runtime libmatthew-java ${JPN}"
+RSUGGESTS_libdbus-java = "libunixsocket-java dbus"
+RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java ${JPN}"
+RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java ${JPN}"
do_compile () {
# run target .binclasses first to fix a brokenness in the Makefile
============================================================
--- packages/dbus-java/dbus-java_2.4.bb 9e606b58fa7b7996d5de35d17f5c373e5ed79c01
+++ packages/dbus-java/dbus-java_2.4.bb 3be815bf6755338045753a524ff10c510c2494e9
@@ -6,10 +6,10 @@ DEPENDS = "libmatthew docbook-utils-nati
SECTION = "libs"
LICENSE = "GPLv2 AFL"
DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native"
-RDEPENDS_dbus-java-viewer = "java2-runtime libmatthew-java ${JPN}"
-RDEPENDS_dbus-java-bin = "java2-runtime libmatthew-java ${JPN}"
-RSUGGESTS_libdbus-java = "libmatthew-java dbus"
-PR = "r0"
+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 = "r1"
SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz"
============================================================
--- packages/imagemagick/imagemagick_6.3.5-10.bb 1d2ed3471deb4e336d60cf64a0fd08aa576337bc
+++ packages/imagemagick/imagemagick_6.3.5-10.bb 214cf6cb6a05d8f49b255817a611d2dd2537a853
@@ -2,7 +2,7 @@ DEPENDS = "tiff"
SECTION = "console/utils"
LICENSE = "GPL"
DEPENDS = "tiff"
-PR = "r2"
+PR = "r3"
SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}.tar.bz2 \
file://PerlMagic_MakePatch;patch=1 \
@@ -24,11 +24,11 @@ FILES_${PN} += "${libdir}/ImageMagick-${
}
FILES_${PN} += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.so \
+ ${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.la \
${libdir}/ImageMagick-${IMVER}/config/ \
${datadir}/ImageMagick-${IMVER}"
-FILES_${PN}-dev += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.la \
- ${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.a"
+FILES_${PN}-dev += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.a"
FILES_${PN}-dbg += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/.debug/*"
============================================================
--- packages/kxml2/kxml2_2.3.0.bb 49eb78153e98183b46a2f235e46470bfde9c4547
+++ packages/kxml2/kxml2_2.3.0.bb c71fddf2204b8e7fc0463810746d9ae54af3ffa4
@@ -15,7 +15,7 @@ SRC_URI = "\
JAR = "${PN}-${PV}.jar"
SRC_URI = "\
- http://belnet.dl.sourceforge.net/sourceforge/kxml/${PN}-src-${PV}.zip \
+ ${SOURCEFORGE_MIRROR}/kxml/${PN}-src-${PV}.zip \
file://makefile.patch;patch=1 \
"
============================================================
--- packages/libmatthew/libmatthew_0.7.bb 14a246a8f48391ed663d6bc440b6c11579d2bf16
+++ packages/libmatthew/libmatthew_0.7.bb fe9e94b1bca7f5fcf2d32b747ffbf8315fc7dd84
@@ -1,50 +1,9 @@
-DESCRIPTION = "Unix socket, debug and hexdump libraries"
-AUTHOR = "Matthew Johnson <web at matthew.ath.cx>"
-HOMEPAGE = "http://www.matthew.ath.cx/projects/java"
-SECTION = "libs"
-LICENSE = "LGPL"
-DEPENDS = "classpath-native classpath fastjar-native virtual/javac-native"
-RDEPENDS_${JPN} = "${PN}-jni"
-PR = "r0"
+require libmatthew.inc
+PR = "r1"
+
SRC_URI = "http://www.matthew.ath.cx/projects/java/libmatthew-java-${PV}.tar.gz \
file://Makefile-0.7.patch;patch=1"
-S = "${WORKDIR}/libmatthew-java-${PV}"
+VER_UNIX ?= "0.4"
-inherit java-library
-
-do_compile() {
- oe_runmake \
- JCFLAGS="-source 1.5" \
- JAVAC="javac" \
- JAR="fastjar" \
- JAVAH="gjavah" \
- INCLUDES="-I${STAGING_INCDIR}/classpath" \
- LDFLAGS="-fpic -shared -lc ${LDFLAGS}" \
- LD="${CC}" \
- CFLAGS="-fpic -Wall -Os -pedantic -std=c99 -Werror"
-}
-do_install() {
- oe_jarinstall cgi-0.5.jar cgi.jar
- oe_jarinstall debug-disable-1.1.jar debug-disable.jar
- oe_jarinstall debug-enable-1.1.jar debug-enable.jar
- oe_jarinstall hexdump-0.2.jar hexdump.jar
- oe_jarinstall io-0.1.jar io.jar
- oe_jarinstall unix-0.4.jar unix.jar
- oe_libinstall -so libcgi-java ${D}${libdir_jni}
- oe_libinstall -so libunix-java ${D}${libdir_jni}
-}
-do_stage() {
- oe_jarinstall -s cgi-0.5.jar cgi.jar
- oe_jarinstall -s debug-disable-1.1.jar debug-disable.jar
- oe_jarinstall -s debug-enable-1.1.jar debug-enable.jar
- oe_jarinstall -s hexdump-0.2.jar hexdump.jar
- oe_jarinstall -s io-0.1.jar io.jar
- oe_jarinstall -s unix-0.4.jar unix.jar
-}
-
-PACKAGES += "${PN}-jni ${PN}-jni-dbg"
-
-FILES_${PN}-jni = "${libdir_jni}/lib*.so"
-FILES_${PN}-jni-dbg = "${libdir_jni}/.debug/lib*.so"
#
# mt diff -r96d88977407dc82a4987de86d47802dd8322556f -re94be71f67802dbc7c4a7111d801cdfb0a05e3fb
#
#
#
# delete "packages/vte/vte_0.16.8.bb"
#
# delete "packages/vte/vte_0.16.9.bb"
#
# add_file "packages/meta/distro-feed-configs.bb"
# content [5c7bcb7a4ed120f1953149991e2a362b36a429be]
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [1b5cac00d46388ab063fd9310c8e3b9aac2ac9c4]
# to [de9d4b591e5fc2aee97cb683cb4c06bd3b30b405]
#
# patch "packages/vte/vte.inc"
# from [780449de951c6a497b507b5dda72add7d9ee3060]
# to [8dfe2fac6874cb77f61c5ecec5fd35f79320358b]
#
============================================================
--- packages/meta/distro-feed-configs.bb 5c7bcb7a4ed120f1953149991e2a362b36a429be
+++ packages/meta/distro-feed-configs.bb 5c7bcb7a4ed120f1953149991e2a362b36a429be
@@ -0,0 +1,30 @@
+DESCRIPTION = "Configuration files for online package repositories aka feeds"
+PR = "r0"
+
+DISTRO_FEED_PREFIX ?= "remote"
+DISTRO_FEED_URI ?= "http://my-distribution.org/remote-feed/"
+
+do_compile() {
+ mkdir -p ${S}/${sysconfdir}/opkg
+ for feed in all ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}; do
+ echo "src/gz ${DISTRO_FEED_PREFIX}-${feed} ${DISTRO_FEED_URI}/${feed}" > ${S}/${sysconfdir}/opkg/${feed}-feed.conf
+ done
+}
+do_install () {
+ install -d ${D}${sysconfdir}/opkg
+ install -m 0644 ${S}/${sysconfdir}/opkg/* ${D}${sysconfdir}/opkg/
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+#def distro_feed_configs(d):
+# import bb
+# parchs = bb.data.getVar( "PACKAGE_EXTRA_ARCHS", d, 1 ).split()
+# march = bb.data.getVar( "MACHINE_ARCH", d, 1 ).split()
+# archs = [ "all" ] + parchs + march
+# confs = [ ( "${sysconfdir}/opkg/%s-feed.conf" % feed ) for feed in archs ]
+# return " ".join( confs )
+#
+#CONFFILES_${PN} += '${@distro_feed_configs(d)}'
+
+CONFFILES_${PN} += '${@ " ".join( [ ( "${sysconfdir}/opkg/%s-feed.conf" % feed ) for feed in "all ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}".split() ] ) }'
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc 1b5cac00d46388ab063fd9310c8e3b9aac2ac9c4
+++ conf/distro/include/preferred-om-2008-versions.inc de9d4b591e5fc2aee97cb683cb4c06bd3b30b405
@@ -1953,7 +1953,7 @@ PREFERRED_VERSION_vsftpd ?= "2.0.5"
PREFERRED_VERSION_vorbis-tools ?= "1.0.1"
PREFERRED_VERSION_vpnc ?= "0.3.3"
PREFERRED_VERSION_vsftpd ?= "2.0.5"
-PREFERRED_VERSION_vte ?= "0.16.9"
+PREFERRED_VERSION_vte ?= "0.16.13"
PREFERRED_VERSION_vtun ?= "2.6"
PREFERRED_VERSION_w3cam ?= "0.7.2"
PREFERRED_VERSION_wakelan ?= "1.1"
============================================================
--- packages/vte/vte.inc 780449de951c6a497b507b5dda72add7d9ee3060
+++ packages/vte/vte.inc 8dfe2fac6874cb77f61c5ecec5fd35f79320358b
@@ -1,7 +1,6 @@ DEPENDS += " glib-2.0 gtk+ intltool-nati
DESCRIPTION = "vte is a virtual terminal emulator"
LICENSE = "LGPL"
DEPENDS += " glib-2.0 gtk+ intltool-native"
-RDEPENDS = "termcap"
inherit gnome
@@ -13,5 +12,7 @@ do_stage() {
autotools_stage_all
}
-PACKAGES =+ "libvte"
+PACKAGES =+ "libvte vte-termcap"
FILES_libvte = "${libdir}/*.so*"
+RDEPENDS_libvte = "vte-termcap"
+FILES_vte-termcap = "${datadir}/vte/termcap"
More information about the Openembedded-commits
mailing list