From f5cf7ef0716d327d38a1ce5971003b70342b2ec5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 20 May 2009 11:17:49 +0100 Subject: alsa: Upgrade to 1.0.20 Signed-off-by: Richard Purdie --- meta/packages/alsa/alsa-lib_1.0.15.bb | 44 ----------------------- meta/packages/alsa/alsa-lib_1.0.20.bb | 44 +++++++++++++++++++++++ meta/packages/alsa/alsa-oss_1.0.15.bb | 17 --------- meta/packages/alsa/alsa-oss_1.0.17.bb | 17 +++++++++ meta/packages/alsa/alsa-tools_1.0.10.bb | 10 ------ meta/packages/alsa/alsa-tools_1.0.20.bb | 10 ++++++ meta/packages/alsa/alsa-utils_1.0.15.bb | 61 -------------------------------- meta/packages/alsa/alsa-utils_1.0.20.bb | 62 +++++++++++++++++++++++++++++++++ 8 files changed, 133 insertions(+), 132 deletions(-) delete mode 100644 meta/packages/alsa/alsa-lib_1.0.15.bb create mode 100644 meta/packages/alsa/alsa-lib_1.0.20.bb delete mode 100644 meta/packages/alsa/alsa-oss_1.0.15.bb create mode 100644 meta/packages/alsa/alsa-oss_1.0.17.bb delete mode 100644 meta/packages/alsa/alsa-tools_1.0.10.bb create mode 100644 meta/packages/alsa/alsa-tools_1.0.20.bb delete mode 100644 meta/packages/alsa/alsa-utils_1.0.15.bb create mode 100644 meta/packages/alsa/alsa-utils_1.0.20.bb (limited to 'meta') diff --git a/meta/packages/alsa/alsa-lib_1.0.15.bb b/meta/packages/alsa/alsa-lib_1.0.15.bb deleted file mode 100644 index 60b44dbc8..000000000 --- a/meta/packages/alsa/alsa-lib_1.0.15.bb +++ /dev/null @@ -1,44 +0,0 @@ -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 - -require alsa-fpu.inc -EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} " - -EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python" - -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-lib_1.0.20.bb b/meta/packages/alsa/alsa-lib_1.0.20.bb new file mode 100644 index 000000000..d4bf79eb5 --- /dev/null +++ b/meta/packages/alsa/alsa-lib_1.0.20.bb @@ -0,0 +1,44 @@ +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 + +require alsa-fpu.inc +EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} " + +EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python" + +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.15.bb b/meta/packages/alsa/alsa-oss_1.0.15.bb deleted file mode 100644 index b11947e86..000000000 --- a/meta/packages/alsa/alsa-oss_1.0.15.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.17.bb b/meta/packages/alsa/alsa-oss_1.0.17.bb new file mode 100644 index 000000000..b11947e86 --- /dev/null +++ b/meta/packages/alsa/alsa-oss_1.0.17.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-tools_1.0.10.bb b/meta/packages/alsa/alsa-tools_1.0.10.bb deleted file mode 100644 index eed86e5db..000000000 --- a/meta/packages/alsa/alsa-tools_1.0.10.bb +++ /dev/null @@ -1,10 +0,0 @@ -BROKEN = "1" - -DESCRIPTION = "Alsa Tools" -SECTION = "console/utils" -LICENSE = "GPL" -DEPENDS = "alsa-lib" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2" - -inherit autotools diff --git a/meta/packages/alsa/alsa-tools_1.0.20.bb b/meta/packages/alsa/alsa-tools_1.0.20.bb new file mode 100644 index 000000000..eed86e5db --- /dev/null +++ b/meta/packages/alsa/alsa-tools_1.0.20.bb @@ -0,0 +1,10 @@ +BROKEN = "1" + +DESCRIPTION = "Alsa Tools" +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "alsa-lib" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2" + +inherit autotools diff --git a/meta/packages/alsa/alsa-utils_1.0.15.bb b/meta/packages/alsa/alsa-utils_1.0.15.bb deleted file mode 100644 index 240b995e7..000000000 --- a/meta/packages/alsa/alsa-utils_1.0.15.bb +++ /dev/null @@ -1,61 +0,0 @@ -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" diff --git a/meta/packages/alsa/alsa-utils_1.0.20.bb b/meta/packages/alsa/alsa-utils_1.0.20.bb new file mode 100644 index 000000000..d6cade20f --- /dev/null +++ b/meta/packages/alsa/alsa-utils_1.0.20.bb @@ -0,0 +1,62 @@ +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 = "--disable-xmlto" +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 v1.2.3