Proxy commit for Emil Karlson. Fix x86-32 build failure on linux-3.17. See bug #526602.
authorManuel Rüger <mrueg@gentoo.org>
Thu, 20 Nov 2014 10:55:22 +0000 (10:55 +0000)
committerManuel Rüger <mrueg@gentoo.org>
Thu, 20 Nov 2014 10:55:22 +0000 (10:55 +0000)
Package-Manager: portage-2.2.14/cvs/Linux x86_64

x11-drivers/ati-drivers/ChangeLog
x11-drivers/ati-drivers/Manifest
x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild [new file with mode: 0644]
x11-drivers/ati-drivers/files/use-kernel_fpu_begin.patch [new file with mode: 0644]

index b03ef2de56e7c7c03d3aad19c23fd2ea2321f859..1aa13e07256c52772866564f3750670446603448 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.365 2014/10/23 14:09:03 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.366 2014/11/20 10:55:18 mrueg Exp $
+
+*ati-drivers-14.9-r1 (20 Nov 2014)
+
+  20 Nov 2014; Manuel Rüger <mrueg@gentoo.org> +ati-drivers-14.9-r1.ebuild,
+  +files/use-kernel_fpu_begin.patch:
+  Proxy commit for Emil Karlson. Fix x86-32 build failure on linux-3.17. See bug
+  #526602.
 
 *ati-drivers-14.9 (23 Oct 2014)
 
index 462d5dfbd185d9393e98e0b5f5b4d97a7ac5c23c..5fd96cf9e58cfb1e2d282c2fea3b3a01b2b57219 100644 (file)
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch 799 SHA256 0001fa7f2c3e15ec315f6c963dd428b682778c129250941a849577b8b3293e36 SHA512 a7ae5e7017c9b5a68d112d9a77df40ada722b06aff0cc31147713bfbce2419f9ca8c22b40398ab8b80c86427ff086a5617fb6de93d540af54365c7039cdcfe0f WHIRLPOOL 809c5bf8f0b0381af6a8549c36fcd00e75ff2f571f21cef3f2dec9ea823c65c29db28373b7145f39b9ed2cad234ec3c063407fb7a12260cfe1fe62eb67b5780d
 AUX ati-drivers-13.12-acpi.patch 548 SHA256 203fde1d773dfd16ab91cbecc9aad7d73a630a3c19f1feb3c74987284c385bff SHA512 1db52b5e4a6398d253122d4d3a3db2261396db9e07cecaf64c4edf1b6d8544cafe6dc0c24651de6b243728f8471f135c0c80c4958bb21cb0b6bf71cca7935981 WHIRLPOOL c7eadd81f517a2cb253c36d1ea401c367bbec88a4c7d14a399ce15c3a5c095fb7ed259d31ef8032304576d2921185e3b06aa1a89d7a209f58e3af93748e240c6
 AUX ati-drivers-13.6-linux-3.10-proc.diff 11837 SHA256 24edbb4fe0390d3eea4bf6b76b8bab87e26a5906cc3e273f2b87b8f3c5fc4918 SHA512 467b111e6c18a587c3d24c0460ce3797b82daf029c5f90614ab7e25e813011a54efc31f8364fe96b46bb28361be87cfe8e49a5ff73b5f23c4e8b072b83785c6c WHIRLPOOL de0d55658ef0f2123cc44928dd3e9d6b6f96223e6669bf38060c5bb50e4084433657708462f04db9ec60932135b6451054b52e962d203dc78f330a9ec48ef309
@@ -19,6 +16,7 @@ AUX fix-the-linux-3.17-no_hotplug-error.patch 556 SHA256 3b95e2b0b6af3e4d8c7d8e3
 AUX linux-3.10-proc.diff 9796 SHA256 a4201674067445369d5f1ed6f855a13481edfffcdce951b58c3bc23ef318ccc5 SHA512 8771604dda5a4ae77867bf5dfe966fc4c930ee7d6429d70ee30ab3a765b0fbb12f0201ab9a6049310a232d1314dc71578ae47d06af56d5b96c4454d427753e4e WHIRLPOOL 687f2275ddb61d39d70e3164bf042afe301c11c8e6baa03a211da07abad665cd91c1e023646c96aba435c9c5fdac19dc4c15be907af4c64ceaaaf025c72fa5cf
 AUX switchlibGL 1349 SHA256 a4aa2107fdb903da77fea432bc809a1155e213db460fdec72fd1c3c7cc0d13a0 SHA512 51d2912aa6ec2002b096c0483be69650d682feec54486ed5226b91988bc1516f718c71d9f58a2b28e0dbc512c0300ea271f9a97885776dd045fe324f1549b85d WHIRLPOOL d335ea9c57a28f8450423089bbf798da77cc72fff6bad1221989412808abcd6bcb7afa41aa2b04231feff3dac6eaaff58a7595173e53b6cf0f5d3d591997b43d
 AUX typesafe-kuid.diff 927 SHA256 1791cdb3640509422d0c6770519cf896c0a0a8a85274c83cb3fa65ebe147366c SHA512 010a605f542d2fa328de8537420ae7dbba56b4075089baedd8d039c2dd271dbaaa4dadf29d6fc5c202ba0077d62f36982f867e2681e36f6bf36ce19b13bca252 WHIRLPOOL 0096d0b77c2eeb62761cccc9e012dfa3ddaf2d10bd3afaff6edf918d921b6e4ce5865e5857f24e23278fcaf37b66fec589e59012142fde9dd8112dd59a78df20
