Fix building against kernel 3.13, bug #498766. Import of Emil Karlson's ebuild from the x11 overlay.

Package-Manager: portage-2.2.7/cvs/Linux x86_64

5 files changed, 52 insertions, 33 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 3816bff72aed..946d0a41c148 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/ati-drivers
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.349 2013/12/27 12:47:52 scarabeus Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.350 2014/01/26 17:56:12 chithanh Exp $
+
+  26 Jan 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/ati-drivers-linux-3.13-acpi-handle.patch, ati-drivers-13.12.ebuild,
+  files/ati-drivers-kernel-3.8-acpihandle.patch:
+  Fix building against kernel 3.13, bug #498766. Import of Emil Karlson's ebuild
+  from the x11 overlay.
 
 *ati-drivers-13.12 (27 Dec 2013)
 
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 9d3a1e4bdb84..a2c51312c99f 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -1,13 +1,11 @@
------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
 AUX ati-drivers-13.8-beta-include-seq_file.patch 623 SHA256 c5e91dbeea4458ec1e36b62bbf6ab71acb86b97542b76039dca1890cf3c7d3c7 SHA512 3dcb426b48f8abe7f82ca990293418f7944ab274f58c224b9a74f117be097289c85a131f2cfc3585a0caf7a71ec0968afc28f4b7b5b533d21bae51ab3e2c6234 WHIRLPOOL dfc6a63bb263809b15bbc2674d893383d4e144c48db023c1842f134bf95302452363af0a6a5088d76327786d094d086187e7abd28dd809b2619a0c01640cc536
 AUX ati-drivers-13.8-proc-permissions.diff 626 SHA256 c514dbfef07249ce9997d57295a6105442f30efcec4eae457461ee4377c65409 SHA512 bc303455ae2e5b68ccb31c346b92837b9101ff5f39f4a6cda6c2c90c572358d03b630855e5186dd3304561a8800071a151cf94f351d234fb22a490a58fdacfb7 WHIRLPOOL 0889b46c109f0a9149f534db402552ee43cbc6aa4037eb5f3c4835db34680b22deb7b04e5d845b569314b4868268ef98e981b546967c1a3384d8f88e2f6d6004
 AUX ati-drivers-do_mmap.patch 1405 SHA256 3fc9bae50d25d3bfe76a3a1e89c8d025674a4cb9afd16d3a5d8b3c25a66f536d SHA512 1a2f8fe7f2506037d6d158e5c2efffa39c503566284d8f516cb2d84db546eced24df5dcb8d74ac84911589efb4547d7f8610d78ad29703f9ed0a9890576c51b7 WHIRLPOOL 86daa957d7569b26fdf92929e5b04a32379af067a208628eab1a4541fdebfb51fa4bfedeec63f4685c6258adcba2ddc4223b69dca329ecbebd4ba13167f66f82
