[oe-commits] org.oe.dev merge of 'c1f56760bf109a8b713045831bca0044ccd1d481'
thebohemian commit
openembedded-commits at lists.openembedded.org
Wed Jan 9 12:59:34 UTC 2008
merge of 'c1f56760bf109a8b713045831bca0044ccd1d481'
and 'dfa87282df155f394e48f13dfb6785a4e617b0c3'
Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: d7fa03e49c13cc4c48551f9ea7d8f18ef558c0f1
ViewMTN: http://monotone.openembedded.org/revision/info/d7fa03e49c13cc4c48551f9ea7d8f18ef558c0f1
Files:
1
packages/atk/atk_1.18.0.bb
packages/atk/atk.inc
packages/atk/atk_1.19.3.bb
packages/atk/atk_1.20.0.bb
packages/nut
packages/nut/files
packages/nut/files/libm.patch
packages/nut/nut_2.2.1.bb
MAINTAINERS
conf/distro/openwrt-sdk.conf
packages/octave/octave.inc
packages/octave/octave_2.1.73.bb
packages/octave/octave_2.9.19.bb
packages/octave/octave_3.0.0.bb
packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
Diffs:
#
# mt diff -rc1f56760bf109a8b713045831bca0044ccd1d481 -rd7fa03e49c13cc4c48551f9ea7d8f18ef558c0f1
#
#
#
# add_file "packages/atk/atk_1.18.0.bb"
# content [6463d96261a3b8f2e0e94b0d20d548719c0bd883]
#
# patch "packages/atk/atk.inc"
# from [c823ee3d1af4afa6bcb287e03e6765369bb78fbd]
# to [2ab6e52b88194beb2fc9643f544884ef33c8b4df]
#
# patch "packages/atk/atk_1.19.3.bb"
# from [e94d8f3fd021065300ad78c840ea3acacdb490d8]
# to [1f58a60fd41519a232f589cdad8fe7d264e9ace7]
#
# patch "packages/atk/atk_1.20.0.bb"
# from [190d05cefc4412792de79e5b9d1dc0f11194d0a3]
# to [be154613042709df815d16321052604d12fbc5e4]
#
============================================================
--- packages/atk/atk_1.18.0.bb 6463d96261a3b8f2e0e94b0d20d548719c0bd883
+++ packages/atk/atk_1.18.0.bb 6463d96261a3b8f2e0e94b0d20d548719c0bd883
@@ -0,0 +1,8 @@
+require atk.inc
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/atk/1.18/atk-${PV}.tar.bz2"
+
+do_stage () {
+ oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
+ autotools_stage_includes
+}
============================================================
--- packages/atk/atk.inc c823ee3d1af4afa6bcb287e03e6765369bb78fbd
+++ packages/atk/atk.inc 2ab6e52b88194beb2fc9643f544884ef33c8b4df
@@ -1,13 +1,14 @@
-DEPENDS = "glib-2.0 gtk-doc-native"
DESCRIPTION = "An accessibility toolkit for GNOME."
SECTION = "x11/libs"
PRIORITY = "optional"
LICENSE = "LGPL"
+DEPENDS = "glib-2.0 gtk-doc-native"
+
inherit autotools pkgconfig
EXTRA_OECONF = "--disable-glibtest"
+do_stage () {
+ autotools_stage_all
+}
-CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 \
- -I${STAGING_INCDIR}/glib-2.0/glib \
- -I${STAGING_INCDIR}/glib-2.0/gobject"
============================================================
--- packages/atk/atk_1.19.3.bb e94d8f3fd021065300ad78c840ea3acacdb490d8
+++ packages/atk/atk_1.19.3.bb 1f58a60fd41519a232f589cdad8fe7d264e9ace7
@@ -1,8 +1,14 @@ SRC_URI = "ftp://ftp.gnome.org/pub/GNOME
require atk.inc
SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/atk/1.19/atk-${PV}.tar.bz2"
+CFLAGS_append = "\
+ -I${STAGING_INCDIR}/glib-2.0 \
+ -I${STAGING_INCDIR}/glib-2.0/glib \
+ -I${STAGING_INCDIR}/glib-2.0/gobject \
+ "
+
do_stage () {
- oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
- autotools_stage_includes
+ oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
+ autotools_stage_includes
}
============================================================
--- packages/atk/atk_1.20.0.bb 190d05cefc4412792de79e5b9d1dc0f11194d0a3
+++ packages/atk/atk_1.20.0.bb be154613042709df815d16321052604d12fbc5e4
@@ -1,16 +1,6 @@
-DESCRIPTION = "An accessibility toolkit for GNOME."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "LGPL"
+require atk.inc
-DEPENDS = "glib-2.0 gtk-doc-native"
-
SRC_URI = "http://download.gnome.org/sources/atk/1.20/${PN}-${PV}.tar.bz2"
-inherit autotools pkgconfig
-EXTRA_OECONF = "--disable-glibtest"
-do_stage () {
- autotools_stage_all
-}
#
# mt diff -rdfa87282df155f394e48f13dfb6785a4e617b0c3 -rd7fa03e49c13cc4c48551f9ea7d8f18ef558c0f1
#
#
#
# add_dir "packages/nut"
#
# add_dir "packages/nut/files"
#
# add_file "packages/nut/files/libm.patch"
# content [11bc3fc336a2fd0e75104921916b615dcf31279c]
#
# add_file "packages/nut/nut_2.2.1.bb"
# content [00d9e22eefd7c427d126869ec2ad17cafc671a0f]
#
# patch "MAINTAINERS"
# from [8be8b1832f42218d3cc6ae809b61dc80fcd70003]
# to [8c59ce00f263c54ebc989a744a0d0538115e6075]
#
# patch "conf/distro/openwrt-sdk.conf"
# from [8b396941add259495d68102ab8ff2429a211f943]
# to [1107f0f69397f0e0bf38f74a1414c0ec52f30efe]
#
# patch "packages/octave/octave.inc"
# from [ee444b2bd09390c3cf0f543fd839457a3a0fb8c3]
# to [2624086bdfb34c85b43593497c19f150d08efa5e]
#
# patch "packages/octave/octave_2.1.73.bb"
# from [028ace8fc5a864067196732b53fb3568c0000830]
# to [ea37fd6f98c2207c29011aaeeae902f8b1c976dc]
#
# patch "packages/octave/octave_2.9.19.bb"
# from [fd814dd8dc7d4aed94aeda8148c85861039e1b40]
# to [8a24462904742811705f1ac39ca11ba7f25b275b]
#
# patch "packages/octave/octave_3.0.0.bb"
# from [fd814dd8dc7d4aed94aeda8148c85861039e1b40]
# to [8a24462904742811705f1ac39ca11ba7f25b275b]
#
# patch "packages/speech-dispatcher/speech-dispatcher_0.6.5.bb"
# from [734832bdee53cde56e75155ac50c7f9aaa55bfe0]
# to [b70cba0c2b41cdc634eb88c2b47dabab343b316a]
#
============================================================
--- packages/nut/files/libm.patch 11bc3fc336a2fd0e75104921916b615dcf31279c
+++ packages/nut/files/libm.patch 11bc3fc336a2fd0e75104921916b615dcf31279c
@@ -0,0 +1,21 @@
+--- a/drivers/Makefile.am.org 2007-10-01 16:06:24.000000000 +0300
++++ a/drivers/Makefile.am 2008-01-09 02:13:09.000000000 +0200
+@@ -125,7 +125,7 @@
+ tripplite_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) -lm
+
+ bcmxcp_usb_SOURCES = bcmxcp_usb.c bcmxcp.c nut_usb.c
+-bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS)
++bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) -lm
+
+ megatec_usb_SOURCES = megatec.c megatec_usb.c libusb.c
+ megatec_usb_CFLAGS = $(AM_CFLAGS) -DMEGATEC_SUBDRV
+--- a/drivers/Makefile.am.org 2008-01-09 02:14:32.000000000 +0200
++++ a/drivers/Makefile.am 2008-01-09 02:17:37.000000000 +0200
+@@ -67,6 +67,7 @@
+ al175_SOURCES = al175.c
+ apcsmart_SOURCES = apcsmart.c
+ bcmxcp_SOURCES = bcmxcp.c bcmxcp_ser.c
++bcmxcp_LDADD = $(LDADD) -lm
+ belkin_SOURCES = belkin.c
+ belkinunv_SOURCES = belkinunv.c
+ bestfcom_SOURCES = bestfcom.c
============================================================
--- packages/nut/nut_2.2.1.bb 00d9e22eefd7c427d126869ec2ad17cafc671a0f
+++ packages/nut/nut_2.2.1.bb 00d9e22eefd7c427d126869ec2ad17cafc671a0f
@@ -0,0 +1,14 @@
+DESCRIPTION = "Network UPS Tools"
+LICENSE = "GPL"
+DEPENDS = "libusb"
+PR = "r1"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-usb"
+
+SRC_URI = "http://www.networkupstools.org/source/2.2/nut-${PV}.tar.gz \
+ file://libm.patch;patch=1 \
+ "
+
+FILES_${PN} += "${datadir}/"
============================================================
--- MAINTAINERS 8be8b1832f42218d3cc6ae809b61dc80fcd70003
+++ MAINTAINERS 8c59ce00f263c54ebc989a744a0d0538115e6075
@@ -162,7 +162,7 @@ Interests: Cross-machine unification
Machines: h3900, h4000, hx4700
Interests: PocketPC and Palm devices support, Win32 support
Interests: Cross-machine unification
-Recipes: linux-handhelds-2.6, opie-*
+Recipes: linux-handhelds-2.6, opie-*, initramfs-*, gnome-mplayer
Person: Philip Balister
Mail: Crofton at balister.org
============================================================
--- conf/distro/openwrt-sdk.conf 8b396941add259495d68102ab8ff2429a211f943
+++ conf/distro/openwrt-sdk.conf 1107f0f69397f0e0bf38f74a1414c0ec52f30efe
@@ -18,9 +18,12 @@ DISTRO_NAME = "OpenWRT"
# Header
#
DISTRO_NAME = "OpenWRT"
+DISTRO_REVISION = "2"
+IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0"
+
# This is what lives in SDK
ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc"
# Make sure that we have correct package dependencies for SDK-provided libs.
+ASSUME_SHLIBS += "libc.so.0:uclibc libm.so.0:uclibc libgcc_s.so.1:libgcc"
-ASSUME_SHLIBS += "libc.so.0:uclibc libgcc_s.so.1:libgcc"
============================================================
--- packages/octave/octave.inc ee444b2bd09390c3cf0f543fd839457a3a0fb8c3
+++ packages/octave/octave.inc 2624086bdfb34c85b43593497c19f150d08efa5e
@@ -1,7 +1,4 @@
-DESCRIPTION = "GNU Octave is a high-level language, primarily intended for numerical computations. \
-It provides a convenient command line interface for solving linear and nonlinear problems numerically, \
-and for performing other numerical experiments using a language that is mostly compatible with Matlab. \
-It may also be used as a batch-oriented language."
+DESCRIPTION = "Matlab alternative for numerical computations"
HOMEPAGE = "http://www.gnu.org/software/octave/"
SECTION = "console/scientific"
LICENSE = "GPL"
@@ -11,8 +8,12 @@ inherit autotools
inherit autotools
-EXTRA_OECONF = "--without-hdf5"
+EXTRA_OECONF = "--without-hdf5 --without-glpk -without-umfpack \
+ --without-colamd --without-ccolamd --without-cholmod \
+ --without-cxsparse"
+# additional missing dependency/functionality: Qhull gperf
+
do_configure() {
gnu-configize
oe_runconf
@@ -26,4 +27,3 @@ do_stage() {
do_stage() {
autotools_stage_all
}
-
============================================================
--- packages/octave/octave_2.1.73.bb 028ace8fc5a864067196732b53fb3568c0000830
+++ packages/octave/octave_2.1.73.bb ea37fd6f98c2207c29011aaeeae902f8b1c976dc
@@ -1,8 +1,8 @@ SRC_URI = "ftp://ftp.octave.org/pub/octa
require octave.inc
SRC_URI = "ftp://ftp.octave.org/pub/octave/obsolete/${PN}-${PV}.tar.gz"
-PR = "r0"
+PR = "r1"
PACKAGES =+ "libcruft-dev liboctave-dev liboctinterp-dev"
============================================================
--- packages/octave/octave_2.9.19.bb fd814dd8dc7d4aed94aeda8148c85861039e1b40
+++ packages/octave/octave_2.9.19.bb 8a24462904742811705f1ac39ca11ba7f25b275b
@@ -1,24 +1,24 @@ SRC_URI = "ftp://ftp.octave.org/pub/octa
require octave.inc
SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \
file://configure.patch;patch=1"
-PR = "r0"
+PR = "r1"
PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \
libcruft-dev liboctave-dev liboctinterp-dev \
libcruft-dbg liboctave-dbg liboctinterp-dbg"
-FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft*"
-FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft.so"
+FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft.so.*"
+FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft*"
FILES_libcruft-dbg += "${libdir}/${PN}-${PV}/.debug/libcruft*"
-FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave*"
-FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave.so"
+FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave.so.*"
+FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave*"
FILES_liboctave-dbg += "${libdir}/${PN}-${PV}/.debug/liboctave*"
-FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp*"
-FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp.so"
+FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp.so.*"
+FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp*"
FILES_liboctinterp-dbg += "${libdir}/${PN}-${PV}/.debug/liboctinterp*"
# octave-oct provides subroutines in .oct file format
============================================================
--- packages/octave/octave_3.0.0.bb fd814dd8dc7d4aed94aeda8148c85861039e1b40
+++ packages/octave/octave_3.0.0.bb 8a24462904742811705f1ac39ca11ba7f25b275b
@@ -1,24 +1,24 @@ SRC_URI = "ftp://ftp.octave.org/pub/octa
require octave.inc
SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \
file://configure.patch;patch=1"
-PR = "r0"
+PR = "r1"
PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \
libcruft-dev liboctave-dev liboctinterp-dev \
libcruft-dbg liboctave-dbg liboctinterp-dbg"
-FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft*"
-FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft.so"
+FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft.so.*"
+FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft*"
FILES_libcruft-dbg += "${libdir}/${PN}-${PV}/.debug/libcruft*"
-FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave*"
-FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave.so"
+FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave.so.*"
+FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave*"
FILES_liboctave-dbg += "${libdir}/${PN}-${PV}/.debug/liboctave*"
-FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp*"
-FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp.so"
+FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp.so.*"
+FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp*"
FILES_liboctinterp-dbg += "${libdir}/${PN}-${PV}/.debug/liboctinterp*"
# octave-oct provides subroutines in .oct file format
============================================================
--- packages/speech-dispatcher/speech-dispatcher_0.6.5.bb 734832bdee53cde56e75155ac50c7f9aaa55bfe0
+++ packages/speech-dispatcher/speech-dispatcher_0.6.5.bb b70cba0c2b41cdc634eb88c2b47dabab343b316a
@@ -5,7 +5,7 @@ RPROVIDES_${PN} += "speechd"
DEPENDS = "espeak flite pulseaudio libdotconf glib-2.0"
RPROVIDES_${PN} += "speechd"
-PR = "r6"
+PR = "r7"
inherit autotools update-rc.d
@@ -47,4 +47,10 @@ do_stage() {
oe_libinstall -so -C src/c/api libspeechd ${STAGING_LIBDIR}
}
+PACKAGES =+ "libspeechd-dbg libspeechd libspeechd-dev"
+
FILES_${PN} += "${libdir}/${PN}-modules/*"
+FILES_${PN}-dbg += "${libdir}/${PN}-modules/.debug"
+FILES_libspeechd += "${libdir}/libspeechd.so.*"
+FILES_libspeechd-dev += "${libdir}/libspeechd* ${includedir}"
+FILES_libspeechd-dbg += "${libdir}/.debug/libspeechd*"
More information about the Openembedded-commits
mailing list