updated to 14.502.1040

4 files changed, 36 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7fdcc4b61516..90fa79e11bcd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = catalyst-firepro
 	pkgdesc = AMD/ATI beta drivers for FirePro/GL/MV brand cards. catalyst-hook + catalyst-utils + lib32-catalyst-utils + experimental powerXpress suppport.
-	pkgver = 14.301.1019
-	pkgrel = 2
+	pkgver = 14.502.1040
+	pkgrel = 1
 	url = http://www.amd.com
 	install = catalyst-firepro.install
 	arch = i686
@@ -12,7 +12,7 @@ pkgbase = catalyst-firepro
 	depends = linux<4.2
 	depends = linux-headers
 	depends = xorg-server>=1.7.0
-	depends = xorg-server<1.16.0
+	depends = xorg-server<1.17.0
 	depends = libxrandr
 	depends = libsm
 	depends = fontconfig
@@ -30,11 +30,11 @@ pkgbase = catalyst-firepro
 	optdepends = acpid: acpi event support / atieventsd
 	optdepends = linux-lts-headers: to build the fglrx module for the linux-lts kernel
 	provides = libgl
-	provides = libatical=14.301.1019
-	provides = catalyst=14.301.1019
-	provides = catalyst-libgl=14.301.1019
-	provides = catalyst-utils=14.301.1019
-	provides = catalyst-hook=14.301.1019
+	provides = libatical=14.502.1040
+	provides = catalyst=14.502.1040
+	provides = catalyst-libgl=14.502.1040
+	provides = catalyst-utils=14.502.1040
+	provides = catalyst-hook=14.502.1040
 	provides = libcl
 	provides = dri
 	provides = libtxc_dxtn
@@ -54,7 +54,7 @@ pkgbase = catalyst-firepro
 	options = libtool
 	options = !strip
 	options = !upx
-	source = http://www2.ati.com/drivers/firepro/14.301.1019-linux-cert-retail_end_user.zip
+	source = http://www2.ati.com/drivers/firepro/14.502.1040-linux-cert-retail.zip
 	source = catalyst_build_module
 	source = lib32-catalyst.sh
 	source = catalyst.sh
@@ -79,8 +79,8 @@ pkgbase = catalyst-firepro
 	source = fglrx_3.17rc6-no_hotplug.patch
 	source = kolasa-3.19-get_cpu_var.patch
 	source = kolasa_4.0-cr4-strn.patch
-	source = kolasa_4.1_remove-IRQF_DISABLED.patch
-	md5sums = 70d5f3b7e8f0c939380df09517c21b8b
+	source = kolasa_4.1_remove-IRQF_DISABLED-15.7-v2.patch
+	md5sums = 37d01238c76792592bfbc77c11dfa9fc
 	md5sums = 601d9c756571dd79d26944e54827631e
 	md5sums = af7fb8ee4fc96fd54c5b483e33dc71c4
 	md5sums = bdafe749e046bfddee2d1c5e90eabd83
@@ -105,7 +105,7 @@ pkgbase = catalyst-firepro
 	md5sums = 67a22f624bae95a76638ce269392cb01
 	md5sums = 3aa45013515b724a71bbd8e01f98ad99
 	md5sums = dee3df1c5d3ed87363f4304da917fc00
-	md5sums = 81a9e38dee025151cccb7e5db2362cfb
+	md5sums = daa56baca90f473cf1831f6c64e35c2c
 
 pkgname = catalyst-firepro
 
diff --git a/PKGBUILD b/PKGBUILD
index 6d3ecbac0355..b9a27a751321 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,19 +19,19 @@
 # Contributor: zoopp
 # Contributor: solar (authatieventsd' patch s/-1/255)
 # Contributor: Cold (current_euid patch)
-# Contributor: kolasa (3.19 and 4.0 kernel patch)
+# Contributor: kolasa (3.19, 4.0 and 4.1 kernel patch)
 
 # PKGEXT='.pkg.tar.gz' # imho time to pack this pkg into tar.xz is too long, unfortunatelly yaourt got problems when ext is different from .pkg.tar.xz - V
 
 pkgname=catalyst-firepro
-pkgver=14.301.1019
-pkgrel=2
+pkgver=14.502.1040
+pkgrel=1
 pkgdesc="AMD/ATI beta drivers for FirePro/GL/MV brand cards. catalyst-hook + catalyst-utils + lib32-catalyst-utils + experimental powerXpress suppport."
 arch=('i686' 'x86_64')
 url="http://www.amd.com"
 license=('custom')
 options=('staticlibs' 'libtool' '!strip' '!upx')