-AUX ati-drivers-kernel-3.8-acpihandle.patch 717 SHA256 f7012bbc1d27a4d9207f8ba78256684a74b917311f525d3b061c11caefad2846 SHA512 a064ad1ebbb1010349c22d6fd6a4a3715df3d7087353a70199957b5c1c325b533b21c3f004567362a834faa0d8f169296ef996765d47439fdad4109a0d01f85c WHIRLPOOL e0eb93cd367f9e6e1848c3c3301c914f783865eb5d6c11a27a334624ee84cf7ee99073a6a2ff69014c8b920a51933573bf1224f53ea64c2666968f93ca922003
+AUX ati-drivers-kernel-3.8-acpihandle.patch 859 SHA256 d0c3f7e8f9e0c7fbffbac9e483c1cc10ec883639233124faf06503faca371fb7 SHA512 9566b6357006fb783a494b9404b11e756913c03f39bd1e53f650dc16a17eeb63a0371db729646a42c412199933cadc4c9bd35aa26fdcdea3d706da2ff33122f3 WHIRLPOOL ccebd25e7686fb393cd880b6bb3d243635b71b36254b41628af71b1d610e70fec803d0818f7c19b08867294666a0b71641f7eaabf889f60b6e1b68cfcd24b3c0
+AUX ati-drivers-linux-3.13-acpi-handle.patch 1227 SHA256 fac8e8a85fdf598a35e880d1a8b10cda84597cfdbee8ac0e9aa667351bbefd24 SHA512 33ce6b9751444de93adec1bb8c99f8592692cdd0ba2b6577ec4978a35587d16f71131471ccded22548a0dd3f1d4afe9ea9c9c7de770fbdfe5f546dfd33979e63 WHIRLPOOL 6f1d537eff041ca8803294552271f2303b8d1ec18c4282c3e3b58c329534bf68889254a108c1b05325f6e95fac923e6b6d06fbb93fceba532d2b6af0044358cf
 AUX ati-drivers-old_rsp.patch 989 SHA256 dd222de89b515046c6cbfef172a3ec8d4bc48664799b3bbfff648091c6d54b49 SHA512 b86a230f126950d309b899ab3445154cf38cb8127b7686d0a467df6d3561a1785747e9522c00b55a294961c1157fe41833a5a85d4737775ae68bdb4099b0ee37 WHIRLPOOL cd06422ee90587c5c7485074b03ccaaef921134c721c0d0f6f678a9c968aae6417523c77d6dfcccc856cb5d125579197cd3c6a5b1c8557ce621784eabd0c43fa
 AUX ati-drivers-vm-reserverd.patch 408 SHA256 61128444938f94f911325b6cac810d3cb3614d0002758e48ba976b678414df30 SHA512 34cd4705f632b1493eac756538eb21fe0e090f78cf92cde7c2a7094a8fc8134ee6d5dd24c6bb9ad18c8ef46dd1d5505ae12d43032265cd4ade03793f277fe4c2 WHIRLPOOL 5a1a98145576b20bdd2e80e5f7f9a2b9bab02942a9fb83814d73d17f1bfec690ee0cd2ccfdf418f297e75432d8fcee8164a1d179eeb5bc716e1becf96bb373f1
 AUX ati-drivers-x32_something_something.patch 486 SHA256 9eb114a797089fca3693420305a6b668c4d7a16a722d5faa53dd904bba1b4c07 SHA512 157884244a49748c897a2eca1a46bf40631042d15af85c2b2f49bc3c3c48f5638dec815a4e9c67ee2c8b88cc15b7f71e9fe4d9bfebf5444bb169542048f66499 WHIRLPOOL f7583d7df16c9eb608aff2330b4bd55ede34986e6f3cf63aa4cb2c77dcfade7c499f1b4cef95fdc8e6ab28d7bb5544a80703bcf5a41eae6b90ca8830b6fdd888
@@ -30,26 +28,9 @@ DIST xvba-sdk-0.74-404001.tar.gz 583847 SHA256 731a2c489f2fb5d7318c1976061b26c10
 EBUILD ati-drivers-13.10_beta.ebuild 19964 SHA256 fa7552a4d9f127decb96d0342bf24f3b1555f32c245be782cd2da5679267dc7a SHA512 7f26050d363ec7d97a2da1136ca70d582b15f4bc7066ebe627a251b478b5587f33dd743a3c381a06ff76cb8420097d24a4be05539acee8dcf4acff47f0263e0d WHIRLPOOL 9b0d32516e6be8d5324e48a36dbdde04e9952636b35aa0984ef27a0bd9927aeea32ff097dc8158fe2af72c692bb73a39589f4aa7ed01c5b6c7a8e6643cdf5f70
 EBUILD ati-drivers-13.11_beta.ebuild 19894 SHA256 dfbf4c492c53f9a8b443d06e4f6a8723f989b706cd0e7de38e10009293ec387f SHA512 7fb193082885e809e363e7b2e4914de24dfbd4c37fd88bd8fb4a94f4e5961fcbd1cc416efb9f2674172f5188948e36b5c236fa64cd3a32770e8e4c102e0960a3 WHIRLPOOL d37ecf6f12afdf5ead2485a19f1407f1bde0aed65e502c19505bf2ae04388425575151e389cf1b157269327416dddec75a1267d300a480661f2786b237918b38
 EBUILD ati-drivers-13.11_beta6.ebuild 19895 SHA256 5ac7bb5ad449e34b0e5ecc465347d706635c7239c73290bf59bb9bd0b43376d6 SHA512 45399b702ee5f40ae3fe48b97f53d8603fbd10da10d95dc15106789b0a42f39b2874e707f2261c7c0b9ec91a2a175762b1884890116fa19e4391ba8e1f8dcfd6 WHIRLPOOL 1c5058e4053b75f9199a3a96aca1e0eba9f793ec2b1347504e75ad23ba7af99f8cd781ec22c7d94aca18eb5a14b6c5f66a0b6632cd42dc7419d5edade61c05c9
