SOURCES: alsa-driver-bluezsco.patch, alsa-driver-make.patch, alsa-...

qboosh qboosh at pld-linux.org
Tue Jun 12 07:25:41 CEST 2007 

Author: qboosh                       Date: Tue Jun 12 05:25:41 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 1.0.14

---- Files affected:
SOURCES:
   alsa-driver-bluezsco.patch (1.16 -> 1.17) , alsa-driver-make.patch (1.13 -> 1.14) , alsa-driver-processor.patch (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SOURCES/alsa-driver-bluezsco.patch
diff -u SOURCES/alsa-driver-bluezsco.patch:1.16 SOURCES/alsa-driver-bluezsco.patch:1.17
--- SOURCES/alsa-driver-bluezsco.patch:1.16	Sat Aug 26 13:55:59 2006
+++ SOURCES/alsa-driver-bluezsco.patch	Tue Jun 12 07:25:36 2007
@@ -11,36 +11,36 @@
  ifeq (y,$(CONFIG_PCMCIA))
  SUBDIRS  += pcmcia
  endif
---- alsa-driver-1.0.12/Makefile.conf.in.orig	2006-08-23 20:35:30.000000000 +0200
-+++ alsa-driver-1.0.12/Makefile.conf.in	2006-08-26 13:19:18.119665750 +0200
-@@ -51,6 +51,7 @@
- CONFIG_PNP_KERNEL	= @CONFIG_PNP_KERNEL@
+--- alsa-driver-1.0.14/Makefile.conf.in.orig	2007-06-04 09:28:51.000000000 +0200
++++ alsa-driver-1.0.14/Makefile.conf.in	2007-06-12 01:08:33.825758708 +0200
+@@ -52,6 +52,7 @@
  CONFIG_PROC_FS		= @CONFIG_PROC_FS@
  CONFIG_PM		= @CONFIG_PM@
+ CONFIG_AC97_BUS		= @CONFIG_AC97_BUS@
 +CONFIG_BLUEZ_SCO	= @CONFIG_BLUEZ_SCO@
  
  ifndef NEW_KBUILD
  INCLUDE		= -I$(TOPDIR)/include @EXTRA_INCLUDES@ @KERNEL_INC@
---- 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 @@
+--- alsa-driver-1.0.14/acinclude.m4.orig	2007-06-04 09:28:55.000000000 +0200
++++ alsa-driver-1.0.14/acinclude.m4	2007-06-12 01:09:05.083539988 +0200
+@@ -208,6 +208,7 @@
  	CONFIG_USB=""
  	CONFIG_SND_USB_AUDIO=""
  	CONFIG_SND_USB_USX2Y=""
 +	CONFIG_SND_BLUEZ_SCO=""
  	CONFIG_ALPHA=""
- 	CONFIG_PCMCIA=""
- 	CONFIG_SND_VXPOCKET=""
-@@ -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 ],
+ 	CONFIG_SND_USB_CAIAQ=""
+ 	CONFIG_SND_USB_CAIAQ_INPUT=""
+@@ -301,7 +302,7 @@
+   [                          at91-soc, at91-soc-eti-b1-wm8731, pxa2xx-soc, ]
+   [                          pxa2xx-soc-corgi, pxa2xx-soc-spitz, ]
+   [                          pxa2xx-soc-poodle, pxa2xx-soc-tosa, s3c24xx-soc, ]
+-  [                          soc-pcm-sh7760, sh7760-ac97 ],
++  [                          soc-pcm-sh7760, sh7760-ac97, bluez-sco ],
    cards="$withval", cards="all")
  SELECTED_CARDS=`echo $cards | sed 's/,/ /g'`
  for card in $SELECTED_CARDS; do
-@@ -1836,6 +1837,10 @@
+@@ -2270,6 +2271,10 @@
        probed=0
      fi
    fi
@@ -51,9 +51,9 @@
    if test -z "$probed"; then
      AC_MSG_ERROR(Unknown soundcard $card)
    elif test "$probed" = "0"; then
-@@ -2356,6 +2361,9 @@
- if test -n "$CONFIG_ALPHA"; then
-   AC_DEFINE(CONFIG_ALPHA_MODULE)
+@@ -2982,6 +2987,9 @@
+ if test -n "$CONFIG_SND_USB_CAIAQ_INPUT"; then
+   AC_DEFINE(CONFIG_SND_USB_CAIAQ_INPUT)
  fi
 +if test -n "$CONFIG_SND_BLUEZ_SCO"; then
 +  AC_DEFINE(CONFIG_SND_BLUEZ_SCO_MODULE)
@@ -61,14 +61,14 @@
  if test -n "$CONFIG_SND_VXPOCKET"; then
    AC_DEFINE(CONFIG_SND_VXPOCKET_MODULE)
  fi
-@@ -2563,6 +2571,7 @@
+@@ -3328,6 +3336,7 @@
  AC_SUBST(CONFIG_USB)
  AC_SUBST(CONFIG_SND_USB_AUDIO)
  AC_SUBST(CONFIG_SND_USB_USX2Y)
 +AC_SUBST(CONFIG_SND_BLUEZ_SCO)
  AC_SUBST(CONFIG_ALPHA)
- AC_SUBST(CONFIG_PCMCIA)
- AC_SUBST(CONFIG_SND_VXPOCKET)
+ AC_SUBST(CONFIG_SND_USB_CAIAQ)
+ AC_SUBST(CONFIG_SND_USB_CAIAQ_INPUT)
 diff -uNdr alsa-driver-1.0.4-orig/alsa-kernel/Kconfig alsa-driver-1.0.4/alsa-kernel/Kconfig
 --- alsa-driver-1.0.4-orig/alsa-kernel/Kconfig	2003-12-01 11:30:44.000000000 +0100
 +++ alsa-driver-1.0.4/alsa-kernel/Kconfig	2004-04-16 18:32:23.000000000 +0200
