15.3-2 initial kernel 4.1 support

2 files changed, 12 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2f542060c28e..4ca717500104 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = catalyst-test
 	pkgdesc = AMD/ATI drivers for Ubuntu 15.04, AMD's version is 15.200. catalyst-hook + catalyst-utils + lib32-catalyst-utils + experimental powerXpress suppport. Radeons HD 2 3 4 xxx ARE NOT SUPPORTED
 	pkgver = 15.3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.amd.com
 	install = catalyst-test.install
 	arch = i686
 	arch = x86_64
 	license = custom
 	depends = linux>=3.0
-	depends = linux<4.1
+	depends = linux<4.2
 	depends = linux-headers
 	depends = xorg-server>=1.7.0
 	depends = xorg-server<1.18.0
@@ -79,6 +79,7 @@ pkgbase = catalyst-test
 	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 = bdadc856a7ba723873561d2d1e9de191
 	md5sums = 601d9c756571dd79d26944e54827631e
 	md5sums = af7fb8ee4fc96fd54c5b483e33dc71c4
@@ -104,6 +105,7 @@ pkgbase = catalyst-test
 	md5sums = 67a22f624bae95a76638ce269392cb01
 	md5sums = 3aa45013515b724a71bbd8e01f98ad99
 	md5sums = dee3df1c5d3ed87363f4304da917fc00
+	md5sums = 81a9e38dee025151cccb7e5db2362cfb
 
 pkgname = catalyst-test
 
diff --git a/PKGBUILD b/PKGBUILD
index 5133ad5242ce..a6e5a3a9b628 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,13 +19,13 @@
 # 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 & 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-test
 pkgver=15.3
-pkgrel=1
+pkgrel=2
 # _betano=1.0
 _amdver=15.200
 pkgdesc="AMD/ATI drivers for Ubuntu 15.04, AMD's version is ${_amdver}. catalyst-hook + catalyst-utils + lib32-catalyst-utils + experimental powerXpress suppport. Radeons HD 2 3 4 xxx ARE NOT SUPPORTED"
@@ -33,7 +33,7 @@ arch=('i686' 'x86_64')
 url="http://www.amd.com"
 license=('custom')
 options=('staticlibs' 'libtool' '!strip' '!upx')
-depends=('linux>=3.0' 'linux<4.1' 'linux-headers' 'xorg-server>=1.7.0' 'xorg-server<1.18.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.18.0' 'libxrandr' 'libsm' 'fontconfig' 'libxcursor' 'libxi' 'gcc-libs' 'gcc>4.0.0' 'make' 'patch' 'libxinerama' 'mesa>=10.1.0-4')
 optdepends=('qt4: to run ATi Catalyst Control Center (amdcccle)'
 	    'libxxf86vm: to run ATi Catalyst Control Center (amdcccle)'
 	    'opencl-headers: headers necessary for OpenCL development'
@@ -89,7 +89,8 @@ source=(
     fglrx_gpl_symbol.patch
     fglrx_3.17rc6-no_hotplug.patch
     kolasa-3.19-get_cpu_var.patch
-    kolasa_4.0-cr4-strn.patch)
+    kolasa_4.0-cr4-strn.patch
+    kolasa_4.1_remove-IRQF_DISABLED.patch)
 
 md5sums=('bdadc856a7ba723873561d2d1e9de191'
 	 '601d9c756571dd79d26944e54827631e'
@@ -115,7 +116,8 @@ md5sums=('bdadc856a7ba723873561d2d1e9de191'
 	 'ef97fc080ce7e5a275fe0c372bc2a418'
 	 '67a22f624bae95a76638ce269392cb01'
 	 '3aa45013515b724a71bbd8e01f98ad99'
-	 'dee3df1c5d3ed87363f4304da917fc00')
+	 'dee3df1c5d3ed87363f4304da917fc00'
+	 '81a9e38dee025151cccb7e5db2362cfb')
 
 
 
@@ -302,6 +304,7 @@ package() {
 #	since 3.19 not only i686 needs gpl symbol - V
       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
 
     # Prepare modules source files
       _archdir=x86_64