-EBUILD ati-drivers-13.12.ebuild 20105 SHA256 8c4609fc6d15fe38660f3aa0dc27c02c38564251dcb8627830ca3d3f6acc4fb7 SHA512 55be46a49b9151dad5737789b4d2385b45f01caa0f9e957a78d1bfd1c91b574f0911c17714b2c27045ad9d5a58bef1514cb1efa0b55c385d62706691d349b9bb WHIRLPOOL 2b8630fc2b2e90661d07ed557786ac899d882d14e8cebdba2687b2a6adfc2f5d7397b0aba391cb773f701a32743092d1c4e36d1d084587f74dd869e6c33f64aa
+EBUILD ati-drivers-13.12.ebuild 20211 SHA256 75307f387839ad4395b9655ad1fe9b8bb870afdb999c6e529ce32622c56272b2 SHA512 f4e58cc89e160c38025a3b4dbfeea6a96ec27cdd31ff112bb6e0a417515f83ad46c93bf3618a9131e630c9c6cc08f7fa2ac3f41b897d9167819ff906b61cd0eb WHIRLPOOL 4e839dfd3ccdca6e7c61a57a196dca1bc34ad4ecb251424e5f33870859f14819ffdeba1a1b1dbf378d60bc76bdd17aa1d62800b899f8ced58758fc1b8b797389
 EBUILD ati-drivers-13.1_pre897.ebuild 19982 SHA256 b004303b1b12563c365d0d2f643bf892092a9262880176c26d3542d9d206dee6 SHA512 9045276558ac065a804a25ae919ddb129ce939c621f3eb61291065729826d99e9d2e9128c47db41f1030552b8aaace29730552420ed03558478c83261aac5e86 WHIRLPOOL 38f437df20b93c0c83f271ab56c7653b356ae2421a28d7a2bb7ea0c3d73c2c3701892a4317ea125dfe447bc9737e9b8369fa1570eca20f5510bf6f21e357f67f
 EBUILD ati-drivers-13.4.ebuild 20497 SHA256 5524e85d6ff84c8c8b1adda8e84be281ac0aded52d5aa6775e7ba1760575817d SHA512 646fc2e0657c12521e87072b8870d660726de337ac35b963f7b586b95032ef2b4082814f966e138febfed75e8b7df8676c7ee998ff16548b0c39e62cbe7e8cd2 WHIRLPOOL e9df25250e4dab82a11eaec0cdf0bff83d1b8360d7f79e76df2603ebec0d3387322be2474f233bf04b2b45d2b50dd22a53cec473a1213db635c4e0c3762c53e0
 EBUILD ati-drivers-13.9.ebuild 19867 SHA256 788e43c18d3f838235995edebe0d62f6ef0de1742debfef79091bc6de9d8c08f SHA512 dc970b56a47ed8d562b3803d1c47d148cd464c293f1bef7a7a0a9b80290467218b30de54f541e2a557bcea75ed77ee5fe93688dde615f86d443709ea0b897f36 WHIRLPOOL 131fee00c0aa468e9913010cb84a02ecb9c6f6191984d758448d5acfaff3eebe941cc0c5a97a4bd224c61287b54e89e93038483a88204c840ee88abebcd672fc
