summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-06-05 14:16:46 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-06-05 14:16:46 +0000
commite648ea1aac7ed792a2173acc92c2f96ab583a5a5 (patch)
tree73244bea8f7311c6f3b1f9163cc49c2a307bc5a0
parentc4607eff087b5833e7e0f7b3b78df0ba34b551fa (diff)
downloadpoky-e648ea1aac7ed792a2173acc92c2f96ab583a5a5.tar.gz
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
-rw-r--r--meta/packages/alsa/alsa-lib/fix-tstamp-declaration.patch13
-rw-r--r--meta/packages/alsa/alsa-lib_1.0.14.bb (renamed from meta/packages/alsa/alsa-lib_1.0.10.bb)22
-rw-r--r--meta/packages/alsa/alsa-oss_1.0.14.bb (renamed from meta/packages/alsa/alsa-oss_1.0.10.bb)0
-rw-r--r--meta/packages/alsa/alsa-utils_1.0.14.bb (renamed from meta/packages/alsa/alsa-utils_1.0.10.bb)45
4 files changed, 51 insertions, 29 deletions
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 @@
1Index: alsa-lib-1.0.13/include/global.h
2===================================================================
3--- alsa-lib-1.0.13.orig/include/global.h
4+++ alsa-lib-1.0.13/include/global.h
5@@ -29,6 +29,8 @@
6 #define __ALSA_GLOBAL_H_
7
8 /* for timeval and timespec */
9+#define __need_timeval
10+#define __need_timespec
11 #include <time.h>
12
13 #ifdef __cplusplus
diff --git a/meta/packages/alsa/alsa-lib_1.0.10.bb b/meta/packages/alsa/alsa-lib_1.0.14.bb
index 081a08ebb1..4d77e7a654 100644
--- a/meta/packages/alsa/alsa-lib_1.0.10.bb
+++ b/meta/packages/alsa/alsa-lib_1.0.14.bb
@@ -1,4 +1,5 @@
1DESCRIPTION = "Alsa sound library" 1DESCRIPTION = "Alsa sound library"
2HOMEPAGE = "http://www.alsa-project.org"
2SECTION = "libs/multimedia" 3SECTION = "libs/multimedia"
3LICENSE = "GPL" 4LICENSE = "GPL"
4 5
@@ -8,7 +9,8 @@ LICENSE = "GPL"
8#FIXME: remove the following 9#FIXME: remove the following
9ARM_INSTRUCTION_SET = "arm" 10ARM_INSTRUCTION_SET = "arm"
10 11
11SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2" 12SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
13 file://fix-tstamp-declaration.patch;patch=1"
12 14
13inherit autotools pkgconfig 15inherit autotools pkgconfig
14 16
@@ -23,11 +25,17 @@ do_stage () {
23 install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/ 25 install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/
24} 26}
25 27
26PACKAGES = "alsa-dbg libasound alsa-server alsa-conf alsa-doc alsa-dev" 28PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev"
27FILES_alsa-dbg = "${FILES_${PN}-dbg}" 29FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
28FILES_libasound = "${libdir}/*.so.* ${libdir}/alsa-lib/smixer/*.so" 30FILES_libasound = "${libdir}/libasound.so.*"
29FILES_alsa-server = "${bindir}/*" 31FILES_alsa-server = "${bindir}/*"
30FILES_alsa-conf = "${datadir}" 32FILES_alsa-conf = "${datadir}/alsa/"
31FILES_alsa-dev = "${libdir}/*.so ${libdir}/pkgconfig/ ${includedir}/" 33FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"
34FILES_alsa-conf-base = "\
35${datadir}/alsa/alsa.conf \
36${datadir}/alsa/cards/aliases.conf \
37${datadir}/alsa/pcm/default.conf \
38${datadir}/alsa/pcm/dmix.conf \
39${datadir}/alsa/pcm/dsnoop.conf"
32 40
33RDEPENDS_libasound = "alsa-conf" 41RDEPENDS_libasound = "alsa-conf-base"
diff --git a/meta/packages/alsa/alsa-oss_1.0.10.bb b/meta/packages/alsa/alsa-oss_1.0.14.bb
index b11947e86a..b11947e86a 100644
--- a/meta/packages/alsa/alsa-oss_1.0.10.bb
+++ b/meta/packages/alsa/alsa-oss_1.0.14.bb
diff --git a/meta/packages/alsa/alsa-utils_1.0.10.bb b/meta/packages/alsa/alsa-utils_1.0.14.bb
index ad931aee3d..240b995e7b 100644
--- a/meta/packages/alsa/alsa-utils_1.0.10.bb
+++ b/meta/packages/alsa/alsa-utils_1.0.14.bb
@@ -1,35 +1,39 @@
1DESCRIPTION = "ALSA Utilities" 1DESCRIPTION = "ALSA Utilities"
2HOMEPAGE = "http://www.alsa-project.org"
2SECTION = "console/utils" 3SECTION = "console/utils"
3LICENSE = "GPL" 4LICENSE = "GPL"
4DEPENDS = "alsa-lib ncurses" 5DEPENDS = "alsa-lib ncurses"
5PR = "r1"
6 6
7SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ 7SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2"
8 file://intl_linking_fix.patch;patch=1" 8
9# lazy hack. needs proper fixing in gettext.m4, see
10# http://bugs.openembedded.org/show_bug.cgi?id=2348
11# please close bug and remove this comment when properly fixed
12#
13EXTRA_OECONF_linux-uclibc = "--disable-nls"
14EXTRA_OECONF_linux-uclibcgnueabi = "--disable-nls"
9 15
10inherit autotools 16inherit autotools
11 17
12# This are all packages that we need to make. Also, the now empty alsa-utils 18# This are all packages that we need to make. Also, the now empty alsa-utils
13# ipk depend on them. 19# ipk depend on them.
14 20
15PACKAGES += "alsa-utils-alsamixer" 21PACKAGES += "\
16PACKAGES += "alsa-utils-midi" 22 alsa-utils-alsamixer \
17PACKAGES += "alsa-utils-aplay" 23 alsa-utils-midi \
18PACKAGES += "alsa-utils-amixer" 24 alsa-utils-aplay \
19PACKAGES += "alsa-utils-aconnect" 25 alsa-utils-amixer \
20PACKAGES += "alsa-utils-iecset" 26 alsa-utils-aconnect \
21PACKAGES += "alsa-utils-speakertest" 27 alsa-utils-iecset \
22PACKAGES += "alsa-utils-aseqnet" 28 alsa-utils-speakertest \
23PACKAGES += "alsa-utils-alsactl" 29 alsa-utils-aseqnet \
24PACKAGES += "alsa-utils-aseqdump" 30 alsa-utils-aseqdump \
25PACKAGES += "alsa-utils-alsaconf" 31 alsa-utils-alsaconf \
26 32 alsa-utils-alsactl "
27 33
28# We omit alsaconf, because 34# We omit alsaconf, because
29# a) this is a bash script 35# a) this is a bash script
30# b) it creates config files for RedHat, Debian, Mandrake etc, but not 36# b) it creates config files not suitable for OE-based distros
31# for Familiar, OpenZaurus etc
32
33 37
34FILES_${PN} = "" 38FILES_${PN} = ""
35FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord" 39FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord"
@@ -47,14 +51,11 @@ FILES_alsa-utils-alsaconf = "${sbindir}/alsaconf"
47DESCRIPTION_alsa-utils-aplay = "play (and record) sound files via ALSA" 51DESCRIPTION_alsa-utils-aplay = "play (and record) sound files via ALSA"
48DESCRIPTION_alsa-utils-amixer = "command-line based control for ALSA mixer and settings" 52DESCRIPTION_alsa-utils-amixer = "command-line based control for ALSA mixer and settings"
49DESCRIPTION_alsa-utils-alsamixer = "ncurses based control for ALSA mixer and settings" 53DESCRIPTION_alsa-utils-alsamixer = "ncurses based control for ALSA mixer and settings"
50DESCRIPTION_alsa-utils-speaker-test = "ALSA surround speaker test utility" 54DESCRIPTION_alsa-utils-speakertest = "ALSA surround speaker test utility"
51DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA" 55DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA"
52DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager" 56DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager"
53DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer" 57DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer"
54DESCRIPTION_alsa-utils-alsactl = "saves/restores ALSA-settings in /etc/asound.state" 58DESCRIPTION_alsa-utils-alsactl = "saves/restores ALSA-settings in /etc/asound.state"
55DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configuration files" 59DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configuration files"
56 60
57RDEPENDS_alsa-utils-aplay += "alsa-conf"
58RDEPENDS_alsa-utils-amixer += "alsa-conf"
59
60ALLOW_EMPTY_alsa-utils = "1" 61ALLOW_EMPTY_alsa-utils = "1"