mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-18 21:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

alsa: update to 1.0.14

Browse Source 
- 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
This commit is contained in:
Marcin Juszkiewicz
2007-06-05 14:16:46 +00:00
parent c4607eff08
commit e648ea1aac
4 changed files with 51 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
meta/packages/alsa/alsa-lib/fix-tstamp-declaration.patch Normal file
View File

@@ -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 <time.h>
#ifdef __cplusplus

22
meta/packages/alsa/alsa-lib_1.0.10.bb → meta/packages/alsa/alsa-lib_1.0.14.bb
View File

@@ -1,4 +1,5 @@
DESCRIPTION = "Alsa sound library"
HOMEPAGE = "http://www.alsa-project.org"
SECTION = "libs/multimedia"
LICENSE = "GPL"
@@ -8,7 +9,8 @@ LICENSE = "GPL"
#FIXME: remove the following
ARM_INSTRUCTION_SET = "arm"
SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2"
SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
file://fix-tstamp-declaration.patch;patch=1"
inherit autotools pkgconfig
@@ -23,11 +25,17 @@ do_stage () {
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"
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}"
FILES_alsa-dev = "${libdir}/*.so ${libdir}/pkgconfig/ ${includedir}/"
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"
RDEPENDS_libasound = "alsa-conf-base"

0
meta/packages/alsa/alsa-oss_1.0.10.bb → meta/packages/alsa/alsa-oss_1.0.14.bb
View File

45
meta/packages/alsa/alsa-utils_1.0.10.bb → meta/packages/alsa/alsa-utils_1.0.14.bb
View File

@@ -1,35 +1,39 @@
DESCRIPTION = "ALSA Utilities"
HOMEPAGE = "http://www.alsa-project.org"
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"
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"
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"
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 for RedHat, Debian, Mandrake etc, but not
# for Familiar, OpenZaurus etc
# b) it creates config files not suitable for OE-based distros
FILES_${PN} = ""
FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord"
@@ -47,14 +51,11 @@ 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-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"
RDEPENDS_alsa-utils-aplay += "alsa-conf"
RDEPENDS_alsa-utils-amixer += "alsa-conf"
ALLOW_EMPTY_alsa-utils = "1"