summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD11
-rw-r--r--kolasa_4.1_remove-IRQF_DISABLED.patch15
3 files changed, 26 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 054d5cfa243..7fdcc4b6151 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 = 1
+ pkgrel = 2
url = http://www.amd.com
install = catalyst-firepro.install
arch = i686
@@ -9,7 +9,7 @@ pkgbase = catalyst-firepro
license = custom
makedepends = unzip
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.16.0
@@ -79,6 +79,7 @@ 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
md5sums = 601d9c756571dd79d26944e54827631e
md5sums = af7fb8ee4fc96fd54c5b483e33dc71c4
@@ -104,6 +105,7 @@ pkgbase = catalyst-firepro
md5sums = 67a22f624bae95a76638ce269392cb01
md5sums = 3aa45013515b724a71bbd8e01f98ad99
md5sums = dee3df1c5d3ed87363f4304da917fc00
+ md5sums = 81a9e38dee025151cccb7e5db2362cfb
pkgname = catalyst-firepro
diff --git a/PKGBUILD b/PKGBUILD
index d0fde5c34d8..6d3ecbac035 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,13 +25,13 @@
pkgname=catalyst-firepro
pkgver=14.301.1019
-pkgrel=1
+pkgrel=2
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.1' '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.16.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)'
@@ -84,7 +84,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=('70d5f3b7e8f0c939380df09517c21b8b'
'601d9c756571dd79d26944e54827631e'
@@ -110,7 +111,8 @@ md5sums=('70d5f3b7e8f0c939380df09517c21b8b'
'ef97fc080ce7e5a275fe0c372bc2a418'
'67a22f624bae95a76638ce269392cb01'
'3aa45013515b724a71bbd8e01f98ad99'
- 'dee3df1c5d3ed87363f4304da917fc00')
+ 'dee3df1c5d3ed87363f4304da917fc00'
+ '81a9e38dee025151cccb7e5db2362cfb')
@@ -294,6 +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
# Prepare modules source files
_archdir=x86_64
diff --git a/kolasa_4.1_remove-IRQF_DISABLED.patch b/kolasa_4.1_remove-IRQF_DISABLED.patch
new file mode 100644
index 00000000000..f0b1b62756e
--- /dev/null
+++ b/kolasa_4.1_remove-IRQF_DISABLED.patch
@@ -0,0 +1,15 @@
+--- 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);