[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-driver/debian/patches (2 files)

David B Harris dbharris-guest@haydn.debian.org
Tue, 13 Apr 2004 13:58:44 -0600


    Date: Tuesday, April 13, 2004 @ 13:58:44
  Author: dbharris-guest
    Path: /cvsroot/pkg-alsa/debian/alsa-driver/debian/patches

Modified: 10_disable_gcc_version_check1.dpatch
          99_debian_makefile_depmod.dpatch

Forward-port patches


--------------------------------------+
 10_disable_gcc_version_check1.dpatch |   14 ++++++++------
 99_debian_makefile_depmod.dpatch     |   25 +++++++++++--------------
 2 files changed, 19 insertions(+), 20 deletions(-)


Index: debian/alsa-driver/debian/patches/10_disable_gcc_version_check1.dpatch
diff -u debian/alsa-driver/debian/patches/10_disable_gcc_version_check1.dpatch:1.3 debian/alsa-driver/debian/patches/10_disable_gcc_version_check1.dpatch:1.4
--- debian/alsa-driver/debian/patches/10_disable_gcc_version_check1.dpatch:1.3	Sun Feb 29 17:20:14 2004
+++ debian/alsa-driver/debian/patches/10_disable_gcc_version_check1.dpatch	Tue Apr 13 13:58:44 2004
@@ -25,14 +25,13 @@
 exit 0
 
 @DPATCH@
-diff -urNad /home/dbharris/source/debian/alsa-driver/configure.in alsa-driver/configure.in
---- /home/dbharris/source/debian/alsa-driver/configure.in	2004-02-29 19:13:00.000000000 -0500
-+++ alsa-driver/configure.in	2004-02-29 19:17:29.000000000 -0500
-@@ -152,48 +152,48 @@
- AC_SUBST(kextraversion)
+diff -urNad /home/dbharris/source/debian/build/alsa-driver-1.0.4/configure.in alsa-driver-1.0.4/configure.in
+--- /home/dbharris/source/debian/build/alsa-driver-1.0.4/configure.in	2004-04-13 15:43:16.000000000 -0400
++++ alsa-driver-1.0.4/configure.in	2004-04-13 15:44:05.000000000 -0400
+@@ -156,50 +156,50 @@
  AC_MSG_RESULT($kaversion)
  
--dnl Check for GCC version...
+ dnl Check for GCC version...
 -AC_MSG_CHECKING(for GCC version)
 -ac_save_CFLAGS="$CFLAGS"
 -CFLAGS="$CFLAGS $KERNEL_INC $HACK_KERNEL_INC"
@@ -40,6 +39,7 @@
 -[AC_TRY_RUN([
 -#include <stdio.h>
 -#include <ctype.h>
+-#include <string.h>
 -#include "$CONFIG_SND_KERNELDIR/include/linux/compile.h"
 -int main()
 -{
@@ -62,6 +62,8 @@
 -     *dptr = *ptr;
 -   *dptr = '\t';
 -   *dptr = '\0';
+-   if (!strcmp(compiler, " "))
+-	compiler[0] = '\0';
 -   fprintf(f,"%s\n",compiler);
 -   fclose(f);
 -   }
@@ -74,7 +76,6 @@
 -kernel_compiler="")])
 -CFLAGS="$ac_save_CFLAGS"
 -my_compiler=`$CROSS_COMPILE$CC --version | head -n 1`
-+dnl dnl Check for GCC version...
 +dnl AC_MSG_CHECKING(for GCC version)
 +dnl ac_save_CFLAGS="$CFLAGS"
 +dnl CFLAGS="$CFLAGS $KERNEL_INC $HACK_KERNEL_INC"
@@ -82,6 +83,7 @@
 +dnl [AC_TRY_RUN([
 +dnl #include <stdio.h>
 +dnl #include <ctype.h>
++dnl #include <string.h>
 +dnl #include "$CONFIG_SND_KERNELDIR/include/linux/compile.h"
 +dnl int main()
 +dnl {
@@ -104,6 +106,8 @@
 +dnl      *dptr = *ptr;
 +dnl    *dptr = '\t';
 +dnl    *dptr = '\0';
++dnl    if (!strcmp(compiler, " "))
++dnl 	compiler[0] = '\0';
 +dnl    fprintf(f,"%s\n",compiler);
 +dnl    fclose(f);
 +dnl    }
@@ -119,7 +123,7 @@
  dnl
  dnl Test section, uncomment any of these double lines to verify the bellow code:
  dnl
-@@ -212,85 +212,85 @@
+@@ -218,85 +218,85 @@
  dnl kernel_compiler="gcc 2.95.3 20010315 (release)"
  dnl my_compiler="2.95.3"
  dnl
Index: debian/alsa-driver/debian/patches/99_debian_makefile_depmod.dpatch
diff -u debian/alsa-driver/debian/patches/99_debian_makefile_depmod.dpatch:1.8 debian/alsa-driver/debian/patches/99_debian_makefile_depmod.dpatch:1.9
--- debian/alsa-driver/debian/patches/99_debian_makefile_depmod.dpatch:1.8	Tue Mar  2 07:24:12 2004
+++ debian/alsa-driver/debian/patches/99_debian_makefile_depmod.dpatch	Tue Apr 13 13:58:44 2004
@@ -22,10 +22,10 @@
 exit 0
 
 @DPATCH@
-
---- alsa-driver/Makefile~	25 Dec 2003 03:02:30 -0000	1.12
-+++ alsa-driver/Makefile	30 Dec 2003 09:24:16 -0000
-@@ -144,20 +144,20 @@
+diff -urNad /home/dbharris/source/debian/build/alsa-driver-1.0.4/Makefile alsa-driver-1.0.4/Makefile
+--- /home/dbharris/source/debian/build/alsa-driver-1.0.4/Makefile	2004-04-13 15:44:33.000000000 -0400
++++ alsa-driver-1.0.4/Makefile	2004-04-13 15:47:13.000000000 -0400
+@@ -148,10 +148,10 @@
  	rm -f $(DESTDIR)$(moddir)/snd*.*o $(DESTDIR)$(moddir)/persist.o $(DESTDIR)$(moddir)/isapnp.o
  endif
  	@for d in $(SUBDIRS); do if ! $(MAKE) -C $$d modules_install; then exit 1; fi; done
@@ -33,24 +33,19 @@
 -	-/sbin/depmod -a $(kaversion) $(SYSTEM_MAP_OPT)
 -else
 -	-/sbin/depmod -a -b $(DESTDIR)/ $(SYSTEM_MAP_OPT) $(kaversion)
--endif
 +#ifeq ($(DESTDIR),)
 +#	-/sbin/depmod -a $(kaversion) $(SYSTEM_MAP_OPT)
 +#else
-+#	-/sbin/depmod -a -b $(DESTDIR)/ $(SYSTEM_MAP_OPT) $(kaversion)
-+#endif
++##	-/sbin/depmod -a -b $(DESTDIR)/ $(SYSTEM_MAP_OPT) $(kaversion)
+ endif
  
  .PHONY: install-scripts
- install-scripts:
- 	if [ -d $(DESTDIR)/sbin/init.d ]; then \
--	  install -m 755 -g $(IGROUP) -o $(IUSER) utils/alsasound $(DESTDIR)/sbin/init.d/alsasound; \
-+	  install -m 755 -g root -o root utils/alsasound $(DESTDIR)/sbin/init.d/alsasound; \
- 	elif [ -d $(DESTDIR)/etc/rc.d/init.d ]; then \
--	  install -m 755 -g $(IGROUP) -o $(IUSER) utils/alsasound $(DESTDIR)/etc/rc.d/init.d/alsasound; \
-+	  install -m 755 -g root -o root utils/alsasound $(DESTDIR)/etc/rc.d/init.d/alsasound; \
- 	elif [ -d $(DESTDIR)/etc/init.d ]; then \
--	  install -m 755 -g $(IGROUP) -o $(IUSER) utils/alsasound $(DESTDIR)/etc/init.d/alsasound; \
-+	  install -m 755 -g root -o root utils/alsasound $(DESTDIR)/etc/init.d/alsasound; \
- 	fi
+@@ -161,7 +161,7 @@
+ 	   if [ -f $(DESTDIR)$$d/alsasound ]; then \
+ 	     cmp -s utils/alsasound $(DESTDIR)$$d/alsasound || cp $(DESTDIR)$$d/alsasound $(DESTDIR)$$d/alsasound.old; \
+ 	   fi; \
+-	   install -m 755 -g $(IGROUP) -o $(IUSER) utils/alsasound $(DESTDIR)$$d/alsasound; \
++	   install -m 755 -g root -o root utils/alsasound $(DESTDIR)$$d/alsasound; \
+ 	   break; \
+ 	fi; done
  
- .PHONY: check-snd-prefix