+AUX use-kernel_fpu_begin.patch 521 SHA256 5b2af71806fb7aa57f03000762c09e74bef8905bba66477387173c51867695d2 SHA512 0969e7ef9d2d0c12b2a3aa074f43b5a525fa234cd8c9d2f85abf4f0c46b3dd7c4acdd2ed2f5aca6a2314e5db1d02f3c17c1b276b6bd181cd2725f72c24ddca5e WHIRLPOOL bd0e87c3ec2faf7f782ea0991db41cb63ae242564d3b0d278ea2ffd0bd27973f6f52d008cd3fbd45c61a88a9d9487f53f52229221454dc0b4d7714282e518b43
 DIST amd-catalyst-13.12-linux-x86.x86_64.zip 160571830 SHA256 024033f4847d1c2a182fc44e0b3df29b2d133e24aeaba390f4504a8f3361a0ca SHA512 bf02aea47dc0588e8fe6590ff5665b25b34b3e10499348e2eb786ba89b32703897753852e6ee8ed52c3d0f8eef46f2026d130329d7af75191e605975379d0109 WHIRLPOOL bcdac0f9641cfdc6d89cd5544fe22dda91f64ae8d34dcd25b55930702108b1bee1db0cdc85d8a68a78fddc34f7f30ab88c9813d3a6ba38b3abf37a24d6210707
 DIST amd-catalyst-13.4-linux-x86.x86_64.zip 122588023 SHA256 ebec78c7f78db3601d1c97116a6823076a7765318e16d88b619ebc80d4c6d1d5 SHA512 ce012f46527ee0073f658e97dd793954930b934b96be9e1c6cd1d344e7734ef81949b484701d5e7e1ebb221f46b5a617f4efb4445e42c06ac0a8b4eca76463fc WHIRLPOOL cb0f7af6d0474c3d521c5785bab49d76da7e09e1ddd02dc0e72b70b5afdb2bd1e07d4a4115a755f213718e7c32c816697d993b73706d58be68fa043aef1ad551
 DIST amd-catalyst-13.9-linux-x86.x86_64.zip 120482826 SHA256 ebade5062713c69d2b703b0a3f62defc409d58e98ceab3bfac7a71643c0c4cd3 SHA512 887c1146920ba7e5b31efd63b1a1b7d9cab586e8c6d705706e0b176b3527e542f452d919cd015c3a04d6f42c884f27d983b2a9229b70716129a94674dd7f62b4 WHIRLPOOL d8b6c7ed772898914c256674ae08a8b3d3054eb5bdfc2f00dc4c796a36b4654c3101410786adb54eaae44ff35386db2aa8d8db12d70805f8732d0709412bdbcc
@@ -35,25 +33,7 @@ EBUILD ati-drivers-13.9.ebuild 19910 SHA256 2a566cbf5a61e2a1bfba73608aeb366bd28d
 EBUILD ati-drivers-14.4_p1.ebuild 20362 SHA256 8834adb4d90edac9b4c79f6b95f2e4ba508fa201c524663ea80041cb63eb4d62 SHA512 604697ba73ebb27f788b69273b36213cde78521f2d46c2967ee6ce68b4ec684e47fd2b3e23e25ad264e0adeb59a677a54f86dc633834e0fbe9b95207df973741 WHIRLPOOL 3213dc6b3e00073f4f8b4821c16cbecf5f690cade7d6176ca6d12488113d01674853ffa8512500b98079da649f3efe4f32206fefaabf54cb94abe1ca3cdde0ea
 EBUILD ati-drivers-14.6_beta1.ebuild 20342 SHA256 15938003337f78211469aebcbf6f0822dc0cfb39296ad5c411eed365f7a2f6e1 SHA512 7aa1b2af43fa67fd9f52e4e889adfc374182d2be07650a326f960b480e708638bdd523b008671be02d7d436728ebaf609aec0200598de29a042b407b780eb1a0 WHIRLPOOL 79fc8c92bbc4da8b9159add6d77765b2bbb7508ec9bafecca5d4660914a3b71ce4a27d27e5216cecda8ea967099f4e187bac01dd8376b7bb72e5dd53e960af19
 EBUILD ati-drivers-14.6_beta2.ebuild 20295 SHA256 cfe2d28104690a1756e5071eb4723ccc43ce9da0a6a794cf20ecfab63030995d SHA512 7b424047acd59b0161c19fabe210dde11f8a19104d1db0bf52fda21dab4f6db1e5455a45ec5b4b8e6b8071649b7ad90cc050d06cc7fe139a92cd3939b5b5177a WHIRLPOOL 7a5208f68f0f2eb35e14d89f8389a334a19544e17a54379dc9575efe869189ab82d51383cfbad97e40db22949c5bd5979ac0cb7a8f733916eb0742deeee67df3
