MPlayer and transcode inline fix - bug #57202.

5 files changed, 60 insertions, 65 deletions

diff --git a/sys-kernel/linux26-headers/ChangeLog b/sys-kernel/linux26-headers/ChangeLog
index 52b5f3820ad0..2eef92c48065 100644
--- a/sys-kernel/linux26-headers/ChangeLog
+++ b/sys-kernel/linux26-headers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/linux26-headers
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.6 2004/07/13 18:22:26 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.7 2004/07/15 19:42:15 plasmaroo Exp $
+
+*linux26-headers-2.6.7-r3 (15 Jul 2004)
+
+  15 Jul 2004; <plasmaroo@gentoo.org> -linux26-headers-2.6.7-r2.ebuild,
+  +linux26-headers-2.6.7-r3.ebuild,
+  files/linux26-headers-2.6.7-appCompat.patch:
+  MPlayer and transcode inline fix - bug #57202.
 
 *linux26-headers-2.6.7-r2 (13 Jul 2004)
 
diff --git a/sys-kernel/linux26-headers/Manifest b/sys-kernel/linux26-headers/Manifest
index 141bb4f939d9..86bc919afa90 100644
--- a/sys-kernel/linux26-headers/Manifest
+++ b/sys-kernel/linux26-headers/Manifest
@@ -1,38 +1,28 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 deb213c657a703e2c33a0b87873fc29c ChangeLog 2636
-MD5 870218f86efb44e8c56ecb360c7af9b4 linux26-headers-2.6.1.ebuild 4111
-MD5 b751725e8dcac2ef109557ec4826812e linux26-headers-2.6.3-r1.ebuild 4028
 MD5 26b9fb030b07a5a83e25ea025c17e8b3 linux26-headers-2.6.4.ebuild 4176
+MD5 f6e619e7991d09cf8a6ef5fea7f70c7b ChangeLog 2882
+MD5 608fe99985244b0445f76cee44c9ae14 metadata.xml 290
 MD5 35eda8dd7aa6785dae7c32d95f7fc47c linux26-headers-2.6.5.ebuild 4187
-MD5 ab5655820a71561f697cf30229948a7f linux26-headers-2.6.6-r1.ebuild 4217
+MD5 b751725e8dcac2ef109557ec4826812e linux26-headers-2.6.3-r1.ebuild 4028
 MD5 e545ff6a66853894c5fcbc60f199f262 linux26-headers-2.6.6.ebuild 4062
-MD5 608fe99985244b0445f76cee44c9ae14 metadata.xml 290
-MD5 54bdce4ab6602b1ceac166cb55d1da92 linux26-headers-2.6.7-r2.ebuild 3929
+MD5 870218f86efb44e8c56ecb360c7af9b4 linux26-headers-2.6.1.ebuild 4111
+MD5 ab5655820a71561f697cf30229948a7f linux26-headers-2.6.6-r1.ebuild 4217
+MD5 880e1c3e913a6d8c73e696ff8ce32418 linux26-headers-2.6.7-r3.ebuild 3932
 MD5 1f7aaa49614b3055b6110518b1ed23ee files/digest-linux26-headers-2.6.1 66
+MD5 598136365858338b26557b7587c6725f files/linux26-headers-2.6.3-strict-ansi-fix.patch 4166
+MD5 b3e4e51616a061327b46cbd31132c8c8 files/generate-asm-sparc 1654
+MD5 b737234adedfb6dc585af6bbb40bf2d3 files/digest-linux26-headers-2.6.6-r1 66
+MD5 a73786f0b9dda7e9ebacb91a192384f9 files/linux26-headers-2.6.0-sysctl_h-compat.patch 352
 MD5 1a3b49dce5bc80827496967e767a4a04 files/digest-linux26-headers-2.6.3-r1 66
-MD5 53405777e395f5520722f9fb2398ddd8 files/digest-linux26-headers-2.6.4 66
-MD5 a8c4e44a323fbde21b9de3940e2ca5ef files/digest-linux26-headers-2.6.5 66
+MD5 aa9ba92e8479bdb5f69b03b5c72be866 files/linux26-headers-2.6.4-unistd-nptl-fix.patch 362
 MD5 b737234adedfb6dc585af6bbb40bf2d3 files/digest-linux26-headers-2.6.6 66
-MD5 b737234adedfb6dc585af6bbb40bf2d3 files/digest-linux26-headers-2.6.6-r1 66
-MD5 b405a908c2cc1e6ed3e25f030c41f4c4 files/digest-linux26-headers-2.6.7-r2 66
-MD5 b3e4e51616a061327b46cbd31132c8c8 files/generate-asm-sparc 1654
-MD5 7f5b6765680735a897bb2fb9e227f6b6 files/linux26-headers-2.6.0-appCompat.patch 17983
 MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux26-headers-2.6.0-fb.patch 386
-MD5 537c756a05fe1a6819277938d570b70a files/linux26-headers-2.6.0-strict-ansi-fix.patch 1484
-MD5 a73786f0b9dda7e9ebacb91a192384f9 files/linux26-headers-2.6.0-sysctl_h-compat.patch 352
 MD5 c33f70f0dc30a6fce5cfea06233defd4 files/linux26-headers-2.6.3-appCompat.patch 17484
-MD5 598136365858338b26557b7587c6725f files/linux26-headers-2.6.3-strict-ansi-fix.patch 4166
-MD5 ec3d195f7d40d599802d5c0c5ad8f502 files/linux26-headers-2.6.4-appCompat.patch 17240
-MD5 aa9ba92e8479bdb5f69b03b5c72be866 files/linux26-headers-2.6.4-unistd-nptl-fix.patch 362
+MD5 b405a908c2cc1e6ed3e25f030c41f4c4 files/digest-linux26-headers-2.6.7-r3 66
 MD5 8fbc202526e4c1b1672c5274bbff4e5f files/linux26-headers-2.6.6-appCompat.patch 26689
+MD5 7f5b6765680735a897bb2fb9e227f6b6 files/linux26-headers-2.6.0-appCompat.patch 17983
+MD5 ec3d195f7d40d599802d5c0c5ad8f502 files/linux26-headers-2.6.4-appCompat.patch 17240
+MD5 537c756a05fe1a6819277938d570b70a files/linux26-headers-2.6.0-strict-ansi-fix.patch 1484
 MD5 830c6d1dcb1b22b9095e6f16f3ebdf85 files/linux26-headers-2.6.6-tcp_info-DRS-backport.patch 288
-MD5 cff3b528297c5386543dd3e046d00dc5 files/linux26-headers-2.6.7-appCompat.patch 37604
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFA9pZ1HTu7gpaalycRAicMAKC8HoXWTHXIHkz/i34AsANsEv+zMQCg1qjd
-jJeJznAsWWsqDDDBQO2PYSM=
-=KbvS
------END PGP SIGNATURE-----
+MD5 a8c4e44a323fbde21b9de3940e2ca5ef files/digest-linux26-headers-2.6.5 66
+MD5 53405777e395f5520722f9fb2398ddd8 files/digest-linux26-headers-2.6.4 66
+MD5 abcd15ba0cdd20d540fe9ff30d45534e files/linux26-headers-2.6.7-appCompat.patch 37506
diff --git a/sys-kernel/linux26-headers/files/digest-linux26-headers-2.6.7-r2 b/sys-kernel/linux26-headers/files/digest-linux26-headers-2.6.7-r3
index fbf6945c9a39..fbf6945c9a39 100644
--- a/sys-kernel/linux26-headers/files/digest-linux26-headers-2.6.7-r2
+++ b/sys-kernel/linux26-headers/files/digest-linux26-headers-2.6.7-r3
diff --git a/sys-kernel/linux26-headers/files/linux26-headers-2.6.7-appCompat.patch b/sys-kernel/linux26-headers/files/linux26-headers-2.6.7-appCompat.patch
index eb7b8ff8629a..e52dc0d8e548 100644
--- a/sys-kernel/linux26-headers/files/linux26-headers-2.6.7-appCompat.patch
+++ b/sys-kernel/linux26-headers/files/linux26-headers-2.6.7-appCompat.patch
@@ -974,10 +974,11 @@ diff -ur linux-2.6.7/include/linux/fd.h linux-2.6.7-gentoo/include/linux/fd.h
 diff -ur linux-2.6.7/include/linux/compiler.h linux-2.6.7-gentoo/include/linux/compiler.h
 --- linux-2.6.7/include/linux/compiler.h	2004-06-12 12:11:54.000000000 +0100
 +++ linux-2.6.7-gentoo/include/linux/compiler.h	2004-06-24 09:48:32.478502752 +0100
