[oe-commits] org.oe.dev merge of 'a5786ab89a3fad9f406eb5b5c5d8a3dde24be1ba'
mickeyl commit
oe at amethyst.openembedded.net
Mon Sep 1 18:07:13 UTC 2008
merge of 'a5786ab89a3fad9f406eb5b5c5d8a3dde24be1ba'
and 'c5f94f2e7a0afd67fafc1a2f867ddf8f10dbc2e9'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 9547cbabc0669e7d4b328f369806d6e2cecd1aba
ViewMTN: http://monotone.openembedded.org/revision/info/9547cbabc0669e7d4b328f369806d6e2cecd1aba
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
classes/kernel.bbclass
Diffs:
#
# mt diff -ra5786ab89a3fad9f406eb5b5c5d8a3dde24be1ba -r9547cbabc0669e7d4b328f369806d6e2cecd1aba
#
#
#
# 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 "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"
============================================================
--- 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 -rc5f94f2e7a0afd67fafc1a2f867ddf8f10dbc2e9 -r9547cbabc0669e7d4b328f369806d6e2cecd1aba
#
#
#
# patch "classes/kernel.bbclass"
# from [fd4d710e7db2886e29dc83097649bf1ad8661939]
# to [772e3ddb49b5122286d15dfc10a357056263d0e7]
#
============================================================
--- classes/kernel.bbclass fd4d710e7db2886e29dc83097649bf1ad8661939
+++ classes/kernel.bbclass 772e3ddb49b5122286d15dfc10a357056263d0e7
@@ -233,6 +233,9 @@ RDEPENDS_kernel-module-dtl1-cs = "bluez-
DEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround"
RDEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround"
+# renamed modules
+RPROVIDES_kernel-module-aes-generic = "kernel-module-aes"
+
pkg_postinst_kernel-image () {
if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
mkdir -p $D/lib/modules/${KERNEL_VERSION}
More information about the Openembedded-commits
mailing list