SOURCES: alsa-driver-bluezsco.patch, alsa-driver-noebus.patch, als...

[qboosh]

Author: qboosh                       Date: Fri Apr 21 23:53:24 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 1.0.11

---- Files affected:
SOURCES:
   alsa-driver-bluezsco.patch (1.14 -> 1.15) , alsa-driver-noebus.patch (1.1 -> 1.2) , alsa-driver-processor.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/alsa-driver-bluezsco.patch
diff -u SOURCES/alsa-driver-bluezsco.patch:1.14 SOURCES/alsa-driver-bluezsco.patch:1.15
--- SOURCES/alsa-driver-bluezsco.patch:1.14	Sat Nov 19 16:28:40 2005
+++ SOURCES/alsa-driver-bluezsco.patch	Sat Apr 22 01:53:19 2006
@@ -21,9 +21,9 @@
  
  ifndef NEW_KBUILD
  INCLUDE		= -I$(TOPDIR)/include @EXTRA_INCLUDES@ @KERNEL_INC@
---- alsa-driver-1.0.10/acinclude.m4.orig	2005-11-16 15:40:58.000000000 +0100
-+++ alsa-driver-1.0.10/acinclude.m4	2005-11-19 15:58:17.507195648 +0100
-@@ -175,6 +175,7 @@
+--- alsa-driver-1.0.11/acinclude.m4.orig	2006-04-19 09:46:39.000000000 +0200
++++ alsa-driver-1.0.11/acinclude.m4	2006-04-21 22:52:22.276986000 +0200
+@@ -183,6 +183,7 @@
  	CONFIG_USB=""
  	CONFIG_SND_USB_AUDIO=""
  	CONFIG_SND_USB_USX2Y=""
@@ -31,16 +31,16 @@
  	CONFIG_ALPHA=""
  	CONFIG_PCMCIA=""
  	CONFIG_SND_VXPOCKET=""
-@@ -221,7 +222,7 @@
-   [                          powermac, sa11xx-uda1341, armaaci, pxa2xx-ac97, ]
-   [                          s3c2410, au1x00, usb-audio, usb-usx2y, vxpocket, ]
-   [                          pdaudiocf, sun-amd7930, sun-cs4231, sun-dbri, ]
--  [                          harmony ],
-+  [                          harmony, bluez-sco ],
+@@ -228,7 +229,7 @@
+   [                          indigodj, powermac, sa11xx-uda1341, armaaci, ]
+   [                          pxa2xx-ac97, s3c2410, pxa2xx-i2sound, au1x00, ]
+   [                          usb-audio, usb-usx2y, vxpocket, pdaudiocf, ]
+-  [                          sun-amd7930, sun-cs4231, sun-dbri, harmony ],
++  [                          sun-amd7930, sun-cs4231, sun-dbri, harmony, bluez-sco ],
    cards="$withval", cards="all")
  SELECTED_CARDS=`echo $cards | sed 's/,/ /g'`
  for card in $SELECTED_CARDS; do
-@@ -1699,6 +1700,10 @@
+@@ -1836,6 +1837,10 @@
        probed=0
      fi
    fi
@@ -51,7 +51,7 @@
    if test -z "$probed"; then
      AC_MSG_ERROR(Unknown soundcard $card)
    elif test "$probed" = "0"; then
-@@ -2196,6 +2201,9 @@
+@@ -2356,6 +2361,9 @@
  if test -n "$CONFIG_ALPHA"; then
    AC_DEFINE(CONFIG_ALPHA_MODULE)
  fi
@@ -61,7 +61,7 @@
  if test -n "$CONFIG_SND_VXPOCKET"; then
    AC_DEFINE(CONFIG_SND_VXPOCKET_MODULE)
  fi
-@@ -2392,6 +2400,7 @@
+@@ -2563,6 +2571,7 @@
  AC_SUBST(CONFIG_USB)
  AC_SUBST(CONFIG_SND_USB_AUDIO)
  AC_SUBST(CONFIG_SND_USB_USX2Y)

