[oe-commits] org.oe.dev merge of '298d9a7548cea11e8e749665e126f35d1b357fa8'
utx commit
oe at amethyst.openembedded.net
Mon Sep 1 18:07:25 UTC 2008
merge of '298d9a7548cea11e8e749665e126f35d1b357fa8'
and '359cd693e28055b9860cd6a08d96acbd63c8461a'
Author: utx at openembedded.org
Branch: org.openembedded.dev
Revision: 5f06a3de7147315e15e46876e65d2a0d406334aa
ViewMTN: http://monotone.openembedded.org/revision/info/5f06a3de7147315e15e46876e65d2a0d406334aa
Files:
1
packages/portaudio/portaudio-v19_20071207.bb
packages/portaudio/portaudio_0.0.19.bb
packages/portaudio/portaudio-v19_svn.bb
conf/distro/include/sane-srcrevs.inc
conf/machine/om-gta01.conf
conf/machine/om-gta02.conf
packages/gpsbabel/gpsbabel_1.3.3.bb
packages/gpsbabel/gpsbabel_1.3.5.bb
packages/linux/linux-rp-2.6.26/defconfig-akita
packages/linux/linux-rp-2.6.26/defconfig-bootcdx86
packages/linux/linux-rp-2.6.26/defconfig-c7x0
packages/linux/linux-rp-2.6.26/defconfig-hx2000
packages/linux/linux-rp-2.6.26/defconfig-poodle
packages/linux/linux-rp-2.6.26/defconfig-qemuarm
packages/linux/linux-rp-2.6.26/defconfig-qemux86
packages/linux/linux-rp-2.6.26/defconfig-spitz
packages/linux/linux-rp-2.6.26/defconfig-zylonite
Diffs:
#
# mt diff -r298d9a7548cea11e8e749665e126f35d1b357fa8 -r5f06a3de7147315e15e46876e65d2a0d406334aa
#
#
#
# delete "packages/portaudio/portaudio-v19_20071207.bb"
#
# rename "packages/portaudio/portaudio_0.0.19.bb"
# to "packages/portaudio/portaudio-v19_svn.bb"
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [8263ed045331336ef156ad477a680016513099eb]
# to [e4429231d4f16a36eda8a63ea02bdb4ec703e0ff]
#
# patch "conf/machine/om-gta01.conf"
# from [a9074ead3cca6d3eb6fdc837d712eecfb35d4e91]
# to [11955cc67c94d27c50a49e55a06ef8c96af9ad6e]
#
# patch "conf/machine/om-gta02.conf"
# from [1320182b35aa623d42f9cb99022c0533b54d5996]
# to [857a1ed4810a63a7d75a7c68d2523b971f9a6c8a]
#
# patch "packages/portaudio/portaudio-v19_svn.bb"
# from [6e0e4519a0c491b4df8965004e222f426ae15d72]
# to [2412bb2e306a60afa27283238b90b401ca15749c]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc 8263ed045331336ef156ad477a680016513099eb
+++ conf/distro/include/sane-srcrevs.inc e4429231d4f16a36eda8a63ea02bdb4ec703e0ff
@@ -71,7 +71,7 @@ SRCREV_pn-linux-ixp4xx ?= "1066"
SRCREV_pn-linux-bfin ?= "3758"
SRCREV_pn-linux-hackndev-2.6 ?= "1308"
SRCREV_pn-linux-ixp4xx ?= "1066"
-SRCREV_pn-linux-openmoko ?= "241f69c55ee8f5dd067ebd2d51aa9fdedb212759"
+SRCREV_pn-linux-openmoko ?= "88bf43840b9df0eb0a077a1394eb564be80a412e"
SRCREV_pn-linux-openmoko-devel ?= "7a1370a816b9348dd8f36a667905dd3533cefc9b"
SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
@@ -146,13 +146,10 @@ SRCREV_pn-packagekit ?= "813fa8cfb139246
SRCREV_pn-opkg-utils-native ?= "4534"
SRCREV_pn-oprofileui ?= "173"
SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5"
+SRCREV_pn-portaudio-v19 ?= "1387"
SRCREV_pn-psplash ?= "249"
SRCREV_pn-pty-forward-native ?= "4214"
SRCREV_pn-python-etk ?= "8b51535150cbc88467e3d8b578e54df27eac643"
-SRCREV_pn-python-odeviced ?= "fcf6f975b18d478ce618284c0dcc2f28f5c43cc1"
-SRCREV_pn-python-oeventd ?= "9053e5be847d694681c3664664ed669543a0a777"
-SRCREV_pn-python-ophoned ?= "82c318b8592588bc7ce8bccdfc090e59cfc9b98c"
-SRCREV_pn-python-ousaged ?= "836c091405eea3e29efdba3e1351befd1c96267b"
SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
SRCREV_pn-pylgrim ?= "20"
SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
============================================================
--- conf/machine/om-gta01.conf a9074ead3cca6d3eb6fdc837d712eecfb35d4e91
+++ conf/machine/om-gta01.conf 11955cc67c94d27c50a49e55a06ef8c96af9ad6e
@@ -1,7 +1,7 @@
#-----------------------------------------------------------------------------
#@TYPE: Machine
-#@NAME: FIC GTA01 (Neo1973)
-#@DESCRIPTION: Machine configuration for the FIC Neo1973/1 GSM phone
+#@NAME: FIC GTA01 (Neo 1973)
+#@DESCRIPTION: Machine configuration for the FIC Neo 1973 GSM phone
#-----------------------------------------------------------------------------
TARGET_ARCH = "arm"
============================================================
--- conf/machine/om-gta02.conf 1320182b35aa623d42f9cb99022c0533b54d5996
+++ conf/machine/om-gta02.conf 857a1ed4810a63a7d75a7c68d2523b971f9a6c8a
@@ -1,7 +1,7 @@
#-----------------------------------------------------------------------------
#@TYPE: Machine
-#@NAME: FIC GTA02 (Neo1973)
-#@DESCRIPTION: Machine configuration for the FIC Neo1973/2 GSM phone
+#@NAME: Openmoko GTA02 (NeoFreerunner)
+#@DESCRIPTION: Machine configuration for the Openmoko NeoFreerunner GSM phone
#-----------------------------------------------------------------------------
TARGET_ARCH = "arm"
@@ -29,6 +29,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-snd-soc-neo1973-gta02-wm8753 \
"
+# no need to bypass this as in om-gta01, since this model is not using a multiplexed ttySAC0
SERIAL_CONSOLE = "115200 ttySAC2"
# used by some images
============================================================
--- packages/portaudio/portaudio_0.0.19.bb 6e0e4519a0c491b4df8965004e222f426ae15d72
+++ packages/portaudio/portaudio-v19_svn.bb 2412bb2e306a60afa27283238b90b401ca15749c
@@ -1,14 +1,14 @@ DESCRIPTION = "A portable audio library"
DESCRIPTION = "A portable audio library"
-SECTION = "libs"
+SECTION = "libs/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
-PV = "1:0.0.19+cvs${SRCDATE}"
-PR = "r1"
+PV = "v19+svnr${SRCREV}"
+PR = "r0"
-SRC_URI = "http://www.portaudio.com/archives/pa_snapshot_v19.tar.gz"
-S = "${WORKDIR}/portaudio"
+SRC_URI = "svn://www.portaudio.com/repos/portaudio;module=trunk;proto=https"
+S = "${WORKDIR}/trunk"
-inherit qmake
+inherit autotools
TESTS = " pa_devs patest1 patest_hang patest_many patest_prime patest_sine patest_stop patest_write_sine \
pa_fuzz patest_buffer patest_in_overflow patest_maxsines patest_read_record patest_sine8 patest_sync \
@@ -16,72 +16,14 @@ paqa_errs patest_dither patest_l
paqa_devs patest_clip patest_leftright patest_out_underflow patest_ringmix patest_sine_time patest_underflow \
paqa_errs patest_dither patest_longsine patest_pink patest_saw patest_start_stop patest_wire"
-do_configure_prepend() {
- echo "TEMPLATE = subdirs" >portaudio.pro
- echo "SUBDIRS = lib tests" >>portaudio.pro
+# DEFINES = PA_USE_OSS=1 HAVE_LIBPTHREAD=1
+# DEFINES += PA_LITTLE_ENDIAN
- mkdir -p lib
- cat <<EOF >lib/lib.pro
-TEMPLATE = lib
-CONFIG = console debug warn_on
-TARGET = portaudio
-VERSION = 0.0.19
-DESTDIR = .
-DEFINES = PA_USE_OSS=1 HAVE_LIBPTHREAD=1
-DEFINES += PA_LITTLE_ENDIAN
+# INCLUDEPATH = ../pa_common
-INCLUDEPATH = ../pa_common
-
-SOURCES = \
- ../pa_common/pa_allocation.c \
- ../pa_common/pa_converters.c \
- ../pa_common/pa_cpuload.c \
- ../pa_common/pa_dither.c \
- ../pa_common/pa_front.c \
- ../pa_common/pa_process.c \
- ../pa_common/pa_skeleton.c \
- ../pa_common/pa_stream.c \
- ../pa_common/pa_trace.c \
-\
- ../pa_unix_oss/pa_unix_oss.c \
- ../pa_unix/pa_unix_hostapis.c \
- ../pa_unix/pa_unix_util.c
-EOF
-
- mkdir -p tests
- echo "TEMPLATE = subdirs" >tests/tests.pro
- echo "SUBDIRS = \\" >>tests/tests.pro
-
- for test in ${TESTS}
- do
- mkdir -p tests/$test
- cat <<EOF >tests/$test/$test.pro
-TEMPLATE = app
-CONFIG = console debug warn_on thread
-DESTDIR = ../../bin
-INCLUDEPATH = ../../pa_common/
-LIBS = -L../../lib -lportaudio -lm
-SOURCES = ../../pa_tests/$test.c
-EOF
- echo "$test \\" >>tests/tests.pro
- done
- echo >>tests/tests.pro
-}
-
do_stage() {
- oe_libinstall -so -C lib libportaudio ${STAGING_LIBDIR}
- install -m 0644 pa_common/portaudio.h ${STAGING_INCDIR}/portaudio.h
+ autotools_stage_all
}
-do_install() {
- install -d ${D}${libdir}
- install -d ${D}${bindir}
- install -d ${D}${includedir}
- oe_libinstall -so -C lib libportaudio ${D}${libdir}
- install -m 0644 pa_common/portaudio.h ${D}${includedir}
- install -m 0755 bin/* ${D}${bindir}/
-}
-
-PACKAGES = "${PN}-dbg libportaudio0 portaudio-dev portaudio-examples"
-FILES_libportaudio0 = "${libdir}"
+PACKAGES += "portaudio-examples"
FILES_portaudio-examples = "${bindir}"
#
# mt diff -r359cd693e28055b9860cd6a08d96acbd63c8461a -r5f06a3de7147315e15e46876e65d2a0d406334aa
#
#
#
# rename "packages/gpsbabel/gpsbabel_1.3.3.bb"
# to "packages/gpsbabel/gpsbabel_1.3.5.bb"
#
# patch "packages/gpsbabel/gpsbabel_1.3.5.bb"
# from [74c8983bc789932d363fc987244b08d4fab8b521]
# to [3e5a504ca8d2083bad1497af1995f2f25510f74c]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-akita"
# from [064c36530b213dae882be1b6bb2cbab8615906f8]
# to [a0a3429c4b8ccf2f435e890ead2c2c201c5c904f]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-bootcdx86"
# from [83dbfc0474bb18348ca67718d27d2dcc262095a3]
# to [d1900766f3a9e8322678ced49e5a5bb93b2f332a]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-c7x0"
# from [9840eec605b360f4cdcf976973331ce274a89b6f]
# to [5c533bfba4b4fbfde44ddf442337a158ecc8a5fe]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-hx2000"
# from [8d4023e3a924b2d01a60011c6aa81cca7bc83d06]
# to [53a11bd3d87b58b40c49ee4586ab730d462b379c]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-poodle"
# from [823d2a1579f2e5312396ba4c0d40a7405bcebd4f]
# to [4c70a99ea564dc7a44015887b731791964dc9ee5]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-qemuarm"
# from [19a7a240f8a4fd58732db1ccb11767dac8fc7221]
# to [5b90b4f63559daa07eddb8a15d4226670dd5bf25]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-qemux86"
# from [8f2d48208eb79e7a2e00941efcaee2cad2d34737]
# to [d47c9d63424aa0cd8dcf1f956fd8af65f05f56b7]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-spitz"
# from [121ce2ca2da79de4072c338f63ad9e345f2674bb]
# to [3e79a57deaec2eed97be90695ff0b6abdcdc8a63]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-zylonite"
# from [71cf26b625ad773ac5468869fe7052854759f70f]
# to [22182e2386826a6baf8d411b182d4bdaad6a91c0]
#
============================================================
--- packages/gpsbabel/gpsbabel_1.3.3.bb 74c8983bc789932d363fc987244b08d4fab8b521
+++ packages/gpsbabel/gpsbabel_1.3.5.bb 3e5a504ca8d2083bad1497af1995f2f25510f74c
@@ -6,7 +6,7 @@ PR = "r1"
PR = "r1"
-SRC_URI = "${SOURCEFORGE_MIRROR}/gpsbabel/gpsbabel-${PV}.tar.gz"
+SRC_URI = "http://www.gpsbabel.org/plan9.php?dl=gpsbabel-${PV}.tar.gz"
inherit autotools pkgconfig
============================================================
--- packages/linux/linux-rp-2.6.26/defconfig-akita 064c36530b213dae882be1b6bb2cbab8615906f8
+++ packages/linux/linux-rp-2.6.26/defconfig-akita a0a3429c4b8ccf2f435e890ead2c2c201c5c904f
@@ -1255,7 +1255,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
# CONFIG_USB_SERIAL_CH341 is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
============================================================
--- packages/linux/linux-rp-2.6.26/defconfig-bootcdx86 83dbfc0474bb18348ca67718d27d2dcc262095a3
+++ packages/linux/linux-rp-2.6.26/defconfig-bootcdx86 d1900766f3a9e8322678ced49e5a5bb93b2f332a
@@ -1612,7 +1612,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
# CONFIG_USB_SERIAL_CH341 is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
============================================================
--- packages/linux/linux-rp-2.6.26/defconfig-c7x0 9840eec605b360f4cdcf976973331ce274a89b6f
+++ packages/linux/linux-rp-2.6.26/defconfig-c7x0 5c533bfba4b4fbfde44ddf442337a158ecc8a5fe
@@ -1260,7 +1260,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
# CONFIG_USB_SERIAL_CH341 is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
============================================================
--- packages/linux/linux-rp-2.6.26/defconfig-hx2000 8d4023e3a924b2d01a60011c6aa81cca7bc83d06
+++ packages/linux/linux-rp-2.6.26/defconfig-hx2000 53a11bd3d87b58b40c49ee4586ab730d462b379c
@@ -1249,7 +1249,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
# CONFIG_USB_SERIAL_CH341 is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
============================================================
--- packages/linux/linux-rp-2.6.26/defconfig-poodle 823d2a1579f2e5312396ba4c0d40a7405bcebd4f
+++ packages/linux/linux-rp-2.6.26/defconfig-poodle 4c70a99ea564dc7a44015887b731791964dc9ee5
@@ -1270,7 +1270,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
# CONFIG_USB_SERIAL_CH341 is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
============================================================
--- packages/linux/linux-rp-2.6.26/defconfig-qemuarm 19a7a240f8a4fd58732db1ccb11767dac8fc7221
+++ packages/linux/linux-rp-2.6.26/defconfig-qemuarm 5b90b4f63559daa07eddb8a15d4226670dd5bf25
@@ -1155,7 +1155,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
# CONFIG_USB_SERIAL_CH341 is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
============================================================
--- packages/linux/linux-rp-2.6.26/defconfig-qemux86 8f2d48208eb79e7a2e00941efcaee2cad2d34737
+++ packages/linux/linux-rp-2.6.26/defconfig-qemux86 d47c9d63424aa0cd8dcf1f956fd8af65f05f56b7
@@ -1611,7 +1611,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
# CONFIG_USB_SERIAL_CH341 is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
============================================================
--- packages/linux/linux-rp-2.6.26/defconfig-spitz 121ce2ca2da79de4072c338f63ad9e345f2674bb
+++ packages/linux/linux-rp-2.6.26/defconfig-spitz 3e79a57deaec2eed97be90695ff0b6abdcdc8a63
@@ -1318,7 +1318,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
# CONFIG_USB_SERIAL_CH341 is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
============================================================
--- packages/linux/linux-rp-2.6.26/defconfig-zylonite 71cf26b625ad773ac5468869fe7052854759f70f
+++ packages/linux/linux-rp-2.6.26/defconfig-zylonite 22182e2386826a6baf8d411b182d4bdaad6a91c0
@@ -1257,7 +1257,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
# CONFIG_USB_SERIAL_CH341 is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-# CONFIG_USB_SERIAL_CP2101 is not set
+CONFIG_USB_SERIAL_CP2101=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
More information about the Openembedded-commits
mailing list