15.9-21: 4.12 kernel support for i686

3 files changed, 21 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 81aada787653..1d9b6939f6e7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,10 @@
 pkgbase = catalyst-total
 	pkgdesc = AMD/ATI Catalyst drivers for linux. catalyst-dkms + catalyst-utils + lib32-catalyst-utils + experimental powerXpress suppport. Radeons HD 2 3 4 xxx ARE NOT SUPPORTED
 	pkgver = 15.9
-	pkgrel = 20
+	pkgrel = 21
 	url = http://www.amd.com
 	install = catalyst-total.install
+	arch = i686
 	arch = x86_64
 	license = custom
 	depends = dkms
@@ -92,6 +93,7 @@ pkgbase = catalyst-total
 	source = 4.11-npfeiler-signal_vmf.patch
 	source = 4.12-npfeiler-PUD_OFFSET.patch
 	source = 4.12-arch-remove_clts.patch
+	source = 4.12-npfeiler-movsl_mask.patch
 	md5sums = d2de2df6946b452c266a3c892e6e46ff
 	md5sums = af7fb8ee4fc96fd54c5b483e33dc71c4
 	md5sums = bdafe749e046bfddee2d1c5e90eabd83
@@ -124,6 +126,7 @@ pkgbase = catalyst-total
 	md5sums = 8e53ba65a0aad42eb2ff771c1ace6609
 	md5sums = f090e47160403e4ba65d1e0de69973c9
 	md5sums = 782769206ed12ded10c347be3e476729
+	md5sums = cb25bc7fbb7d5cb1c07d2f3fa5fda826
 
 pkgname = catalyst-total
 
diff --git a/4.12-npfeiler-movsl_mask.patch b/4.12-npfeiler-movsl_mask.patch
new file mode 100644
index 000000000000..284aa471931c
--- /dev/null
+++ b/4.12-npfeiler-movsl_mask.patch
@@ -0,0 +1,10 @@
+--- archive_files/common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2015-12-18 19:47:41.000000000 +0100
++++ archive_filesb/common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2017-08-20 19:44:10.356564038 +0200
+@@ -30,6 +30,7 @@
+  *
+  */
+ 
++#include <linux/cache.h>
+ #include <linux/version.h>
+ #include <asm/uaccess.h>
+ 
diff --git a/PKGBUILD b/PKGBUILD
index 9974d30e8c32..608a8c23e297 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,10 +28,10 @@
 
 pkgname=catalyst-total
 pkgver=15.9
-pkgrel=20
+pkgrel=21
 _amdver=15.201.1151
 pkgdesc="AMD/ATI Catalyst drivers for linux. catalyst-dkms + catalyst-utils + lib32-catalyst-utils + experimental powerXpress suppport. Radeons HD 2 3 4 xxx ARE NOT SUPPORTED"
-arch=('x86_64')
+arch=('i686' 'x86_64')
 url="http://www.amd.com"
 license=('custom')
 options=('staticlibs' 'libtool' '!strip' '!upx')
@@ -101,7 +101,8 @@ source=(
     4.10-arch-sling00-virtual_address-acpi_get_table_with_size.patch
     4.11-npfeiler-signal_vmf.patch
     4.12-npfeiler-PUD_OFFSET.patch
-    4.12-arch-remove_clts.patch)
+    4.12-arch-remove_clts.patch
+    4.12-npfeiler-movsl_mask.patch)
 
 md5sums=('d2de2df6946b452c266a3c892e6e46ff'
 	 'af7fb8ee4fc96fd54c5b483e33dc71c4'
@@ -134,7 +135,8 @@ md5sums=('d2de2df6946b452c266a3c892e6e46ff'
 	 '05f6364db877d9c4bdf1592deda905b7'
 	 '8e53ba65a0aad42eb2ff771c1ace6609'
 	 'f090e47160403e4ba65d1e0de69973c9'
-	 '782769206ed12ded10c347be3e476729')
+	 '782769206ed12ded10c347be3e476729'
+	 'cb25bc7fbb7d5cb1c07d2f3fa5fda826')
 
 
 build() {
@@ -330,6 +332,7 @@ package() {
       patch -Np1 -i ../4.11-npfeiler-signal_vmf.patch
       patch -Np1 -i ../4.12-npfeiler-PUD_OFFSET.patch
       patch -Np1 -i ../4.12-arch-remove_clts.patch
+      patch -Np1 -i ../4.12-npfeiler-movsl_mask.patch
 
     # Prepare modules source files
       install -dm755 ${pkgdir}/usr/src/fglrx-${pkgver}/2.6.x