-depends=('linux>=3.0' 'linux<4.2' 'linux-headers' 'xorg-server>=1.7.0' 'xorg-server<1.16.0' 'libxrandr' 'libsm' 'fontconfig' 'libxcursor' 'libxi' 'gcc-libs' 'gcc>4.0.0' 'make' 'patch' 'libxinerama' 'mesa>=10.1.0-4')
+depends=('linux>=3.0' 'linux<4.2' 'linux-headers' 'xorg-server>=1.7.0' 'xorg-server<1.17.0' 'libxrandr' 'libsm' 'fontconfig' 'libxcursor' 'libxi' 'gcc-libs' 'gcc>4.0.0' 'make' 'patch' 'libxinerama' 'mesa>=10.1.0-4')
 makedepends=('unzip')
 optdepends=('qt4: to run ATi Catalyst Control Center (amdcccle)'
 	    'libxxf86vm: to run ATi Catalyst Control Center (amdcccle)'
@@ -60,7 +60,7 @@ url_ref="http://support.amd.com/en-us/download/workstation?os=Linux+x86"
 DLAGENTS="http::/usr/bin/curl --referer ${url_ref} -o %o %u"
 
 source=(
-    http://www2.ati.com/drivers/firepro/14.301.1019-linux-cert-retail_end_user.zip
+    http://www2.ati.com/drivers/firepro/14.502.1040-linux-cert-retail.zip
     catalyst_build_module
     lib32-catalyst.sh
     catalyst.sh
@@ -85,9 +85,9 @@ source=(
     fglrx_3.17rc6-no_hotplug.patch
     kolasa-3.19-get_cpu_var.patch
     kolasa_4.0-cr4-strn.patch
-    kolasa_4.1_remove-IRQF_DISABLED.patch)
+    kolasa_4.1_remove-IRQF_DISABLED-15.7-v2.patch)
 
-md5sums=('70d5f3b7e8f0c939380df09517c21b8b'
+md5sums=('37d01238c76792592bfbc77c11dfa9fc'
 	 '601d9c756571dd79d26944e54827631e'
 	 'af7fb8ee4fc96fd54c5b483e33dc71c4'
          'bdafe749e046bfddee2d1c5e90eabd83'
@@ -112,7 +112,7 @@ md5sums=('70d5f3b7e8f0c939380df09517c21b8b'
 	 '67a22f624bae95a76638ce269392cb01'
 	 '3aa45013515b724a71bbd8e01f98ad99'
 	 'dee3df1c5d3ed87363f4304da917fc00'
-	 '81a9e38dee025151cccb7e5db2362cfb')
+	 'daa56baca90f473cf1831f6c64e35c2c')
 
 
 
@@ -296,7 +296,7 @@ package() {
       patch -Np1 -i ../kolasa-3.19-get_cpu_var.patch
       patch -Np1 -i ../fglrx_gpl_symbol.patch
       patch -Np1 -i ../kolasa_4.0-cr4-strn.patch
-      patch -Np1 -i ../kolasa_4.1_remove-IRQF_DISABLED.patch
+      patch -Np1 -i ../kolasa_4.1_remove-IRQF_DISABLED-15.7-v2.patch
 
     # Prepare modules source files
       _archdir=x86_64
diff --git a/kolasa_4.1_remove-IRQF_DISABLED-15.7-v2.patch b/kolasa_4.1_remove-IRQF_DISABLED-15.7-v2.patch
new file mode 100644
index 000000000000..fe7cd3bd9488
--- /dev/null
+++ b/kolasa_4.1_remove-IRQF_DISABLED-15.7-v2.patch
@@ -0,0 +1,15 @@
+--- 15.7/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-07-04 16:31:23.000000000 +0200
++++ 15.7b/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-07-11 11:30:12.617426303 +0200
+@@ -3498,7 +3498,11 @@
+ #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_SHARED)),    
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
++        ((useMSI) ? (0x0) : (IRQF_SHARED)),
++#else
++        ((useMSI) ? (IRQF_DISABLED) : (IRQF_SHARED)),
++#endif
+ #endif
+         dev_name,
+         context);
diff --git a/kolasa_4.1_remove-IRQF_DISABLED.patch b/kolasa_4.1_remove-IRQF_DISABLED.patch
deleted file mode 100644
index f0b1b62756e9..000000000000
--- a/kolasa_4.1_remove-IRQF_DISABLED.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 15.3/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-03-06 17:44:48.000000000 +0100
-+++ 15.3/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-06-04 12:12:04.997661763 +0200
-@@ -3496,7 +3496,11 @@
- #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);