From e648ea1aac7ed792a2173acc92c2f96ab583a5a5 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 5 Jun 2007 14:16:46 +0000 Subject: alsa: update to 1.0.14 - some parts are from 1.0.13 OpenEmbedded recipes - removed dependency on alsa-conf as libasound package already depends on alsa-conf-base - fixed alsa-utils-speakertest DESCRIPTION git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1860 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../alsa/alsa-lib/fix-tstamp-declaration.patch | 13 +++++ meta/packages/alsa/alsa-lib_1.0.10.bb | 33 ------------ meta/packages/alsa/alsa-lib_1.0.14.bb | 41 +++++++++++++++ meta/packages/alsa/alsa-oss_1.0.10.bb | 17 ------ meta/packages/alsa/alsa-oss_1.0.14.bb | 17 ++++++ meta/packages/alsa/alsa-utils_1.0.10.bb | 60 --------------------- meta/packages/alsa/alsa-utils_1.0.14.bb | 61 ++++++++++++++++++++++ 7 files changed, 132 insertions(+), 110 deletions(-) create mode 100644 meta/packages/alsa/alsa-lib/fix-tstamp-declaration.patch delete mode 100644 meta/packages/alsa/alsa-lib_1.0.10.bb create mode 100644 meta/packages/alsa/alsa-lib_1.0.14.bb delete mode 100644 meta/packages/alsa/alsa-oss_1.0.10.bb create mode 100644 meta/packages/alsa/alsa-oss_1.0.14.bb delete mode 100644 meta/packages/alsa/alsa-utils_1.0.10.bb create mode 100644 meta/packages/alsa/alsa-utils_1.0.14.bb (limited to 'meta/packages') diff --git a/meta/packages/alsa/alsa-lib/fix-tstamp-declaration.patch b/meta/packages/alsa/alsa-lib/fix-tstamp-declaration.patch new file mode 100644 index 0000000000..59b3b6d150 --- /dev/null +++ b/meta/packages/alsa/alsa-lib/fix-tstamp-declaration.patch @@ -0,0 +1,13 @@ +Index: alsa-lib-1.0.13/include/global.h +=================================================================== +--- alsa-lib-1.0.13.orig/include/global.h ++++ alsa-lib-1.0.13/include/global.h +@@ -29,6 +29,8 @@ + #define __ALSA_GLOBAL_H_ + + /* for timeval and timespec */ ++#define __need_timeval ++#define __need_timespec + #include + + #ifdef __cplusplus diff --git a/meta/packages/alsa/alsa-lib_1.0.10.bb b/meta/packages/alsa/alsa-lib_1.0.10.bb deleted file mode 100644 index 081a08ebb1..0000000000 --- a/meta/packages/alsa/alsa-lib_1.0.10.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "Alsa sound library" -SECTION = "libs/multimedia" -LICENSE = "GPL" - -# configure.in sets -D__arm__ on the command line for any arm system -# (not just those with the ARM instruction set), this should be removed, -# (or replaced by a permitted #define). -#FIXME: remove the following -ARM_INSTRUCTION_SET = "arm" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes" - -do_stage () { - oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/alsa/sound - install -m 0644 include/*.h ${STAGING_INCDIR}/alsa/ - install -m 0644 include/sound/ainstr*.h ${STAGING_INCDIR}/alsa/sound/ - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/ -} - -PACKAGES = "alsa-dbg libasound alsa-server alsa-conf alsa-doc alsa-dev" -FILES_alsa-dbg = "${FILES_${PN}-dbg}" -FILES_libasound = "${libdir}/*.so.* ${libdir}/alsa-lib/smixer/*.so" -FILES_alsa-server = "${bindir}/*" -FILES_alsa-conf = "${datadir}" -FILES_alsa-dev = "${libdir}/*.so ${libdir}/pkgconfig/ ${includedir}/" - -RDEPENDS_libasound = "alsa-conf" diff --git a/meta/packages/alsa/alsa-lib_1.0.14.bb b/meta/packages/alsa/alsa-lib_1.0.14.bb new file mode 100644 index 0000000000..4d77e7a654 --- /dev/null +++ b/meta/packages/alsa/alsa-lib_1.0.14.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "Alsa sound library" +HOMEPAGE = "http://www.alsa-project.org" +SECTION = "libs/multimedia" +LICENSE = "GPL" + +# configure.in sets -D__arm__ on the command line for any arm system +# (not just those with the ARM instruction set), this should be removed, +# (or replaced by a permitted #define). +#FIXME: remove the following +ARM_INSTRUCTION_SET = "arm" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ + file://fix-tstamp-declaration.patch;patch=1" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes" + +do_stage () { + oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/ + install -d ${STAGING_INCDIR}/alsa/sound + install -m 0644 include/*.h ${STAGING_INCDIR}/alsa/ + install -m 0644 include/sound/ainstr*.h ${STAGING_INCDIR}/alsa/sound/ + install -d ${STAGING_DATADIR}/aclocal + install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/ +} + +PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev" +FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*" +FILES_libasound = "${libdir}/libasound.so.*" +FILES_alsa-server = "${bindir}/*" +FILES_alsa-conf = "${datadir}/alsa/" +FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*" +FILES_alsa-conf-base = "\ +${datadir}/alsa/alsa.conf \ +${datadir}/alsa/cards/aliases.conf \ +${datadir}/alsa/pcm/default.conf \ +${datadir}/alsa/pcm/dmix.conf \ +${datadir}/alsa/pcm/dsnoop.conf" + +RDEPENDS_libasound = "alsa-conf-base" diff --git a/meta/packages/alsa/alsa-oss_1.0.10.bb b/meta/packages/alsa/alsa-oss_1.0.10.bb deleted file mode 100644 index b11947e86a..0000000000 --- a/meta/packages/alsa/alsa-oss_1.0.10.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Alsa OSS Compatibility Package" -SECTION = "libs/multimedia" -LICENSE = "GPL" -DEPENDS = "alsa-lib" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2" - -inherit autotools - -do_configure_prepend () { - touch NEWS README AUTHORS ChangeLog -} - -do_stage () { - oe_libinstall -C alsa -a -so libaoss ${STAGING_LIBDIR} - oe_libinstall -C alsa -a -so libalsatoss ${STAGING_LIBDIR} -} diff --git a/meta/packages/alsa/alsa-oss_1.0.14.bb b/meta/packages/alsa/alsa-oss_1.0.14.bb new file mode 100644 index 0000000000..b11947e86a --- /dev/null +++ b/meta/packages/alsa/alsa-oss_1.0.14.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Alsa OSS Compatibility Package" +SECTION = "libs/multimedia" +LICENSE = "GPL" +DEPENDS = "alsa-lib" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2" + +inherit autotools + +do_configure_prepend () { + touch NEWS README AUTHORS ChangeLog +} + +do_stage () { + oe_libinstall -C alsa -a -so libaoss ${STAGING_LIBDIR} + oe_libinstall -C alsa -a -so libalsatoss ${STAGING_LIBDIR} +} diff --git a/meta/packages/alsa/alsa-utils_1.0.10.bb b/meta/packages/alsa/alsa-utils_1.0.10.bb deleted file mode 100644 index ad931aee3d..0000000000 --- a/meta/packages/alsa/alsa-utils_1.0.10.bb +++ /dev/null @@ -1,60 +0,0 @@ -DESCRIPTION = "ALSA Utilities" -SECTION = "console/utils" -LICENSE = "GPL" -DEPENDS = "alsa-lib ncurses" -PR = "r1" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ - file://intl_linking_fix.patch;patch=1" - -inherit autotools - -# This are all packages that we need to make. Also, the now empty alsa-utils -# ipk depend on them. - -PACKAGES += "alsa-utils-alsamixer" -PACKAGES += "alsa-utils-midi" -PACKAGES += "alsa-utils-aplay" -PACKAGES += "alsa-utils-amixer" -PACKAGES += "alsa-utils-aconnect" -PACKAGES += "alsa-utils-iecset" -PACKAGES += "alsa-utils-speakertest" -PACKAGES += "alsa-utils-aseqnet" -PACKAGES += "alsa-utils-alsactl" -PACKAGES += "alsa-utils-aseqdump" -PACKAGES += "alsa-utils-alsaconf" - - -# We omit alsaconf, because -# a) this is a bash script -# b) it creates config files for RedHat, Debian, Mandrake etc, but not -# for Familiar, OpenZaurus etc - - -FILES_${PN} = "" -FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord" -FILES_alsa-utils-amixer = "${bindir}/amixer" -FILES_alsa-utils-alsamixer = "${bindir}/alsamixer" -FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/" -FILES_alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi" -FILES_alsa-utils-aconnect = "${bindir}/aconnect" -FILES_alsa-utils-aseqnet = "${bindir}/aseqnet" -FILES_alsa-utils-iecset = "${bindir}/iecset" -FILES_alsa-utils-alsactl = "${sbindir}/alsactl" -FILES_alsa-utils-aseqdump = "${bindir}/aseqdump" -FILES_alsa-utils-alsaconf = "${sbindir}/alsaconf" - -DESCRIPTION_alsa-utils-aplay = "play (and record) sound files via ALSA" -DESCRIPTION_alsa-utils-amixer = "command-line based control for ALSA mixer and settings" -DESCRIPTION_alsa-utils-alsamixer = "ncurses based control for ALSA mixer and settings" -DESCRIPTION_alsa-utils-speaker-test = "ALSA surround speaker test utility" -DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA" -DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager" -DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer" -DESCRIPTION_alsa-utils-alsactl = "saves/restores ALSA-settings in /etc/asound.state" -DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configuration files" - -RDEPENDS_alsa-utils-aplay += "alsa-conf" -RDEPENDS_alsa-utils-amixer += "alsa-conf" - -ALLOW_EMPTY_alsa-utils = "1" diff --git a/meta/packages/alsa/alsa-utils_1.0.14.bb b/meta/packages/alsa/alsa-utils_1.0.14.bb new file mode 100644 index 0000000000..240b995e7b --- /dev/null +++ b/meta/packages/alsa/alsa-utils_1.0.14.bb @@ -0,0 +1,61 @@ +DESCRIPTION = "ALSA Utilities" +HOMEPAGE = "http://www.alsa-project.org" +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "alsa-lib ncurses" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2" + +# lazy hack. needs proper fixing in gettext.m4, see +# http://bugs.openembedded.org/show_bug.cgi?id=2348 +# please close bug and remove this comment when properly fixed +# +EXTRA_OECONF_linux-uclibc = "--disable-nls" +EXTRA_OECONF_linux-uclibcgnueabi = "--disable-nls" + +inherit autotools + +# This are all packages that we need to make. Also, the now empty alsa-utils +# ipk depend on them. + +PACKAGES += "\ + alsa-utils-alsamixer \ + alsa-utils-midi \ + alsa-utils-aplay \ + alsa-utils-amixer \ + alsa-utils-aconnect \ + alsa-utils-iecset \ + alsa-utils-speakertest \ + alsa-utils-aseqnet \ + alsa-utils-aseqdump \ + alsa-utils-alsaconf \ + alsa-utils-alsactl " + +# We omit alsaconf, because +# a) this is a bash script +# b) it creates config files not suitable for OE-based distros + +FILES_${PN} = "" +FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord" +FILES_alsa-utils-amixer = "${bindir}/amixer" +FILES_alsa-utils-alsamixer = "${bindir}/alsamixer" +FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/" +FILES_alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi" +FILES_alsa-utils-aconnect = "${bindir}/aconnect" +FILES_alsa-utils-aseqnet = "${bindir}/aseqnet" +FILES_alsa-utils-iecset = "${bindir}/iecset" +FILES_alsa-utils-alsactl = "${sbindir}/alsactl" +FILES_alsa-utils-aseqdump = "${bindir}/aseqdump" +FILES_alsa-utils-alsaconf = "${sbindir}/alsaconf" + +DESCRIPTION_alsa-utils-aplay = "play (and record) sound files via ALSA" +DESCRIPTION_alsa-utils-amixer = "command-line based control for ALSA mixer and settings" +DESCRIPTION_alsa-utils-alsamixer = "ncurses based control for ALSA mixer and settings" +DESCRIPTION_alsa-utils-speakertest = "ALSA surround speaker test utility" +DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA" +DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager" +DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer" +DESCRIPTION_alsa-utils-alsactl = "saves/restores ALSA-settings in /etc/asound.state" +DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configuration files" + +ALLOW_EMPTY_alsa-utils = "1" -- cgit 1.2.3-korg