Change patch for compiling with newer PowerPC kernels, allow building on 2.6.17 as well as 2.6.16. Fix quoting.

(Portage version: 2.1_rc2-r2)

3 files changed, 28 insertions, 16 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 187d440a7f42..c29b930b90bc 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/alsa-driver
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.213 2006/05/14 03:23:11 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.214 2006/05/24 14:05:40 flameeyes Exp $
+
+  24 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  files/alsa-driver-1.0.11-powermac.patch, alsa-driver-1.0.11.ebuild:
+  Change patch for compiling with newer PowerPC kernels, allow building on
+  2.6.17 as well as 2.6.16. Fix quoting.
 
   14 May 2006; Luis Medinas <metalgod@gentoo.org> alsa-driver-1.0.11.ebuild:
   Stable on amd64. Bug #130535.
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.11.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.11.ebuild
index 02f924ad5489..bbf34d07b4d7 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.11.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.11.ebuild,v 1.7 2006/05/14 03:23:11 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.11.ebuild,v 1.8 2006/05/24 14:05:40 flameeyes Exp $
 
 inherit linux-mod flag-o-matic eutils multilib
 
@@ -68,13 +68,13 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-powermac.patch"
 	epatch "${FILESDIR}"/${PN}-1.0.10_rc1-include.patch
 
-	convert_to_m ${S}/Makefile
-	sed -i -e 's:\(.*depmod\):#\1:' ${S}/Makefile
+	convert_to_m "${S}/Makefile"
+	sed -i -e 's:\(.*depmod\):#\1:' "${S}/Makefile"
 }
 
 src_compile() {
diff --git a/media-sound/alsa-driver/files/alsa-driver-1.0.11-powermac.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.11-powermac.patch
index 5dc15746fb8a..652b6385aa90 100644
--- a/media-sound/alsa-driver/files/alsa-driver-1.0.11-powermac.patch
+++ b/media-sound/alsa-driver/files/alsa-driver-1.0.11-powermac.patch
@@ -1,11 +1,18 @@
---- alsa-driver-1.0.11rc5/ppc/../alsa-kernel/ppc/pmac.c_orig	2006-04-06 15:50:03.000000000 +0200
-+++ alsa-driver-1.0.11rc5/ppc/../alsa-kernel/ppc/pmac.c	2006-04-18 21:58:29.000000000 +0200
-@@ -869,7 +869,7 @@
- 
- 	u32 layout_id = 0;
- 
--	if (!machine_is(powermac))
-+	if (_machine != _MACH_Pmac)
- 		return -ENODEV;
- 
- 	chip->subframe = 0;
+Index: alsa-driver-1.0.11/ppc/pmac.c
+===================================================================
+--- alsa-driver-1.0.11.orig/ppc/pmac.c
++++ alsa-driver-1.0.11/ppc/pmac.c
+@@ -5,5 +5,13 @@
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
+ #include "pmac_old.c"
+ #else
++#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,16)
++/* hack for machine_is(powermac) */
++static int _machine_is(void);
++#define machine_is(x)	_machine_is()
++#endif
+ #include "../alsa-kernel/ppc/pmac.c"
++#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,16)
++static int _machine_is(void) { return _machine == _MACH_Pmac; }
++#endif
+ #endif