summaryrefslogtreecommitdiffstats
path: root/meta/packages/alsa
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/alsa')
-rw-r--r--meta/packages/alsa/alsa-fpu.inc6
-rw-r--r--meta/packages/alsa/alsa-lib-1.0.23/fix-tstamp-declaration.patch19
-rw-r--r--meta/packages/alsa/alsa-lib-1.0.23/unbreak_plugindir.patch12
-rw-r--r--meta/packages/alsa/alsa-lib_1.0.23.bb40
-rw-r--r--meta/packages/alsa/alsa-oss_1.0.17.bb12
-rw-r--r--meta/packages/alsa/alsa-tools_1.0.20.bb10
-rw-r--r--meta/packages/alsa/alsa-utils-1.0.23/ncursesfix.patch42
-rw-r--r--meta/packages/alsa/alsa-utils_1.0.23.bb67
8 files changed, 0 insertions, 208 deletions
diff --git a/meta/packages/alsa/alsa-fpu.inc b/meta/packages/alsa/alsa-fpu.inc
deleted file mode 100644
index ebd3493e6c..0000000000
--- a/meta/packages/alsa/alsa-fpu.inc
+++ /dev/null
@@ -1,6 +0,0 @@
1
2def get_alsa_fpu_setting(bb, d):
3 if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
4 return "--with-softfloat"
5 return ""
6
diff --git a/meta/packages/alsa/alsa-lib-1.0.23/fix-tstamp-declaration.patch b/meta/packages/alsa/alsa-lib-1.0.23/fix-tstamp-declaration.patch
deleted file mode 100644
index 9016b348de..0000000000
--- a/meta/packages/alsa/alsa-lib-1.0.23/fix-tstamp-declaration.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1# Author: Michael Lauer <mickey@vanille-media.de>
2# Date: Thu Jan 18 00:27:21 2007 +0000
3# alsa-lib: fix "error: field 'tstamp' has incomplete type" when including alsa headers with strict compilation options
4#
5# Acquired from OpenEmbedded
6
7Index: alsa-lib-1.0.13/include/global.h
8===================================================================
9--- alsa-lib-1.0.13.orig/include/global.h
10+++ alsa-lib-1.0.13/include/global.h
11@@ -29,6 +29,8 @@
12 #define __ALSA_GLOBAL_H_
13
14 /* for timeval and timespec */
15+#define __need_timeval
16+#define __need_timespec
17 #include <time.h>
18
19 #ifdef __cplusplus
diff --git a/meta/packages/alsa/alsa-lib-1.0.23/unbreak_plugindir.patch b/meta/packages/alsa/alsa-lib-1.0.23/unbreak_plugindir.patch
deleted file mode 100644
index 7d13166809..0000000000
--- a/meta/packages/alsa/alsa-lib-1.0.23/unbreak_plugindir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1diff -Nur alsa-lib-1.0.14.orig/configure.in alsa-lib-1.0.14/configure.in
2--- alsa-lib-1.0.14.orig/configure.in 2007-05-31 03:05:13.000000000 -0500
3+++ alsa-lib-1.0.14/configure.in 2007-08-18 13:05:49.000000000 -0500
4@@ -93,7 +93,7 @@
5 esac
6 plugindir="$dir/$PACKAGE"
7 fi
8-AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "plugindir", [directory containing ALSA add-on modules])
9+AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "${plugindir}", [directory containing ALSA add-on modules])
10 ALSA_PLUGIN_DIR="$plugindir"
11 AC_SUBST(ALSA_PLUGIN_DIR)
12
diff --git a/meta/packages/alsa/alsa-lib_1.0.23.bb b/meta/packages/alsa/alsa-lib_1.0.23.bb
deleted file mode 100644
index b0a2a305c0..0000000000
--- a/meta/packages/alsa/alsa-lib_1.0.23.bb
+++ /dev/null
@@ -1,40 +0,0 @@
1DESCRIPTION = "Alsa sound library"
2HOMEPAGE = "http://www.alsa-project.org"
3BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php"
4SECTION = "libs/multimedia"
5LICENSE = "LGPLv2.1 & GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
7 file://src/socket.c;beginline=1;endline=26;md5=11ff89a8a7a4a690a5c78effe8159545"
8
9# configure.in sets -D__arm__ on the command line for any arm system
10# (not just those with the ARM instruction set), this should be removed,
11# (or replaced by a permitted #define).
12#FIXME: remove the following
13ARM_INSTRUCTION_SET = "arm"
14
15PR = "r0"
16
17SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
18 file://fix-tstamp-declaration.patch;patch=1"
19
20inherit autotools pkgconfig
21
22require alsa-fpu.inc
23EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} "
24
25EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python"
26
27PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev"
28FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
29FILES_libasound = "${libdir}/libasound.so.*"
30FILES_alsa-server = "${bindir}/*"
31FILES_alsa-conf = "${datadir}/alsa/"
32FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"
33FILES_alsa-conf-base = "\
34${datadir}/alsa/alsa.conf \
35${datadir}/alsa/cards/aliases.conf \
36${datadir}/alsa/pcm/default.conf \
37${datadir}/alsa/pcm/dmix.conf \
38${datadir}/alsa/pcm/dsnoop.conf"
39
40RDEPENDS_libasound = "alsa-conf-base"
diff --git a/meta/packages/alsa/alsa-oss_1.0.17.bb b/meta/packages/alsa/alsa-oss_1.0.17.bb
deleted file mode 100644
index 00e00dc62b..0000000000
--- a/meta/packages/alsa/alsa-oss_1.0.17.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1DESCRIPTION = "Alsa OSS Compatibility Package"
2SECTION = "libs/multimedia"
3LICENSE = "GPL"
4DEPENDS = "alsa-lib"
5
6SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2"
7
8inherit autotools
9
10do_configure_prepend () {
11 touch NEWS README AUTHORS ChangeLog
12}
diff --git a/meta/packages/alsa/alsa-tools_1.0.20.bb b/meta/packages/alsa/alsa-tools_1.0.20.bb
deleted file mode 100644
index 789b68e438..0000000000
--- a/meta/packages/alsa/alsa-tools_1.0.20.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1BROKEN = "1"
2
3DESCRIPTION = "Alsa Tools"
4SECTION = "console/utils"
5LICENSE = "GPL"
6DEPENDS = "alsa-lib ncurses"
7
8SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2"
9
10inherit autotools
diff --git a/meta/packages/alsa/alsa-utils-1.0.23/ncursesfix.patch b/meta/packages/alsa/alsa-utils-1.0.23/ncursesfix.patch
deleted file mode 100644
index 0009c1afe9..0000000000
--- a/meta/packages/alsa/alsa-utils-1.0.23/ncursesfix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1# alsa-utils: Fix ncurses build failures
2# Richard Purdie <rpurdie@linux.intel.com>
3# Rebased to 1.0.23, Dongxiao Xu <dongxiao.xu@intel.com>
4
5diff -ruN alsa-utils-1.0.23-orig/configure.in alsa-utils-1.0.23/configure.in
6--- alsa-utils-1.0.23-orig/configure.in 2010-04-16 19:19:12.000000000 +0800
7+++ alsa-utils-1.0.23/configure.in 2010-06-22 15:22:06.731202478 +0800
8@@ -109,34 +109,16 @@
9 NCURSESLIBSUFFIX=""
10 CURSES_NLS="no"
11 if test "$curseslib" = "ncursesw" -o \( "$curseslib" = "auto" -a "$USE_NLS" = "yes" \); then
12- AC_CHECK_PROG([ncursesw5_config], [ncursesw5-config], [yes])
13- if test "$ncursesw5_config" = "yes"; then
14- CURSESINC="<ncurses.h>"
15- CURSESLIB=`ncursesw5-config --libs`
16- CURSESLIBDIR=`ncursesw5-config --libdir`
17- CURSES_CFLAGS=`ncursesw5-config --cflags`
18- curseslib="ncursesw"
19- else
20 AC_CHECK_LIB(ncursesw, initscr,
21 [ CURSESINC='<ncurses.h>'; CURSESLIB='-lncursesw'; curseslib="ncursesw"])
22- fi
23 if test -n "$CURSESINC"; then
24 NCURSESLIBSUFFIX="w"
25 CURSES_NLS="yes"
26 fi
27 fi
28 if test "$curseslib" = "ncurses" -o "$curseslib" = "auto"; then
29- AC_CHECK_PROG([ncurses5_config], [ncurses5-config], [yes])
30- if test "$ncurses5_config" = "yes"; then
31- CURSESINC="<ncurses.h>"
32- CURSESLIB=`ncurses5-config --libs`
33- CURSESLIBDIR=`ncurses5-config --libdir`
34- CURSES_CFLAGS=`ncurses5-config --cflags`
35- curseslib="ncurses"
36- else
37 AC_CHECK_LIB(ncurses, initscr,
38 [ CURSESINC='<ncurses.h>'; CURSESLIB='-lncurses'; curseslib="ncurses"])
39- fi
40 fi
41 if test "$curseslib" = "curses" -o "$curseslib" = "auto"; then
42 AC_CHECK_LIB(curses, initscr,
diff --git a/meta/packages/alsa/alsa-utils_1.0.23.bb b/meta/packages/alsa/alsa-utils_1.0.23.bb
deleted file mode 100644
index 7b30c0d4b0..0000000000
--- a/meta/packages/alsa/alsa-utils_1.0.23.bb
+++ /dev/null
@@ -1,67 +0,0 @@
1DESCRIPTION = "ALSA Utilities"
2HOMEPAGE = "http://www.alsa-project.org"
3BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php"
4SECTION = "console/utils"
5LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
7 file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9"
8DEPENDS = "alsa-lib ncurses gettext"
9PR = "r0"
10
11SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
12 file://ncursesfix.patch;patch=1 "
13
14# lazy hack. needs proper fixing in gettext.m4, see
15# http://bugs.openembedded.org/show_bug.cgi?id=2348
16# please close bug and remove this comment when properly fixed
17#
18EXTRA_OECONF = "--disable-xmlto"
19EXTRA_OECONF_linux-uclibc = "--disable-nls"
20EXTRA_OECONF_linux-uclibcgnueabi = "--disable-nls"
21
22inherit autotools
23
24# This are all packages that we need to make. Also, the now empty alsa-utils
25# ipk depend on them.
26
27PACKAGES += "\
28 alsa-utils-alsamixer \
29 alsa-utils-midi \
30 alsa-utils-aplay \
31 alsa-utils-amixer \
32 alsa-utils-aconnect \
33 alsa-utils-iecset \
34 alsa-utils-speakertest \
35 alsa-utils-aseqnet \
36 alsa-utils-aseqdump \
37 alsa-utils-alsaconf \
38 alsa-utils-alsactl "
39
40# We omit alsaconf, because
41# a) this is a bash script
42# b) it creates config files not suitable for OE-based distros
43
44FILES_${PN} = ""
45FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord"
46FILES_alsa-utils-amixer = "${bindir}/amixer"
47FILES_alsa-utils-alsamixer = "${bindir}/alsamixer"
48FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/"
49FILES_alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi"
50FILES_alsa-utils-aconnect = "${bindir}/aconnect"
51FILES_alsa-utils-aseqnet = "${bindir}/aseqnet"
52FILES_alsa-utils-iecset = "${bindir}/iecset"
53FILES_alsa-utils-alsactl = "${sbindir}/alsactl"
54FILES_alsa-utils-aseqdump = "${bindir}/aseqdump"
55FILES_alsa-utils-alsaconf = "${sbindir}/alsaconf"
56
57DESCRIPTION_alsa-utils-aplay = "play (and record) sound files via ALSA"
58DESCRIPTION_alsa-utils-amixer = "command-line based control for ALSA mixer and settings"
59DESCRIPTION_alsa-utils-alsamixer = "ncurses based control for ALSA mixer and settings"
60DESCRIPTION_alsa-utils-speakertest = "ALSA surround speaker test utility"
61DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA"
62DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager"
63DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer"
64DESCRIPTION_alsa-utils-alsactl = "saves/restores ALSA-settings in /etc/asound.state"
65DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configuration files"
66
67ALLOW_EMPTY_alsa-utils = "1"