-@@ -15,6 +15,18 @@
+@@ -15,8 +15,19 @@
  # define __chk_user_ptr(x) (void)0
  #endif
  
+-#ifdef __KERNEL__
 +#if (__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
 +#define inline          __inline__
 +#define __inline__      __inline__
@@ -989,10 +990,39 @@ diff -ur linux-2.6.7/include/linux/compiler.h linux-2.6.7-gentoo/include/linux/c
 +#  define volatile      __volatile__
 +#endif
 +#endif
-+
- #ifdef __KERNEL__
  
++#ifdef __KERNEL__
  #ifndef __ASSEMBLY__
+ #if __GNUC__ > 3
+ # include <linux/compiler-gcc+.h>	/* catch-all for GCC 4, 5, etc. */
+@@ -28,6 +39,7 @@
+ # error Sorry, your compiler is too old/not recognized.
+ #endif
+ #endif
++#endif
+ 
+ /* Intel compiler defines __GNUC__. So we will overwrite implementations
+  * coming from above header files here
+@@ -57,8 +69,6 @@
+     (typeof(ptr)) (__ptr + (off)); })
+ #endif
+ 
+-#endif /* __KERNEL__ */
+-
+ /*
+  * Allow us to mark functions as 'deprecated' and have gcc emit a nice
+  * warning for each use, in hopes of speeding the functions removal.
+@@ -120,4 +130,10 @@
+ #define noinline
+ #endif
+ 
++#ifdef __cplusplus
++#define __cast__(_to) (_to)
++#else
++#define __cast__(_to)
++#endif
++
+ #endif /* __LINUX_COMPILER_H */
 diff -ur linux-2.6.6/include/linux/hiddev.h linux-2.6.6-gentoo/include/linux/hiddev.h
 --- linux-2.6.6/include/linux/hiddev.h	2004-06-12 12:11:54.000000000 +0100
 +++ linux-2.6.6-gentoo/include/linux/hiddev.h	2004-07-10 00:13:36.584448824 +0100
@@ -1146,38 +1176,6 @@ diff -ur linux-2.6.7/include/linux/list.h linux-2.6.7-gentoo/include/linux/list.
  }
  
  /*
-diff -ur linux-2.6.7/include/linux/compiler.h linux-2.6.7-gentoo/include/linux/compiler.h
---- linux-2.6.7/include/linux/compiler.h	2004-07-13 19:00:02.464663368 +0100
-+++ linux-2.6.7-gentoo/include/linux/compiler.h	2004-07-13 18:44:43.000000000 +0100
-@@ -27,8 +27,6 @@
- #endif
- #endif
- 
--#ifdef __KERNEL__
--
- #ifndef __ASSEMBLY__
- #if __GNUC__ > 3
- # include <linux/compiler-gcc+.h>	/* catch-all for GCC 4, 5, etc. */
-@@ -69,8 +67,6 @@
-     (typeof(ptr)) (__ptr + (off)); })
- #endif
- 
--#endif /* __KERNEL__ */
--
- /*
-  * Allow us to mark functions as 'deprecated' and have gcc emit a nice
-  * warning for each use, in hopes of speeding the functions removal.
-@@ -132,4 +128,10 @@
- #define noinline
- #endif
- 
-+#ifdef __cplusplus
-+#define __cast__(_to) (_to)
-+#else
-+#define __cast__(_to)
-+#endif
-+
- #endif /* __LINUX_COMPILER_H */
 diff -ur linux-2.6.7/include/linux/list.h linux-2.6.7-gentoo/include/linux/list.h
 --- linux-2.6.7/include/linux/list.h	2004-07-13 19:00:02.453665040 +0100
 +++ linux-2.6.7-gentoo/include/linux/list.h	2004-07-13 18:44:43.000000000 +0100
diff --git a/sys-kernel/linux26-headers/linux26-headers-2.6.7-r2.ebuild b/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild
index 35b18e3d4411..fdee4eca2fc2 100644
--- a/sys-kernel/linux26-headers/linux26-headers-2.6.7-r2.ebuild
+++ b/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/linux26-headers-2.6.7-r2.ebuild,v 1.4 2004/07/15 14:36:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild,v 1.1 2004/07/15 19:42:15 plasmaroo Exp $
 
 ETYPE="headers"
 inherit kernel eutils