diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-05-24 14:05:40 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-05-24 14:05:40 +0000 |
| commit | f04444664e8ad3d7098701bf89875120419a4e68 (patch) | |
| tree | 720caac1899697940eb4ced29669ee9e6dca9a87 /media-sound/alsa-driver/files | |
| parent | Stable on sparc (diff) | |
| download | historical-f04444664e8ad3d7098701bf89875120419a4e68.tar.gz historical-f04444664e8ad3d7098701bf89875120419a4e68.tar.bz2 historical-f04444664e8ad3d7098701bf89875120419a4e68.zip | |
Change patch for compiling with newer PowerPC kernels, allow building on 2.6.17 as well as 2.6.16. Fix quoting.
Package-Manager: portage-2.1_rc2-r2
Diffstat (limited to 'media-sound/alsa-driver/files')
| -rw-r--r-- | media-sound/alsa-driver/files/alsa-driver-1.0.11-powermac.patch | 29 |
1 files changed, 18 insertions, 11 deletions
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 |