From 0cafa265a03646eb53e1bd169043425492437e83 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 9 Feb 2005 17:54:45 +0000 Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into lieve.(none):/data/build/oe/clean-tree/openembedded 2005/02/09 18:39:43+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/09 18:21:43+01:00 uni-frankfurt.de!mickeyl upgrade alsa to 1.0.8 and increase package granularity 2005/02/09 17:04:07+01:00 uni-frankfurt.de!mickeyl add jack 0.99.0, modernize, increase package granularity BKrev: 420a4e656YTCpItmpeW-wcYmR4E5zQ --- packages/alsa/alsa-lib_1.0.8.bb | 0 packages/alsa/alsa-oss_1.0.8.bb | 0 packages/alsa/alsa-tools_1.0.8.bb | 0 packages/alsa/alsa-utils_1.0.8.bb | 0 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 packages/alsa/alsa-lib_1.0.8.bb create mode 100644 packages/alsa/alsa-oss_1.0.8.bb create mode 100644 packages/alsa/alsa-tools_1.0.8.bb create mode 100644 packages/alsa/alsa-utils_1.0.8.bb (limited to 'packages/alsa') diff --git a/packages/alsa/alsa-lib_1.0.8.bb b/packages/alsa/alsa-lib_1.0.8.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/alsa/alsa-oss_1.0.8.bb b/packages/alsa/alsa-oss_1.0.8.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/alsa/alsa-tools_1.0.8.bb b/packages/alsa/alsa-tools_1.0.8.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/alsa/alsa-utils_1.0.8.bb b/packages/alsa/alsa-utils_1.0.8.bb new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.3 From aedc336335b36ba0847de1d20ecfad50fa98f00c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 12 Apr 2005 14:00:27 +0000 Subject: more SECTION fixes BKrev: 425bd47buhbtCJBnikdorOaepQvQMQ --- packages/alsa/alsa-oss_1.0.8.bb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'packages/alsa') diff --git a/packages/alsa/alsa-oss_1.0.8.bb b/packages/alsa/alsa-oss_1.0.8.bb index e69de29bb2..f62550bb93 100644 --- a/packages/alsa/alsa-oss_1.0.8.bb +++ b/packages/alsa/alsa-oss_1.0.8.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Alsa OSS Compatibility Package" +MAINTAINER = "Lorn Potter " +SECTION = "libs/multimedia" +LICENSE = "GPL" +DEPENDS = "alsa-lib" +PR = "r1" + +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} +} -- cgit v1.2.3 From 7653e980f66b4bd147df308f9b04d6b197382d6a Mon Sep 17 00:00:00 2001 From: Holger Schurig Date: Fri, 22 Apr 2005 06:52:57 +0000 Subject: split alsa-utils in handsome chunks BKrev: 42689f49m-ugZ9mHd7V4fJAEbD2VcA --- packages/alsa/alsa-utils_1.0.8.bb | 56 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) (limited to 'packages/alsa') diff --git a/packages/alsa/alsa-utils_1.0.8.bb b/packages/alsa/alsa-utils_1.0.8.bb index e69de29bb2..e798f6321b 100644 --- a/packages/alsa/alsa-utils_1.0.8.bb +++ b/packages/alsa/alsa-utils_1.0.8.bb @@ -0,0 +1,56 @@ +DESCRIPTION = "ALSA Utilities" +MAINTAINER = "Lorn Potter " +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "alsa-lib" +PR = "r1" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2" + +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" + + +# 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 + + +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" +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" + +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= "??" +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" +RDEPENDS_alsa-utils += "${ALSA_PACKAGES}" +ALLOW_EMPTY_alsa-utils = 1 -- cgit v1.2.3 From df23118932f22155a5c05b7f97bee3cacd019ece Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Mon, 27 Jun 2005 08:20:52 +0000 Subject: add handhelds.org alsa driver, courtesy Pierluigi Frullani BKrev: 42bfb6e4zTh6i4W4O6ngbFv0gt7kjQ --- packages/alsa/alsa-driver/adriver.h.patch | 0 packages/alsa/alsa-driver/h5400.patch | 0 packages/alsa/alsa-driver/sound.p.patch | 0 packages/alsa/alsa-driver_0.9.6-hh4c.bb | 0 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 packages/alsa/alsa-driver/adriver.h.patch create mode 100644 packages/alsa/alsa-driver/h5400.patch create mode 100644 packages/alsa/alsa-driver/sound.p.patch create mode 100644 packages/alsa/alsa-driver_0.9.6-hh4c.bb (limited to 'packages/alsa') diff --git a/packages/alsa/alsa-driver/adriver.h.patch b/packages/alsa/alsa-driver/adriver.h.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/alsa/alsa-driver/h5400.patch b/packages/alsa/alsa-driver/h5400.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/alsa/alsa-driver/sound.p.patch b/packages/alsa/alsa-driver/sound.p.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/alsa/alsa-driver_0.9.6-hh4c.bb b/packages/alsa/alsa-driver_0.9.6-hh4c.bb new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.3 From c8e5702127e507e82e6f68a4b8c546803accea9d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 30 Jun 2005 08:19:37 +0000 Subject: import clean BK tree at cset 1.3670 --- packages/alsa/.mtn2git_empty | 0 packages/alsa/alsa-driver/.mtn2git_empty | 0 packages/alsa/alsa-driver/adriver.h.patch | 23 ++++++++++ packages/alsa/alsa-driver/h5400.patch | 12 +++++ packages/alsa/alsa-driver/sound.p.patch | 59 ++++++++++++++++++++++++ packages/alsa/alsa-driver_0.9.6-hh4c.bb | 75 +++++++++++++++++++++++++++++++ packages/alsa/alsa-lib_1.0.8.bb | 27 +++++++++++ packages/alsa/alsa-tools_1.0.8.bb | 10 +++++ 8 files changed, 206 insertions(+) create mode 100644 packages/alsa/.mtn2git_empty create mode 100644 packages/alsa/alsa-driver/.mtn2git_empty (limited to 'packages/alsa') diff --git a/packages/alsa/.mtn2git_empty b/packages/alsa/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/alsa/alsa-driver/.mtn2git_empty b/packages/alsa/alsa-driver/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/alsa/alsa-driver/adriver.h.patch b/packages/alsa/alsa-driver/adriver.h.patch index e69de29bb2..cd648838c0 100644 --- a/packages/alsa/alsa-driver/adriver.h.patch +++ b/packages/alsa/alsa-driver/adriver.h.patch @@ -0,0 +1,23 @@ +--- ./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 ++#include + #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 index e69de29bb2..e156708783 100644 --- a/packages/alsa/alsa-driver/h5400.patch +++ b/packages/alsa/alsa-driver/h5400.patch @@ -0,0 +1,12 @@ +--- ./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 + #include + #include +-#include ++#include + + #include + #include + diff --git a/packages/alsa/alsa-driver/sound.p.patch b/packages/alsa/alsa-driver/sound.p.patch index e69de29bb2..38b073c8bd 100644 --- a/packages/alsa/alsa-driver/sound.p.patch +++ b/packages/alsa/alsa-driver/sound.p.patch @@ -0,0 +1,59 @@ +--- ./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 index e69de29bb2..bf307d13e2 100644 --- a/packages/alsa/alsa-driver_0.9.6-hh4c.bb +++ b/packages/alsa/alsa-driver_0.9.6-hh4c.bb @@ -0,0 +1,75 @@ +DESCRIPTION = "Alsa Drivers" +MAINTAINER = "Pigi" +SECTION = "console/utils" +LICENSE = "GPL" +#DEPENDS = "alsa-lib" + + +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://adriver.h.patch;patch=1 " + +#inherit autotools +#inherit module + +#EXTRA_OECONF = " --with-isapnp=no " +EXTRA_OECONF=" --with-sequencer=no --with-isapnp=no --with-oss=yes --with-cards=${cards} --with-kernel=${STAGING_KERNEL_DIR} --with-kernel-version=${KERNEL_VERSION} --host=arm-linux" +#EXTRA_OECONF = " /ext/ambient/tmp/work/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4-r5/kernel/ " + + +do_configure() { + +VERS=`grep "^VERSION =" ${STAGING_KERNEL_DIR}/Makefile | awk '{print $3}'` +PATLEV=`grep "^PATCHLEVEL =" ${STAGING_KERNEL_DIR}/Makefile | awk '{print $3}'` +SBLEV=`grep "^SUBLEVEL =" ${STAGING_KERNEL_DIR}/Makefile | awk '{print $3}'` +EXVER=`grep "^EXTRAVERSION =" ${STAGING_KERNEL_DIR}/Makefile | awk '{print $3}'` + +KERNEL_VERSION=$VERS.$PATLEV.$SBLEV$EXVER + +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" + + configure ${EXTRA_OECONF} + #./config.ipaq ${STAGING_KERNEL_DIR} + +} + + + +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 +extra_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 \ + snd-seq-midi-emul.o snd-seq-midi-event.o snd-seq-midi.o snd-seq-virmidi.o snd-seq-oss.o" + + fakeroot make -k NODEPMOD=yes DESTDIR=${D} install; + + for i in ${extra_modules}; + do rm -f ${D}/lib/modules/*/misc/$i; + done + + if [ -d ${D}/${sysconfdir}/modutils/ ] ; then + rm -r ${D}/${sysconfdir}/modutils/ ; + fi + mkdir ${D}/${sysconfdir}/modutils/ + cp familiar/alsa-modules-${familiar_arch} ${D}/${sysconfdir}/modutils/ +} + +#FILES_alsa-driver = "/lib/modules/${KERNEL_VERSION}/misc/snd* /${sysconfdir}/init.d/ /${sysconfdir}" +FILES_${PN} = "/lib/modules/*/misc/snd* ${sysconfdir}/modutils/* " + diff --git a/packages/alsa/alsa-lib_1.0.8.bb b/packages/alsa/alsa-lib_1.0.8.bb index e69de29bb2..a58b21f532 100644 --- a/packages/alsa/alsa-lib_1.0.8.bb +++ b/packages/alsa/alsa-lib_1.0.8.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Alsa sound library" +MAINTAINER = "Lorn Potter " +SECTION = "libs/multimedia" +LICENSE = "GPL" +PR = "r1" + +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 = "libasound alsa-server alsa-conf alsa-doc alsa-dev" +FILES_libasound = "${libdir}/libasound.so*" +FILES_alsa-server = "${bindir}" +FILES_alsa-conf = "${datadir}" +FILES_alsa-dev = "${libdir}/pkgconfig/ ${incdir}" + diff --git a/packages/alsa/alsa-tools_1.0.8.bb b/packages/alsa/alsa-tools_1.0.8.bb index e69de29bb2..eed86e5dba 100644 --- a/packages/alsa/alsa-tools_1.0.8.bb +++ b/packages/alsa/alsa-tools_1.0.8.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 -- cgit v1.2.3 From e0b41578571cf4541a512dc4a9b18e3dbc389f35 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 9 Jul 2005 13:04:04 +0000 Subject: KEY = "VALUE" changed the grammar to force the quotes and update the bb files accordingly --- packages/alsa/alsa-utils_1.0.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/alsa') diff --git a/packages/alsa/alsa-utils_1.0.8.bb b/packages/alsa/alsa-utils_1.0.8.bb index e798f6321b..5a6d04f0e3 100644 --- a/packages/alsa/alsa-utils_1.0.8.bb +++ b/packages/alsa/alsa-utils_1.0.8.bb @@ -53,4 +53,4 @@ DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configura RDEPENDS_alsa-utils-aplay += "alsa-conf" RDEPENDS_alsa-utils-amixer += "alsa-conf" RDEPENDS_alsa-utils += "${ALSA_PACKAGES}" -ALLOW_EMPTY_alsa-utils = 1 +ALLOW_EMPTY_alsa-utils = "1" -- cgit v1.2.3 From 69ee91776ad264c273395ff1cfe40c1c655ccbec Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Fri, 19 Aug 2005 23:09:17 +0000 Subject: alsa-driver: commit updates submitted by Pigi in Bug #120 --- packages/alsa/alsa-driver/sa11xx.patch | 38 +++++++++++++++++++++++++++++++++ packages/alsa/alsa-driver_0.9.6-hh4c.bb | 4 +++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 packages/alsa/alsa-driver/sa11xx.patch (limited to 'packages/alsa') diff --git a/packages/alsa/alsa-driver/sa11xx.patch b/packages/alsa/alsa-driver/sa11xx.patch new file mode 100644 index 0000000000..34509b13b0 --- /dev/null +++ b/packages/alsa/alsa-driver/sa11xx.patch @@ -0,0 +1,38 @@ +--- ./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_0.9.6-hh4c.bb b/packages/alsa/alsa-driver_0.9.6-hh4c.bb index bf307d13e2..b045af116a 100644 --- a/packages/alsa/alsa-driver_0.9.6-hh4c.bb +++ b/packages/alsa/alsa-driver_0.9.6-hh4c.bb @@ -3,11 +3,13 @@ MAINTAINER = "Pigi" SECTION = "console/utils" LICENSE = "GPL" #DEPENDS = "alsa-lib" +PR = "r1" + 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 -- cgit v1.2.3 From a085235edaa93ff6bbca5eb0c48845136450a90a Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Fri, 19 Aug 2005 23:25:33 +0000 Subject: alsa-driver: first try at making things actually work. - remove commented out code - inherit autotools and module classes - use KERNEL_VERSION as defined by module.bbclass - FILES is defined correctly by module.bbclass as well - make do_configure() use oe_runconf (didn't work at all before this change) - Pigi removed the h5400 patch. need to investigate whether this was by intention --- packages/alsa/alsa-driver_0.9.6-hh4c.bb | 43 +++++++++++---------------------- 1 file changed, 14 insertions(+), 29 deletions(-) (limited to 'packages/alsa') diff --git a/packages/alsa/alsa-driver_0.9.6-hh4c.bb b/packages/alsa/alsa-driver_0.9.6-hh4c.bb index b045af116a..a909c0211c 100644 --- a/packages/alsa/alsa-driver_0.9.6-hh4c.bb +++ b/packages/alsa/alsa-driver_0.9.6-hh4c.bb @@ -1,34 +1,25 @@ DESCRIPTION = "Alsa Drivers" MAINTAINER = "Pigi" -SECTION = "console/utils" +SECTION = "base" LICENSE = "GPL" -#DEPENDS = "alsa-lib" -PR = "r1" - - +PR = "r2" SRC_URI = "ftp://ftp.handhelds.org/packages/alsa-driver/alsa-driver-${PV}.tar.gz \ file://sound.p.patch;patch=1 \ file://sa11xx.patch;patch=1 \ - file://adriver.h.patch;patch=1 " + file://adriver.h.patch;patch=1" -#inherit autotools -#inherit module +inherit autotools module -#EXTRA_OECONF = " --with-isapnp=no " -EXTRA_OECONF=" --with-sequencer=no --with-isapnp=no --with-oss=yes --with-cards=${cards} --with-kernel=${STAGING_KERNEL_DIR} --with-kernel-version=${KERNEL_VERSION} --host=arm-linux" -#EXTRA_OECONF = " /ext/ambient/tmp/work/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4-r5/kernel/ " +EXTRA_OECONF=" --with-sequencer=no \ + --with-isapnp=no \ + --with-oss=yes \ + --with-kernel=${STAGING_KERNEL_DIR} \ + --with-kernel-version=${KERNEL_VERSION}" do_configure() { -VERS=`grep "^VERSION =" ${STAGING_KERNEL_DIR}/Makefile | awk '{print $3}'` -PATLEV=`grep "^PATCHLEVEL =" ${STAGING_KERNEL_DIR}/Makefile | awk '{print $3}'` -SBLEV=`grep "^SUBLEVEL =" ${STAGING_KERNEL_DIR}/Makefile | awk '{print $3}'` -EXVER=`grep "^EXTRAVERSION =" ${STAGING_KERNEL_DIR}/Makefile | awk '{print $3}'` - -KERNEL_VERSION=$VERS.$PATLEV.$SBLEV$EXVER - cards= if egrep "CONFIG_SA1100_H3[168]00=y" "${STAGING_KERNEL_DIR}/.config" ; then cards="$cards,sa11xx-uda1341" @@ -40,13 +31,10 @@ if grep "CONFIG_ARCH_H3900=y" "${STAGING_KERNEL_DIR}/.config" ; then fi cards="$cards,bluez-sco,pdaudiocf" - configure ${EXTRA_OECONF} - #./config.ipaq ${STAGING_KERNEL_DIR} - + oe_runconf --with-cards=${cards} } - do_install() { if egrep "CONFIG_SA1100_H3[168]00=y" "${STAGING_KERNEL_DIR}/.config" ; then @@ -65,13 +53,10 @@ extra_modules="snd-gus-synth.o snd-emu8000-synth.o snd-emux-synth.o \ do rm -f ${D}/lib/modules/*/misc/$i; done - if [ -d ${D}/${sysconfdir}/modutils/ ] ; then - rm -r ${D}/${sysconfdir}/modutils/ ; + if [ -d ${D}${sysconfdir}/modutils/ ] ; then + rm -r ${D}${sysconfdir}/modutils/ ; fi - mkdir ${D}/${sysconfdir}/modutils/ - cp familiar/alsa-modules-${familiar_arch} ${D}/${sysconfdir}/modutils/ + mkdir -p ${D}${sysconfdir}/modutils/ + cp familiar/alsa-modules-${familiar_arch} ${D}${sysconfdir}/modutils/ } -#FILES_alsa-driver = "/lib/modules/${KERNEL_VERSION}/misc/snd* /${sysconfdir}/init.d/ /${sysconfdir}" -FILES_${PN} = "/lib/modules/*/misc/snd* ${sysconfdir}/modutils/* " - -- cgit v1.2.3 From b0c425738f35f1ee8cec94e388ad8b89b5f8f3dd Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Sat, 20 Aug 2005 00:05:20 +0000 Subject: alsa-driver: turns out the init script is useless. re-add FILES_${PN}. --- packages/alsa/alsa-driver_0.9.6-hh4c.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'packages/alsa') diff --git a/packages/alsa/alsa-driver_0.9.6-hh4c.bb b/packages/alsa/alsa-driver_0.9.6-hh4c.bb index a909c0211c..ba775ff511 100644 --- a/packages/alsa/alsa-driver_0.9.6-hh4c.bb +++ b/packages/alsa/alsa-driver_0.9.6-hh4c.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Alsa Drivers" MAINTAINER = "Pigi" SECTION = "base" LICENSE = "GPL" -PR = "r2" +PR = "r3" SRC_URI = "ftp://ftp.handhelds.org/packages/alsa-driver/alsa-driver-${PV}.tar.gz \ file://sound.p.patch;patch=1 \ @@ -17,6 +17,8 @@ EXTRA_OECONF=" --with-sequencer=no \ --with-kernel=${STAGING_KERNEL_DIR} \ --with-kernel-version=${KERNEL_VERSION}" +FILES_${PN} = "/lib/modules/*/misc/snd* \ + ${sysconfdir}/modutils/*" do_configure() { -- cgit v1.2.3 From 6bf5dd04cdb06e971d33ce36768b95e03c5de9b1 Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Sat, 20 Aug 2005 00:32:33 +0000 Subject: alsa-driver: re-enable h5400.patch. Thanks to Mustafa Yuecel for testing. --- packages/alsa/alsa-driver_0.9.6-hh4c.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages/alsa') diff --git a/packages/alsa/alsa-driver_0.9.6-hh4c.bb b/packages/alsa/alsa-driver_0.9.6-hh4c.bb index ba775ff511..deb4ee4505 100644 --- a/packages/alsa/alsa-driver_0.9.6-hh4c.bb +++ b/packages/alsa/alsa-driver_0.9.6-hh4c.bb @@ -2,10 +2,11 @@ DESCRIPTION = "Alsa Drivers" MAINTAINER = "Pigi" SECTION = "base" LICENSE = "GPL" -PR = "r3" +PR = "r4" 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" -- cgit v1.2.3 From a9b6a0a881c44ec67bb87cf5116b0304f7786ecd Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Sat, 20 Aug 2005 12:53:10 +0000 Subject: alsa-driver: package midi/misc modules separately instead of deleting them (not all are actually built right now). re-enable sequencer. make configure checks work. --- packages/alsa/alsa-driver_0.9.6-hh4c.bb | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) (limited to 'packages/alsa') diff --git a/packages/alsa/alsa-driver_0.9.6-hh4c.bb b/packages/alsa/alsa-driver_0.9.6-hh4c.bb index deb4ee4505..d8f7dcfa0b 100644 --- a/packages/alsa/alsa-driver_0.9.6-hh4c.bb +++ b/packages/alsa/alsa-driver_0.9.6-hh4c.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Alsa Drivers" MAINTAINER = "Pigi" SECTION = "base" LICENSE = "GPL" -PR = "r4" +PR = "r5" SRC_URI = "ftp://ftp.handhelds.org/packages/alsa-driver/alsa-driver-${PV}.tar.gz \ file://sound.p.patch;patch=1 \ @@ -12,14 +12,33 @@ SRC_URI = "ftp://ftp.handhelds.org/packages/alsa-driver/alsa-driver-${PV}.tar.gz inherit autotools module -EXTRA_OECONF=" --with-sequencer=no \ +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() { @@ -46,16 +65,9 @@ fi if grep "CONFIG_ARCH_H3900=y" "${STAGING_KERNEL_DIR}/.config" ; then familiar_arch=ipaqpxa fi -extra_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 \ - snd-seq-midi-emul.o snd-seq-midi-event.o snd-seq-midi.o snd-seq-virmidi.o snd-seq-oss.o" fakeroot make -k NODEPMOD=yes DESTDIR=${D} install; - for i in ${extra_modules}; - do rm -f ${D}/lib/modules/*/misc/$i; - done - if [ -d ${D}${sysconfdir}/modutils/ ] ; then rm -r ${D}${sysconfdir}/modutils/ ; fi -- cgit v1.2.3 From dce98c8679e2e369d5254ebbe590de79c500f25b Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 22 Aug 2005 17:45:35 +0000 Subject: add ncurses dependency --- packages/alsa/alsa-utils_1.0.8.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/alsa') diff --git a/packages/alsa/alsa-utils_1.0.8.bb b/packages/alsa/alsa-utils_1.0.8.bb index 5a6d04f0e3..ca9a52e58a 100644 --- a/packages/alsa/alsa-utils_1.0.8.bb +++ b/packages/alsa/alsa-utils_1.0.8.bb @@ -2,8 +2,8 @@ DESCRIPTION = "ALSA Utilities" MAINTAINER = "Lorn Potter " SECTION = "console/utils" LICENSE = "GPL" -DEPENDS = "alsa-lib" -PR = "r1" +DEPENDS = "alsa-lib ncurses" +PR = "r2" SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2" -- cgit v1.2.3 From eeb51b853fc1c0ee24f3643cdd66d936fe36c291 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 6 Sep 2005 19:58:08 +0000 Subject: alsa-utils: alsamixer.c is patched to use strsignal not sys_siglist This allows alsa-utils to build on uclibc --- packages/alsa/alsa-utils_1.0.8.bb | 3 ++- packages/alsa/files/.mtn2git_empty | 0 packages/alsa/files/alsa-utils-sys-siglist.patch | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 packages/alsa/files/.mtn2git_empty create mode 100644 packages/alsa/files/alsa-utils-sys-siglist.patch (limited to 'packages/alsa') diff --git a/packages/alsa/alsa-utils_1.0.8.bb b/packages/alsa/alsa-utils_1.0.8.bb index ca9a52e58a..8e8297c85b 100644 --- a/packages/alsa/alsa-utils_1.0.8.bb +++ b/packages/alsa/alsa-utils_1.0.8.bb @@ -3,9 +3,10 @@ MAINTAINER = "Lorn Potter " SECTION = "console/utils" LICENSE = "GPL" DEPENDS = "alsa-lib ncurses" -PR = "r2" +PR = "r3" SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2" +SRC_URI += "file://alsa-utils-sys-siglist.patch;patch=108" inherit autotools diff --git a/packages/alsa/files/.mtn2git_empty b/packages/alsa/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/alsa/files/alsa-utils-sys-siglist.patch b/packages/alsa/files/alsa-utils-sys-siglist.patch new file mode 100644 index 0000000000..8c499e8d63 --- /dev/null +++ b/packages/alsa/files/alsa-utils-sys-siglist.patch @@ -0,0 +1,15 @@ +sys_siglist is not supported by default on uclibc and is, in general, +a bad thing for the same reasons as sys_errlist is a bad thing. GNU +supports strsignal in the manner of strerror + +--- alsa-utils-1.0.8/alsamixer/alsamixer.c.orig 2005-09-06 12:44:41.415219126 -0700 ++++ alsa-utils-1.0.8/alsamixer/alsamixer.c 2005-09-06 12:44:43.407344482 -0700 +@@ -2188,7 +2188,7 @@ + mixer_signal_handler (int signal) + { + if (signal != SIGSEGV) +- mixer_abort (ERR_SIGNAL, sys_siglist[signal], 0); ++ mixer_abort (ERR_SIGNAL, strsignal(signal), 0); + else + { + fprintf (stderr, "\nSegmentation fault.\n"); -- cgit v1.2.3 From 4a9c78c951bff090fcc5e45e215243c364eef589 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Fri, 9 Sep 2005 22:47:04 +0000 Subject: uclibc, alsa, monotone-5, util-linux: enable thumb on ucslugc, disable it on these packages This commit causes thumb build for everything in ucslugc-packages except these packages and libgcc (from gcc). libgcc and uclibc still need some work, the other packages reveal compiler bugs (monotone), source bugs (alsa) or missing configuration (thumb arch support in util-linux) and so are disabled for the moment. --- packages/alsa/alsa-lib_1.0.8.bb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'packages/alsa') diff --git a/packages/alsa/alsa-lib_1.0.8.bb b/packages/alsa/alsa-lib_1.0.8.bb index a58b21f532..49ee525318 100644 --- a/packages/alsa/alsa-lib_1.0.8.bb +++ b/packages/alsa/alsa-lib_1.0.8.bb @@ -4,6 +4,12 @@ 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 = "" + SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2" inherit autotools pkgconfig -- cgit v1.2.3 From 08c9668df356fc47f01cde8e421d3dc24adc4c9e Mon Sep 17 00:00:00 2001 From: John Bowler Date: Wed, 26 Oct 2005 21:05:31 +0000 Subject: slugos, openslug, ucslugc: move to new slugos base distro in openslug 3.0, ucslugc 3 - all the nslu2-???.conf files are now slugos-???.conf and slugos has been made - the base for both openslug and ucslugc. OpenSlug now enables thumb interwork. --- packages/alsa/alsa-lib_1.0.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/alsa') diff --git a/packages/alsa/alsa-lib_1.0.8.bb b/packages/alsa/alsa-lib_1.0.8.bb index 49ee525318..3b926b4853 100644 --- a/packages/alsa/alsa-lib_1.0.8.bb +++ b/packages/alsa/alsa-lib_1.0.8.bb @@ -8,7 +8,7 @@ PR = "r1" # (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_INSTRUCTION_SET = "arm" SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2" -- cgit v1.2.3