@@ -80,17 +80,17 @@
  
  # the following will depenend on the order of config.
  # here assuming PCMCIA is defined before ALSA
---- alsa-driver-1.0.12/alsa-kernel/Makefile.orig	2006-08-23 20:35:34.000000000 +0200
-+++ alsa-driver-1.0.12/alsa-kernel/Makefile	2006-08-26 13:20:07.370743750 +0200
-@@ -4,7 +4,7 @@
- obj-$(CONFIG_SOUND) += soundcore.o
+--- alsa-driver-1.0.14/alsa-kernel/Makefile.orig	2007-06-04 09:28:52.000000000 +0200
++++ alsa-driver-1.0.14/alsa-kernel/Makefile	2007-06-12 01:09:28.048848706 +0200
+@@ -5,7 +5,7 @@
+ obj-$(CONFIG_SOUND_PRIME) += sound_firmware.o
  obj-$(CONFIG_SOUND_PRIME) += oss/
  obj-$(CONFIG_DMASOUND) += oss/
--obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/
-+obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/ bluez/
+-obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/ soc/
++obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/ soc/ bluez/
  obj-$(CONFIG_SND_AOA) += aoa/
  
- ifeq ($(CONFIG_SND),y)
+ # This one must be compilable even if sound is configured out
 diff -uNdr alsa-driver-1.0.4-orig/alsa-kernel/bluez/Makefile alsa-driver-1.0.4/alsa-kernel/bluez/Makefile
 --- alsa-driver-1.0.4-orig/alsa-kernel/bluez/Makefile	1970-01-01 01:00:00.000000000 +0100
 +++ alsa-driver-1.0.4/alsa-kernel/bluez/Makefile	2004-04-16 18:32:23.000000000 +0200

================================================================
Index: SOURCES/alsa-driver-make.patch
diff -u SOURCES/alsa-driver-make.patch:1.13 SOURCES/alsa-driver-make.patch:1.14
--- SOURCES/alsa-driver-make.patch:1.13	Thu Oct 26 14:40:37 2006
+++ SOURCES/alsa-driver-make.patch	Tue Jun 12 07:25:36 2007
@@ -26,14 +26,3 @@
  		done \
  	fi
  
---- alsa-driver-1.0.12/pci/emu10k1/Makefile.orig	2006-08-23 20:35:32.000000000 +0200
-+++ alsa-driver-1.0.12/pci/emu10k1/Makefile	2006-08-26 13:33:07.675509750 +0200
-@@ -5,7 +5,7 @@
- include $(SND_TOPDIR)/toplevel.config
- include $(SND_TOPDIR)/Makefile.conf
- 
--export-objs  := memory.o voice.o io.c
-+export-objs  := memory.o voice.o io.o
- 
- include $(SND_TOPDIR)/alsa-kernel/pci/emu10k1/Makefile
- 

================================================================
Index: SOURCES/alsa-driver-processor.patch
diff -u SOURCES/alsa-driver-processor.patch:1.6 SOURCES/alsa-driver-processor.patch:1.7
--- SOURCES/alsa-driver-processor.patch:1.6	Sat Apr 22 01:53:19 2006
+++ SOURCES/alsa-driver-processor.patch	Tue Jun 12 07:25:36 2007
@@ -1,6 +1,6 @@
---- 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 @@
+--- alsa-driver-1.0.14/configure.in.orig	2007-06-04 09:28:51.000000000 +0200
++++ alsa-driver-1.0.14/configure.in	2007-06-12 01:03:08.443216214 +0200
+@@ -817,6 +817,11 @@
  CONFIG_ISA=probe
  fi
  
@@ -12,7 +12,7 @@
  dnl Check processor type...
  AC_MSG_CHECKING(for processor type)
  CONFIG_X86=
-@@ -787,8 +792,9 @@
+@@ -831,8 +836,9 @@
  CONFIG_SBUS=
  CONFIG_MIPS=
  CONFIG_SND_BIT32_EMUL=
@@ -23,7 +23,7 @@
  rm -f processor.id
  ac_save_CFLAGS="$CFLAGS"
  CFLAGS="$CFLAGS $KERNEL_INC $HACK_KERNEL_INC"
-@@ -888,6 +894,7 @@
+@@ -942,6 +948,7 @@
  )
  CFLAGS="$ac_save_CFLAGS"
  rm -f processor.id
@@ -31,16 +31,16 @@
  c_opts=""
  KLD=ld
  ARCH=
-@@ -1133,7 +1140,7 @@
+@@ -1214,7 +1221,7 @@
  
  dnl set ia32 (X86)
  case "$processor" in
--  i?86*|k?|crusoe|mcyrixiii|mwinchip|viac3_2)
-+  i?86*|k?|crusoe|mcyrixiii|mwinchip|viac3_2|athlon)
+-  i?86*|k?|crusoe|mcyrixiii|mwinchip|viac3_2|mcore2|geodegx*)
++  i?86*|k?|athlon|crusoe|mcyrixiii|mwinchip|viac3_2|mcore2|geodegx*)
      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
-@@ -1240,7 +1247,7 @@
+@@ -1322,7 +1329,7 @@
    c_opts="$c_opts -Wno-pointer-sign"
  fi
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/alsa-driver-bluezsco.patch?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SOURCES/alsa-driver-make.patch?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SOURCES/alsa-driver-processor.patch?r1=1.6&r2=1.7&f=u

More information about the pld-cvs-commit mailing list