summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-07-03 00:59:50 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-07-03 00:59:50 +0000
commitd0fc772bcd53c7b424af1146fc4b8d4b7f14380e (patch)
treedef55b4e1bb5672903f37e1c9e56cc2743404428
parentWhoops, xemacs for gnuplot, not emacs. (diff)
downloadgentoo-2-d0fc772bcd53c7b424af1146fc4b8d4b7f14380e.tar.gz
gentoo-2-d0fc772bcd53c7b424af1146fc4b8d4b7f14380e.tar.bz2
gentoo-2-d0fc772bcd53c7b424af1146fc4b8d4b7f14380e.zip
Make __user patch work with linux-headers-2.4
-rw-r--r--media-libs/alsa-lib/ChangeLog5
-rw-r--r--media-libs/alsa-lib/files/fix-asound_h.patch9
2 files changed, 9 insertions, 5 deletions
diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index 854aebad9050..ec329ce4958a 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,10 +1,11 @@
# ChangeLog for media-libs/alsa-lib
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.75 2004/07/03 00:40:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.76 2004/07/03 00:59:50 eradicator Exp $
02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
- alsa-lib-1.0.5-r2.ebuild:
+ alsa-lib-1.0.5-r2.ebuild, files/fix-asound_h.patch:
Make bad alsa headers non-fatal.
+ Make __user patch work with linux-headers-2.4
02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
files/fix-asound_h.patch:
diff --git a/media-libs/alsa-lib/files/fix-asound_h.patch b/media-libs/alsa-lib/files/fix-asound_h.patch
index 027fe7134282..bea1a9b42531 100644
--- a/media-libs/alsa-lib/files/fix-asound_h.patch
+++ b/media-libs/alsa-lib/files/fix-asound_h.patch
@@ -1,10 +1,13 @@
---- asound.h.orig 2004-07-02 03:37:34.548378530 -0700
-+++ asound.h 2004-07-02 03:37:57.019607386 -0700
-@@ -26,6 +26,7 @@
+--- asound.h.vanilla 2004-07-02 17:54:08.477728617 -0700
++++ asound.h 2004-07-02 17:54:48.148176909 -0700
+@@ -26,6 +26,10 @@
#if defined(LINUX) || defined(__LINUX__) || defined(__linux__)
#include <linux/ioctl.h>
+#include <linux/compiler.h>
++#ifndef __user
++#define __user
++#endif
#ifdef __KERNEL__