Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/PKGBUILD b/PKGBUILD
- index 201d753..5f6d539 100644
- --- a/PKGBUILD
- +++ b/PKGBUILD
- @@ -31,7 +31,7 @@ PKGEXT='.pkg.tar'
- pkgname=catalyst-test
- pkgver=15.12
- -pkgrel=29
- +pkgrel=30
- # _betano=1.0
- _amdver=15.302
- pkgdesc="AMD/ATI Catalyst drivers for linux AKA Crimson. catalyst-dkms + catalyst-utils + lib32-catalyst-utils + experimental powerXpress suppport. PRE-GCN Radeons are optionally supported"
- @@ -39,7 +39,7 @@ arch=('i686' 'x86_64')
- url="http://www.amd.com"
- license=('custom')
- options=('staticlibs' 'libtool' '!strip')
- -depends=('dkms' 'linux>=5.0' 'linux<5.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-noglvnd')
- +depends=('dkms' 'linux>=5.0' 'linux<5.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-noglvnd')
- optdepends=('qt4: to run ATi Catalyst Control Center (amdcccle)'
- 'libxxf86vm: to run ATi Catalyst Control Center (amdcccle)'
- 'opencl-headers: headers necessary for OpenCL development'
- diff --git a/src/archive_files/common/lib/modules/fglrx/build_mod/firegl_public.c b/src/archive_files/common/lib/modules/fglrx/build_mod/firegl_public.c
- index be06518..1545912 100755
- --- a/src/archive_files/common/lib/modules/fglrx/build_mod/firegl_public.c
- +++ b/src/archive_files/common/lib/modules/fglrx/build_mod/firegl_public.c
- @@ -212,6 +212,10 @@
- #include <asm/set_memory.h>
- #endif
- +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0)
- +#include <uapi/linux/mman.h>// MAP_SHARED
- +#endif
- +
- #include "firegl_public.h"
- #include "kcl_osconfig.h"
- #include "kcl_io.h"
- @@ -4262,22 +4266,28 @@ static vm_nopage_ret_t ip_vm_gart_nopage(struct vm_area_struct* vma,
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
- -static int ip_vm_fault(struct vm_fault *vmf) {
- +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0)
- +typedef unsigned int ip_vm_ret;
- +#else
- +typedef int ip_vm_ret;
- +#endif
- +
- +static ip_vm_ret ip_vm_fault(struct vm_fault *vmf) {
- TRACE_FAULT(do_vm_fault, vmf->vma, vmf);
- }
- -static int ip_vm_shm_fault(struct vm_fault *vmf) {
- +static ip_vm_ret ip_vm_shm_fault(struct vm_fault *vmf) {
- TRACE_FAULT(do_vm_shm_fault, vmf->vma, vmf);
- }
- -static int ip_vm_dma_fault(struct vm_fault *vmf) {
- +static ip_vm_ret ip_vm_dma_fault(struct vm_fault *vmf) {
- TRACE_FAULT(do_vm_dma_fault, vmf->vma, vmf);
- }
- -static int ip_vm_kmap_fault(struct vm_fault *vmf) {
- +static ip_vm_ret ip_vm_kmap_fault(struct vm_fault *vmf) {
- TRACE_FAULT(do_vm_kmap_fault, vmf->vma, vmf);
- }
- -static int ip_vm_pcie_fault(struct vm_fault *vmf) {
- +static ip_vm_ret ip_vm_pcie_fault(struct vm_fault *vmf) {
- TRACE_FAULT(do_vm_pcie_fault, vmf->vma, vmf);
- }
- -static int ip_vm_gart_fault(struct vm_fault *vmf) {
- +static ip_vm_ret ip_vm_gart_fault(struct vm_fault *vmf) {
- TRACE_FAULT(do_vm_gart_fault, vmf->vma, vmf);
- }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement