[Pkg-alsa-devel] Re: [Alsa-devel] aoa drivers and alsa 1.0.12

[Elimar Riesebieter]

On Tue, 05 Sep 2006 the mental interface of
Takashi Iwai told:

[...]
> Fix the content of alsa-driver/aoa/soundbus/sysfs.c to include
> ..../soundbus/sysfs.c.  Sorry, it's a copy&paste error.

You have won ;) Corrected patch applied. One thing, please:
What do you advice to release to Debian unstable? 1.0.12 or
1.0.13.rc1? For 1.0.12 I need the "Fix detection of
CONFIG_I2C_POWERMAC" to compile the drivers using ./configure and
not ./hgcompile.

THX for your cooperation ;)

Elimar

-- 
  The path to source is always uphill!
                                -unknown-

-------------- next part --------------
diff -urNad alsa-driver-1.0.13rc1~/aoa/codecs/Makefile alsa-driver-1.0.13rc1/aoa/codecs/Makefile
--- alsa-driver-1.0.13rc1~/aoa/codecs/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ alsa-driver-1.0.13rc1/aoa/codecs/Makefile	2006-09-05 20:44:45.000000000 +0200
@@ -0,0 +1,10 @@
+ifndef SND_TOPDIR
+SND_TOPDIR=../..
+endif
+
+include $(SND_TOPDIR)/toplevel.config
+include $(SND_TOPDIR)/Makefile.conf
+
+include $(SND_TOPDIR)/alsa-kernel/aoa/codecs/Makefile
+
+include $(SND_TOPDIR)/Rules.make
diff -urNad alsa-driver-1.0.13rc1~/aoa/codecs/snd-aoa-codec-onyx.c alsa-driver-1.0.13rc1/aoa/codecs/snd-aoa-codec-onyx.c
--- alsa-driver-1.0.13rc1~/aoa/codecs/snd-aoa-codec-onyx.c	1970-01-01 01:00:00.000000000 +0100
+++ alsa-driver-1.0.13rc1/aoa/codecs/snd-aoa-codec-onyx.c	2006-09-05 20:44:45.000000000 +0200
@@ -0,0 +1 @@
+#include "../../alsa-kernel/aoa/codecs/snd-aoa-codec-onyx.c"
diff -urNad alsa-driver-1.0.13rc1~/aoa/codecs/snd-aoa-codec-tas.c alsa-driver-1.0.13rc1/aoa/codecs/snd-aoa-codec-tas.c
--- alsa-driver-1.0.13rc1~/aoa/codecs/snd-aoa-codec-tas.c	1970-01-01 01:00:00.000000000 +0100
+++ alsa-driver-1.0.13rc1/aoa/codecs/snd-aoa-codec-tas.c	2006-09-05 20:44:45.000000000 +0200
@@ -0,0 +1 @@
+#include "../../alsa-kernel/aoa/codecs/snd-aoa-codec-tas.c"
diff -urNad alsa-driver-1.0.13rc1~/aoa/codecs/snd-aoa-codec-toonie.c alsa-driver-1.0.13rc1/aoa/codecs/snd-aoa-codec-toonie.c
--- alsa-driver-1.0.13rc1~/aoa/codecs/snd-aoa-codec-toonie.c	1970-01-01 01:00:00.000000000 +0100
+++ alsa-driver-1.0.13rc1/aoa/codecs/snd-aoa-codec-toonie.c	2006-09-05 20:44:45.000000000 +0200
@@ -0,0 +1 @@
+#include "../../alsa-kernel/aoa/codecs/snd-aoa-codec-toonie.c"
diff -urNad alsa-driver-1.0.13rc1~/aoa/core/Makefile alsa-driver-1.0.13rc1/aoa/core/Makefile
--- alsa-driver-1.0.13rc1~/aoa/core/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ alsa-driver-1.0.13rc1/aoa/core/Makefile	2006-09-05 20:44:45.000000000 +0200
@@ -0,0 +1,10 @@
+ifndef SND_TOPDIR
+SND_TOPDIR=../..
+endif
+
+include $(SND_TOPDIR)/toplevel.config
+include $(SND_TOPDIR)/Makefile.conf
+
+include $(SND_TOPDIR)/alsa-kernel/aoa/core/Makefile
+
+include $(SND_TOPDIR)/Rules.make
diff -urNad alsa-driver-1.0.13rc1~/aoa/core/snd-aoa-alsa.c alsa-driver-1.0.13rc1/aoa/core/snd-aoa-alsa.c
--- alsa-driver-1.0.13rc1~/aoa/core/snd-aoa-alsa.c	1970-01-01 01:00:00.000000000 +0100
+++ alsa-driver-1.0.13rc1/aoa/core/snd-aoa-alsa.c	2006-09-05 20:44:45.000000000 +0200
@@ -0,0 +1 @@
+#include "../../alsa-kernel/aoa/core/snd-aoa-alsa.c"
diff -urNad alsa-driver-1.0.13rc1~/aoa/core/snd-aoa-core.c alsa-driver-1.0.13rc1/aoa/core/snd-aoa-core.c
--- alsa-driver-1.0.13rc1~/aoa/core/snd-aoa-core.c	1970-01-01 01:00:00.000000000 +0100
+++ alsa-driver-1.0.13rc1/aoa/core/snd-aoa-core.c	2006-09-05 20:44:45.000000000 +0200
@@ -0,0 +1 @@
+#include "../../alsa-kernel/aoa/core/snd-aoa-core.c"
diff -urNad alsa-driver-1.0.13rc1~/aoa/core/snd-aoa-gpio-feature.c alsa-driver-1.0.13rc1/aoa/core/snd-aoa-gpio-feature.c
--- alsa-driver-1.0.13rc1~/aoa/core/snd-aoa-gpio-feature.c	1970-01-01 01:00:00.000000000 +0100
+++ alsa-driver-1.0.13rc1/aoa/core/snd-aoa-gpio-feature.c	2006-09-05 20:44:45.000000000 +0200
@@ -0,0 +1 @@
+#include "../../alsa-kernel/aoa/core/snd-aoa-gpio-feature.c"
diff -urNad alsa-driver-1.0.13rc1~/aoa/core/snd-aoa-gpio-pmf.c alsa-driver-1.0.13rc1/aoa/core/snd-aoa-gpio-pmf.c
--- alsa-driver-1.0.13rc1~/aoa/core/snd-aoa-gpio-pmf.c	1970-01-01 01:00:00.000000000 +0100
+++ alsa-driver-1.0.13rc1/aoa/core/snd-aoa-gpio-pmf.c	2006-09-05 20:44:45.000000000 +0200
@@ -0,0 +1 @@
+#include "../../alsa-kernel/aoa/core/snd-aoa-gpio-pmf.c"
diff -urNad alsa-driver-1.0.13rc1~/aoa/fabrics/Makefile alsa-driver-1.0.13rc1/aoa/fabrics/Makefile
--- alsa-driver-1.0.13rc1~/aoa/fabrics/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ alsa-driver-1.0.13rc1/aoa/fabrics/Makefile	2006-09-05 20:44:45.000000000 +0200
@@ -0,0 +1,10 @@
+ifndef SND_TOPDIR
+SND_TOPDIR=../..
+endif
+
+include $(SND_TOPDIR)/toplevel.config
+include $(SND_TOPDIR)/Makefile.conf
+
+include $(SND_TOPDIR)/alsa-kernel/aoa/fabrics/Makefile
+
+include $(SND_TOPDIR)/Rules.make
diff -urNad alsa-driver-1.0.13rc1~/aoa/fabrics/snd-aoa-fabric-layout.c alsa-driver-1.0.13rc1/aoa/fabrics/snd-aoa-fabric-layout.c
--- alsa-driver-1.0.13rc1~/aoa/fabrics/snd-aoa-fabric-layout.c	1970-01-01 01:00:00.000000000 +0100
+++ alsa-driver-1.0.13rc1/aoa/fabrics/snd-aoa-fabric-layout.c	2006-09-05 20:44:45.000000000 +0200
@@ -0,0 +1 @@
+#include "../../alsa-kernel/aoa/fabrics/snd-aoa-fabric-layout.c"
diff -urNad alsa-driver-1.0.13rc1~/aoa/Makefile alsa-driver-1.0.13rc1/aoa/Makefile
--- alsa-driver-1.0.13rc1~/aoa/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ alsa-driver-1.0.13rc1/aoa/Makefile	2006-09-05 20:44:45.000000000 +0200
@@ -0,0 +1,10 @@
+ifndef SND_TOPDIR
+SND_TOPDIR=..
+endif
+
+include $(SND_TOPDIR)/toplevel.config
+include $(SND_TOPDIR)/Makefile.conf
+
+include $(SND_TOPDIR)/alsa-kernel/aoa/Makefile
+
+include $(SND_TOPDIR)/Rules.make
diff -urNad alsa-driver-1.0.13rc1~/aoa/soundbus/core.c alsa-driver-1.0.13rc1/aoa/soundbus/core.c
--- alsa-driver-1.0.13rc1~/aoa/soundbus/core.c	1970-01-01 01:00:00.000000000 +0100
+++ alsa-driver-1.0.13rc1/aoa/soundbus/core.c	2006-09-05 20:44:45.000000000 +0200
@@ -0,0 +1 @@
+#include "../../alsa-kernel/aoa/soundbus/sysfs.c"
diff -urNad alsa-driver-1.0.13rc1~/aoa/soundbus/i2sbus/i2sbus-control.c alsa-driver-1.0.13rc1/aoa/soundbus/i2sbus/i2sbus-control.c
--- alsa-driver-1.0.13rc1~/aoa/soundbus/i2sbus/i2sbus-control.c	1970-01-01 01:00:00.000000000 +0100
+++ alsa-driver-1.0.13rc1/aoa/soundbus/i2sbus/i2sbus-control.c	2006-09-05 20:44:45.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../alsa-kernel/aoa/soundbus/i2sbus/i2sbus-control.c"
diff -urNad alsa-driver-1.0.13rc1~/aoa/soundbus/i2sbus/i2sbus-core.c alsa-driver-1.0.13rc1/aoa/soundbus/i2sbus/i2sbus-core.c
--- alsa-driver-1.0.13rc1~/aoa/soundbus/i2sbus/i2sbus-core.c	1970-01-01 01:00:00.000000000 +0100
+++ alsa-driver-1.0.13rc1/aoa/soundbus/i2sbus/i2sbus-core.c	2006-09-05 20:44:45.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../alsa-kernel/aoa/soundbus/i2sbus/i2sbus-core.c"
diff -urNad alsa-driver-1.0.13rc1~/aoa/soundbus/i2sbus/i2sbus-pcm.c alsa-driver-1.0.13rc1/aoa/soundbus/i2sbus/i2sbus-pcm.c
--- alsa-driver-1.0.13rc1~/aoa/soundbus/i2sbus/i2sbus-pcm.c	1970-01-01 01:00:00.000000000 +0100
+++ alsa-driver-1.0.13rc1/aoa/soundbus/i2sbus/i2sbus-pcm.c	2006-09-05 20:44:45.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../alsa-kernel/aoa/soundbus/i2sbus/i2sbus-pcm.c"
diff -urNad alsa-driver-1.0.13rc1~/aoa/soundbus/i2sbus/Makefile alsa-driver-1.0.13rc1/aoa/soundbus/i2sbus/Makefile
--- alsa-driver-1.0.13rc1~/aoa/soundbus/i2sbus/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ alsa-driver-1.0.13rc1/aoa/soundbus/i2sbus/Makefile	2006-09-05 20:44:45.000000000 +0200
@@ -0,0 +1,10 @@
+ifndef SND_TOPDIR
+SND_TOPDIR=../../..
+endif
+
+include $(SND_TOPDIR)/toplevel.config
+include $(SND_TOPDIR)/Makefile.conf
+
+include $(SND_TOPDIR)/alsa-kernel/aoa/soundbus/i2sbus/Makefile
+
+include $(SND_TOPDIR)/Rules.make
diff -urNad alsa-driver-1.0.13rc1~/aoa/soundbus/Makefile alsa-driver-1.0.13rc1/aoa/soundbus/Makefile
--- alsa-driver-1.0.13rc1~/aoa/soundbus/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ alsa-driver-1.0.13rc1/aoa/soundbus/Makefile	2006-09-05 20:44:45.000000000 +0200
@@ -0,0 +1,10 @@
+ifndef SND_TOPDIR
+SND_TOPDIR=../..
+endif
+
+include $(SND_TOPDIR)/toplevel.config
+include $(SND_TOPDIR)/Makefile.conf
+
+include $(SND_TOPDIR)/alsa-kernel/aoa/soundbus/Makefile
+
+include $(SND_TOPDIR)/Rules.make
diff -urNad alsa-driver-1.0.13rc1~/aoa/soundbus/sysfs.c alsa-driver-1.0.13rc1/aoa/soundbus/sysfs.c
--- alsa-driver-1.0.13rc1~/aoa/soundbus/sysfs.c	1970-01-01 01:00:00.000000000 +0100
+++ alsa-driver-1.0.13rc1/aoa/soundbus/sysfs.c	2006-09-05 20:44:45.000000000 +0200
@@ -0,0 +1 @@
+#include "../../alsa-kernel/aoa/soundbus/core.c"
diff -urNad alsa-driver-1.0.13rc1~/Makefile alsa-driver-1.0.13rc1/Makefile
--- alsa-driver-1.0.13rc1~/Makefile	2006-08-31 10:07:30.000000000 +0200
+++ alsa-driver-1.0.13rc1/Makefile	2006-09-05 20:44:45.000000000 +0200
@@ -6,7 +6,7 @@
 ifneq ($(KERNELRELEASE),)
 # call from 2.6 kernel build system
 
-obj-m += acore/ i2c/ drivers/ isa/ pci/ ppc/ arm/ synth/ usb/ sparc/ parisc/ pcmcia/
+obj-m += acore/ i2c/ drivers/ isa/ pci/ ppc/ arm/ synth/ usb/ sparc/ parisc/ pcmcia/ aoa/
 
 else
 
@@ -64,7 +64,7 @@
 export KBUILD_VERBOSE KBUILD_CHECKSRC
 endif
 
-SUBDIRS  = acore i2c drivers isa synth pci
+SUBDIRS  = acore i2c drivers isa synth pci aoa
 CSUBDIRS =
 
 ifndef NEW_KBUILD