ati-drivers: finally, not happy, but it builds

x11-drivers/ati-drivers/Manifest

@@ -1,3 +1,4 @@
+AUX KCL-ACPI_Slot_No_Hotplug-remove.patch 761 SHA256 b8d96b4c1db08e18b63b5e1abebd7010d18bf3c58da000fab83d49d7779b64b9 SHA512 e274bbaadff9f0ba3e95ae516b9f97b45d97c015f7c3cc16ed92051ca4ed0027141d0422d6d5dc91a625ccd8f3ea926037487c87fb84102eea13d7a90deac244 WHIRLPOOL c7ae208c665d6ffe7a0299896159dabd4580fee220ecfe3134d0e508e1bfc509b4a5a036fd2eb3985be3d726ab0f53ab1c4e3bbaf73fd1a6fce1e99206f787f7
 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.8-beta-include-seq_file.patch 623 SHA256 c5e91dbeea4458ec1e36b62bbf6ab71acb86b97542b76039dca1890cf3c7d3c7 SHA512 3dcb426b48f8abe7f82ca990293418f7944ab274f58c224b9a74f117be097289c85a131f2cfc3585a0caf7a71ec0968afc28f4b7b5b533d21bae51ab3e2c6234 WHIRLPOOL dfc6a63bb263809b15bbc2674d893383d4e144c48db023c1842f134bf95302452363af0a6a5088d76327786d094d086187e7abd28dd809b2619a0c01640cc536
@@ -8,10 +9,10 @@ AUX const-notifier-block.patch 878 SHA256 cd73f5e15d9521a989d8cd9b7e3b252406e7b8
 AUX fgl_glxgears-do-not-include-glATI.patch 361 SHA256 7f276c35b2c3dd2e588b7870bcee4994bc2d518ff35a7c9cfe50d13a877897f4 SHA512 6b9bd5af81508db21adcaa4684eec0062d0bf28fca8c7259dfca1994de9e6b521c2fa8f4519d038b1f40c4f36e7c8a4a29863bc5bd92483c5e1a039b06534da9 WHIRLPOOL 76113c89829bf1898c2e6411e94de55fd282fe836ab5c19ec288aec33dbd93a89472124bb3d978b57b2382d6d8769743bd1379836e3374375f5675cf0c10068a
 AUX fix-the-linux-3.17-no_hotplug-error.patch 556 SHA256 3b95e2b0b6af3e4d8c7d8e358760783d6d0c677fac97bcce5bed08896778148e SHA512 3b55ef70f0b221cf7025d159e40e725aed33f2c8ab4b85d50d777155493c82c38630aeb214ce904f1d08a07fbf143022d771fe474a37d5bd3fa523e71ca2c94a WHIRLPOOL 458fe67194a9f76e37b8bed7521c99c84d4f6a48688bf866cb3c142e3fa1df208cd6097bad85546857a3b2b79d29632ef23e12085e2a37b81d0301ef1151503f
 AUX get-percpu-without-preempt-on-linux-3.19.patch 1535 SHA256 58c605403915d29e6fb6cad51a8538ab65b55b5a4206b186790695a396be04ea SHA512 256eb949b6b0b6bc423b8baac33419e5e98bc589cbbff2030fca9434f0a7589fe2152fd0ae3abfc63b963648eceb4fe2b5ddd9dc2a4f5c1ecb50e21bc748f5ec WHIRLPOOL 0337c9bee1cba16f0d57810239c35b8593826a26c86a31a8f1efc26cdcce8d7a12c8f02fa068cd598c2f4f0861aeb7686a8ffa03f1c97abfff10e2f340a966a3