================================================================
Index: SOURCES/alsa-driver-noebus.patch
diff -u SOURCES/alsa-driver-noebus.patch:1.1 SOURCES/alsa-driver-noebus.patch:1.2
--- SOURCES/alsa-driver-noebus.patch:1.1	Thu Dec 29 07:34:02 2005
+++ SOURCES/alsa-driver-noebus.patch	Sat Apr 22 01:53:19 2006
@@ -1,14 +1,3 @@
---- alsa-driver-1.0.10/alsa-kernel/include/cs4231.h.orig	2004-11-25 15:17:52.000000000 +0000
-+++ alsa-driver-1.0.10/alsa-kernel/include/cs4231.h	2005-12-28 23:38:23.642770750 +0000
-@@ -31,7 +31,7 @@
- #include <asm/sbus.h>
- #endif
- 
--#if defined(CONFIG_PCI) && defined(CONFIG_SPARC64)
-+#if defined(CONFIG_PCI) && defined(CONFIG_SPARC64) && defined(WANT_EBUS)
- #define EBUS_SUPPORT
- #include <linux/pci.h>
- #include <asm/ebus.h>
 --- alsa-driver-1.0.10/alsa-kernel/sparc/cs4231.c.orig	2005-11-15 11:58:31.000000000 +0000
 +++ alsa-driver-1.0.10/alsa-kernel/sparc/cs4231.c	2005-12-28 23:37:36.507825000 +0000
 @@ -37,7 +37,7 @@

================================================================
Index: SOURCES/alsa-driver-processor.patch
diff -u SOURCES/alsa-driver-processor.patch:1.5 SOURCES/alsa-driver-processor.patch:1.6
--- SOURCES/alsa-driver-processor.patch:1.5	Sat Nov 19 16:28:41 2005
+++ SOURCES/alsa-driver-processor.patch	Sat Apr 22 01:53:19 2006
@@ -1,6 +1,6 @@
---- alsa-driver-1.0.10/configure.in.orig	2005-01-13 10:54:14.000000000 +0100
-+++ alsa-driver-1.0.10/configure.in	2005-01-14 00:55:23.654225472 +0100
-@@ -747,6 +747,11 @@
+--- alsa-driver-1.0.11/configure.in.orig	2006-04-19 09:41:18.000000000 +0200
++++ alsa-driver-1.0.11/configure.in	2006-04-21 22:50:55.699575250 +0200
+@@ -773,6 +773,11 @@
  CONFIG_ISA=probe
  fi
  
@@ -12,18 +12,18 @@
  dnl Check processor type...
  AC_MSG_CHECKING(for processor type)
  CONFIG_X86=
-@@ -758,8 +763,9 @@
- CONFIG_SPARC64=
+@@ -787,8 +792,9 @@
  CONFIG_SBUS=
+ CONFIG_MIPS=
  CONFIG_SND_BIT32_EMUL=
-+KCC=$CROSS_COMPILE$CC
+-processor=""
+ KCC=$CROSS_COMPILE$CC
 +if test x$processor = x; then
- processor=""
--KCC=$CROSS_COMPILE$CC
++processor=""
  rm -f processor.id
  ac_save_CFLAGS="$CFLAGS"
  CFLAGS="$CFLAGS $KERNEL_INC $HACK_KERNEL_INC"
-@@ -855,6 +861,7 @@
+@@ -888,6 +894,7 @@
  )
  CFLAGS="$ac_save_CFLAGS"
  rm -f processor.id
@@ -31,16 +31,16 @@
  c_opts=""
  KLD=ld
  ARCH=
-@@ -1074,7 +1081,7 @@
+@@ -1133,7 +1140,7 @@
  
  dnl set ia32 (X86)
  case "$processor" in
--  i?86*|k?|crusoe|mcyrixiii|mwinchip)
-+  i?86*|k?|crusoe|mcyrixiii|mwinchip|athlon)
+-  i?86*|k?|crusoe|mcyrixiii|mwinchip|viac3_2)
++  i?86*|k?|crusoe|mcyrixiii|mwinchip|viac3_2|athlon)
      if $KCC -mpreferred-stack-boundary=2 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then
        c_opts="-mpreferred-stack-boundary=2 $c_opts"
        CONFIG_X86=y
-@@ -1208,7 +1208,7 @@
+@@ -1240,7 +1247,7 @@
    c_opts="$c_opts -Wno-pointer-sign"
  fi
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/alsa-driver-bluezsco.patch?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SOURCES/alsa-driver-noebus.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/alsa-driver-processor.patch?r1=1.5&r2=1.6&f=u