+EBUILD ati-drivers-14.9-r1.ebuild 19977 SHA256 17bddb58c7f3f0c773cb59da6817f77c4f6f0c417aaaa5d11beacd054a8c0f5c SHA512 b3780ae61ebf15744471719c3d94c62291054e77e6bd7a4c9885023f274a25685e64f9af69c648c4266ea9d42572777a600ccf3c4bdd9e83ca4d90bb348ace8f WHIRLPOOL a31ee6677c609c4e517760ddbf8d1bae466359d868e3cea2df97d19a9e603614ff76fe3c7e674a17d59d6fe68661a31288c48e8ede65aa1cde8d2373ad2abf43
 EBUILD ati-drivers-14.9.ebuild 20281 SHA256 cc1c206a4384bf1d975e1a97df42021cd995c6ecf390c2f715c759659d9da95d SHA512 4476abba5a9778a9a0c3160e88d6c8327469ac2c056bc75c72e64ca89f9f6a8101094fefc6fa6a5815c1d4f2fd501b537cbef79bd74b807aa547f622bf39c8c5 WHIRLPOOL 49ef5eea86e06994137251d5c5ea99e133ac6d72de640e27209dc41aa45d66383261c3a0bb11a97dd89ac2d2bfb07b01be77dfa9aeacb7b46bab07315bc13ad8
