diff options
author | Vi0L0 | 2015-06-26 23:08:18 +0200 |
---|---|---|
committer | Vi0L0 | 2015-06-26 23:08:18 +0200 |
commit | 6ba2cb92eac8ae292a785c970f13f5b8ebe882e1 (patch) | |
tree | 094ac840e57da5a1c0f0517c981d0927229d1aaf | |
parent | 27357157125bc30c297ff1ddf9efc3462e1fe359 (diff) | |
download | aur-6ba2cb92eac8ae292a785c970f13f5b8ebe882e1.tar.gz |
adding 4.1 kernel support
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 22 | ||||
-rw-r--r-- | arch-fglrx-acpi_handle.patch (renamed from arch-fglrx-3.8.patch) | 10 | ||||
-rw-r--r-- | arch_3.13_kernel_acpi_node.patch | 13 | ||||
-rw-r--r-- | kolasa_4.1_remove-IRQF_DISABLED.patch | 15 |
5 files changed, 39 insertions, 33 deletions
@@ -1,14 +1,14 @@ pkgbase = catalyst-total-hd234k pkgdesc = AMD/ATI legacy drivers. catalyst-hook + catalyst-utils + lib32-catalyst-utils pkgver = 13.1 - pkgrel = 30 + pkgrel = 31 url = http://www.amd.com install = catalyst-total-hd234k.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.13.0 @@ -69,16 +69,16 @@ pkgbase = catalyst-total-hd234k source = catalyst-hook.service source = 3.5-do_mmap.patch source = arch-fglrx-3.7.patch - source = arch-fglrx-3.8.patch source = gentoo_linux-3.10-proc.diff source = foutrelis_3.10_fix_for_legacy.patch source = lano1106_fglrx_intel_iommu.patch source = lano1106_kcl_agp_13_4.patch - source = arch_3.13_kernel_acpi_node.patch source = cold-fglrx-3.14-current_euid.patch source = fglrx_gpl_symbol.patch source = kolasa-3.19-get_cpu_var.patch source = kolasa_4.0-cr4-strn.patch + source = kolasa_4.1_remove-IRQF_DISABLED.patch + source = arch-fglrx-acpi_handle.patch md5sums = c07fd1332abe4c742a9a0d0e0d0a90de md5sums = 769d233666d4353f514b5d7ff035f6b6 md5sums = af7fb8ee4fc96fd54c5b483e33dc71c4 @@ -93,16 +93,16 @@ pkgbase = catalyst-total-hd234k md5sums = a64e2eae5addc6d670911ccf94b8cda4 md5sums = a450e2e3db61994b09e9d99d95bee837 md5sums = ff60c162b46e21e9810a722718023451 - md5sums = 52a79bddac813f19f72fcb32acebb1b9 md5sums = 5872d95907a93ada44982e355e91e59d md5sums = 5d6b5ae55adfb4909e042f50400a4e2d md5sums = 5184b94a2a40216a67996999481dd9ee md5sums = c5156eddf81c8a1719b160d05a2e8d67 - md5sums = 25e7c640aeafb08bb5593b647c69cf9b md5sums = ba33b6ef10896d3e1b5e4cd96390b771 md5sums = ef97fc080ce7e5a275fe0c372bc2a418 md5sums = 3aa45013515b724a71bbd8e01f98ad99 md5sums = dee3df1c5d3ed87363f4304da917fc00 + md5sums = 81a9e38dee025151cccb7e5db2362cfb + md5sums = 645422762125052a0f13ecd03d7bf9dd pkgname = catalyst-total-hd234k @@ -17,20 +17,20 @@ # 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-total-hd234k pkgver=13.1 -pkgrel=30 +pkgrel=31 pkgdesc="AMD/ATI legacy drivers. catalyst-hook + catalyst-utils + lib32-catalyst-utils" 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.13.0' 'netkit-bsd-finger' '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.13.0' 'netkit-bsd-finger' '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' @@ -72,16 +72,16 @@ source=( catalyst-hook.service 3.5-do_mmap.patch arch-fglrx-3.7.patch - arch-fglrx-3.8.patch gentoo_linux-3.10-proc.diff foutrelis_3.10_fix_for_legacy.patch lano1106_fglrx_intel_iommu.patch lano1106_kcl_agp_13_4.patch - arch_3.13_kernel_acpi_node.patch cold-fglrx-3.14-current_euid.patch fglrx_gpl_symbol.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 + arch-fglrx-acpi_handle.patch) md5sums=('c07fd1332abe4c742a9a0d0e0d0a90de' '769d233666d4353f514b5d7ff035f6b6' @@ -97,16 +97,16 @@ md5sums=('c07fd1332abe4c742a9a0d0e0d0a90de' 'a64e2eae5addc6d670911ccf94b8cda4' 'a450e2e3db61994b09e9d99d95bee837' 'ff60c162b46e21e9810a722718023451' - '52a79bddac813f19f72fcb32acebb1b9' '5872d95907a93ada44982e355e91e59d' '5d6b5ae55adfb4909e042f50400a4e2d' '5184b94a2a40216a67996999481dd9ee' 'c5156eddf81c8a1719b160d05a2e8d67' - '25e7c640aeafb08bb5593b647c69cf9b' 'ba33b6ef10896d3e1b5e4cd96390b771' 'ef97fc080ce7e5a275fe0c372bc2a418' '3aa45013515b724a71bbd8e01f98ad99' - 'dee3df1c5d3ed87363f4304da917fc00') + 'dee3df1c5d3ed87363f4304da917fc00' + '81a9e38dee025151cccb7e5db2362cfb' + '645422762125052a0f13ecd03d7bf9dd') build() { @@ -263,18 +263,18 @@ package() { patch -Np1 -i ../makefile_compat.patch patch -Np1 -i ../3.5-do_mmap.patch patch -Np1 -i ../arch-fglrx-3.7.patch - patch -Np1 -i ../arch-fglrx-3.8.patch patch -Np0 -i ../gentoo_linux-3.10-proc.diff patch -l -Np1 -i ../foutrelis_3.10_fix_for_legacy.patch patch -Np1 -i ../lano1106_fglrx_intel_iommu.patch patch -Np1 -i ../lano1106_kcl_agp_13_4.patch - patch -Np1 -i ../arch_3.13_kernel_acpi_node.patch patch -Np1 -i ../cold-fglrx-3.14-current_euid.patch patch -Np1 -i ../kolasa-3.19-get_cpu_var.patch # test "${CARCH}" = "i686" && patch -Np1 -i ../fglrx_gpl_symbol.patch # 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 + patch -Np1 -i ../arch-fglrx-acpi_handle.patch # Prepare modules source files _archdir=x86_64 diff --git a/arch-fglrx-3.8.patch b/arch-fglrx-acpi_handle.patch index ad2f3f18cfbc..2f62c97358d0 100644 --- a/arch-fglrx-3.8.patch +++ b/arch-fglrx-acpi_handle.patch @@ -1,12 +1,16 @@ ---- 12.11/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2012-10-23 22:44:52.000000000 +0200 -+++ 12.11/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2012-12-22 22:11:30.289750331 +0100 -@@ -775,7 +775,9 @@ +--- 13.1/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-01-15 22:33:27.000000000 +0100 ++++ 13.1/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2015-06-26 22:01:03.082264877 +0200 +@@ -775,7 +775,13 @@ unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo) { #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12) - #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19) + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) ++ #ifdef ACPI_HANDLE ++ pInfo->video_handle = ACPI_HANDLE(&(pInfo->pcidev->dev)); ++ #else + pInfo->video_handle = pInfo->pcidev->dev.acpi_node.handle; ++ #endif + #elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19) pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle; #else diff --git a/arch_3.13_kernel_acpi_node.patch b/arch_3.13_kernel_acpi_node.patch deleted file mode 100644 index ca26556d3c9f..000000000000 --- a/arch_3.13_kernel_acpi_node.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 13.11/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-11-22 19:52:37.000000000 +0100 -+++ 13.11/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-11-25 11:48:51.227678982 +0100 -@@ -778,7 +778,9 @@ - unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo) - { - #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12) -- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) -+ pInfo->video_handle = pInfo->pcidev->dev.acpi_node.companion; -+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) - pInfo->video_handle = pInfo->pcidev->dev.acpi_node.handle; - #elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19) - pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle; diff --git a/kolasa_4.1_remove-IRQF_DISABLED.patch b/kolasa_4.1_remove-IRQF_DISABLED.patch new file mode 100644 index 000000000000..f0b1b62756e9 --- /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); |