merge of 21d66a92293faf76a506c7d17e3cd16e143bb401

     and 70f8ac179abbb777f1bec20edf02530820b33e92

13 files changed, 343 insertions, 0 deletions

diff --git a/packages/alsa/.mtn2git_empty b/packages/alsa/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/alsa/.mtn2git_empty
diff --git a/packages/alsa/alsa-driver/.mtn2git_empty b/packages/alsa/alsa-driver/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/alsa/alsa-driver/.mtn2git_empty
diff --git a/packages/alsa/alsa-driver/adriver.h.patch b/packages/alsa/alsa-driver/adriver.h.patch
new file mode 100644
index 0000000000..cd648838c0
--- /dev/null
+++ 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 <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
new file mode 100644
index 0000000000..e156708783
--- /dev/null
+++ 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 <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
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/sound.p.patch b/packages/alsa/alsa-driver/sound.p.patch
new file mode 100644
index 0000000000..38b073c8bd
--- /dev/null
+++ 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
new file mode 100644
index 0000000000..d8f7dcfa0b
--- /dev/null
+++ b/packages/alsa/alsa-driver_0.9.6-hh4c.bb
@@ -0,0 +1,77 @@
+DESCRIPTION = "Alsa Drivers"
+MAINTAINER = "Pigi"
+SECTION = "base"
+LICENSE = "GPL"
+PR = "r5"
+
+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-lib_1.0.8.bb b/packages/alsa/alsa-lib_1.0.8.bb
new file mode 100644
index 0000000000..3b926b4853
--- /dev/null
+++ b/packages/alsa/alsa-lib_1.0.8.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Alsa sound library"
+MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
+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"
+
+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-oss_1.0.8.bb b/packages/alsa/alsa-oss_1.0.8.bb
new file mode 100644
index 0000000000..f62550bb93
--- /dev/null
+++ b/packages/alsa/alsa-oss_1.0.8.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Alsa OSS Compatibility Package"
+MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
+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}
+}
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..eed86e5dba
--- /dev/null
+++ 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
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..8e8297c85b
--- /dev/null
+++ b/packages/alsa/alsa-utils_1.0.8.bb
@@ -0,0 +1,57 @@
+DESCRIPTION = "ALSA Utilities"
+MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
+SECTION = "console/utils"
+LICENSE = "GPL"
+DEPENDS = "alsa-lib ncurses"
+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
+
+# 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"
diff --git a/packages/alsa/files/.mtn2git_empty b/packages/alsa/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/alsa/files/.mtn2git_empty
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");