Advertisement
Guest User

aur-catalyst-test-linux-5.1.patch

a guest
May 19th, 2019
143
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.99 KB | None | 0 0
  1. diff --git a/PKGBUILD b/PKGBUILD
  2. index 201d753..5f6d539 100644
  3. --- a/PKGBUILD
  4. +++ b/PKGBUILD
  5. @@ -31,7 +31,7 @@ PKGEXT='.pkg.tar'
  6.  
  7.  pkgname=catalyst-test
  8.  pkgver=15.12
  9. -pkgrel=29
  10. +pkgrel=30
  11.  # _betano=1.0
  12.  _amdver=15.302
  13.  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"
  14. @@ -39,7 +39,7 @@ arch=('i686' 'x86_64')
  15.  url="http://www.amd.com"
  16.  license=('custom')
  17.  options=('staticlibs' 'libtool' '!strip')
  18. -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')
  19. +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')
  20.  optdepends=('qt4: to run ATi Catalyst Control Center (amdcccle)'
  21.     'libxxf86vm: to run ATi Catalyst Control Center (amdcccle)'
  22.     'opencl-headers: headers necessary for OpenCL development'
  23. 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
  24. index be06518..1545912 100755
  25. --- a/src/archive_files/common/lib/modules/fglrx/build_mod/firegl_public.c
  26. +++ b/src/archive_files/common/lib/modules/fglrx/build_mod/firegl_public.c
  27. @@ -212,6 +212,10 @@
  28.  #include <asm/set_memory.h>
  29.  #endif
  30.  
  31. +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0)
  32. +#include <uapi/linux/mman.h>// MAP_SHARED
  33. +#endif
  34. +
  35.  #include "firegl_public.h"
  36.  #include "kcl_osconfig.h"
  37.  #include "kcl_io.h"
  38. @@ -4262,22 +4266,28 @@ static vm_nopage_ret_t ip_vm_gart_nopage(struct vm_area_struct* vma,
  39.  
  40.  #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
  41.  
  42. -static int ip_vm_fault(struct vm_fault *vmf) {
  43. +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0)
  44. +typedef unsigned int ip_vm_ret;
  45. +#else
  46. +typedef int ip_vm_ret;
  47. +#endif
  48. +
  49. +static ip_vm_ret ip_vm_fault(struct vm_fault *vmf) {
  50.      TRACE_FAULT(do_vm_fault, vmf->vma, vmf);
  51.  }
  52. -static int ip_vm_shm_fault(struct vm_fault *vmf) {
  53. +static ip_vm_ret ip_vm_shm_fault(struct vm_fault *vmf) {
  54.      TRACE_FAULT(do_vm_shm_fault, vmf->vma, vmf);
  55.  }
  56. -static int ip_vm_dma_fault(struct vm_fault *vmf) {
  57. +static ip_vm_ret ip_vm_dma_fault(struct vm_fault *vmf) {
  58.      TRACE_FAULT(do_vm_dma_fault, vmf->vma, vmf);
  59.  }
  60. -static int ip_vm_kmap_fault(struct vm_fault *vmf) {
  61. +static ip_vm_ret ip_vm_kmap_fault(struct vm_fault *vmf) {
  62.      TRACE_FAULT(do_vm_kmap_fault, vmf->vma, vmf);
  63.  }
  64. -static int ip_vm_pcie_fault(struct vm_fault *vmf) {
  65. +static ip_vm_ret ip_vm_pcie_fault(struct vm_fault *vmf) {
  66.      TRACE_FAULT(do_vm_pcie_fault, vmf->vma, vmf);
  67.  }
  68. -static int ip_vm_gart_fault(struct vm_fault *vmf) {
  69. +static ip_vm_ret ip_vm_gart_fault(struct vm_fault *vmf) {
  70.      TRACE_FAULT(do_vm_gart_fault, vmf->vma, vmf);
  71.  }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement