Updated configure patch to update Makefile.conf.in as well to fix compilation with...

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 6d238a57e7a1da16a0e60fab3fd7800f5afd2522..50788a9d37d01ca8907b698500ed2e34d65c5bdf 100644 (file)
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/alsa-driver
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.116 2004/12/02 22:36:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.117 2004/12/04 10:12:26 eradicator Exp $
+
+  04 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  files/alsa-driver-1.0.7-configure.patch:
+  Updated configure patch to update Makefile.conf.in as well to fix
+  compilation with 2.4 kernels. Closes bug #73290.
 
 *alsa-driver-1.0.7-r3 (02 Dec 2004)
 

diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index bf7e961cf520822ba8c6b677f2d81d126281c5c2..502520948164e196d473d4dbe57990ba54a494e8 100644 (file)
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f4394c15f2a0e1df46e9894aaef5ad5a ChangeLog 20117
+MD5 2e589555c3a7b2e097179e311218e7f3 ChangeLog 20337
 MD5 d388a1b0706024ddccccc99045b976f9 alsa-driver-0.9.8.ebuild 2341
 MD5 f290aa99c4fa3d4650c008edfdf6788b alsa-driver-1.0.7-r3.ebuild 3431
 MD5 e5de43659b629d1e9f0ee8d3f1864840 alsa-driver-1.0.3.ebuild 3363
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 9f0283e4e9611766ad3110532d4976d7 alsa-driver-1.0.5a.ebuild 3603
 MD5 45f95cf50aad5f544f0fa05dcf94d1ad alsa-driver-1.0.6a.ebuild 3501
-MD5 0e3de515e49e01db460ca33e8cc55383 files/alsa-driver-1.0.7-configure.patch 21425
+MD5 bc0105e64f35a41aa0602c43e7f09733 files/alsa-driver-1.0.7-configure.patch 21924
 MD5 8c120f7730b91118d0a8148d2deb3a43 files/alsa-driver-0.9.8-au-fix.patch 1267
 MD5 1d70561326ef89e94179634d92782610 files/alsa-driver-1.0.4-devfix.patch 2756
 MD5 08af7cfec9cd33819c62880d6219f3a5 files/alsa-driver-1.0.5-devfix.patch 763
@@ -27,7 +27,7 @@ MD5 479ee887025f4ce7944adee1e4a6fdf3 files/digest-alsa-driver-1.0.7-r3 71
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBsPuEArHZZzCEUG0RAuTGAJ4p73FYJ96/Rjtqnay6J24tUejEaACdFn58
-sy2LnGGCKYh+7I1XDdYJwCs=
-=CzjV
+iD8DBQFBsY2/ArHZZzCEUG0RApYmAJ9fe2A7MlpueB1LA98I0X9H4ln2RQCfaQYk
+am62wRz7sl3a8v/R7xsBs9w=
+=nThP
 -----END PGP SIGNATURE-----

diff --git a/media-sound/alsa-driver/files/alsa-driver-1.0.7-configure.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.7-configure.patch
index daeada8fac896ac248b6e8d63bc277d32133d15a..d6601dcadcc7595f1a97d00f0e4fe1aa3f5ca012 100644 (file)
--- a/media-sound/alsa-driver/files/alsa-driver-1.0.7-configure.patch
+++ b/media-sound/alsa-driver/files/alsa-driver-1.0.7-configure.patch
@@ -693,3 +693,20 @@
  CONFIG_SND_RTCTIMER=$rtcsup
  AC_SUBST(CONFIG_SND_RTCTIMER)
  test "$CONFIG_SND_RTCTIMER" = "m" && AC_DEFINE(CONFIG_SND_RTCTIMER_MODULE)
+--- alsa-driver-1.0.7/Makefile.conf.in 2004-10-18 06:04:21.000000000 -0700
++++ alsa-cvs/alsa-driver/Makefile.conf.in      2004-11-23 08:07:56.000000000 -0800
+@@ -9,9 +9,12 @@
+ MAINSRCDIR    = @SRCDIR@
+ 
+ CROSS_COMPILE   ?= @CROSS_COMPILE@
+-ifndef NEW_KBUILD
++ARCH            ?= @ARCH@
++ifdef NEW_KBUILD
++export CROSS_COMPILE ARCH
++else
+ AS            = $(CROSS_COMPILE)@AS@
+-LD            = $(CROSS_COMPILE)@LD@
++LD            = $(CROSS_COMPILE)@KLD@
+ CC            = $(CROSS_COMPILE)@CC@
+ CPP           = $(CROSS_COMPILE)@CPP@
+ AR            = $(CROSS_COMPILE)@AR@