diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | 4.9_over_4.6-arch-get_user_pages_remote.patch | 24 | ||||
| -rw-r--r-- | PKGBUILD | 32 |
3 files changed, 49 insertions, 17 deletions
@@ -1,7 +1,7 @@ pkgbase = catalyst-firepro pkgdesc = AMD/ATI drivers for FirePro/GL/MV brand cards. catalyst-dkms + catalyst-utils + lib32-catalyst-utils + experimental powerXpress suppport. pkgver = 15.302.2301 - pkgrel = 2 + pkgrel = 3 url = http://www.amd.com install = catalyst-firepro.install arch = i686 @@ -9,7 +9,7 @@ pkgbase = catalyst-firepro license = custom depends = dkms depends = linux>=3.0 - depends = linux<4.9 + depends = linux<4.10 depends = linux-headers depends = xorg-server>=1.7.0 depends = xorg-server<1.18.0 @@ -29,6 +29,7 @@ pkgbase = catalyst-firepro optdepends = opencl-headers: headers necessary for OpenCL development optdepends = acpid: acpi event support / atieventsd optdepends = procps-ng: brings pgrep used in acpi event support + optdepends = opencl-icd-loader: OpenCL ICD Bindings provides = libgl provides = libatical=15.302.2301 provides = catalyst=15.302.2301 @@ -36,18 +37,17 @@ pkgbase = catalyst-firepro provides = catalyst-dkms=15.302.2301 provides = catalyst-libgl=15.302.2301 provides = opencl-catalyst=15.302.2301 - provides = libcl provides = dri provides = libtxc_dxtn provides = mesa-libgl provides = mesa-libgl-git + provides = opencl-driver conflicts = libgl conflicts = catalyst conflicts = catalyst-daemon conflicts = catalyst-generator conflicts = catalyst-dkms conflicts = catalyst-utils - conflicts = libcl conflicts = catalyst-dkms conflicts = mesa-libgl conflicts = mesa-libgl-git @@ -81,6 +81,7 @@ pkgbase = catalyst-firepro source = dkms.conf source = makesh-dont-check-gcc-version.patch source = 4.7-arch-cpu_has_pge-v2.patch + source = 4.9_over_4.6-arch-get_user_pages_remote.patch md5sums = 211a7e52d032bc60806012a13407ba87 md5sums = af7fb8ee4fc96fd54c5b483e33dc71c4 md5sums = bdafe749e046bfddee2d1c5e90eabd83 @@ -107,6 +108,7 @@ pkgbase = catalyst-firepro md5sums = 23d569abfdd7de433d76e003e4b3ccf9 md5sums = 10829e3b992b3e80a6e78c8e27748703 md5sums = 37eef5103a11d8136979463e7bc31091 + md5sums = 194cb44e9e2ab0e65b6267aca66d0400 pkgname = catalyst-firepro diff --git a/4.9_over_4.6-arch-get_user_pages_remote.patch b/4.9_over_4.6-arch-get_user_pages_remote.patch new file mode 100644 index 000000000000..802ca96b6787 --- /dev/null +++ b/4.9_over_4.6-arch-get_user_pages_remote.patch @@ -0,0 +1,24 @@ +--- 16.12/common/lib/modules/fglrx/build_mod/firegl_public.c 2016-12-10 19:44:46.764677311 +0100 ++++ 16.12b/common/lib/modules/fglrx/build_mod/firegl_public.c 2016-12-10 19:45:43.941354338 +0100 +@@ -3225,7 +3225,9 @@ + int ret; + + down_read(¤t->mm->mmap_sem); +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0) ++ ret = get_user_pages_remote(current, current->mm, vaddr, page_cnt, 1, (struct page **)page_list, NULL); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0) + ret = get_user_pages_remote(current, current->mm, vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL); + #else + ret = get_user_pages(current, current->mm, vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL); +@@ -3247,7 +3249,9 @@ + int ret; + + down_read(¤t->mm->mmap_sem); +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0) ++ ret = get_user_pages_remote(current, current->mm, vaddr, page_cnt, 0, (struct page **)page_list, NULL); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0) + ret = get_user_pages_remote(current, current->mm, vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL); + #else + ret = get_user_pages(current, current->mm, vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL); @@ -20,14 +20,15 @@ # Contributor: solar (authatieventsd' patch s/-1/255) # Contributor: kolasa (part of 4.3 kernel patches) # Contributor: gentoo (part of 4.3 kernel patches) -# Contributor: Philip Muller @ Manjaro (4.4 kernel patch) -# Contributor: aslmaswd (acpi main script) +# Contributor: Philip Muller @ Manjaro (4.4 kernel patch) +# Contributor: aslmaswd (acpi main script) +# Contributor: npfeiler (libcl/opencl-icd-loader cleaning) # 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=15.302.2301 -pkgrel=2 +pkgrel=3 # _betano=1.0 # _amdver=15.302 pkgdesc="AMD/ATI drivers for FirePro/GL/MV brand cards. catalyst-dkms + catalyst-utils + lib32-catalyst-utils + experimental powerXpress suppport." @@ -35,14 +36,15 @@ arch=('i686' 'x86_64') url="http://www.amd.com" license=('custom') options=('staticlibs' 'libtool' '!strip' '!upx') -depends=('dkms' 'linux>=3.0' 'linux<4.9' '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=('dkms' 'linux>=3.0' 'linux<4.10' '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' 'acpid: acpi event support / atieventsd' - 'procps-ng: brings pgrep used in acpi event support') -conflicts=('libgl' 'catalyst' 'catalyst-daemon' 'catalyst-generator' 'catalyst-dkms' 'catalyst-utils' 'libcl' 'catalyst-dkms' 'mesa-libgl' 'mesa-libgl-git') -provides=('libgl' "libatical=${pkgver}" "catalyst=${pkgver}" "catalyst-utils=${pkgver}" "catalyst-dkms=${pkgver}" "catalyst-libgl=${pkgver}" "opencl-catalyst=${pkgver}" 'libcl' 'dri' 'libtxc_dxtn' 'mesa-libgl' 'mesa-libgl-git') + 'procps-ng: brings pgrep used in acpi event support' + 'opencl-icd-loader: OpenCL ICD Bindings') +conflicts=('libgl' 'catalyst' 'catalyst-daemon' 'catalyst-generator' 'catalyst-dkms' 'catalyst-utils' 'catalyst-dkms' 'mesa-libgl' 'mesa-libgl-git') +provides=('libgl' "libatical=${pkgver}" "catalyst=${pkgver}" "catalyst-utils=${pkgver}" "catalyst-dkms=${pkgver}" "catalyst-libgl=${pkgver}" "opencl-catalyst=${pkgver}" 'dri' 'libtxc_dxtn' 'mesa-libgl' 'mesa-libgl-git' 'opencl-driver') if [ "${CARCH}" = "x86_64" ]; then warning "x86_64 system detected" @@ -50,8 +52,9 @@ if [ "${CARCH}" = "x86_64" ]; then if [[ `cat /etc/pacman.conf | grep -c "#\[multilib]"` = 0 ]]; then warning "OK, lib32-catalyst-utils will be added to the package" depends+=('lib32-libxext' 'lib32-libdrm' 'lib32-libxinerama' 'lib32-mesa>=10.1.0-4') - conflicts+=('lib32-libgl' 'lib32-catalyst-utils' 'lib32-libcl' 'lib32-mesa-libgl' 'lib32-mesa-libgl-git') - provides+=('lib32-libgl' "lib32-catalyst-utils=${pkgver}" "lib32-catalyst-libgl=${pkgver}" "lib32-opencl-catalyst=${pkgver}" 'lib32-dri' 'lib32-libtxc_dxtn' 'lib32-libcl' 'lib32-mesa-libgl' 'lib32-mesa-libgl-git') + conflicts+=('lib32-libgl' 'lib32-catalyst-utils' 'lib32-mesa-libgl' 'lib32-mesa-libgl-git') + provides+=('lib32-libgl' "lib32-catalyst-utils=${pkgver}" "lib32-catalyst-libgl=${pkgver}" "lib32-opencl-catalyst=${pkgver}" 'lib32-dri' 'lib32-libtxc_dxtn' 'lib32-mesa-libgl' 'lib32-mesa-libgl-git' 'lib32-opencl-driver') + optdepends+=('lib32-opencl-icd-loader: OpenCL ICD Bindings (32-bit)') else warning "lib32-catalyst-utils will NOT be added to the package" fi @@ -93,7 +96,8 @@ source=( 4.6-arch-get_user_pages-page_cache_release.patch dkms.conf makesh-dont-check-gcc-version.patch - 4.7-arch-cpu_has_pge-v2.patch) + 4.7-arch-cpu_has_pge-v2.patch + 4.9_over_4.6-arch-get_user_pages_remote.patch) md5sums=('211a7e52d032bc60806012a13407ba87' 'af7fb8ee4fc96fd54c5b483e33dc71c4' @@ -120,7 +124,8 @@ md5sums=('211a7e52d032bc60806012a13407ba87' '11b7c2e0dc4794801005d66b0e7608a3' '23d569abfdd7de433d76e003e4b3ccf9' '10829e3b992b3e80a6e78c8e27748703' - '37eef5103a11d8136979463e7bc31091') + '37eef5103a11d8136979463e7bc31091' + '194cb44e9e2ab0e65b6267aca66d0400') build() { @@ -201,6 +206,7 @@ package() { install -m644 X11R6/${_lib}/*.cap ${pkgdir}/usr/lib install -m755 X11R6/${_lib}/modules/dri/*.so ${pkgdir}/usr/lib/xorg/modules/dri install -m755 ${_lib}/*.so* ${pkgdir}/usr/lib + rm ${pkgdir}/usr/lib/libOpenCL.so.1 #opencl-icd-loader provides this # install -m755 ${_lib}/hsa/* ${pkgdir}/usr/lib/hsa #removed in 14.1 ## QT libs (only 2 files) - un-comment 2 lines below if you don't want to install qt package @@ -212,7 +218,6 @@ package() { ln -snf libfglrx_dm.so.1.0 ${pkgdir}/usr/lib/libfglrx_dm.so ln -snf libatiuki.so.1.0 ${pkgdir}/usr/lib/libatiuki.so.1 ln -snf libatiuki.so.1.0 ${pkgdir}/usr/lib/libatiuki.so - ln -snf libOpenCL.so.1 ${pkgdir}/usr/lib/libOpenCL.so ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib/fglrx/libGL.so.1.2.0 ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib/fglrx/libGL.so.1 @@ -310,6 +315,7 @@ package() { patch -Np1 -i ../4.6-arch-get_user_pages-page_cache_release.patch patch -Np1 -i ../makesh-dont-check-gcc-version.patch patch -Np1 -i ../4.7-arch-cpu_has_pge-v2.patch + patch -Np1 -i ../4.9_over_4.6-arch-get_user_pages_remote.patch # Prepare modules source files install -dm755 ${pkgdir}/usr/src/fglrx-${pkgver}/2.6.x @@ -342,6 +348,7 @@ package() { install -dm755 ${pkgdir}/usr/lib32/xorg/modules/dri # install -dm755 ${pkgdir}/usr/lib32/hsa #removed in 14.1 install -m755 lib/*.so* ${pkgdir}/usr/lib32 + rm ${pkgdir}/usr/lib32/libOpenCL.so.1 #lib32-opencl-icd-loader provides this # install -m755 lib/hsa/* ${pkgdir}/usr/lib32/hsa #removed in 14.1 install -m755 X11R6/lib/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib32/fglrx install -m755 X11R6/lib/libAMDXvBA.so.1.0 ${pkgdir}/usr/lib32 @@ -360,7 +367,6 @@ package() { ln -sf /usr/lib32/libXvBAW.so.1.0 ${pkgdir}/usr/lib32/libXvBAW.so ln -sf /usr/lib32/libatiuki.so.1.0 ${pkgdir}/usr/lib32/libatiuki.so.1 ln -sf /usr/lib32/libatiuki.so.1.0 ${pkgdir}/usr/lib32/libatiuki.so - ln -sf /usr/lib32/libOpenCL.so.1 ${pkgdir}/usr/lib32/libOpenCL.so ln -sf /usr/lib32/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib32/fglrx/libGL.so.1.2.0 ln -sf /usr/lib32/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib32/fglrx/libGL.so.1 |