-MISC ChangeLog 90866 SHA256 6473bc85eaad64aef357972918bebe91ea6cf9aab4583008312f1cf563261ad4 SHA512 100b624de8b5b345ea3caab4998f3d10ae9c890506c738cb8a33b065ff6710d52bdf36ab32fe2384af6c6fbc5cf005ae9db84bf9eb00595d1bee359f53a84c36 WHIRLPOOL 7343bfa72486c01092e3b810c8905daae22d893f8d19a0238f70aea1a1210fb015a94770971ba63766d8d01505ba66d2d1b698355ca7957578981ae0c756fe3f
+MISC ChangeLog 91166 SHA256 8ab282fcd7e1d38ecb908a41e336c2f82033149e0ff1764959e5f4b9ed3b79bf SHA512 5efce9971e4bb9fabe71ea835c37dbbd87113b237446455cd813fbaef7eafbe8eb16d62424c841aa4ef847e2cbc84fab9bc8a7a6cb54b8757833bac46c0fe141 WHIRLPOOL a2e79a142d13808bec2ee3595775849d94a7aa78db62450e65f77c763c2a3bfce47aa8c49d0790a930d04e94f4a59f7c50cbdd1f7314e39ba09101b4a86a67de
 MISC metadata.xml 819 SHA256 307162294fb540508f534090e854c82bafaad9ffe698f95c296b8e493600ed5f SHA512 7be7b5f03b8d99534eac82fb6d76178ee9149d763a52482180e62955e4c25a935b8dfd682ca83b1904944c0471a9df4e8a4beec20f14dc74e039064b7ef7d051 WHIRLPOOL 9bd3b8b1f882d2294177e5f2a524d501510593d9f29f61a19a48b8320207136e9643bf2d9f6f93250312f0dadd4e5c69e07b293691b4195306e0140f52a17f4b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJSvXd2AAoJEOSiRoyO7jvo48oP/0nHKdo8z2MraSf2GHJPVzDM
-tGzV4QHjWCA/Q4s3k5J58frTt8Cok1K+DEzt6emE5cT42X1WCgujH2WO75sJzkhe
-TOA0WGK2E0JEAkYuKBTtvkWMT6F96qcFpouPvQTbCKx9VmY/E4Y+Mf62zH7Ls1YN
-ipS8QrVsU0LyBEJPN4k/fhuFUjIGD1K8FfPpktgInmXbVyHBqrFvhP5otFtu3RVh
-PIItpVs/1RwkqrkTESwRyX3Ia+pjmhoCz6ag2y/Yy16th9VGbV7FX/r/K0za9KDF
-Wn38AEIetyUwrF16IduluPBqPu9x3s6a6+uSUs+xG2Db9tnOWnN9vM4OlJcj4owp
-m4mTsGrrI+X+5FYjADFHiExMgzfeAzNIwbqDjJKA2NruspP+p1JBq2XKb3dK5CBT
-TItUNbDNqBwptXut1W6mrZJetqqLYhyptS5GBIHkuG0BnIboc/y4teeMh8nHL0cD
-a32PtlvV8ojeG2x2in+E2ld2C2S7KKGghuKR9QFSrMhwF5qUChCqlcp8G0DLi6iP
-eYGDAh0RBCoMZ4uwU8eUL3/4hoZyJ/MIuvWWFpAAyT7mSmB/1JmIhOhsxetPuXVo
-L/lZusccVky9tGEVRkhvDlXnSab9gQPsA3L3yISyGmraaQqrg1DHDrBSNdIXtQjK
-TQv97Tn3z79a/GNw6ouJ
-=/1jE
------END PGP SIGNATURE-----
diff --git a/x11-drivers/ati-drivers/ati-drivers-13.12.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.12.ebuild
index 46d944645743..970cf321ff68 100644
--- a/x11-drivers/ati-drivers/ati-drivers-13.12.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-13.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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-13.12.ebuild,v 1.1 2013/12/27 12:47:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.12.ebuild,v 1.2 2014/01/26 17:56:12 chithanh Exp $
 
 EAPI=5
 
