summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-11-23 00:06:19 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-11-23 00:06:19 +0000
commitc60d04dfacc0ce3a1e3795267fd9c29f9c9bab03 (patch)
tree8daf01fc2be301af91bbbb4862f2e09a42a26828
parentmove app-emulation/kvm to app-emulation/qemu-kvm (diff)
downloadhistorical-c60d04dfacc0ce3a1e3795267fd9c29f9c9bab03.tar.gz
historical-c60d04dfacc0ce3a1e3795267fd9c29f9c9bab03.tar.bz2
historical-c60d04dfacc0ce3a1e3795267fd9c29f9c9bab03.zip
Drop stale patches.
Package-Manager: portage-2.2_rc51/cvs/Linux x86_64
-rw-r--r--x11-drivers/ati-drivers/ChangeLog16
-rw-r--r--x11-drivers/ati-drivers/Manifest17
-rw-r--r--x11-drivers/ati-drivers/ati-drivers-8.552-r2.ebuild4
-rw-r--r--x11-drivers/ati-drivers/files/09ati3
-rw-r--r--x11-drivers/ati-drivers/files/8.471.3/ati-powermode-opt-path-2.patch42
-rw-r--r--x11-drivers/ati-drivers/files/8.552/ati-drivers-xen-8.552.patch62
-rw-r--r--x11-drivers/ati-drivers/files/8.552/ati-powermode-opt-path-2.patch42
-rw-r--r--x11-drivers/ati-drivers/files/8.573/ati-drivers-xen-8.552.patch62
-rw-r--r--x11-drivers/ati-drivers/files/8.573/ati-powermode-opt-path-2.patch42
-rw-r--r--x11-drivers/ati-drivers/files/8.582/ati-drivers-xen-8.552.patch62
-rw-r--r--x11-drivers/ati-drivers/files/8.582/ati-powermode-opt-path-2.patch42
-rw-r--r--x11-drivers/ati-drivers/files/ati-drivers-2.6.20.patch73
-rw-r--r--x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch33
-rw-r--r--x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch11
-rw-r--r--x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch22
-rw-r--r--x11-drivers/ati-drivers/files/ati-powermode.sh.patch32
16 files changed, 19 insertions, 546 deletions
diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index bf2e7b930c8a..a7974b2a52a7 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,20 @@
# ChangeLog for x11-drivers/ati-drivers
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.202 2009/11/19 19:09:36 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.203 2009/11/23 00:06:18 scarabeus Exp $
+
+ 23 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> -files/09ati,
+ -files/ati-drivers-2.6.20.patch,
+ -files/8.471.3/ati-powermode-opt-path-2.patch,
+ -files/8.552/ati-powermode-opt-path-2.patch,
+ -files/8.573/ati-powermode-opt-path-2.patch,
+ -files/8.582/ati-powermode-opt-path-2.patch,
+ -files/ati-drivers-8.35.5-2.6.19.patch,
+ -files/ati-drivers-8.35.5-2.6.20.patch, ati-drivers-8.552-r2.ebuild,
+ -files/8.552/ati-drivers-xen-8.552.patch,
+ -files/8.573/ati-drivers-xen-8.552.patch,
+ -files/8.582/ati-drivers-xen-8.552.patch, -files/ati-powermode.sh.patch,
+ -files/ati-powermode-opt-path.patch:
+ Drop stale patches.
*ati-drivers-9.11 (19 Nov 2009)
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index b85364e57d07..995bda99b799 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -1,22 +1,9 @@
-AUX 09ati 75 RMD160 f4b42cfdc7deaa6fe7618e3506860a06a75de435 SHA1 01cac55ba02710dbd7d71737dd64dbec2cc081fd SHA256 5daa70f3e4c19f2b006bc7b2b22abde5404c3b498485b9ffac428eb458c32134
AUX 8.40.4/ati-drivers-2.6.23.patch 1497 RMD160 3bcd335769ee98b2119fc62784d091000115a5bd SHA1 9328ece148ad52c048805b9c2c3a3bf0937b6d16 SHA256 6ea6385e602b9659ca01ef1d53cb53ca955f2396a2d8cc914355d3bb2a590d88
AUX 8.40.4/ati-drivers-8.40.4-warnings.patch 3262 RMD160 158206cf638fd0f2ee34e8ff02e6a399933f844d SHA1 7b47d4d89ff80e930cd2fc66f513dbaf66de07d5 SHA256 45caca456493c23a6475bbec63df26a33ead8de59bf52e3c06c4433740dc5261
AUX 8.452/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
-AUX 8.471.3/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
-AUX 8.552/ati-drivers-xen-8.552.patch 1994 RMD160 45fe1a96bfaec597214c2b058c720c5f71797085 SHA1 4fd6da4c726c67feed8a6484af484ea525f3a112 SHA256 514dad9629fc689ec0344875a29d713f9d8de7ccbb0a22a2b80ede11bbbc6c58
-AUX 8.552/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
-AUX 8.573/ati-drivers-xen-8.552.patch 1994 RMD160 45fe1a96bfaec597214c2b058c720c5f71797085 SHA1 4fd6da4c726c67feed8a6484af484ea525f3a112 SHA256 514dad9629fc689ec0344875a29d713f9d8de7ccbb0a22a2b80ede11bbbc6c58
-AUX 8.573/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
-AUX 8.582/ati-drivers-xen-8.552.patch 1994 RMD160 45fe1a96bfaec597214c2b058c720c5f71797085 SHA1 4fd6da4c726c67feed8a6484af484ea525f3a112 SHA256 514dad9629fc689ec0344875a29d713f9d8de7ccbb0a22a2b80ede11bbbc6c58
-AUX 8.582/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
AUX ati-drivers-2.6.19.patch 3158 RMD160 b9b3af8169f4b0e7cf655f0da9b8dcb7946b204e SHA1 13d009989f24f5c568b156a128adcd8402f47c9a SHA256 278e5d2bbddf1b5956485698684f50609371c6ef1c432fd436c85ee3345e24f6
-AUX ati-drivers-2.6.20.patch 2386 RMD160 8b563155a63ba8d9639fa3b89719b8da49b2c8a3 SHA1 3714fa58e8ead0287d593cf0ed011e22327a5e71 SHA256 12b56122216a2fdba9f52e9939bf33f7d0c262417923ea9596c70337d44dd9f8
-AUX ati-drivers-8.35.5-2.6.19.patch 913 RMD160 511ef4e6eb7fcfa8db5419c05d160c6b538f9bc8 SHA1 adcd3860d1b0877779e85695053cda36511b4c71 SHA256 5c2b1ba7e291e118f37a87e3a653d0a654ee4e95a46c9e3d723ecef72aba1f01
-AUX ati-drivers-8.35.5-2.6.20.patch 333 RMD160 b9ef336b8dd4874854910d8eb62bc15f9ab066bd SHA1 8261034f3e539251adb0ca5b1da880e3f1231559 SHA256 cd4abde649ede2d03b5faa115acc567fcff85b6db39f19ba70d25e194e8973a6
AUX ati-drivers-xen.patch 1994 RMD160 45fe1a96bfaec597214c2b058c720c5f71797085 SHA1 4fd6da4c726c67feed8a6484af484ea525f3a112 SHA256 514dad9629fc689ec0344875a29d713f9d8de7ccbb0a22a2b80ede11bbbc6c58
AUX ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
-AUX ati-powermode-opt-path.patch 826 RMD160 450b5c9ecd7f4c123ce12f855b287e6b97e6ad23 SHA1 80725f60def6bd968157f09474c00722865b1f27 SHA256 e1d6dbe2e73c8ed575b2f9188e707fcb90f808d0fbdb686067c16f853662c208
-AUX ati-powermode.sh.patch 1142 RMD160 b81cdd4d2a49c2f7b04f7e00e4391b4e0ad67a40 SHA1 eef7f658474ca8e9e66ee1955a851782eba4dd0e SHA256 050602d5e0656961c0b16a75b470a7327a9e8b16f7d0ae3228341b3a8dcc9289
AUX atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a SHA1 982ffdb8064785c8b96fb0213ad7892ac918b5d7 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3
AUX atieventsd.rc6 590 RMD160 fbf8aba7ada36aed666d506d6b0f7146e1b2f4ad SHA1 b2b457a4122f0a3a5db785df46880351d795fb25 SHA256 a00aa241e53b21872218bd247bfdb6292a075d9ef641f36198d8f4e399cc025e
AUX kernel/2.6.31-fglrx_find_task_by_vpid.patch 581 RMD160 2da3e760a41b967f16e92e94d7ac7d5fc841f60e SHA1 a7c9f836b302cc8bd708b0c266a60baea2f5560d SHA256 4e95b588e894cfb89270168cd771c67bf270c805f30481fceebe47aac3f36980
@@ -26,10 +13,10 @@ DIST ati-driver-installer-9-10-x86.x86_64.run 87135724 RMD160 0f0d35adfe21c69560
DIST ati-driver-installer-9-11-x86.x86_64.run 87577817 RMD160 2ab19f685f7bb39f6336e081f9d207f87e0c0700 SHA1 e987c1540f7d0141cfe9145442367d1e88314cc4 SHA256 c7a7beaaa5f0e2b09f21590aaa76b3306411095f1cf56991e20d60d0be117683
DIST ati-driver-installer-9-3-x86.x86_64.run 84841550 RMD160 76d4aa6ec575403190b8feadce99000b69d64d14 SHA1 ceefdfd2f8ecee4998a4ce4b7b87a45f1851e8d0 SHA256 5efec58f92f2fbb90b0d9a9059eb27c9cfffcea0a4ba64f3c8f24fc5dbf8053e
DIST ati-driver-installer-9-9-x86.x86_64.run 98115301 RMD160 ab5fca036c3e5b3b4926ed16f24822596441cda6 SHA1 22e2adb9c4fdec4647927acec0410e43cb246a4d SHA256 66be4f4aa377cd22a45596c2e3fb5f1a0fbcdd3db5412478175d777572edc483
-EBUILD ati-drivers-8.552-r2.ebuild 15159 RMD160 0da6fc5dae6e01d533e42f1bc8ba4202b281d065 SHA1 95c2c944a7f23c5f6ff095f2a5ce31c0632e76b7 SHA256 d1ce7e41b11e38c3d1b0b9c3b3a20962df74f0d5bbe147e4f0db6e2f73b5ee0a
+EBUILD ati-drivers-8.552-r2.ebuild 15154 RMD160 d41da317a256df7ea94aa8a206748f4e1ec484ca SHA1 90909da4f960af12bbdbe99f3cbf368997a6ed40 SHA256 93f3685069866522dcad08f04d67f3a160d01455d63c1b051a39d6eca676c34e
EBUILD ati-drivers-8.593.ebuild 15053 RMD160 a3dbfe4c37711b94c32de563565b420688f6fe36 SHA1 fe5d8f8fef80e6c1ab2c86b1e5839ca19fddd36a SHA256 7eeb0a77548c4e21eaa8be827009e1ee9907c8a28977af31267d83ca1b43010e
EBUILD ati-drivers-9.10.ebuild 18467 RMD160 87f2ec3af5826a837267b4cbd84d46906ee7f3c6 SHA1 fb5c0e1cce988d79da655170c9c28243e2257d06 SHA256 d23b11808c4535977c8398ed64507b7787475dd30b13774c750822272eec5d24
EBUILD ati-drivers-9.11.ebuild 18457 RMD160 f6836b0e5ed55f77b4c00443424113ac5f20710d SHA1 e3b2508c9c24283cbb1fbb56ca00e79e125b851d SHA256 0d50927f66ab09353e278652e2bac8ae61de329e2f84bb249852a5e3fbe2d13a
EBUILD ati-drivers-9.9-r2.ebuild 18603 RMD160 478de170d9064ac958ceabaf54b5c26a8239a484 SHA1 138aa96fff22f473cb91a84cd317562879976e2c SHA256 2a29c232d71a4b379af7bbd6e58f45fee1e799ad31df388c76775785932db35f
-MISC ChangeLog 60879 RMD160 98a29eb642d30a8640d67164cdf9da98efdae032 SHA1 2097d00c46f5b23c8071ae89e08f2469083e5c5c SHA256 a3047eb653ef7ab69b33a67702b3c66d5b5af69645f0f138e1adcc363b239ff7
+MISC ChangeLog 61513 RMD160 e6a116f0a49774157425f024a2302aa10a00dd01 SHA1 66c7ded50aa621726e9cc807fb30772d6217a259 SHA256 755662f440d3ccafcf23ee25806f1b7b9d8bb8b27eeb5cd52ff98796eded3e88
MISC metadata.xml 292 RMD160 b7147d33f577e620cc3619c33e4998d934db4ae3 SHA1 50d77810085e2dd55517ffae1882619b774844e0 SHA256 dca87597dda4c00f1252c7ae492afb80e1e026a4ec2a1ab025a7f6af52cd0429
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.552-r2.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.552-r2.ebuild
index 393ea5ac0980..3dd7fc9fe196 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.552-r2.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.552-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.552-r2.ebuild,v 1.9 2009/10/22 10:49:06 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.552-r2.ebuild,v 1.10 2009/11/23 00:06:18 scarabeus Exp $
IUSE="acpi debug"
@@ -168,7 +168,7 @@ src_unpack() {
|| die "Replacing 'finger' with 'who' failed."
# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
# add funktion to detect default state.
- epatch "${FILESDIR}"/${PV}/ati-powermode-opt-path-2.patch
+ epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch
fi
pushd ${MODULE_DIR} >/dev/null
diff --git a/x11-drivers/ati-drivers/files/09ati b/x11-drivers/ati-drivers/files/09ati
deleted file mode 100644
index 27180e06554e..000000000000
--- a/x11-drivers/ati-drivers/files/09ati
+++ /dev/null
@@ -1,3 +0,0 @@
-PATH=/opt/ati/bin
-ROOTPATH=/opt/ati/bin:/opt/ati/sbin
-MANPATH=/opt/ati/man
diff --git a/x11-drivers/ati-drivers/files/8.471.3/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.471.3/ati-powermode-opt-path-2.patch
deleted file mode 100644
index f5a35a304ec4..000000000000
--- a/x11-drivers/ati-drivers/files/8.471.3/ati-powermode-opt-path-2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh
---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100
-+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100
-@@ -4,6 +4,8 @@
- # Control script for ACPI lid state and AC adapter state
- #
-
-+aticonfig='/opt/bin/aticonfig'
-+
- getXuser() {
- user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'`
- if [ x"$user" = x"" ]; then
-@@ -47,7 +49,7 @@
- done
-
- #If PPLIB is enabled
--su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB
-+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB
- if [ $? = 0 ]; then
- echo "Has PPLIB"
- has_pplib=1
-@@ -61,15 +63,15 @@
- if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then
- echo "Low power"
- if [ ${has_pplib} -eq 1 ]; then
-- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"'
-+ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"'
- else
-- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now"
-+ su $user -c "$aticonfig --set-powerstate=1"
- fi
- else
- echo "high power"
- if [ ${has_pplib} -eq 1 ]; then
-- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"'
-+ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"'
- else
-- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now"
-+ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)"
- fi
- fi
-
diff --git a/x11-drivers/ati-drivers/files/8.552/ati-drivers-xen-8.552.patch b/x11-drivers/ati-drivers/files/8.552/ati-drivers-xen-8.552.patch
deleted file mode 100644
index a1b88df7fa84..000000000000
--- a/x11-drivers/ati-drivers/files/8.552/ati-drivers-xen-8.552.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-09 15:17:27.000000000 +0000
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-09 15:12:34.000000000 +0000
-@@ -31,6 +31,9 @@
- #include <linux/autoconf.h>
-
- #if !defined(CONFIG_X86_PC)
-+#if !defined(CONFIG_X86_PC_XEN)
-+#if !defined(CONFIG_X86_XEN)
-+#if !defined(CONFIG_X86_64_XEN)
- #if !defined(CONFIG_X86_64)
- #if !defined(CONFIG_X86_VOYAGER)
- #if !defined(CONFIG_X86_NUMAQ)
-@@ -47,6 +50,9 @@
- #endif
- #endif
- #endif
-+#endif
-+#endif
-+#endif
-
- /* The dirty-page-tracking patch included in NLD 9 SMP kernels defines
- * a static inline function that uses a GPL-only symbol in a header
---- common/lib/modules/fglrx/build_mod/firegl_public.h 2008-12-09 15:17:27.000000000 +0000
-+++ common/lib/modules/fglrx/build_mod/firegl_public.h 2008-12-09 15:15:45.000000000 +0000
-@@ -30,9 +30,13 @@
- #endif
-
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
--
-+#ifdef CONFIG_XEN
-+#define REMAP_PAGE_RANGE_FN io_remap_pfn_range
-+#define REMAP_PAGE_RANGE_STR "io_remap_pfn_range"
-+#else
- #define REMAP_PAGE_RANGE_FN remap_pfn_range
- #define REMAP_PAGE_RANGE_STR "remap_pfn_range"
-+#endif
- #define REMAP_PAGE_RANGE_OFF(offset) ((offset) >> PAGE_SHIFT)
-
- #else /* LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,9) */
-@@ -43,13 +47,21 @@
-
- #endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) */
-
-+#ifdef CONFIG_XEN
-+#define REMAP_PAGE_RANGE(vma,offset) \
-+ REMAP_PAGE_RANGE_FN((vma), \
-+ (vma)->vm_start, \
-+ REMAP_PAGE_RANGE_OFF(offset), \
-+ (vma)->vm_end - (vma)->vm_start, \
-+ (vma)->vm_page_prot)
-+#else
- #define REMAP_PAGE_RANGE(vma,offset) \
- REMAP_PAGE_RANGE_FN(FGL_VMA_API_PASS \
- (vma)->vm_start, \
- REMAP_PAGE_RANGE_OFF(offset), \
- (vma)->vm_end - (vma)->vm_start, \
- (vma)->vm_page_prot)
--
-+#endif
-
- /* Page table macros */
-
diff --git a/x11-drivers/ati-drivers/files/8.552/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.552/ati-powermode-opt-path-2.patch
deleted file mode 100644
index f5a35a304ec4..000000000000
--- a/x11-drivers/ati-drivers/files/8.552/ati-powermode-opt-path-2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh
---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100
-+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100
-@@ -4,6 +4,8 @@
- # Control script for ACPI lid state and AC adapter state
- #
-
-+aticonfig='/opt/bin/aticonfig'
-+
- getXuser() {
- user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'`
- if [ x"$user" = x"" ]; then
-@@ -47,7 +49,7 @@
- done
-
- #If PPLIB is enabled
--su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB
-+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB
- if [ $? = 0 ]; then
- echo "Has PPLIB"
- has_pplib=1
-@@ -61,15 +63,15 @@
- if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then
- echo "Low power"
- if [ ${has_pplib} -eq 1 ]; then
-- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"'
-+ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"'
- else
-- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now"
-+ su $user -c "$aticonfig --set-powerstate=1"
- fi
- else
- echo "high power"
- if [ ${has_pplib} -eq 1 ]; then
-- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"'
-+ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"'
- else
-- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now"
-+ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)"
- fi
- fi
-
diff --git a/x11-drivers/ati-drivers/files/8.573/ati-drivers-xen-8.552.patch b/x11-drivers/ati-drivers/files/8.573/ati-drivers-xen-8.552.patch
deleted file mode 100644
index a1b88df7fa84..000000000000
--- a/x11-drivers/ati-drivers/files/8.573/ati-drivers-xen-8.552.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-09 15:17:27.000000000 +0000
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-09 15:12:34.000000000 +0000
-@@ -31,6 +31,9 @@
- #include <linux/autoconf.h>
-
- #if !defined(CONFIG_X86_PC)
-+#if !defined(CONFIG_X86_PC_XEN)
-+#if !defined(CONFIG_X86_XEN)
-+#if !defined(CONFIG_X86_64_XEN)
- #if !defined(CONFIG_X86_64)
- #if !defined(CONFIG_X86_VOYAGER)
- #if !defined(CONFIG_X86_NUMAQ)
-@@ -47,6 +50,9 @@
- #endif
- #endif
- #endif
-+#endif
-+#endif
-+#endif
-
- /* The dirty-page-tracking patch included in NLD 9 SMP kernels defines
- * a static inline function that uses a GPL-only symbol in a header
---- common/lib/modules/fglrx/build_mod/firegl_public.h 2008-12-09 15:17:27.000000000 +0000
-+++ common/lib/modules/fglrx/build_mod/firegl_public.h 2008-12-09 15:15:45.000000000 +0000
-@@ -30,9 +30,13 @@
- #endif
-
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
--
-+#ifdef CONFIG_XEN
-+#define REMAP_PAGE_RANGE_FN io_remap_pfn_range
-+#define REMAP_PAGE_RANGE_STR "io_remap_pfn_range"
-+#else
- #define REMAP_PAGE_RANGE_FN remap_pfn_range
- #define REMAP_PAGE_RANGE_STR "remap_pfn_range"
-+#endif
- #define REMAP_PAGE_RANGE_OFF(offset) ((offset) >> PAGE_SHIFT)
-
- #else /* LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,9) */
-@@ -43,13 +47,21 @@
-
- #endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) */
-
-+#ifdef CONFIG_XEN
-+#define REMAP_PAGE_RANGE(vma,offset) \
-+ REMAP_PAGE_RANGE_FN((vma), \
-+ (vma)->vm_start, \
-+ REMAP_PAGE_RANGE_OFF(offset), \
-+ (vma)->vm_end - (vma)->vm_start, \
-+ (vma)->vm_page_prot)
-+#else
- #define REMAP_PAGE_RANGE(vma,offset) \
- REMAP_PAGE_RANGE_FN(FGL_VMA_API_PASS \
- (vma)->vm_start, \
- REMAP_PAGE_RANGE_OFF(offset), \
- (vma)->vm_end - (vma)->vm_start, \
- (vma)->vm_page_prot)
--
-+#endif
-
- /* Page table macros */
-
diff --git a/x11-drivers/ati-drivers/files/8.573/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.573/ati-powermode-opt-path-2.patch
deleted file mode 100644
index f5a35a304ec4..000000000000
--- a/x11-drivers/ati-drivers/files/8.573/ati-powermode-opt-path-2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh
---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100
-+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100
-@@ -4,6 +4,8 @@
- # Control script for ACPI lid state and AC adapter state
- #
-
-+aticonfig='/opt/bin/aticonfig'
-+
- getXuser() {
- user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'`
- if [ x"$user" = x"" ]; then
-@@ -47,7 +49,7 @@
- done
-
- #If PPLIB is enabled
--su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB
-+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB
- if [ $? = 0 ]; then
- echo "Has PPLIB"
- has_pplib=1
-@@ -61,15 +63,15 @@
- if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then
- echo "Low power"
- if [ ${has_pplib} -eq 1 ]; then
-- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"'
-+ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"'
- else
-- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now"
-+ su $user -c "$aticonfig --set-powerstate=1"
- fi
- else
- echo "high power"
- if [ ${has_pplib} -eq 1 ]; then
-- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"'
-+ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"'
- else
-- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now"
-+ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)"
- fi
- fi
-
diff --git a/x11-drivers/ati-drivers/files/8.582/ati-drivers-xen-8.552.patch b/x11-drivers/ati-drivers/files/8.582/ati-drivers-xen-8.552.patch
deleted file mode 100644
index a1b88df7fa84..000000000000
--- a/x11-drivers/ati-drivers/files/8.582/ati-drivers-xen-8.552.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-09 15:17:27.000000000 +0000
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-09 15:12:34.000000000 +0000
-@@ -31,6 +31,9 @@
- #include <linux/autoconf.h>
-
- #if !defined(CONFIG_X86_PC)
-+#if !defined(CONFIG_X86_PC_XEN)
-+#if !defined(CONFIG_X86_XEN)
-+#if !defined(CONFIG_X86_64_XEN)
- #if !defined(CONFIG_X86_64)
- #if !defined(CONFIG_X86_VOYAGER)
- #if !defined(CONFIG_X86_NUMAQ)
-@@ -47,6 +50,9 @@
- #endif
- #endif
- #endif
-+#endif
-+#endif
-+#endif
-
- /* The dirty-page-tracking patch included in NLD 9 SMP kernels defines
- * a static inline function that uses a GPL-only symbol in a header
---- common/lib/modules/fglrx/build_mod/firegl_public.h 2008-12-09 15:17:27.000000000 +0000
-+++ common/lib/modules/fglrx/build_mod/firegl_public.h 2008-12-09 15:15:45.000000000 +0000
-@@ -30,9 +30,13 @@
- #endif
-
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
--
-+#ifdef CONFIG_XEN
-+#define REMAP_PAGE_RANGE_FN io_remap_pfn_range
-+#define REMAP_PAGE_RANGE_STR "io_remap_pfn_range"
-+#else
- #define REMAP_PAGE_RANGE_FN remap_pfn_range
- #define REMAP_PAGE_RANGE_STR "remap_pfn_range"
-+#endif
- #define REMAP_PAGE_RANGE_OFF(offset) ((offset) >> PAGE_SHIFT)
-
- #else /* LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,9) */
-@@ -43,13 +47,21 @@
-
- #endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) */
-
-+#ifdef CONFIG_XEN
-+#define REMAP_PAGE_RANGE(vma,offset) \
-+ REMAP_PAGE_RANGE_FN((vma), \
-+ (vma)->vm_start, \
-+ REMAP_PAGE_RANGE_OFF(offset), \
-+ (vma)->vm_end - (vma)->vm_start, \
-+ (vma)->vm_page_prot)
-+#else
- #define REMAP_PAGE_RANGE(vma,offset) \
- REMAP_PAGE_RANGE_FN(FGL_VMA_API_PASS \
- (vma)->vm_start, \
- REMAP_PAGE_RANGE_OFF(offset), \
- (vma)->vm_end - (vma)->vm_start, \
- (vma)->vm_page_prot)
--
-+#endif
-
- /* Page table macros */
-
diff --git a/x11-drivers/ati-drivers/files/8.582/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.582/ati-powermode-opt-path-2.patch
deleted file mode 100644
index f5a35a304ec4..000000000000
--- a/x11-drivers/ati-drivers/files/8.582/ati-powermode-opt-path-2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh
---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100
-+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100
-@@ -4,6 +4,8 @@
- # Control script for ACPI lid state and AC adapter state
- #
-
-+aticonfig='/opt/bin/aticonfig'
-+
- getXuser() {
- user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'`
- if [ x"$user" = x"" ]; then
-@@ -47,7 +49,7 @@
- done
-
- #If PPLIB is enabled
--su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB
-+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB
- if [ $? = 0 ]; then
- echo "Has PPLIB"
- has_pplib=1
-@@ -61,15 +63,15 @@
- if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then
- echo "Low power"
- if [ ${has_pplib} -eq 1 ]; then
-- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"'
-+ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"'
- else
-- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now"
-+ su $user -c "$aticonfig --set-powerstate=1"
- fi
- else
- echo "high power"
- if [ ${has_pplib} -eq 1 ]; then
-- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"'
-+ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"'
- else
-- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now"
-+ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)"
- fi
- fi
-
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.20.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.20.patch
deleted file mode 100644
index aeaba719ff62..000000000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-2.6.20.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- common/lib/modules/fglrx/build_mod/firegl_public.c 2006-12-18 10:58:15.000000000 -0500
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c 2006-12-18 11:14:04.000000000 -0500
-@@ -181,6 +181,70 @@
- int errno;
- #endif // __ia64__
-
-+#if defined(__i386__)
-+#define __syscall_return(type, res) \
-+do { \
-+ if ((unsigned long)(res) >= (unsigned long)(-(128 + 1))) { \
-+ errno = -(res); \
-+ res = -1; \
-+ } \
-+ return (type) (res); \
-+} while (0)
-+#define _syscall2(type,name,type1,arg1,type2,arg2) \
-+type name(type1 arg1,type2 arg2) \
-+{ \
-+long __res; \
-+__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" \
-+ : "=a" (__res) \
-+ : "0" (__NR_##name),"ri" ((long)(arg1)),"c" ((long)(arg2)) \
-+ : "memory"); \
-+__syscall_return(type,__res); \
-+}
-+
-+#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-+type name(type1 arg1,type2 arg2,type3 arg3) \
-+{ \
-+long __res; \
-+__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" \
-+ : "=a" (__res) \
-+ : "0" (__NR_##name),"ri" ((long)(arg1)),"c" ((long)(arg2)), \
-+ "d" ((long)(arg3)) : "memory"); \
-+__syscall_return(type,__res); \
-+}
-+#elif defined(__x86_64__)
-+#define __syscall_clobber "r11","rcx","memory"
-+#define __syscall "syscall"
-+
-+#define __syscall_return(type, res) \
-+do { \
-+ if ((unsigned long)(res) >= (unsigned long)(-127)) { \
-+ errno = -(res); \
-+ res = -1; \
-+ } \
-+ return (type) (res); \
-+} while (0)
-+#define _syscall2(type,name,type1,arg1,type2,arg2) \
-+type name(type1 arg1,type2 arg2) \
-+{ \
-+long __res; \
-+__asm__ volatile (__syscall \
-+ : "=a" (__res) \
-+ : "0" (__NR_##name),"D" ((long)(arg1)),"S" ((long)(arg2)) : __syscall_clobber ); \
-+__syscall_return(type,__res); \
-+}
-+
-+#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-+type name(type1 arg1,type2 arg2,type3 arg3) \
-+{ \
-+long __res; \
-+__asm__ volatile (__syscall \
-+ : "=a" (__res) \
-+ : "0" (__NR_##name),"D" ((long)(arg1)),"S" ((long)(arg2)), \
-+ "d" ((long)(arg3)) : __syscall_clobber); \
-+__syscall_return(type,__res); \
-+}
-+#endif
-+
- // int mlock(const void *addr, size_t len);
- _syscall2(int, mlock, const void *, addr, size_t, len )
- // int munlock(const void *addr, size_t len);
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch
deleted file mode 100644
index 665d8d602921..000000000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- common/lib/modules/fglrx/build_mod/firegl_public.c 2007-03-29 23:48:46.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c 2007-03-30 00:15:21.000000000 +0200
-@@ -5055,7 +5057,6 @@
- */
- unsigned int ATI_API_CALL KAS_SlabCache_Destroy(void* hSlabCache)
- {
-- unsigned int ret = 0;
- kasSlabCache_t* slabcache_obj = (kasSlabCache_t*)hSlabCache;
-
- DBG_ENTER("0x%08X", hSlabCache);
-@@ -5069,18 +5070,11 @@
-
- DBG_TRACE("destroying slab object '%s'", slabcache_obj->name);
-
-- if (kmem_cache_destroy(slabcache_obj->cache) == 0)
-- {
-- ret = 1;
-- slabcache_obj->cache = NULL;
-- }
-- else
-- {
-- DBG_ERROR("destroying failed");
-- }
-+ kmem_cache_destroy(slabcache_obj->cache);
-+ slabcache_obj->cache = NULL;
-
-- DBG_LEAVE("%d", ret);
-- return ret;
-+ DBG_LEAVE("1");
-+ return 1;
- }
-
- /** \brief Allocate an entry in a Slab Cache
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch
deleted file mode 100644
index c830d386dc28..000000000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- common/lib/modules/fglrx/build_mod/firegl_public.c 2007-03-29 23:48:46.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c 2007-03-30 00:15:21.000000000 +0200
-@@ -171,6 +171,8 @@
- #endif
- #endif
-
-+#include <linux/freezer.h>
-+
- #include <linux/kmod.h>
-
- // To enable DBG_* macros set this variable to nonzero
diff --git a/x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch b/x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch
deleted file mode 100644
index fb6119e42833..000000000000
--- a/x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-=== modified file 'common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh'
---- common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2007-02-09 12:25:40 +0000
-+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2007-02-09 12:28:54 +0000
-@@ -46,7 +46,7 @@
- getXuser;
- if [ x"$XAUTHORITY" != x"" ]; then
- export DISPLAY=":$displaynum"
-- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=1 --effective=now"
-+ su $user -c "/opt/bin/aticonfig --set-powerstate=1 --effective=now"
- fi
- done
- else
-@@ -56,7 +56,7 @@
- getXuser;
- if [ x"$XAUTHORITY" != x"" ]; then
- export DISPLAY=":$displaynum"
-- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=3 --effective=now"
-+ su $user -c "/opt/bin/aticonfig --set-powerstate=3 --effective=now"
- fi
- done
- fi
-
diff --git a/x11-drivers/ati-drivers/files/ati-powermode.sh.patch b/x11-drivers/ati-drivers/files/ati-powermode.sh.patch
deleted file mode 100644
index cd776e0ac118..000000000000
--- a/x11-drivers/ati-drivers/files/ati-powermode.sh.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh
---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100
-+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100
-@@ -17,6 +17,10 @@
- fi
- }
-
-+aticonfig='/opt/ati/bin/aticonfig'
-+
-+# default high power state
-+default_state=`$aticonfig --lsp | grep 'default state' | cut -c 3`
-
- grep -q closed /proc/acpi/button/lid/*/state
- if [ $? = 0 ]; then
-@@ -46,7 +50,7 @@
- getXuser;
- if [ x"$XAUTHORITY" != x"" ]; then
- export DISPLAY=":$displaynum"
-- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=1 --effective=now"
-+ su $user -c "$aticonfig --set-powerstate=1 --effective=now"
- fi
- done
- else
-@@ -56,7 +60,7 @@
- getXuser;
- if [ x"$XAUTHORITY" != x"" ]; then
- export DISPLAY=":$displaynum"
-- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=3 --effective=now"
-+ su $user -c "$aticonfig --set-powerstate=$default_state --effective=now"
- fi
- done
- fi