-AUX kernel-4-license-ugh.patch 3961 SHA256 a762c5d79741ce1efb36a52a67f0ee87378a2eab9bff221f4840b74169455e2f SHA512 203370a3ec21c5689036e79b4e087fdbe71240db74fda417d9e0fdb041e17a756cb3628ce3b1875d9b52a7089f3d6778268b7cf78ab9d630d8ab131943737a99 WHIRLPOOL 140d1d380242a0a3f8297a8753281e29a093562b5659856ee776a5bde904e3ed529f9b3a34cfd02c92153f8e23ac36a886d78fafe4b19548118c1b91292ba248
+AUX kernel-4-ugh.patch 4284 SHA256 ed72de8a7654162d8dff61cc77501027deab32db91d3a7ea874d216fb7575750 SHA512 ca6b328c2f5618229f7a0a1de0efded04177b7ad5191ecc7ad70ef7671baaf198edc3370b799a6b918fa1933ecb6806a46f141c9020d29d24f2dc4c827bd7629 WHIRLPOOL 50336faa1d23c1f20cb306933cf09e5ba8a8dad06f69b31c785cb1798944af94c6315b400ce33650912c57e51e8e2f08d7d08719914a33329bdb7bc0271c37fe
 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-omega-14.12-linux-run-installers.zip 155616187 SHA256 68669836f20ad4351e08b13c5766c6b2ffc6b8cd2a37e9baf55779da32d3a249 SHA512 f87be6a56c03ca4aae3782668af8700d83c85872387753cf002ba4a0e0816fae9af29841a4390db972bfe2f7fb853571b32f8434c2008983461b80699347ac21 WHIRLPOOL 2675a387abd372b34c51f4e8ebfd6547300a8c3ffcc0562633838bc0cdaec3675ca3f4cfa2ab7481c8fa1238a46059f5f848611780638ef6d2301a527d900326
 DIST xvba-sdk-0.74-404001.tar.gz 583847 SHA256 731a2c489f2fb5d7318c1976061b26c1057a696f46d09dcf55fbada97fed17eb SHA512 aa1dd52b59eeeabd026d8b76e3b75eaf02587ef286438ba28884afeef5a5efaf50283b5ee4f5b81b12cf79cb4ec77c9a235a886b29fb7cdf850c9779f4b07b35 WHIRLPOOL 69917b746d353a884512e97b9d9a9b89e6f51add3119e69ddd119d51c0c3f2820b93a449fe42bd76d671dc505f92bf25b7f2c5868b33768fc68a19596e460951
-EBUILD ati-drivers-14.12-r3.ebuild 20321 SHA256 018dc3eab21300c8160182714cb3320f54a792705834a6db9997de906a4004d8 SHA512 2bf0d9939e10973d884e02773e1e6e8ab856429c0169edbbc8d6ea460a868659d206741fb54e191fabd64520b89d6ae89a2d866d81ee7040e3719c99f428d272 WHIRLPOOL 32c2965f2962c286d62badea07492b792f7d3104f81fb89f3e7c0b2f6e029e01314dcf196b31c3dd82a26a5e8a280ab53d9f62006106df4f8e5b1d465de50504
+EBUILD ati-drivers-14.12-r3.ebuild 20373 SHA256 e75704afce90cd1cee4a31366a1239606dfdb701243d32bd672d9fd11fb3bb21 SHA512 54a5815f97cf44691552fbd2a0a9b9f33f48ffca0d09a11c1ad38c57b25139a1bab3f30ddbdcb0c08e6c18d661cf938549425503a30f8fdb206afd9ebd82f7f2 WHIRLPOOL 2ebd76b3367a8e7da925f5aa55bf8fc4f380d6493a979d9349a11284ccfc7534f2d7734b63bc946de7399afe8531d07075605b28fc19d8b83ff43dfa3680200d

x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild

@@ -318,7 +318,8 @@ src_prepare() {
 
 	#moar compile fixes
 	epatch "${FILESDIR}/get-percpu-without-preempt-on-linux-3.19.patch"
-	epatch "${FILESDIR}/kernel-4-license-ugh.patch"
+	epatch "${FILESDIR}/kernel-4-ugh.patch"
+	epatch "${FILESDIR}/KCL-ACPI_Slot_No_Hotplug-remove.patch"
 
 	cd "${MODULE_DIR}"
 

x11-drivers/ati-drivers/files/KCL-ACPI_Slot_No_Hotplug-remove.patch

@@ -0,0 +1,19 @@
+diff -Naur work/common/lib/modules/fglrx/build_mod/kcl_acpi.c work-fixed/common/lib/modules/fglrx/build_mod/kcl_acpi.c
+--- work/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2015-08-01 16:18:47.813171957 -0400
++++ work-fixed/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2015-08-01 16:24:27.023170514 -0400
+@@ -863,6 +863,7 @@
+ void ATI_API_CALL KCL_ACPI_No_Hotplug(void* dev)
+ {
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,7)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
+     struct pci_dev  *pdev = (struct pci_dev*)dev;
+ 
+     if(pdev && pdev->bus && pdev->bus->bridge)
+@@ -870,6 +871,7 @@
+        acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_HANDLE(pdev->bus->bridge), 1, KCL_ACPI_Slot_No_Hotplug, NULL, pdev , NULL);
+     }
+ #endif
++#endif
+ }
+ 
+ #else

x11-drivers/ati-drivers/files/kernel-4-ugh.patch

