summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-07-02 10:41:25 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-07-02 10:41:25 +0000
commit9c6aefab59d2b52c66d9216250f91ecd2f9429b7 (patch)
treeece731f9c771273c1071bd967c1b47c2d6343e85 /media-libs
parentVersion bump. (diff)
downloadhistorical-9c6aefab59d2b52c66d9216250f91ecd2f9429b7.tar.gz
historical-9c6aefab59d2b52c66d9216250f91ecd2f9429b7.tar.bz2
historical-9c6aefab59d2b52c66d9216250f91ecd2f9429b7.zip
Made __user patch better. (#include <linux/compiler.h>)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/alsa-lib/ChangeLog6
-rw-r--r--media-libs/alsa-lib/Manifest4
-rw-r--r--media-libs/alsa-lib/files/fix-asound_h.patch21
3 files changed, 16 insertions, 15 deletions
diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index c87e5a886105..2dd5160ad8cd 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,6 +1,10 @@
# 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.73 2004/07/01 07:54:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.74 2004/07/02 10:41:25 eradicator Exp $
+
+ 02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+ files/fix-asound_h.patch:
+ Made __user patch better. (#include <linux/compiler.h>)
01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
alsa-lib-0.5.10b.ebuild, alsa-lib-0.9.2.ebuild, alsa-lib-1.0.2.ebuild:
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index a3490a1d9292..be7591a5e47d 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -7,7 +7,7 @@ MD5 30c24770677d9b2cd942438b6e46761e alsa-lib-1.0.3b-r2.ebuild 1329
MD5 2236aa4afa6a060c354d1b7e0d90b1e8 alsa-lib-1.0.4.ebuild 1714
MD5 60e98bd5e8fe3c26aa3162a591ddb58e alsa-lib-1.0.5.ebuild 1718
MD5 e1147a642867b3b3ea43518a1376f6d2 metadata.xml 250
-MD5 c797c9e97f2bff98aaee4964937253b4 ChangeLog 11071
+MD5 11be8cd84c4c9c82c171d896e62e56ed ChangeLog 11215
MD5 c2abd6412c8bc46d842c69c1f77de1e1 alsa-lib-1.0.5-r2.ebuild 3362
MD5 7866cccb2308203280e2a4382cbddee4 files/alsa-lib-1.0.3b-rate-capture.patch 565
MD5 190a6c4ffe2eef20e3095ab70ea34941 files/configure.diff 586
@@ -21,4 +21,4 @@ MD5 fb12c702eb134e6b86366ccf8aa6153d files/digest-alsa-lib-1.0.4 67
MD5 446ddecdcb2f56eec8683f1294749061 files/digest-alsa-lib-1.0.5 67
MD5 446ddecdcb2f56eec8683f1294749061 files/digest-alsa-lib-1.0.5-r2 67
MD5 48e9478afe2656cd4869ebaa951f2348 files/test-asound_h.c 54
-MD5 c198b8cd6e4386614bf7874136d19ee4 files/fix-asound_h.patch 229
+MD5 0da91706bd9610458636f98e3e4a4ea3 files/fix-asound_h.patch 265
diff --git a/media-libs/alsa-lib/files/fix-asound_h.patch b/media-libs/alsa-lib/files/fix-asound_h.patch
index 50ccefb9195d..027fe7134282 100644
--- a/media-libs/alsa-lib/files/fix-asound_h.patch
+++ b/media-libs/alsa-lib/files/fix-asound_h.patch
@@ -1,13 +1,10 @@
---- asound.h.orig 2004-06-30 15:18:14.131997218 -0700
-+++ asound.h 2004-06-30 15:19:05.599888165 -0700
-@@ -61,6 +61,10 @@
- #include <sys/types.h>
- #endif
+--- 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 @@
+ #if defined(LINUX) || defined(__LINUX__) || defined(__linux__)
+
+ #include <linux/ioctl.h>
++#include <linux/compiler.h>
+
+ #ifdef __KERNEL__
-+#ifndef __user
-+#define __user
-+#endif
-+
- /*
- * protocol version
- */