@@ -307,6 +307,9 @@ src_prepare() {
 	# Fix build on new kernels
 	epatch "${FILESDIR}/ati-drivers-13.12-acpi.patch"
 
+	# Add support for linux-3.13. See #498766
+	epatch "${FILESDIR}/ati-drivers-linux-3.13-acpi-handle.patch"
+
 	# Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870
 	use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch"
 
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-kernel-3.8-acpihandle.patch b/x11-drivers/ati-drivers/files/ati-drivers-kernel-3.8-acpihandle.patch
index bdff4fb73450..145abc757c7f 100644
--- a/x11-drivers/ati-drivers/files/ati-drivers-kernel-3.8-acpihandle.patch
+++ b/x11-drivers/ati-drivers/files/ati-drivers-kernel-3.8-acpihandle.patch
@@ -1,6 +1,6 @@
---- common/lib/modules/fglrx/build_mod/kcl_acpi.c	2012-07-04 21:43:47.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/kcl_acpi.c.new	2012-12-23 11:25:38.000000000 +0100
-@@ -775,11 +775,7 @@
+--- common/lib/modules/fglrx/build_mod/kcl_acpi.c.ORIG	2014-01-21 10:38:08.951838343 +0100
++++ common/lib/modules/fglrx/build_mod/kcl_acpi.c	2014-01-21 10:42:25.728845582 +0100
+@@ -775,10 +775,10 @@
  unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo)
  {
  #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
@@ -8,8 +8,10 @@
 -        pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle;
 -    #else 
 -        pInfo->video_handle = pInfo->pcidev->dev.firmware_data;
--    #endif    
-+    pInfo->video_handle = DEVICE_ACPI_HANDLE(&pInfo->pcidev->dev);
++    #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)
++        pInfo->video_handle = (acpi_handle)ACPI_HANDLE(&pInfo->pcidev->dev);
++    #else
++        pInfo->video_handle = DEVICE_ACPI_HANDLE(&pInfo->pcidev->dev);
+     #endif    
      if ( pInfo->video_handle &&
          (KCL_ACPI_videoDevice(pInfo->video_handle) != KCL_ACPI_OK) )
-     {
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-linux-3.13-acpi-handle.patch b/x11-drivers/ati-drivers/files/ati-drivers-linux-3.13-acpi-handle.patch
new file mode 100644
index 000000000000..3ecc7c451447
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-drivers-linux-3.13-acpi-handle.patch
@@ -0,0 +1,27 @@
+From 889165af52ba694f72d4d1e333a1f9ba14a82fde Mon Sep 17 00:00:00 2001
+From: Emil Karlson <jekarlson@gmail.com>
+Date: Tue, 21 Jan 2014 23:25:26 +0200
+Subject: [PATCH] ati-drivers: linux-3.13 acpi handle
+
+---
+ common/lib/modules/fglrx/build_mod/kcl_acpi.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/common/lib/modules/fglrx/build_mod/kcl_acpi.c b/common/lib/modules/fglrx/build_mod/kcl_acpi.c
+index d875bf9..e063057 100755
+--- a/common/lib/modules/fglrx/build_mod/kcl_acpi.c
++++ b/common/lib/modules/fglrx/build_mod/kcl_acpi.c
+@@ -792,7 +792,9 @@ static unsigned int KCL_ACPI_SearchHandles(KCL_ACPI_DevHandle handle, unsigned i
+ unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo)
+ {
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
+-    #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
++    #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)
++        pInfo->video_handle = (acpi_handle)ACPI_HANDLE(&pInfo->pcidev->dev);
++    #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
+         pInfo->video_handle = pInfo->pcidev->dev.acpi_node.handle;
+     #elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)
+         pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle;
+-- 
+1.8.3.2
+