-MISC ChangeLog 94199 SHA256 c238cd27ca0ab4054c4218cfd351398e6c3e19caf787dedf0c7711841939c6ff SHA512 9aa7ea9df4552bb83df92758a7cdb31d74d819b705fa1da78c5313b85fed93b0cc7efed960a0622f89149391772cf40e37e290bc700f4128bb9ff29c4a89a4be WHIRLPOOL ac1f9182e8c631ee60bf50bc27d81420a6e6b253230ef29b845b54b0b5dc856133875125c8aca22d0ef5bfb4d89a64907c7d96ee9556e5e5c44adb8b2c68ba16
+MISC ChangeLog 94439 SHA256 d6d4848979f3d25596f7b9984585cf167cb98c98690cb350cdc589053412cec3 SHA512 5ddd3aa4d284cd9674368b4a5101ae8b0ad835486955b8f17b0487b266f3f1410fbca5ead5ccbdf08a168ce91b0c67026359edad4895fc169fd011b62a1b9def WHIRLPOOL 52b16126ffebca9992e83a0d6f551b87ebb2fb3a6c6f14db6891ad75d9b6b422cf3b47fc5b826faac1d86f03c4a396320fa37ffc3f69b2d05c504b3d884510e5
 MISC metadata.xml 775 SHA256 827539e024f84e38b06ca3ef03d2c1938a14f27f1556efc76bc747a006764c76 SHA512 87a8b404a33c29a63a685482026ffdfbb92556f1548a2940918569a3d0272d68d06496dbbbe414e4c8d42c5b9e51c32f55609fa9cf209a4e9ddb7d1613e34a79 WHIRLPOOL a69a2f49a3879d349947a399b306b084328daa025d95976e6223c2e2269b1e5f302a68f3e299733073aaf6b2743a2ef7f81bbe5f4016cf8897bc4226c9b3d477
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCABmBQJUSQwEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
-MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRk8AP/3I3zL5I91OahdibZv8QIhPZ
-892s0dwyRBerlUA0q4Z+raxIBzCMqhI90Q/AHgonFEc5ashDpvz4XN3ZFGlocjqj
-LPfUzrQDZ640XyurKOYDHw+Ftvbz6A2aB5gYf94t7AFvVhMVovJOO7lsQO6q4KWH
-MrW4iURq8oBdqsw0zacsdsNM9qaKnWV8uyDgzeIAj90jigsHAgSGYQNqyg1ZpR2d
-5/VnhsyoW+GD79uZFpJ6+MpVrDbtCMAWHehgSpox3UeTXEx8hl/pQYk14hRUkkYd
-7L8aQb3x6qu6OrWeKpUxSNUCuiUTEbkfuos24N3536lW0YkhDl+F/DAQeOobEI/0
-A6tk5TQEJF80Q520Dh44f+Al6uOwDLn7hudZipk02lf0yL8BfUww8M/H8SmZto8H
-fVj6yLHfVU21+9SOi36AZ0QpKm4TRIWoGs63Lrsb3wwBtZf155eGOticRv9XdvTC
-vu9bKrxqbxkiE8UPEqMkHngee1V1KgUQpTNsZIw1QAjCnvbulC9T6E0J5LdCW30M
-Ht7fEiVb7D+biUAlBLGA+RwDkK8MzVbSr7srFlyPpbuhx8A71g5kdhoDj3smVIh6
-yP4UPA6paZ6VVHjq4uQYWUkTV1L3k0Fdhc427mRcMzYBuaP3+avghlhfFN63DLjo
-PaNKgJSIYv0hExQyyKOL
-=GYsA
------END PGP SIGNATURE-----
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild
new file mode 100644 (file)
index 0000000..fc66282
--- /dev/null
@@ -0,0 +1,606 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild,v 1.1 2014/11/20 10:55:18 mrueg Exp $
+
+EAPI=5
+
+inherit eutils multilib-build linux-info linux-mod toolchain-funcs versionator pax-utils
+
+DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets"
+HOMEPAGE="http://www.amd.com"
+RUN="${WORKDIR}/fglrx-14.301.1001/amd-driver-installer-14.301.1001-x86.x86_64.run"
+SLOT="1"
+# Uses javascript for download YESSSS
+#DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"
+DRIVERS_URI="mirror://gentoo/amd-catalyst-14-9-linux-x86-x86-64.zip"
+XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
+SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
+FOLDER_PREFIX="common/"
+IUSE="debug +modules qt4 static-libs pax_kernel"
+
+LICENSE="AMD GPL-2 QPL-1.0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="bindist test fetch"
+
+RDEPEND="
+       <=x11-base/xorg-server-1.15.49[-minimal]
+       >=app-admin/eselect-opengl-1.0.7
+       app-admin/eselect-opencl
+       sys-power/acpid
+       x11-apps/xauth
+       x11-libs/libX11
+       x11-libs/libXext
+       x11-libs/libXinerama
+       x11-libs/libXrandr
+       x11-libs/libXrender
+       virtual/glu
+       abi_x86_32? (
+                       || (
+                               virtual/glu[abi_x86_32]
+                               app-emulation/emul-linux-x86-opengl
+                       )
+                       || (
+                               (
+                                       x11-libs/libX11[abi_x86_32]
+                                       x11-libs/libXext[abi_x86_32]
+                                       x11-libs/libXinerama[abi_x86_32]
+                                       x11-libs/libXrandr[abi_x86_32]
+                                       x11-libs/libXrender[abi_x86_32]
+                               )
+                               app-emulation/emul-linux-x86-xlibs
+                       )
+       )
+       qt4? (
+                       x11-libs/libICE
+                       x11-libs/libSM
+                       x11-libs/libXcursor
+                       x11-libs/libXfixes
+                       x11-libs/libXxf86vm
+                       dev-qt/qtcore:4
+                       dev-qt/qtgui:4[accessibility]
+       )
+"
+if [[ legacy != ${SLOT} ]]; then
+       RDEPEND="${RDEPEND}
+               !x11-drivers/ati-drivers:legacy"
+else
+       RDEPEND="${RDEPEND}
+               !x11-drivers/ati-drivers:1"
+fi
+
+DEPEND="${RDEPEND}
+       x11-proto/inputproto
+       x11-proto/xf86miscproto
+       x11-proto/xf86vidmodeproto
+       x11-proto/xineramaproto
+       x11-libs/libXtst
+       sys-apps/findutils
+       app-misc/pax-utils
+       app-arch/unzip
+"
+
+EMULTILIB_PKG="true"
+
+S="${WORKDIR}"
+
+# QA Silencing
+QA_TEXTRELS="
+       usr/lib*/opengl/ati/lib/libGL.so.1.2
+       usr/lib*/libatiadlxx.so
+       usr/lib*/xorg/modules/glesx.so
+       usr/lib*/libaticaldd.so
+       usr/lib*/dri/fglrx_dri.so
+"
+
+QA_EXECSTACK="
+       opt/bin/atiode
+       opt/bin/amdcccle
+       usr/lib*/opengl/ati/lib/libGL.so.1.2
+       usr/lib*/dri/fglrx_dri.so
+"
+
+QA_WX_LOAD="
+       usr/lib*/opengl/ati/lib/libGL.so.1.2
+       usr/lib*/dri/fglrx_dri.so
+"
+
+QA_PRESTRIPPED="
+       usr/lib\(32\|64\)\?/libXvBAW.so.1.0
+       usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
+       usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
+       usr/lib\(32\|64\)\?/xorg/modules/glesx.so
+       usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
+       usr/lib\(32\|64\)\?/libaticaldd.so
+       usr/lib\(32\|64\)\?/dri/fglrx_dri.so
+       usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
+       usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\).so
+"
+
+QA_SONAME="
+       usr/lib\(32\|64\)\?/libatiadlxx.so
+       usr/lib\(32\|64\)\?/libaticalcl.so
+       usr/lib\(32\|64\)\?/libaticaldd.so
+       usr/lib\(32\|64\)\?/libaticalrt.so
+       usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
+"
+
+QA_DT_HASH="
+       opt/bin/amdcccle
+       opt/bin/aticonfig
+       opt/bin/atiodcli
+       opt/bin/atiode
+       opt/bin/clinfo
+       opt/bin/fglrxinfo
+       opt/sbin/atieventsd
+       opt/sbin/amdnotifyui
+       usr/lib\(32\|64\)\?/libaticalcl.so
+       usr/lib\(32\|64\)\?/libaticalrt.so
+       usr/lib\(32\|64\)\?/libatiuki.so.1.0
+       usr/lib\(32\|64\)\?/libatiadlxx.so
+       usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
+       usr/lib\(32\|64\)\?/libXvBAW.so.1.0
+       usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
+       usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
+       usr/lib\(32\|64\)\?/xorg/modules/glesx.so
+       usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
+       usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
+       usr/lib\(32\|64\)\?/libaticaldd.so
+       usr/lib\(32\|64\)\?/dri/fglrx_dri.so
+       usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
+       usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
+       usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
+       usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
+       usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
+       usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
+"
+
+pkg_nofetch() {
+       einfo "The driver packages"
+       einfo ${A}
+       einfo "need to be downloaded manually from"
+       einfo "http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64"
+       einfo "and ${XVBA_SDK_URI}"
+}
+
+pkg_pretend() {
+       local CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR"
+       use amd64 && CONFIG_CHECK+=" COMPAT"
+
+       local ERROR_MTRR="CONFIG_MTRR required for direct rendering."
+       local ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct
+               rendering to work."
+       local ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports the symbol lock_acquire
+               as GPL-only. This prevents ${P} from compiling with an error like this:
+               FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
+       local ERROR_PAX_KERNEXEC_PLUGIN_METHOD_OR="This config option will cause
+               kernel to reject loading the fglrx module with
+               \"ERROR: could not insert 'fglrx': Exec format error.\"
+               You may want to try CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS instead."
+       local ERROR_BKL="CONFIG_BKL must be enabled for kernels 2.6.37-2.6.38."
+
+       # workaround until bug 365543 is solved
+       if use modules; then
+               linux-info_pkg_setup
+               require_configured_kernel
+               kernel_is ge 2 6 37 && kernel_is le 2 6 38 && CONFIG_CHECK+=" BKL"
+               check_extra_config
+               if ! linux_chkconfig_present AGP && \
+                       ! linux_chkconfig_present PCIEPORTBUS; then
+                       ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
+                       ewarn "Direct rendering will not work."
+               fi
+       fi
+
+       if ! has XT ${PAX_MARKINGS} && use pax_kernel; then
+               ewarn "You have disabled xattr pax markings for portage."
+               ewarn "This will likely cause programs using ati-drivers provided"
+               ewarn "libraries to be killed kernel."
+       fi
+}
+
+pkg_setup() {
+       if use modules; then
+               MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod/2.6.x)"
+               BUILD_TARGETS="kmod_build"
+               linux-mod_pkg_setup
+               BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
+               BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
+               if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
+                       BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
+               else
+                       BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
+               fi
+       fi
+       # Define module dir.
+       MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
+       # get the xorg-server version and set BASE_DIR for that
+       BASE_DIR="${S}/xpic"
+
+       # amd64/x86
+       if use amd64 ; then
+               MY_BASE_DIR="${BASE_DIR}_64a"
+               PKG_LIBDIR=lib64
+               ARCH_DIR="${S}/arch/x86_64"
+       else
+               MY_BASE_DIR="${BASE_DIR}"
+               PKG_LIBDIR=lib
+               ARCH_DIR="${S}/arch/x86"
+       fi
+
+       elog
+       elog "Please note that this driver only supports graphic cards based on"
+       elog "Evergreen chipset and newer."
+       elog "This includes the AMD Radeon HD 5400+ series at this moment."
+       elog
+       elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
+       elog "For migration informations please refer to:"
+       elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
+       einfo
+}
+
+src_unpack() {
+       local DRIVERS_DISTFILE XVBA_SDK_DISTFILE
+       DRIVERS_DISTFILE=${DRIVERS_URI##*/}
+       XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/}
+
+       if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then
+               unpack ${DRIVERS_DISTFILE}
+       else
+               #please note, RUN may be insanely assigned at top near SRC_URI
+               if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then
+                       unpack ${DRIVERS_DISTFILE}
+                       [[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}"
+               else
+                       RUN="${DISTDIR}/${DRIVERS_DISTFILE}"
+               fi
+               sh "${RUN}" --extract "${S}" 2>&1 > /dev/null || die
+       fi
+
+       mkdir xvba_sdk
+       cd xvba_sdk
+       unpack ${XVBA_SDK_DISTFILE}
+
+       mkdir -p "${WORKDIR}/extra" || die "mkdir extra failed"
+       cd "${WORKDIR}/extra"
+       tar -xf "../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz"
+}
+
+src_prepare() {
+       if use modules; then
+               if use debug; then
+                       sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
+                               "${MODULE_DIR}/firegl_public.c" \
+                               || die "Failed to enable debug output."
+               fi
+       fi
+
+       # These are the userspace utilities that we also have source for.
+       # We rebuild these later.
+       rm \
+               "${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
+               || die "bin rm failed"
+
+       # in this version amdcccle isn't static, thus we depend on qt4
+       use qt4 || rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle
+
+       # ACPI fixups
+       sed -i \
+               -e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
+               -e "s:/var/lib/gdm/:/var/gdm/:" \
+               "${S}/${FOLDER_PREFIX}etc/ati/authatieventsd.sh" \
+               || die "ACPI fixups failed."
+
+       # Since "who" is in coreutils, we're using that one instead of "finger".
+       sed -i -e 's:finger:who:' \
+               "${S}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
+               || die "Replacing 'finger' with 'who' failed."
+       # Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
+       # add function to detect default state.
+       epatch "${FILESDIR}"/ati-powermode-opt-path-3.patch
+
+       # see http://ati.cchtml.com/show_bug.cgi?id=495
+       #epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
+       # first hunk applied upstream second (x32 related) was not
+       epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch
+
+       # compile fix for AGP-less kernel, bug #435322
+       epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
+
+       epatch "${FILESDIR}/ati-drivers-13.8-beta-include-seq_file.patch"
+
+       # Fix #483400
+       epatch "${FILESDIR}/fgl_glxgears-do-not-include-glATI.patch"
+
+       # Fix #524658
+       epatch "${FILESDIR}/fix-the-linux-3.17-no_hotplug-error.patch"
+
+       # Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870
+       use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch"
+
+       # Compile fix, #526602
+       epatch "${FILESDIR}/use-kernel_fpu_begin.patch"
+
+       cd "${MODULE_DIR}"
+
+       # bugged fglrx build system, this file should be copied by hand
+       cp ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
+
+       convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
+
+       # When built with ati's make.sh it defines a bunch of macros if
+       # certain .config values are set, falling back to less reliable
+       # detection methods if linux/autoconf.h is not available. We
+       # simply use the linux/autoconf.h settings directly, bypassing the
+       # detection script.
+       sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
+       sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
+               || die "MODVERSIONS sed failed"
+}
+
+src_compile() {
+       use modules && linux-mod_src_compile
+
+       ebegin "Building fgl_glxgears"
+       cd "${S}"/extra/fgl_glxgears
+       # These extra libs/utils either have an Imakefile that does not
+       # work very well without tweaking or a Makefile ignoring CFLAGS
+       # and the like. We bypass those.
+       # The -DUSE_GLU is needed to compile using nvidia headers
+       # according to a comment in ati-drivers-extra-8.33.6.ebuild.
+       "$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
+               -I"${S}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
+               -lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
+       eend $?
+}
+
+src_install() {
+       use modules && linux-mod_src_install
+
+       # We can do two things here, and neither of them is very nice.
+
+       # For direct rendering libGL has to be able to load one or more
+       # dri modules (files ending in _dri.so, like fglrx_dri.so).
+       # Gentoo's mesa looks for these files in the location specified by
+       # LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
+       # location /usr/$(get_libdir)/dri. Ati's libGL does the same
+       # thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
+       # on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
+       # 64bit. So we can either put the .so files in that (unusual,
+       # compared to "normal" mesa libGL) location or set
+       # LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
+       # 101539.
+
+       # The problem with this approach is that LIBGL_DRIVERS_PATH
+       # *overrides* the default hardcoded location, it does not extend
+       # it. So if ati-drivers is merged but a non-ati libGL is selected
+       # and its hardcoded path does not match our LIBGL_DRIVERS_PATH
+       # (because it changed in a newer mesa or because it was compiled
+       # for a different set of multilib abis than we are) stuff breaks.
+
+       # We create one file per ABI to work with "native" multilib, see
+       # below.
+
+       echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
+       doenvd "${T}/03ati-colon-sep" || die
+
+       # All libraries that we have a 32 bit and 64 bit version of on
+       # amd64 are installed in src_install-libs. Everything else
+       # (including libraries only available in native 64bit on amd64)
+       # goes in here.
+       multilib_foreach_abi src_install-libs
+
+       # This is sorted by the order the files occur in the source tree.
+
+       # X modules.
+       exeinto /usr/$(get_libdir)/xorg/modules/drivers
+       doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
+       exeinto /usr/$(get_libdir)/xorg/modules/linux
+       doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
+       exeinto /usr/$(get_libdir)/xorg/modules
+       doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{glesx.so,amdxmm.so}
+
+       # Arch-specific files.
+       # (s)bin.
+       into /opt
+       dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
+       use qt4 && dosbin "${ARCH_DIR}"/usr/sbin/amdnotifyui
+       dobin "${ARCH_DIR}"/usr/bin/clinfo
+       # We cleaned out the compilable stuff in src_unpack
+       dobin "${ARCH_DIR}"/usr/X11R6/bin/*
+
+       # Common files.
+       # etc.
+       insinto /etc/ati
+       exeinto /etc/ati
+       # Everything except for the authatieventsd.sh script.
+       doins ${FOLDER_PREFIX}etc/ati/{logo*,control,signature,amdpcsdb.default}
+       doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
+
+       # include.
+       insinto /usr
+       doins -r ${FOLDER_PREFIX}usr/include
+       insinto /usr/include/X11/extensions
+
+       # Just the atigetsysteminfo.sh script.
+       into /usr
+       dosbin ${FOLDER_PREFIX}usr/sbin/*
+
+       # data files for the control panel.
+       if use qt4 ; then
+               insinto /usr/share
+               doins -r ${FOLDER_PREFIX}usr/share/ati
+               insinto /usr/share/pixmaps
+               doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
+               make_desktop_entry amdcccle 'AMD Catalyst Control Center' \
+                       ccc_large System
+       fi
+
+       # doc.
+       dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
+
+       doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
+
+       pushd ${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi > /dev/null
+
+       exeinto /etc/acpi
+       doexe ati-powermode.sh
+       insinto /etc/acpi/events
+       doins events/*
+
+       popd > /dev/null
+
+       # Done with the "source" tree. Install tools we rebuilt:
+       dobin extra/fgl_glxgears/fgl_glxgears
+       newdoc extra/fgl_glxgears/README README.fgl_glxgears
+
+       # Gentoo-specific stuff:
+       newinitd "${FILESDIR}"/atieventsd.init atieventsd
+       echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
+       newconfd "${T}"/atieventsd.conf atieventsd
+
+       # PowerXpress stuff
+       exeinto /usr/$(get_libdir)/fglrx
+       doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
+       cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
+       doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
+}
+
+src_install-libs() {
+       if [[ "${ABI}" == "amd64" ]]; then
+               local EX_BASE_DIR="${BASE_DIR}_64a"
+               local pkglibdir=lib64
+               local MY_ARCH_DIR="${S}/arch/x86_64"
+               local oclsuffix=64
+       else
+               local EX_BASE_DIR="${BASE_DIR}"
+               local pkglibdir=lib
+               local MY_ARCH_DIR="${S}/arch/x86"
+               local oclsuffix=32
+       fi
+       einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
+
+       local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
+       # To make sure we do not miss a spot when these change.
+       local libmajor=1 libminor=2
+       local libver=${libmajor}.${libminor}
+
+       # The GLX libraries
+       # (yes, this really is "lib" even on amd64/multilib --marienz)
+       exeinto ${ATI_ROOT}/lib
+       newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
+               libGL.so.${libver}
+       dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
+       dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
+
+       exeinto ${ATI_ROOT}/extensions
+       doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so
+       mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
+
+       # other libs
+       exeinto /usr/$(get_libdir)
+       # Everything except for the libGL.so installed some row above
+       doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
+               -maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
+       insinto /usr/$(get_libdir)
+       doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
+               -maxdepth 1 -type f -not -name '*.so*')
+
+       # DRI modules, installed into the path used by recent versions of mesa.
+       exeinto /usr/$(get_libdir)/dri
+       doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+
+       # AMD Cal and OpenCL libraries
+       exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
+       doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
+       doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
+       dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
+       exeinto /usr/$(get_libdir)
+       doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
+
+       # OpenCL vendor files
+       insinto /etc/OpenCL/vendors/
+       cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
+               /usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
+       EOF
+       doins "${T}"/amdocl${oclsuffix}.icd
+
+       local envname="${T}"/04ati-dri-path
+       if [[ -n ${ABI} ]]; then
+               envname="${envname}-${ABI}"
+       fi
+       echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
+       doenvd "${envname}"
+
+       # Silence the QA notice by creating missing soname symlinks
+       for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
+       do
+               local soname=${so##*/}
+               local soname_one=${soname%.[0-9]}
+               local soname_zero=${soname_one%.[0-9]}
+               dosym ${soname} /usr/$(get_libdir)/${soname_one}
+               dosym ${soname_one} /usr/$(get_libdir)/${soname_zero}
+       done
+
+       # See https://bugs.gentoo.org/show_bug.cgi?id=443466
+       dodir /etc/revdep-rebuild/
+       echo "SEARCH_DIRS_MASK=\"/opt/bin/clinfo\"" > "${ED}/etc/revdep-rebuild/62-ati-drivers"
+
+       #remove static libs if not wanted
+       use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a
+
+       #install xvba sdk headers
+       doheader xvba_sdk/include/amdxvba.h
+
+       if use pax_kernel; then
+               pax-mark m "${D}"/usr/lib*/opengl/ati/lib/libGL.so.1.2 || die "pax-mark failed"
+       fi
+}
+
+pkg_postinst() {
+       elog "To switch to AMD OpenGL, run \"eselect opengl set ati\""
+       elog "To change your xorg.conf you can use the bundled \"aticonfig\""
+       elog
+       elog "If you experience unexplained segmentation faults and kernel crashes"
+       elog "with this driver and multi-threaded applications such as wine,"
+       elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
+       elog
+       elog "Fully rebooting the system after an ${PN} update is recommended"
+       elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
+       elog "might not work"
+       elog
+       elog "Some cards need acpid running to handle events"
+       elog "Please add it to boot runlevel with rc-update add acpid boot"
+       elog
+
+       use modules && linux-mod_pkg_postinst
+       "${ROOT}"/usr/bin/eselect opengl set --use-old ati
+       "${ROOT}"/usr/bin/eselect opencl set --use-old amd
+
+       if has_version "x11-drivers/xf86-video-intel[sna]"; then
+               ewarn "It is reported that xf86-video-intel built with USE=\"sna\" causes the X server"
+               ewarn "to crash on systems that use hybrid AMD/Intel graphics. If you experience"
+               ewarn "this crash, downgrade to xf86-video-intel-2.20.2 or earlier or"
+               ewarn "try disabling sna for xf86-video-intel."
+               ewarn "For details, see https://bugs.gentoo.org/show_bug.cgi?id=430000"
+       fi
+
+       if use pax_kernel; then
+               ewarn "Please run \"revdep-pax -s libGL.so.1 -me\" after installation and"
+               ewarn "after you have run \"eselect opengl set ati\". Executacle"
+               ewarn "revdep-pax is part of package sys-apps/elfix."
+       fi
+}
+
+pkg_preinst() {
+       use modules && linux-mod_pkg_preinst
+}
+
+pkg_prerm() {
+       "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+       use modules && linux-mod_pkg_postrm
+       "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/ati-drivers/files/use-kernel_fpu_begin.patch b/x11-drivers/ati-drivers/files/use-kernel_fpu_begin.patch
new file mode 100644 (file)
index 0000000..f0ba278
--- /dev/null
@@ -0,0 +1,12 @@
+diff -Naur a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c       2014-10-27 23:30:58.630304842 +0200
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c       2014-10-27 23:32:57.300306011 +0200
+@@ -6389,7 +6389,7 @@
+  */
+ void ATI_API_CALL KCL_fpu_begin(void)
+ {
+-#ifdef CONFIG_X86_64
++#if defined(CONFIG_X86_64) || LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
+     kernel_fpu_begin();
+ #else
+ #ifdef TS_USEDFPU