@@ -1,37 +1,18 @@
---- common/lib/modules/fglrx/build_mod/kcl_acpi.c.orig	2015-06-23 18:43:30.311615366 +0200
-+++ common/lib/modules/fglrx/build_mod/kcl_acpi.c	2015-06-23 18:13:28.996970000 +0200
-@@ -829,6 +829,7 @@
-     return retHandle;
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
- static acpi_status KCL_ACPI_Slot_No_Hotplug(KCL_ACPI_DevHandle handle, u32 lvl, void *data, void **rv)
- {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,7) && LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
-@@ -848,6 +849,7 @@
- #endif
-    return 0;
- }
-+#endif
- 
- void ATI_API_CALL KCL_ACPI_No_Hotplug(void* dev)
- {
---- common/lib/modules/fglrx/build_mod/kcl_str.c.orig	2015-06-23 18:43:30.313615287 +0200
-+++ common/lib/modules/fglrx/build_mod/kcl_str.c	2015-06-23 18:13:03.822783000 +0200
-@@ -169,7 +169,11 @@
-                                   const char* s2,
-                                   KCL_TYPE_SizeSigned count)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
-     return strnicmp(s1, s2, count);
-+#else
-+    return strncasecmp(s1, s2, count);
-+#endif
- }
- 
- /** \brief Locate character in string
---- common/lib/modules/fglrx/build_mod/firegl_public.c.orig	2015-06-23 18:43:30.309615445 +0200
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2015-06-23 18:42:27.737091000 +0200
+From 66a25e76c538f7844568a20243bfe015ee0315a1 Mon Sep 17 00:00:00 2001
+From: Krzysztof Kolasa <kkolasa@winsoft.pl>
+Date: Tue, 17 Mar 2015 23:41:25 +0100
+Subject: [PATCH] changes for kernel 4.0.0
+
+---
+ firegl_public.c | 38 ++++++++++++++++++++++++++++++--------
+ kcl_acpi.c      |  2 ++
+ kcl_str.c       |  4 ++++
+ 4 files changed, 42 insertions(+), 8 deletions(-)
+
+diff --git a/firegl_public.c b/firegl_public.c
+index eccbc1c..a7368c8 100644
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
 @@ -93,7 +93,7 @@
     and they use different config options. These options can only be enabled
     on x86_64 with newer 2.6 kernels (2.6.23 for intel, 2.6.26 for amd). 
@@ -41,7 +22,7 @@
      #define FIREGL_DMA_REMAPPING
  #endif
  
-@@ -269,8 +269,12 @@
+@@ -269,8 +269,12 @@ module_param(firegl, charp, 0);
  #endif
  
  #ifdef MODULE_LICENSE
@@ -54,21 +35,7 @@
  #ifdef MODULE_DEVICE_TABLE
  MODULE_DEVICE_TABLE(pci, fglrx_pci_table);
  #endif
-@@ -3498,7 +3500,12 @@
- #else
-         //when MSI enabled. keep irq disabled when calling the action handler,
-         //exclude this IRQ from irq balancing (only on one CPU) 
--        ((useMSI) ? (IRQF_DISABLED | IRQF_NOBALANCING) : (IRQF_SHARED)),    
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0)
-+        ((useMSI) ? (IRQF_DISABLED | IRQF_NOBALANCING) : (IRQF_SHARED)),
-+#else
-+        ((useMSI) ? (IRQF_NOBALANCING) : (IRQF_SHARED)),
-+#endif
- #endif
-         dev_name,
-         context);
-@@ -4498,8 +4505,13 @@
+@@ -4496,8 +4500,13 @@ static void kcl_mem_pat_setup (void *info)
  
      if (cpu_has_pge)
      {
@@ -84,7 +51,7 @@
      }
       __flush_tlb();
  
-@@ -4512,7 +4524,11 @@
+@@ -4510,7 +4519,11 @@ static void kcl_mem_pat_setup (void *info)
      write_cr0(cr0 & 0xbfffffff);
      if (cpu_has_pge)
      {
@@ -97,7 +64,7 @@
      }
      local_irq_restore(flags);
  
-@@ -4539,8 +4555,13 @@
+@@ -4537,8 +4550,13 @@ static void kcl_mem_pat_restore (void *info)
  
      if (cpu_has_pge)
      {
@@ -113,7 +80,7 @@
      }
       __flush_tlb();
    
-@@ -4552,7 +4573,11 @@
+@@ -4550,7 +4568,11 @@ static void kcl_mem_pat_restore (void *info)
      write_cr0(cr0 & 0xbfffffff);
      if (cpu_has_pge)
      {
@@ -126,7 +93,7 @@
      }
      local_irq_restore(flags);
  
-@@ -6422,7 +6447,7 @@
+@@ -6420,7 +6442,7 @@ void ATI_API_CALL KCL_create_uuid(void *buf)
      generate_random_uuid((char *)buf);
  }
  
@@ -134,4 +101,40 @@
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0) && LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
  static int KCL_fpu_save_init(struct task_struct *tsk)
  {
-    struct fpu *fpu = &tsk->thread.fpu;
+    struct fpu *fpu = &tsk->thread.fpu;
+diff --git a/kcl_acpi.c b/kcl_acpi.c
+index 3a80984..8b88b62 100644
+--- a/common/lib/modules/fglrx/build_mod/kcl_acpi.c
++++ b/common/lib/modules/fglrx/build_mod/kcl_acpi.c
+@@ -829,6 +829,7 @@ KCL_ACPI_DevHandle ATI_API_CALL KCL_ACPI_GetAlternateHandle(KCL_ACPI_DevHandle p
+     return retHandle;
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
+ static acpi_status KCL_ACPI_Slot_No_Hotplug(KCL_ACPI_DevHandle handle, u32 lvl, void *data, void **rv)
+ {
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,7) && LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
+@@ -848,6 +849,7 @@ static acpi_status KCL_ACPI_Slot_No_Hotplug(KCL_ACPI_DevHandle handle, u32 lvl,
+ #endif
+    return 0;
+ }
++#endif
+ 
+ void ATI_API_CALL KCL_ACPI_No_Hotplug(void* dev)
+ {
+diff --git a/kcl_str.c b/kcl_str.c
+index 2d89eb0..dcaa1be 100644
+--- a/common/lib/modules/fglrx/build_mod/kcl_str.c
++++ b/common/lib/modules/fglrx/build_mod/kcl_str.c
+@@ -169,7 +169,11 @@ int ATI_API_CALL KCL_STR_Strnicmp(const char* s1,
+                                   const char* s2,
+                                   KCL_TYPE_SizeSigned count)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
+     return strnicmp(s1, s2, count);
++#else
++    return strncasecmp(s1, s2, count);
++#endif
+ }
+ 
+ /** \brief Locate character in string