summaryrefslogtreecommitdiff
path: root/packages/alsa
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2009-03-19 20:56:09 +0100
committerFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2009-03-19 20:56:09 +0100
commit6a21d65d2840c58cfa7cd749a04669d8f7980646 (patch)
tree00b1aa153b69cda8cf9406c4700fd7730c34d3a5 /packages/alsa
parentdcfe7349b369a87881cf1fa43085d9e9c5609fcf (diff)
parent6f854d71c347475d53d5080a5490625345d95d12 (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages/alsa')
-rw-r--r--packages/alsa/alsa-driver/adriver.h.patch23
-rw-r--r--packages/alsa/alsa-driver/h5400.patch12
-rw-r--r--packages/alsa/alsa-driver/sa11xx.patch38
-rw-r--r--packages/alsa/alsa-driver/sound.p.patch59
-rw-r--r--packages/alsa/alsa-driver_0.9.6-hh4c.bb83
-rw-r--r--packages/alsa/alsa-fpu.inc6
-rw-r--r--packages/alsa/alsa-lib/fix-tstamp-declaration.patch13
-rw-r--r--packages/alsa/alsa-lib/fix_libmath.patch17
-rw-r--r--packages/alsa/alsa-lib/unbreak_plugindir.patch12
-rw-r--r--packages/alsa/alsa-lib_1.0.11.bb41
-rw-r--r--packages/alsa/alsa-lib_1.0.13.bb42
-rw-r--r--packages/alsa/alsa-lib_1.0.14.bb47
-rw-r--r--packages/alsa/alsa-lib_1.0.15.bb54
-rw-r--r--packages/alsa/alsa-lib_1.0.17.bb48
-rw-r--r--packages/alsa/alsa-lib_1.0.18.bb48
-rw-r--r--packages/alsa/alsa-oss_1.0.11.bb19
-rw-r--r--packages/alsa/alsa-oss_1.0.14.bb17
-rw-r--r--packages/alsa/alsa-oss_1.0.15.bb22
-rw-r--r--packages/alsa/alsa-oss_1.0.17.bb20
-rw-r--r--packages/alsa/alsa-plugins_1.0.15.bb20
-rw-r--r--packages/alsa/alsa-plugins_1.0.17.bb20
-rw-r--r--packages/alsa/alsa-plugins_1.0.18.bb20
-rw-r--r--packages/alsa/alsa-scenario_git.bb13
-rw-r--r--packages/alsa/alsa-state.bb58
-rw-r--r--packages/alsa/alsa-state/a780/gsmhandset.state55
-rw-r--r--packages/alsa/alsa-state/a780/gsmheadset.state55
-rw-r--r--packages/alsa/alsa-state/a780/stereoout.state55
-rw-r--r--packages/alsa/alsa-state/akita/asound.state619
-rwxr-xr-xpackages/alsa/alsa-state/alsa-state29
-rw-r--r--packages/alsa/alsa-state/asound.conf12
-rw-r--r--packages/alsa/alsa-state/asound.state1
-rw-r--r--packages/alsa/alsa-state/at91sam9263ek/asound.conf2
-rw-r--r--packages/alsa/alsa-state/at91sam9263ek/asound.state283
-rw-r--r--packages/alsa/alsa-state/c7x0/asound.state150
-rw-r--r--packages/alsa/alsa-state/hx4700/asound.state37
-rw-r--r--packages/alsa/alsa-state/magician/asound.state202
-rw-r--r--packages/alsa/alsa-state/nokia800/asound.state105
-rw-r--r--packages/alsa/alsa-state/spitz/asound.state619
-rw-r--r--packages/alsa/alsa-state/tosa/asound.state769
-rw-r--r--packages/alsa/alsa-utils_1.0.11.bb55
-rw-r--r--packages/alsa/alsa-utils_1.0.13.bb63
-rw-r--r--packages/alsa/alsa-utils_1.0.14.bb56
-rw-r--r--packages/alsa/alsa-utils_1.0.15.bb57
-rw-r--r--packages/alsa/alsa-utils_1.0.17.bb63
-rw-r--r--packages/alsa/alsa-utils_1.0.18.bb66
-rw-r--r--packages/alsa/alsa-versym.inc6
-rw-r--r--packages/alsa/files/alsa-utils-autoconf-strl-funcs.patch43
-rw-r--r--packages/alsa/files/alsa-utils-automake.patch10
-rw-r--r--packages/alsa/files/alsa-utils-remove-xmlto.patch15
-rw-r--r--packages/alsa/files/alsa-utils-sys-siglist.patch15
-rw-r--r--packages/alsa/files/libio.patch43
51 files changed, 0 insertions, 4237 deletions
diff --git a/packages/alsa/alsa-driver/adriver.h.patch b/packages/alsa/alsa-driver/adriver.h.patch
deleted file mode 100644
index cd648838c0..0000000000
--- a/packages/alsa/alsa-driver/adriver.h.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./include/adriver.h.orig 2003-09-22 22:04:21.000000000 +0200
-+++ ./include/adriver.h 2005-06-26 10:33:15.000000000 +0200
-@@ -328,8 +328,18 @@
- #endif /* SND_NEED_USB_WRAPPER && CONFIG_USB */
-
- /* workqueue-alike; 2.5.45 */
--#include <linux/workqueue.h>
-+#include <linux/workqueue.h>
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 45) && !defined(__WORK_INITIALIZER)
-+#ifdef work_struct
-+#undef work_struct
-+#endif
-+#ifdef INIT_WORK
-+#undef INIT_WORK
-+#endif
-+#ifdef schedule_work
-+#undef schedule_work
-+#endif
-+
- struct work_struct {
- void (*func)(void *);
- void *data;
-
diff --git a/packages/alsa/alsa-driver/h5400.patch b/packages/alsa/alsa-driver/h5400.patch
deleted file mode 100644
index e156708783..0000000000
--- a/packages/alsa/alsa-driver/h5400.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./alsa-kernel/arm/h5400-ak4535.c.orig 2005-06-26 22:12:57.000000000 +0200
-+++ ./alsa-kernel/arm/h5400-ak4535.c 2005-06-26 22:13:08.000000000 +0200
-@@ -36,7 +36,7 @@
- #include <asm/arch-sa1100/h3600_hal.h>
- #include <asm/arch-sa1100/h3600_asic.h>
- #include <asm/arch-pxa/h5400-asic.h>
--#include <asm/arch-pxa/pxa-i2s.h>
-+#include <drivers/sound/pxa-i2s.h>
-
- #include <sound/core.h>
- #include <sound/pcm.h>
-
diff --git a/packages/alsa/alsa-driver/sa11xx.patch b/packages/alsa/alsa-driver/sa11xx.patch
deleted file mode 100644
index 34509b13b0..0000000000
--- a/packages/alsa/alsa-driver/sa11xx.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- ./alsa-kernel/arm/sa11xx-uda1341.c 2005-06-27 12:59:53.000000000 +0200
-+++ ./alsa-kernel/arm/sa11xx-uda1341.c.orig 2005-06-27 12:59:29.000000000 +0200
-@@ -366,7 +366,7 @@
- DEBUG("\t request id <%s>\n", s->id);
- DEBUG("\t request dma_dev = 0x%x \n", s->dma_dev);
- if((ret = sa1100_request_dma((s)->dma_dev, (s)->id, callback, s, &((s)->dma_regs))))
-- printk(__FUNCTION__ ": sa1100_request_dma returned %d\n",ret);
-+ printk("%s: sa1100_request_dma returned %d\n",__FUNCTION__,ret);
-
-
-
-@@ -978,7 +978,7 @@
- switch (req) {
- case PM_SUSPEND: /* enter D1-D3 */
- if (card->power_state == SNDRV_CTL_POWER_D3hot){
-- printk(__FUNCTION__ ": exiting eraly from suspend\n");
-+ printk("%s: exiting eraly from suspend\n",__FUNCTION__);
- return 0;
- }
- snd_power_lock(card);
-@@ -1002,7 +1002,7 @@
- case PM_RESUME: /* enter D0 */
-
- if (card->power_state == SNDRV_CTL_POWER_D0){
-- printk(__FUNCTION__ ": exiting eraly from resume\n");
-+ printk("%s: exiting eraly from resume\n",__FUNCTION__);
- return 0;
- }
- snd_power_lock(card);
-@@ -1020,7 +1020,7 @@
-
- break;
- }
-- printk(KERN_DEBUG __FUNCTION__": exiting...\n");
-+ printk(KERN_DEBUG "%s: exiting...\n",__FUNCTION__);
- return 0;
-
- }
diff --git a/packages/alsa/alsa-driver/sound.p.patch b/packages/alsa/alsa-driver/sound.p.patch
deleted file mode 100644
index 38b073c8bd..0000000000
--- a/packages/alsa/alsa-driver/sound.p.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- ./acore/sound.patch.orig 2003-07-03 16:05:15.000000000 +0200
-+++ ./acore/sound.patch 2005-06-26 09:45:05.000000000 +0200
-@@ -1,6 +1,26 @@
----- sound.c 2003-05-30 15:29:14.000000000 +0200
--+++ sound.c.old 2003-05-30 15:30:11.000000000 +0200
--@@ -154,7 +154,9 @@
-+--- sound.c.orig 2005-06-25 23:33:07.000000000 +0200
-++++ sound.c 2005-06-25 23:33:07.000000000 +0200
-+@@ -77,6 +77,7 @@
-+ void snd_request_card(int card)
-+ {
-+ int locked;
-++ char *str;
-+
-+ read_lock(&snd_card_rwlock);
-+ locked = snd_cards_lock & (1 << card);
-+@@ -85,7 +86,10 @@
-+ return;
-+ if (card < 0 || card >= cards_limit)
-+ return;
-+- request_module("snd-card-%i", card);
-++ str = kmalloc(15,GFP_KERNEL);
-++ snprintf(str,15,"snd-card-%i",card);
-++ request_module(str);
-++ kfree(str);
-+ }
-+
-+ static void snd_request_other(int minor)
-+@@ -154,7 +158,9 @@
-
- struct file_operations snd_fops =
- {
-@@ -10,7 +30,7 @@
- .open = snd_open
- };
-
--@@ -364,6 +366,9 @@
-+@@ -364,6 +370,9 @@
- #ifndef MODULE
- printk(KERN_INFO "Advanced Linux Sound Architecture Driver Version " CONFIG_SND_VERSION CONFIG_SND_DATE ".\n");
- #endif
-@@ -20,7 +40,7 @@
- return 0;
- }
-
--@@ -378,6 +383,9 @@
-+@@ -378,6 +387,9 @@
- snd_info_minor_unregister();
- #endif
- snd_info_done();
-@@ -30,7 +50,7 @@
- #ifdef CONFIG_SND_DEBUG_MEMORY
- snd_memory_done();
- #endif
--@@ -490,3 +498,5 @@
-+@@ -508,3 +520,5 @@
- EXPORT_SYMBOL(snd_wrapper_vmalloc);
- EXPORT_SYMBOL(snd_wrapper_vfree);
- #endif
diff --git a/packages/alsa/alsa-driver_0.9.6-hh4c.bb b/packages/alsa/alsa-driver_0.9.6-hh4c.bb
deleted file mode 100644
index 53d898d030..0000000000
--- a/packages/alsa/alsa-driver_0.9.6-hh4c.bb
+++ /dev/null
@@ -1,83 +0,0 @@
-# needs a gcc4 fix
-BROKEN = "1"
-
-COMPATIBLE_MACHINE = "(h3600|h3900)"
-
-DESCRIPTION = "Alsa Drivers"
-SECTION = "base"
-LICENSE = "GPL"
-PR = "r6"
-
-DEPENDS += "fakeroot-native"
-
-SRC_URI = "ftp://ftp.handhelds.org/packages/alsa-driver/alsa-driver-${PV}.tar.gz \
- file://sound.p.patch;patch=1 \
- file://h5400.patch;patch=1 \
- file://sa11xx.patch;patch=1 \
- file://adriver.h.patch;patch=1"
-
-inherit autotools module
-
-EXTRA_OECONF = "--with-sequencer=yes \
- --with-isapnp=no \
- --with-oss=yes \
- --with-kernel=${STAGING_KERNEL_DIR} \
- --with-kernel-version=${KERNEL_VERSION}"
-
-PACKAGES =+ "${PN}-midi ${PN}-misc"
-FILES_${PN} = "/lib/modules/*/misc/snd* \
- ${sysconfdir}/modutils/*"
-midi_modules = "snd-seq-midi-emul.o \
- snd-seq-midi-event.o \
- snd-seq-midi.o \
- snd-seq-virmidi.o \
- snd-seq-oss.o"
-FILES_${PN}-midi = "${@' '.join(map ((lambda x: '/lib/modules/*/misc/%s' % x), bb.data.getVar('midi_modules', d).split()))}"
-misc_modules = "snd-gus-synth.o \
- snd-emu8000-synth.o \
- snd-emux-synth.o \
- snd-ainstr-fm.o \
- snd-ainstr-gf1.o \
- snd-ainstr-iw.o \
- snd-ainstr-simple.o"
-FILES_${PN}-misc = "${@' '.join(map ((lambda x: '/lib/modules/*/misc/%s' % x), bb.data.getVar('misc_modules', d).split()))}"
-
-# put in-kernel headers first in the include search path.
-# without this all configure checks fail
-CFLAGS =+ "-I${STAGING_KERNEL_DIR}/include"
-
-do_configure() {
-
-cards=
-if egrep "CONFIG_SA1100_H3[168]00=y" "${STAGING_KERNEL_DIR}/.config" ; then
- cards="$cards,sa11xx-uda1341"
- familiar_arch=ipaqsa
-fi
-if grep "CONFIG_ARCH_H3900=y" "${STAGING_KERNEL_DIR}/.config" ; then
- cards="$cards,pxa-uda1380,h5400-ak4535"
- familiar_arch=ipaqpxa
-fi
-cards="$cards,bluez-sco,pdaudiocf"
-
- oe_runconf --with-cards=${cards}
-}
-
-
-do_install() {
-
-if egrep "CONFIG_SA1100_H3[168]00=y" "${STAGING_KERNEL_DIR}/.config" ; then
- familiar_arch=ipaqsa
-fi
-if grep "CONFIG_ARCH_H3900=y" "${STAGING_KERNEL_DIR}/.config" ; then
- familiar_arch=ipaqpxa
-fi
-
- fakeroot make -k NODEPMOD=yes DESTDIR=${D} install;
-
- if [ -d ${D}${sysconfdir}/modutils/ ] ; then
- rm -r ${D}${sysconfdir}/modutils/ ;
- fi
- mkdir -p ${D}${sysconfdir}/modutils/
- cp familiar/alsa-modules-${familiar_arch} ${D}${sysconfdir}/modutils/
-}
-
diff --git a/packages/alsa/alsa-fpu.inc b/packages/alsa/alsa-fpu.inc
deleted file mode 100644
index ebd3493e6c..0000000000
--- a/packages/alsa/alsa-fpu.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-def get_alsa_fpu_setting(bb, d):
- if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
- return "--with-softfloat"
- return ""
-
diff --git a/packages/alsa/alsa-lib/fix-tstamp-declaration.patch b/packages/alsa/alsa-lib/fix-tstamp-declaration.patch
deleted file mode 100644
index 59b3b6d150..0000000000
--- a/packages/alsa/alsa-lib/fix-tstamp-declaration.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
diff --git a/packages/alsa/alsa-lib/fix_libmath.patch b/packages/alsa/alsa-lib/fix_libmath.patch
deleted file mode 100644
index 23309ce381..0000000000
--- a/packages/alsa/alsa-lib/fix_libmath.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: alsa-lib-1.0.15/configure.in
-===================================================================
---- alsa-lib-1.0.15.orig/configure.in 2007-10-15 10:45:26.000000000 +0200
-+++ alsa-lib-1.0.15/configure.in 2008-07-19 15:51:34.177119589 +0200
-@@ -191,9 +191,9 @@
- AC_MSG_RESULT(no)
- fi
-
--ALSA_DEPLIBS=""
--if test "$softfloat" != "yes"; then
-- ALSA_DEPLIBS="-lm"
-+ALSA_DEPLIBS="-lm"
-+if test "$softfloat" = "yes"; then
-+ AC_CHECK_LIB([m], [floor], , [ALSA_DEPLIBS=""])
- fi
-
- dnl Check for libdl
diff --git a/packages/alsa/alsa-lib/unbreak_plugindir.patch b/packages/alsa/alsa-lib/unbreak_plugindir.patch
deleted file mode 100644
index 7d13166809..0000000000
--- a/packages/alsa/alsa-lib/unbreak_plugindir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur alsa-lib-1.0.14.orig/configure.in alsa-lib-1.0.14/configure.in
---- alsa-lib-1.0.14.orig/configure.in 2007-05-31 03:05:13.000000000 -0500
-+++ alsa-lib-1.0.14/configure.in 2007-08-18 13:05:49.000000000 -0500
-@@ -93,7 +93,7 @@
- esac
- plugindir="$dir/$PACKAGE"
- fi
--AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "plugindir", [directory containing ALSA add-on modules])
-+AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "${plugindir}", [directory containing ALSA add-on modules])
- ALSA_PLUGIN_DIR="$plugindir"
- AC_SUBST(ALSA_PLUGIN_DIR)
-
diff --git a/packages/alsa/alsa-lib_1.0.11.bb b/packages/alsa/alsa-lib_1.0.11.bb
deleted file mode 100644
index b9169e608f..0000000000
--- a/packages/alsa/alsa-lib_1.0.11.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-DESCRIPTION = "Alsa sound library"
-HOMEPAGE = "http://www.alsa-project.org"
-SECTION = "libs/multimedia"
-LICENSE = "GPL"
-PR = "r4"
-
-# 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-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/packages/alsa/alsa-lib_1.0.13.bb b/packages/alsa/alsa-lib_1.0.13.bb
deleted file mode 100644
index 860ef11f18..0000000000
--- a/packages/alsa/alsa-lib_1.0.13.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-DESCRIPTION = "Alsa sound library"
-HOMEPAGE = "http://www.alsa-project.org"
-SECTION = "libs/multimedia"
-LICENSE = "GPL"
-PR = "r4"
-
-# 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/packages/alsa/alsa-lib_1.0.14.bb b/packages/alsa/alsa-lib_1.0.14.bb
deleted file mode 100644
index ba46342ae7..0000000000
--- a/packages/alsa/alsa-lib_1.0.14.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-DESCRIPTION = "Alsa sound library"
-HOMEPAGE = "http://www.alsa-project.org"
-SECTION = "libs/multimedia"
-LICENSE = "GPL"
-
-PR = "r2"
-
-# 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 \
- file://unbreak_plugindir.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"
-
-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/packages/alsa/alsa-lib_1.0.15.bb b/packages/alsa/alsa-lib_1.0.15.bb
deleted file mode 100644
index 4cf393843b..0000000000
--- a/packages/alsa/alsa-lib_1.0.15.bb
+++ /dev/null
@@ -1,54 +0,0 @@
-DESCRIPTION = "Alsa sound library"
-HOMEPAGE = "http://www.alsa-project.org"
-SECTION = "libs/multimedia"
-LICENSE = "GPL"
-PR = "r1"
-
-# 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 \
- file://fix_libmath.patch;patch=1 \
- "
-
-inherit autotools pkgconfig
-
-
-EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python"
-
-
-require alsa-fpu.inc
-EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} "
-
-
-require alsa-versym.inc
-EXTRA_OECONF += "${@get_alsa_versym_setting(bb, d)} "
-
-
-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/packages/alsa/alsa-lib_1.0.17.bb b/packages/alsa/alsa-lib_1.0.17.bb
deleted file mode 100644
index f4ae21b637..0000000000
--- a/packages/alsa/alsa-lib_1.0.17.bb
+++ /dev/null
@@ -1,48 +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 \
- file://fix_libmath.patch;patch=1 \
- "
-
-inherit autotools pkgconfig
-
-
-EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python"
-
-
-require alsa-fpu.inc
-EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} "
-
-
-require alsa-versym.inc
-EXTRA_OECONF += "${@get_alsa_versym_setting(bb, d)} "
-
-
-do_stage () {
- autotools_stage_all
-}
-
-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/packages/alsa/alsa-lib_1.0.18.bb b/packages/alsa/alsa-lib_1.0.18.bb
deleted file mode 100644
index f4ae21b637..0000000000
--- a/packages/alsa/alsa-lib_1.0.18.bb
+++ /dev/null
@@ -1,48 +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 \
- file://fix_libmath.patch;patch=1 \
- "
-
-inherit autotools pkgconfig
-
-
-EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python"
-
-
-require alsa-fpu.inc
-EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} "
-
-
-require alsa-versym.inc
-EXTRA_OECONF += "${@get_alsa_versym_setting(bb, d)} "
-
-
-do_stage () {
- autotools_stage_all
-}
-
-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/packages/alsa/alsa-oss_1.0.11.bb b/packages/alsa/alsa-oss_1.0.11.bb
deleted file mode 100644
index 9a7751ee6b..0000000000
--- a/packages/alsa/alsa-oss_1.0.11.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Alsa OSS Compatibility Package"
-HOMEPAGE = "http://www.alsa-project.org"
-SECTION = "libs/multimedia"
-LICENSE = "GPL"
-DEPENDS = "alsa-lib"
-PR = "r0"
-
-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/packages/alsa/alsa-oss_1.0.14.bb b/packages/alsa/alsa-oss_1.0.14.bb
deleted file mode 100644
index b11947e86a..0000000000
--- a/packages/alsa/alsa-oss_1.0.14.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"
-
-in