[oe-commits] org.oe.dev merge of '80e11d2d53016f865ea2a634c725c9e643e7606b'
slapin commit
openembedded-commits at lists.openembedded.org
Fri Jul 27 22:09:01 UTC 2007
merge of '80e11d2d53016f865ea2a634c725c9e643e7606b'
and '96140c2b284f4cb67311bf2ca1e0926bd7fb5cdd'
Author: slapin at openembedded.org
Branch: org.openembedded.dev
Revision: 1298044ef255a216be0d62dedb533b4ab4d8606f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1298044ef255a216be0d62dedb533b4ab4d8606f
Files:
1
packages/guile/guile-native_1.8.2.bb
packages/gnuradio/gnuradio/no-trellis-doc.patch
packages/gnuradio/gnuradio_svn.bb
packages/opie-taskbar/opie-taskbar-images
packages/opie-taskbar/opie-taskbar-images/firstuse-320x320.jpg
packages/opie-taskbar/opie-taskbar-images/opie-background-320x320.jpg
packages/opie-taskbar/opie-taskbar-images.inc
packages/opie-taskbar/opie-taskbar-images_1.2.3.bb
packages/opie-taskbar/opie-taskbar-images_cvs.bb
mtn:manual_merge
true
Diffs:
#
# mt diff -r80e11d2d53016f865ea2a634c725c9e643e7606b -r1298044ef255a216be0d62dedb533b4ab4d8606f
#
#
#
# add_file "packages/guile/guile-native_1.8.2.bb"
# content [5620660481d437ae965ccd3a6b88b1fd8d7cd254]
#
# patch "packages/gnuradio/gnuradio/no-trellis-doc.patch"
# from [cc0bb2e796e247acfa67f211e8d48be947e1d0f6]
# to [d5c686ac12fd6206586be1587735047f2ea35191]
#
# patch "packages/gnuradio/gnuradio_svn.bb"
# from [25ab6f6695b8c3a7ebb07f9d8f8d8eded6cddc07]
# to [afe45c2b8d3962029ab5b1bc7dd62aa9c8e32168]
#
============================================================
--- packages/guile/guile-native_1.8.2.bb 5620660481d437ae965ccd3a6b88b1fd8d7cd254
+++ packages/guile/guile-native_1.8.2.bb 5620660481d437ae965ccd3a6b88b1fd8d7cd254
@@ -0,0 +1,133 @@
+SECTION = "unknown"
+LICENSE = "GPL"
+SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
+ "
+
+inherit autotools native
+
+S="${WORKDIR}/guile-${PV}"
+
+OE_LT_RPATH_ALLOW = "any"
+LDFLAGS += " -L${STAGING_LIBDIR} "
+
+do_configure() {
+ # no autoreconf, thanks
+ oe_runconf
+}
+
+LIBGUILE_HEADERS = "\
+__scm.h \
+alist.h \
+arbiters.h \
+async.h \
+backtrace.h \
+boolean.h \
+chars.h \
+continuations.h \
+debug-malloc.h \
+debug.h \
+deprecation.h \
+dynl.h \
+dynwind.h \
+environments.h \
+eq.h \
+error.h \
+eval.h \
+evalext.h \
+extensions.h \
+feature.h \
+filesys.h \
+fluids.h \
+fports.h \
+gc.h \
+gdb_interface.h \
+gdbint.h \
+goops.h \
+gsubr.h \
+guardians.h \
+hash.h \
+hashtab.h \
+hooks.h \
+init.h \
+ioext.h \
+iselect.h \
+keywords.h \
+lang.h \
+list.h \
+load.h \
+macros.h \
+mallocs.h \
+modules.h \
+net_db.h \
+numbers.h \
+objects.h \
+objprop.h \
+options.h \
+pairs.h \
+ports.h \
+posix.h \
+print.h \
+procprop.h \
+procs.h \
+properties.h \
+ramap.h \
+random.h \
+rdelim.h \
+read.h \
+regex-posix.h \
+root.h \
+rw.h \
+scmconfig.h \
+scmsigs.h \
+script.h \
+simpos.h \
+smob.h \
+snarf.h \
+socket.h \
+sort.h \
+srcprop.h \
+stackchk.h \
+stacks.h \
+stime.h \
+strings.h \
+strorder.h \
+strports.h \
+struct.h \
+symbols.h \
+tags.h \
+threads.h \
+throw.h \
+unif.h \
+validate.h \
+values.h \
+variable.h \
+vectors.h \
+version.h \
+vports.h \
+weaks.h \
+"
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/libguile
+ for i in ${LIBGUILE_HEADERS}; do
+ install -m 0644 libguile/$i ${STAGING_INCDIR}/libguile/$i
+ done
+
+ install -d ${STAGING_BINDIR_NATIVE}
+ install -m 0755 ${S}/libguile/.libs/guile ${STAGING_BINDIR_NATIVE}/
+
+ install -m 0644 libguile.h ${STAGING_INCDIR}/libguile.h
+ install -d ${STAGING_INCDIR}/guile
+ install -m 0644 libguile/gh.h ${STAGING_INCDIR}/guile/
+ install -d ${STAGING_INCDIR}/guile/srfi
+ install -d ${STAGING_INCDIR}/guile-readline
+ install -m 0644 guile-readline/readline.h ${STAGING_INCDIR}/guile-readline/
+ install -d ${STAGING_DATADIR}/aclocal
+ install -m 0644 guile-config/guile.m4 ${STAGING_DATADIR}/aclocal
+
+ install -d ${STAGING_DATADIR}/guile/1.8
+ cp -pPr ${S}/ice-9 ${STAGING_DATADIR}/guile/1.8/
+
+ oe_libinstall -C guile-readline -so -a libguilereadline-v-17 ${STAGING_LIBDIR}
+ oe_libinstall -C libguile -so -a libguile ${STAGING_LIBDIR}
+}
============================================================
--- packages/gnuradio/gnuradio/no-trellis-doc.patch cc0bb2e796e247acfa67f211e8d48be947e1d0f6
+++ packages/gnuradio/gnuradio/no-trellis-doc.patch d5c686ac12fd6206586be1587735047f2ea35191
@@ -7,3 +7,14 @@
-SUBDIRS = src doc
+SUBDIRS = src
+--- /tmp/Makefile.am 2007-07-27 19:18:00.000000000 +0200
++++ trunk/usrp/Makefile.am 2007-07-27 19:18:20.995215000 +0200
+@@ -20,7 +20,7 @@
+ #
+
+ EXTRA_DIST = usrp.pc.in usrp.iss.in usrp.inf
+-SUBDIRS = host firmware fpga doc
++SUBDIRS = host firmware fpga
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = usrp.pc
============================================================
--- packages/gnuradio/gnuradio_svn.bb 25ab6f6695b8c3a7ebb07f9d8f8d8eded6cddc07
+++ packages/gnuradio/gnuradio_svn.bb afe45c2b8d3962029ab5b1bc7dd62aa9c8e32168
@@ -1,15 +1,14 @@ LICENSE = "GPL"
DESCRIPTION = "GNU Radio"
SECTION = "apps"
PRIORITY = "optional"
LICENSE = "GPL"
-DEPENDS = "fftwf python boost cppunit sdcc-native swig swig-native"
+DEPENDS = " guile-native fftwf python libusb virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native"
-RDEPENDS_${PN} = "python-core python-audio python-codecs python-lang python-textutils swig"
+RDEPENDS_${PN} = "python-core python-audio python-codecs python-lang python-textutils"
PV = "3.0.4+svn${SRCDATE}"
-PR = "r1"
+PR = "r2"
-
SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http \
file://no-trellis-doc.patch;patch=1 \
"
@@ -23,9 +22,22 @@ export HOST_SYS := "${HOST_SYS}"
export BUILD_SYS := "${BUILD_SYS}"
export HOST_SYS := "${HOST_SYS}"
-EXTRA_OECONF = "--disable-gr-atsc --disable-gr-video-sdl"
+EXTRA_OECONF = " \
+ --disable-gr-atsc \
+ --enable-gr-video-sdl \
+ --enable-gr-audio-alsa \
+ --enable-gr-audio-jack \
+ --enable-gr-audio-oss \
+ --enable-mblock \
+ "
-PACKAGES =+ "libgromnithread libgnuradio-core libgnuradio-core-qa"
+do_configure_append() {
+ find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
+}
+
+PACKAGES =+ "libusrp libusrp-inband libgromnithread libgnuradio-core libgnuradio-core-qa"
+FILES_libusrp = "${libdir}/libusrp.so.*"
+FILES_libusrp-inband = "${libdir}/libusrp_inband.so.*"
FILES_libgnuradio-core = "${libdir}/libgnuradio-core.so.*"
FILES_libgnuradio-core-qa = "${libdir}/libgnuradio-core-qa.so.*"
FILES_libgromnithread = "${libdir}/libgromnithread.so*"
#
# mt diff -r96140c2b284f4cb67311bf2ca1e0926bd7fb5cdd -r1298044ef255a216be0d62dedb533b4ab4d8606f
#
#
#
# add_dir "packages/opie-taskbar/opie-taskbar-images"
#
# add_file "packages/opie-taskbar/opie-taskbar-images/firstuse-320x320.jpg"
# content [fa0276a0e0b6dc68a281e947c7103eba9fa39c86]
#
# add_file "packages/opie-taskbar/opie-taskbar-images/opie-background-320x320.jpg"
# content [3e2fc630413d05944b90a0f31f514262c20e46f6]
#
# patch "packages/opie-taskbar/opie-taskbar-images.inc"
# from [af9f1520fa611e94512ba6574a480e95de8a16bd]
# to [fa74199fe1a5102d17da7ed6417c493736dc2272]
#
# patch "packages/opie-taskbar/opie-taskbar-images_1.2.3.bb"
# from [bc274c765ec5981754215fbdaa6f4bb4ace500e8]
# to [d8972ce32ccf3ccd77f9e7cf60410b292cb04f45]
#
# patch "packages/opie-taskbar/opie-taskbar-images_cvs.bb"
# from [1bba5e8ec05293d5c7cc7bb8b1381f603bec4e86]
# to [6e2e43b9defd2572266fc75bac6aad2cb5a06999]
#
# set "packages/opie-taskbar/opie-taskbar-images/firstuse-320x320.jpg"
# attr "mtn:manual_merge"
# value "true"
#
# set "packages/opie-taskbar/opie-taskbar-images/opie-background-320x320.jpg"
# attr "mtn:manual_merge"
# value "true"
#
============================================================
# packages/opie-taskbar/opie-taskbar-images/firstuse-320x320.jpg is binary
============================================================
# packages/opie-taskbar/opie-taskbar-images/opie-background-320x320.jpg is binary
============================================================
--- packages/opie-taskbar/opie-taskbar-images.inc af9f1520fa611e94512ba6574a480e95de8a16bd
+++ packages/opie-taskbar/opie-taskbar-images.inc fa74199fe1a5102d17da7ed6417c493736dc2272
@@ -18,18 +18,20 @@ PIXMAP_SIZE_hx4700 = "-480x640"
PIXMAP_SIZE_htcuniversal= "-480x640"
PIXMAP_SIZE_hx4700 = "-480x640"
-PACKAGES = "${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320"
+PACKAGES = "${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320 ${PN}-320x320"
do_install() {
install -d ${D}${palmtopdir}/pics/launcher
-
+
+ install -m 0644 ${FILESDIR}/firstuse-320x320.jpg ${D}${palmtopdir}/pics/launcher/firstuse-320x320.jpg
+ install -m 0644 ${FILESDIR}/opie-background-320x320.jpg ${D}${palmtopdir}/pics/launcher/opie-background-320x320.jpg
install -m 0644 ${WORKDIR}/pics/launcher/firstuse.jpg ${D}${palmtopdir}/pics/launcher/firstuse-240x320.jpg
install -m 0644 ${WORKDIR}/pics/launcher/opie-background.jpg ${D}${palmtopdir}/pics/launcher/opie-background-240x320.jpg
# TODO: those should be correct images for the resolution:
install -m 0644 ${WORKDIR}/pics/launcher/firstuse.jpg ${D}${palmtopdir}/pics/launcher/firstuse-320x240.jpg
install -m 0644 ${WORKDIR}/pics/launcher/opie-background.jpg ${D}${palmtopdir}/pics/launcher/opie-background-320x240.jpg
- for res in 480x640 640x480 800x600 ; do
+ for res in 480x640 640x480 800x600; do
install -m 0644 ${WORKDIR}/pics/launcher/firstuse-${res}.jpg ${D}${palmtopdir}/pics/launcher/firstuse-${res}.jpg
install -m 0644 ${WORKDIR}/pics/launcher/opie-background-${res}.jpg ${D}${palmtopdir}/pics/launcher/opie-background-${res}.jpg
done
@@ -39,7 +41,7 @@ python do_package_prepend () {
}
python do_package_prepend () {
- reslist = ['240x320','320x240', '480x640','640x480', '800x600','600x800']
+ reslist = ['240x320','320x240', '320x320', '480x640','640x480', '800x600','600x800']
dir = bb.data.expand('${palmtopdir}/pics/launcher/', d)
ft = bb.data.expand('${palmtopdir}/pics/*/*-%s.*', d)
pn = bb.data.getVar('PN', d, 1)
============================================================
--- packages/opie-taskbar/opie-taskbar-images_1.2.3.bb bc274c765ec5981754215fbdaa6f4bb4ace500e8
+++ packages/opie-taskbar/opie-taskbar-images_1.2.3.bb d8972ce32ccf3ccd77f9e7cf60410b292cb04f45
@@ -1,5 +1,5 @@ require ${PN}.inc
require ${PN}.inc
-PR = "r0"
+PR = "r1"
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
============================================================
--- packages/opie-taskbar/opie-taskbar-images_cvs.bb 1bba5e8ec05293d5c7cc7bb8b1381f603bec4e86
+++ packages/opie-taskbar/opie-taskbar-images_cvs.bb 6e2e43b9defd2572266fc75bac6aad2cb5a06999
@@ -1,5 +1,5 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r5"
+PR = "r6"
SRC_URI = "${HANDHELDS_CVS};module=opie/pics"
More information about the Openembedded-commits
mailing list