SHARE
TWEET

aur-catalyst-test-linux4.20.patch

a guest Jan 18th, 2019 164 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/4.20.patch b/4.20.patch
  2. new file mode 100644
  3. index 0000000..34b13f5
  4. --- /dev/null
  5. +++ b/4.20.patch
  6. @@ -0,0 +1,28 @@
  7. +--- archive_files/common/lib/modules/fglrx/build_mod/2.6.x/Makefile
  8. ++++ archive_files/common/lib/modules/fglrx/build_mod/2.6.x/Makefile
  9. +@@ -27,7 +27,6 @@
  10. + LIBIP_PREFIX  ?= ..
  11. +
  12. + obj-m           += fglrx.o
  13. +-fglrx-libs      += libfglrx_ip.a
  14. +
  15. + fglrx-c-objs    += firegl_public.o      \
  16. +                    kcl_acpi.o           \
  17. +@@ -41,7 +40,7 @@ fglrx-c-objs    += firegl_public.o      \
  18. +                    kcl.o                \
  19. +                    kcl_wait.o
  20. +
  21. +-fglrx-objs      += $(fglrx-c-objs) $(fglrx-libs)
  22. ++fglrx-objs      += $(fglrx-c-objs)
  23. +
  24. + fglrx-hdrs      += firegl_public.h      \
  25. +                    fglrxko_pci_ids.h    \
  26. +@@ -70,6 +69,8 @@ EXTRA_CFLAGS    += \
  27. +                 -DPAGE_ATTR_FIX=$(PAGE_ATTR_FIX) \
  28. +                 -DCOMPAT_ALLOC_USER_SPACE=$(COMPAT_ALLOC_USER_SPACE) \
  29. +
  30. ++EXTRA_LDFLAGS      := /usr/lib/fglrx/libfglrx_ip.a_shipped
  31. ++
  32. + ifeq ($(KERNELRELEASE),)
  33. + # on first call from remote location we get into this path
  34. + # whilst on second call all is managed by the embedding kernel makefile
  35. diff --git a/PKGBUILD b/PKGBUILD
  36. index 325413b..1b59bde 100644
  37. --- a/PKGBUILD
  38. +++ b/PKGBUILD
  39. @@ -30,7 +30,7 @@ _old_control=n #for pre-GCN users who has problems with default config, pick =y
  40.  
  41.  pkgname=catalyst-test
  42.  pkgver=15.12
  43. -pkgrel=27
  44. +pkgrel=28
  45.  # _betano=1.0
  46.  _amdver=15.302
  47.  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"
  48. @@ -38,7 +38,7 @@ arch=('i686' 'x86_64')
  49.  url="http://www.amd.com"
  50.  license=('custom')
  51.  options=('staticlibs' 'libtool' '!strip')
  52. -depends=('dkms' 'linux>=3.0' 'linux<4.20' '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')
  53. +depends=('dkms' 'linux>=3.0' 'linux<4.21' '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')
  54.  optdepends=('qt4: to run ATi Catalyst Control Center (amdcccle)'
  55.     'libxxf86vm: to run ATi Catalyst Control Center (amdcccle)'
  56.     'opencl-headers: headers necessary for OpenCL development'
  57. @@ -109,45 +109,47 @@ source=(
  58.     4.13-npfeiler-wait_queue_t.patch
  59.     4.14-npfeiler-task_struct-mm_segment_t.patch
  60.     4.14.21_4.15.5-npfeiler-flush_tlb_one_kernel.patch
  61. -   4.17-npfeiler-pci_get_domain_bus_and_slot.patch)
  62. +   4.17-npfeiler-pci_get_domain_bus_and_slot.patch
  63. +   4.20.patch)
  64.  
  65.  md5sums=('39808c8a9bcc9041f1305e3531b60622'
  66. -   'af7fb8ee4fc96fd54c5b483e33dc71c4'
  67. -   'bdafe749e046bfddee2d1c5e90eabd83'
  68. -   '9d9ea496eadf7e883d56723d65e96edf'
  69. -   'b79e144932616221f6d01c4b05dc9306'
  70. -   '9e2a7ded987b7d2b2cfffc7281ebd8a5'
  71. -   '3e19c2285c76f4cb92108435a1e9c302'
  72. -   'b3ceefeb97c609037845f65d0956c4f0'
  73. -   '3e1b82bd69774ea808da69c983d6a43b'
  74. -   '394bc493fdf493a5093f9e2095096d02'
  75. -   '3226230592fa3c91ff22389114fc5dc7'
  76. -   '9e706c272feb167be55ba7201dfa8d51'
  77. -   '0e6d963436dd23dbb45ae0f4fc9b661c'
  78. -   '2c22bb4d4f828cb8b024f670c1ae7e45'
  79. -   '5184b94a2a40216a67996999481dd9ee'
  80. -   'c5156eddf81c8a1719b160d05a2e8d67'
  81. -   'ef97fc080ce7e5a275fe0c372bc2a418'
  82. -   '0e0666e95d1d590a7a83192805679485'
  83. -   '98828e3eeaec2b3795e584883cc1b746'
  84. -   '6cdbaf5f71d867d225721a0369413616'
  85. -   'd9bea135ae3e1b3ca87c5bbe6dcf8e72'
  86. -   '8941e91fc58cb44ce21ab9bda135754e'
  87. -   '11b7c2e0dc4794801005d66b0e7608a3'
  88. -   '23d569abfdd7de433d76e003e4b3ccf9'
  89. -   '10829e3b992b3e80a6e78c8e27748703'
  90. -   '37eef5103a11d8136979463e7bc31091'
  91. -   '194cb44e9e2ab0e65b6267aca66d0400'
  92. -   'e98e50bebe96b08ca680aed6ca505356'
  93. -   '05f6364db877d9c4bdf1592deda905b7'
  94. -   '8e53ba65a0aad42eb2ff771c1ace6609'
  95. -   'f090e47160403e4ba65d1e0de69973c9'
  96. -   '782769206ed12ded10c347be3e476729'
  97. -   'cb25bc7fbb7d5cb1c07d2f3fa5fda826'
  98. -   '0a725f40bc980d578cbed3e57a05b765'
  99. -   '5ba3bf9f58aa63c1849b056cf23022c9'
  100. -   '10af58c21e4e972115dda6dbd8279594'
  101. -   '7ed6e1cf3a9719e6a9874e6a18f29bfb')
  102. +         'af7fb8ee4fc96fd54c5b483e33dc71c4'
  103. +         'bdafe749e046bfddee2d1c5e90eabd83'
  104. +         '9d9ea496eadf7e883d56723d65e96edf'
  105. +         'b79e144932616221f6d01c4b05dc9306'
  106. +         '9e2a7ded987b7d2b2cfffc7281ebd8a5'
  107. +         '3e19c2285c76f4cb92108435a1e9c302'
  108. +         'b3ceefeb97c609037845f65d0956c4f0'
  109. +         '3e1b82bd69774ea808da69c983d6a43b'
  110. +         'cb89e8621b47dc476dcc52df6c12a8c5'
  111. +         '3226230592fa3c91ff22389114fc5dc7'
  112. +         '0d3d706bc3e4608515f04fa77eb281d1'
  113. +         '0e6d963436dd23dbb45ae0f4fc9b661c'
  114. +         '2c22bb4d4f828cb8b024f670c1ae7e45'
  115. +         '5184b94a2a40216a67996999481dd9ee'
  116. +         'c5156eddf81c8a1719b160d05a2e8d67'
  117. +         'ef97fc080ce7e5a275fe0c372bc2a418'
  118. +         '0e0666e95d1d590a7a83192805679485'
  119. +         '98828e3eeaec2b3795e584883cc1b746'
  120. +         '6cdbaf5f71d867d225721a0369413616'
  121. +         'd9bea135ae3e1b3ca87c5bbe6dcf8e72'
  122. +         '8941e91fc58cb44ce21ab9bda135754e'
  123. +         '11b7c2e0dc4794801005d66b0e7608a3'
  124. +         '23d569abfdd7de433d76e003e4b3ccf9'
  125. +         '10829e3b992b3e80a6e78c8e27748703'
  126. +         '37eef5103a11d8136979463e7bc31091'
  127. +         '194cb44e9e2ab0e65b6267aca66d0400'
  128. +         'e98e50bebe96b08ca680aed6ca505356'
  129. +         '05f6364db877d9c4bdf1592deda905b7'
  130. +         '8e53ba65a0aad42eb2ff771c1ace6609'
  131. +         'f090e47160403e4ba65d1e0de69973c9'
  132. +         '782769206ed12ded10c347be3e476729'
  133. +         'cb25bc7fbb7d5cb1c07d2f3fa5fda826'
  134. +         '0a725f40bc980d578cbed3e57a05b765'
  135. +         '5ba3bf9f58aa63c1849b056cf23022c9'
  136. +         '10af58c21e4e972115dda6dbd8279594'
  137. +         '7ed6e1cf3a9719e6a9874e6a18f29bfb'
  138. +         '3ca961ceefbc4ddc0eb21452cba79c6c')
  139.  
  140.  if [ "${_old_control}" = "y" ]; then
  141.     source+=(https://www2.ati.com/drivers/linux/amd-catalyst-15.9-linux-installer-15.201.1151-x86.x86_64.zip)
  142. @@ -189,6 +191,7 @@ prepare() {
  143.     patch -Np1 -i ../4.14-npfeiler-task_struct-mm_segment_t.patch
  144.     patch -Np1 -i ../4.14.21_4.15.5-npfeiler-flush_tlb_one_kernel.patch
  145.     patch -Np1 -i ../4.17-npfeiler-pci_get_domain_bus_and_slot.patch
  146. +   patch -Np1 -i ../4.20.patch
  147.  
  148.     cd ${srcdir}/archive_files/common
  149.     patch -Np2 -i ${srcdir}/arch-fglrx-authatieventsd_new.patch
  150. @@ -205,7 +208,6 @@ package() {
  151.     install -m755 -d ${pkgdir}/etc/security/console.apps
  152.     install -m755 -d ${pkgdir}/etc/OpenCL/vendors
  153.  
  154. -   install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
  155.     install -m755 -d ${pkgdir}/usr/lib/xorg/modules/drivers
  156.     install -m755 -d ${pkgdir}/usr/lib/xorg/modules/extensions
  157.     install -m755 -d ${pkgdir}/usr/lib/xorg/modules/extensions/fglrx
  158. @@ -236,7 +238,7 @@ package() {
  159.     install -m755 drivers/*.so ${pkgdir}/usr/lib/xorg/modules/drivers
  160.     install -m755 linux/*.so ${pkgdir}/usr/lib/xorg/modules/linux
  161.     install -m755 extensions/fglrx/fglrx-libglx.so ${pkgdir}/usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so
  162. -   ln -snf /usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so ${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so
  163. +   ln -s /usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so ${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so
  164.  
  165.     # Controlcenter / libraries
  166.     if [ "${CARCH}" = "i686" ]; then
  167. @@ -253,17 +255,18 @@ package() {
  168.     install -m755 sbin/* ${pkgdir}/usr/bin
  169.     install -m755 X11R6/${_lib}/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib/fglrx
  170.     install -m755 X11R6/${_lib}/libAMDXvBA.so.1.0 ${pkgdir}/usr/lib
  171. -   ln -snf libAMDXvBA.so.1.0 ${pkgdir}/usr/lib/libAMDXvBA.so.1
  172. -   ln -snf libAMDXvBA.so.1.0 ${pkgdir}/usr/lib/libAMDXvBA.so
  173. +   ln -s libAMDXvBA.so.1.0 ${pkgdir}/usr/lib/libAMDXvBA.so.1
  174. +   ln -s libAMDXvBA.so.1.0 ${pkgdir}/usr/lib/libAMDXvBA.so
  175.     install -m755 X11R6/${_lib}/libatiadlxx.so ${pkgdir}/usr/lib
  176.     install -m755 X11R6/${_lib}/libfglrx_dm.so.1.0 ${pkgdir}/usr/lib
  177.     install -m755 X11R6/${_lib}/libXvBAW.so.1.0 ${pkgdir}/usr/lib
  178. -   ln -snf libXvBAW.so.1.0 ${pkgdir}/usr/lib/libXvBAW.so.1
  179. -   ln -snf libXvBAW.so.1.0 ${pkgdir}/usr/lib/libXvBAW.so
  180. -   ln -snf /usr/lib/libXvBAW.so.1.0 ${pkgdir}/usr/lib/dri/fglrx_drv_video.so #omega 14.12
  181. +   ln -s libXvBAW.so.1.0 ${pkgdir}/usr/lib/libXvBAW.so.1
  182. +   ln -s libXvBAW.so.1.0 ${pkgdir}/usr/lib/libXvBAW.so
  183. +   ln -s /usr/lib/libXvBAW.so.1.0 ${pkgdir}/usr/lib/dri/fglrx_drv_video.so #omega 14.12
  184.     install -m644 X11R6/${_lib}/*.a ${pkgdir}/usr/lib
  185.     install -m644 X11R6/${_lib}/*.cap ${pkgdir}/usr/lib
  186. -   install -m755 X11R6/${_lib}/modules/dri/*.so ${pkgdir}/usr/lib/xorg/modules/dri
  187. +   install -m755 X11R6/${_lib}/modules/dri/*.so ${pkgdir}/usr/lib/dri
  188. +   ln -s /usr/lib/dri ${pkgdir}/usr/lib/xorg/modules/dri
  189.     install -m755 ${_lib}/*.so* ${pkgdir}/usr/lib
  190.  
  191.     if [ "${_old_control}" = "y" ]; then
  192. @@ -277,31 +280,31 @@ package() {
  193.     #      install -m755 -d ${pkgdir}/usr/share/ati/${_lib}
  194.     #      install -m755 share/ati/${_lib}/*.so* ${pkgdir}/usr/share/ati/${_lib}
  195.  
  196. -   ln -snf /usr/lib/xorg/modules/dri/fglrx_dri.so ${pkgdir}/usr/lib/dri/fglrx_dri.so
  197. -   ln -snf libfglrx_dm.so.1.0 ${pkgdir}/usr/lib/libfglrx_dm.so.1
  198. -   ln -snf libfglrx_dm.so.1.0 ${pkgdir}/usr/lib/libfglrx_dm.so
  199. -   ln -snf libatiuki.so.1.0 ${pkgdir}/usr/lib/libatiuki.so.1
  200. -   ln -snf libatiuki.so.1.0 ${pkgdir}/usr/lib/libatiuki.so
  201. +   ln -s libfglrx_dm.so.1.0 ${pkgdir}/usr/lib/libfglrx_dm.so.1
  202. +   ln -s libfglrx_dm.so.1 ${pkgdir}/usr/lib/libfglrx_dm.so
  203. +   ln -s libatiuki.so.1.0 ${pkgdir}/usr/lib/libatiuki.so.1
  204. +   ln -s libatiuki.so.1 ${pkgdir}/usr/lib/libatiuki.so
  205.  
  206. -   ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib/fglrx/libGL.so.1.2.0
  207. -   ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib/fglrx/libGL.so.1
  208. -   ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib/fglrx/libGL.so
  209. -   ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib/libGL.so.1.2.0
  210. -   ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib/libGL.so.1
  211. -   ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib/libGL.so
  212. +   ln -s fglrx-libGL.so.1.2 ${pkgdir}/usr/lib/fglrx/libGL.so.1.2.0
  213. +   ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib/fglrx/libGL.so.1
  214. +   ln -s libGL.so.1 ${pkgdir}/usr/lib/fglrx/libGL.so
  215. +
  216. +   ln -s fglrx/libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1.2.0
  217. +   ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1
  218. +   ln -s libGL.so.1 ${pkgdir}/usr/lib/libGL.so
  219.  
  220.     # We have to provide symlinks to mesa, as catalyst doesn't ship them
  221. -   ln -s /usr/lib/mesa/libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1.0.0
  222. +   ln -s mesa/libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1.0.0
  223.     ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1
  224. -   ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so
  225. +   ln -s libEGL.so.1 ${pkgdir}/usr/lib/libEGL.so
  226.  
  227. -   ln -s /usr/lib/mesa/libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0
  228. -   ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1
  229. -   ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so
  230. +   ln -s mesa/libGLESv1_CM.so.1.0.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1.0.0
  231. +   ln -s libGLESv1_CM.so.1.0.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1
  232. +   ln -s libGLESv1_CM.so.1 ${pkgdir}/usr/lib/libGLESv1_CM.so
  233.  
  234. -   ln -s /usr/lib/mesa/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2.0.0
  235. +   ln -s mesa/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2.0.0
  236.     ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2
  237. -   ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so
  238. +   ln -s libGLESv2.so.2 ${pkgdir}/usr/lib/libGLESv2.so
  239.  
  240.     cd ${srcdir}/archive_files/common
  241.     install -m644 etc/ati/* ${pkgdir}/etc/ati
  242. @@ -367,7 +370,7 @@ package() {
  243.    
  244.     #fix laptops wake on 4.15+
  245.     install -m755 -d ${pkgdir}/usr/X11R6/lib64/modules/dri
  246. -   ln -snf /usr/lib/xorg/modules/dri/fglrx_dri.so ${pkgdir}/usr/X11R6/lib64/modules/dri/fglrx_dri.so
  247. +   ln -s /usr/lib/dri/fglrx_dri.so ${pkgdir}/usr/X11R6/lib64/modules/dri/fglrx_dri.so
  248.  
  249.     ##catalyst-dkms section
  250.     cd ${srcdir}/archive_files
  251. @@ -387,6 +390,7 @@ package() {
  252.         ${pkgdir}/usr/src/fglrx-${pkgver}
  253.     install -m644 arch/${_archdir}/lib/modules/fglrx/build_mod/libfglrx_ip.a \
  254.         ${pkgdir}/usr/src/fglrx-${pkgver}
  255. +   install -m644 arch/${_archdir}/lib/modules/fglrx/build_mod/libfglrx_ip.a ${pkgdir}/usr/lib/fglrx/libfglrx_ip.a_shipped
  256.  
  257.     # copy dkms.conf and set version
  258.     cp ${srcdir}/dkms.conf ${pkgdir}/usr/src/fglrx-${pkgver}/
  259. @@ -400,7 +404,6 @@ package() {
  260.         install -dm755 ${pkgdir}/usr/lib32
  261.         install -dm755 ${pkgdir}/usr/lib32/fglrx
  262.         install -dm755 ${pkgdir}/usr/lib32/dri
  263. -       install -dm755 ${pkgdir}/usr/lib32/xorg/modules/dri
  264.         #   install -dm755 ${pkgdir}/usr/lib32/hsa      #removed in 14.1
  265.         install -m755 lib/*.so* ${pkgdir}/usr/lib32
  266.         if [ "${_old_control}" = "y" ]; then
  267. @@ -414,38 +417,38 @@ package() {
  268.         install -m755 X11R6/lib/libatiadlxx.so ${pkgdir}/usr/lib32
  269.         install -m755 X11R6/lib/libfglrx_dm.so.1.0 ${pkgdir}/usr/lib32
  270.         install -m755 X11R6/lib/libXvBAW.so.1.0 ${pkgdir}/usr/lib32
  271. -       install -m755 X11R6/lib/modules/dri/*.so ${pkgdir}/usr/lib32/xorg/modules/dri
  272. -       ln -snf /usr/lib32/xorg/modules/dri/fglrx_dri.so ${pkgdir}/usr/lib32/dri/fglrx_dri.so
  273. +
  274. +       install -m755 X11R6/lib/modules/dri/*.so ${pkgdir}/usr/lib32/dri
  275.  
  276.         cd $pkgdir/usr/lib32
  277. -       ln -sf /usr/lib32/libfglrx_dm.so.1.0 ${pkgdir}/usr/lib32/libfglrx_dm.so.1
  278. -       ln -sf /usr/lib32/libfglrx_dm.so.1.0 ${pkgdir}/usr/lib32/libfglrx_dm.so
  279. -       ln -sf /usr/lib32/libAMDXvBA.so.1.0 ${pkgdir}/usr/lib32/libAMDXvBA.so.1
  280. -       ln -sf /usr/lib32/libAMDXvBA.so.1.0 ${pkgdir}/usr/lib32/libAMDXvBA.so
  281. -       ln -sf /usr/lib32/libXvBAW.so.1.0 ${pkgdir}/usr/lib32/libXvBAW.so.1
  282. -       ln -sf /usr/lib32/libXvBAW.so.1.0 ${pkgdir}/usr/lib32/libXvBAW.so
  283. -       ln -sf /usr/lib32/libatiuki.so.1.0 ${pkgdir}/usr/lib32/libatiuki.so.1
  284. -       ln -sf /usr/lib32/libatiuki.so.1.0 ${pkgdir}/usr/lib32/libatiuki.so
  285. -
  286. -       ln -sf /usr/lib32/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib32/fglrx/libGL.so.1.2.0
  287. -       ln -sf /usr/lib32/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib32/fglrx/libGL.so.1
  288. -       ln -sf /usr/lib32/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib32/fglrx/libGL.so
  289. -       ln -sf /usr/lib32/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib32/libGL.so.1.2.0
  290. -       ln -sf /usr/lib32/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib32/libGL.so.1
  291. -       ln -sf /usr/lib32/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib32/libGL.so
  292. +       ln -s libfglrx_dm.so.1.0 ${pkgdir}/usr/lib32/libfglrx_dm.so.1
  293. +       ln -s libfglrx_dm.so.1 ${pkgdir}/usr/lib32/libfglrx_dm.so
  294. +       ln -s libAMDXvBA.so.1.0 ${pkgdir}/usr/lib32/libAMDXvBA.so.1
  295. +       ln -s libAMDXvBA.so.1 ${pkgdir}/usr/lib32/libAMDXvBA.so
  296. +       ln -s libXvBAW.so.1.0 ${pkgdir}/usr/lib32/libXvBAW.so.1
  297. +       ln -s libXvBAW.so.1 ${pkgdir}/usr/lib32/libXvBAW.so
  298. +       ln -s libatiuki.so.1.0 ${pkgdir}/usr/lib32/libatiuki.so.1
  299. +       ln -s libatiuki.so.1 ${pkgdir}/usr/lib32/libatiuki.so
  300. +
  301. +       ln -s fglrx-libGL.so.1.2 ${pkgdir}/usr/lib32/fglrx/libGL.so.1.2.0
  302. +       ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib32/fglrx/libGL.so.1
  303. +       ln -s libGL.so.1 ${pkgdir}/usr/lib32/fglrx/libGL.so
  304. +       ln -s fglrx/libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so.1.2.0
  305. +       ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so.1
  306. +       ln -s libGL.so.1 ${pkgdir}/usr/lib32/libGL.so
  307.  
  308.         # We have to provide symlinks to lib32-mesa, as catalyst doesn't ship them
  309. -       ln -s /usr/lib32/mesa/libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so.1.0.0
  310. +       ln -s mesa/libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so.1.0.0
  311.         ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so.1
  312. -       ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so
  313. +       ln -s libEGL.so.1 ${pkgdir}/usr/lib32/libEGL.so
  314.  
  315. -       ln -s /usr/lib32/mesa/libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so.1.1.0
  316. -       ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so.1
  317. -       ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so
  318. +       ln -s mesa/libGLESv1_CM.so.1.0.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so.1.0.0
  319. +       ln -s libGLESv1_CM.so.1.0.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so.1
  320. +       ln -s libGLESv1_CM.so.1 ${pkgdir}/usr/lib32/libGLESv1_CM.so
  321.  
  322. -       ln -s /usr/lib32/mesa/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so.2.0.0
  323. +       ln -s mesa/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so.2.0.0
  324.         ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so.2
  325. -       ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so
  326. +       ln -s libGLESv2.so.2 ${pkgdir}/usr/lib32/libGLESv2.so
  327.  
  328.         # OpenCL
  329.         install -m755 -d ${pkgdir}/etc/OpenCL/vendors
  330. diff --git a/catalyst-test.install b/catalyst-test.install
  331. index 68598bc..3ed8251 100644
  332. --- a/catalyst-test.install
  333. +++ b/catalyst-test.install
  334. @@ -57,10 +57,16 @@ pre_upgrade(){
  335.      fi
  336.      # remove hook fglrx
  337.      sed '/^HOOKS/s/ *fglrx//' -i etc/mkinitcpio.conf
  338. -    systemctl stop catalyst-hook.service
  339. -    systemctl disable catalyst-hook.service
  340. +    if systemctl is-active -q catalyst-hook; then
  341. +        systemctl stop catalyst-hook.service
  342. +    fi
  343. +    if systemctl is-enabled -q catalyst-hook > /dev/null 2>&1; then
  344. +        systemctl disable catalyst-hook.service
  345. +    fi
  346.      # remove existing  fglrx modules
  347. -    usr/bin/catalyst_build_module ra
  348. +    if [[ -e usr/bin/catalyst_build_module ]]; then
  349. +        usr/bin/catalyst_build_module ra
  350. +    fi
  351.  }
  352.  
  353.  post_install(){
  354. diff --git a/pxp_switch_catalyst b/pxp_switch_catalyst
  355. index 0b1a0fa..5d53fa6 100755
  356. --- a/pxp_switch_catalyst
  357. +++ b/pxp_switch_catalyst
  358. @@ -118,16 +118,10 @@ function switch_to_intel() {
  359.  }
  360.  
  361.  function get_current_driver() {
  362. -
  363. -    LIB_LINK="`readlink /usr/lib/libGL.so 2>/dev/null`"
  364. -    if [[ "${LIB_LINK}" = "/usr/lib/fglrx/fglrx-libGL.so.1.2" || "${LIB_LINK}" = "fglrx/fglrx-libGL.so.1.2" ]]; then
  365. -        echo "amd (catalyst)"
  366. -    elif [[ "${LIB_LINK}" = "/usr/lib/mesa/libGL.so.1" || "${LIB_LINK}" = "/usr/lib/mesa/libGL.so.1.2.0" || "${LIB_LINK}" = "/usr/lib/mesa/libGL.so" ]]; then
  367. -        echo "intel (or oss radeon)"
  368. -    else
  369. -        echo "unknown"
  370. -    fi
  371. -
  372. +    echo "libGL"
  373. +    /usr/lib/fglrx/switchlibGL query
  374. +    echo "libglx"
  375. +    /usr/lib/fglrx/switchlibglx query
  376.  }
  377.  
  378.  
  379. diff --git a/switchlibGL b/switchlibGL
  380. index 1d72e35..606ebfe 100755
  381. --- a/switchlibGL
  382. +++ b/switchlibGL
  383. @@ -44,15 +44,11 @@ fi
  384.  
  385.  function switch_to_amd() {
  386.  
  387. -    ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 /usr/lib/libGL.so
  388. -    ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 /usr/lib/libGL.so.1
  389.      ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 /usr/lib/libGL.so.1.2.0
  390.      ldconfig /usr/lib
  391.  
  392.    #lib32 switch
  393.      if [ -e /usr/lib32/fglrx/fglrx-libGL.so.1.2 ]; then
  394. -      ln -snf /usr/lib32/fglrx/fglrx-libGL.so.1.2 /usr/lib32/libGL.so
  395. -      ln -snf /usr/lib32/fglrx/fglrx-libGL.so.1.2 /usr/lib32/libGL.so.1
  396.        ln -snf /usr/lib32/fglrx/fglrx-libGL.so.1.2 /usr/lib32/libGL.so.1.2.0
  397.        ldconfig /usr/lib32
  398.      fi
  399. @@ -61,15 +57,11 @@ function switch_to_amd() {
  400.  
  401.  function switch_to_intel() {
  402.  
  403. -    ln -snf /usr/lib/mesa/libGL.so.1.2.0 /usr/lib/libGL.so
  404. -    ln -snf /usr/lib/mesa/libGL.so.1.2.0 /usr/lib/libGL.so.1
  405.      ln -snf /usr/lib/mesa/libGL.so.1.2.0 /usr/lib/libGL.so.1.2.0
  406.      ldconfig /usr/lib
  407.  
  408.    #lib32 switch
  409.      if [ -e /usr/lib32/mesa/libGL.so.1.2.0 ]; then
  410. -      ln -snf /usr/lib32/mesa/libGL.so.1.2.0 /usr/lib32/libGL.so
  411. -      ln -snf /usr/lib32/mesa/libGL.so.1.2.0 /usr/lib32/libGL.so.1
  412.        ln -snf /usr/lib32/mesa/libGL.so.1.2.0 /usr/lib32/libGL.so.1.2.0
  413.        ldconfig /usr/lib32
  414.      fi
  415. @@ -78,10 +70,10 @@ function switch_to_intel() {
  416.  
  417.  function get_current_driver() {
  418.  
  419. -    LIB_LINK="`readlink /usr/lib/libGL.so 2>/dev/null`"
  420. +    LIB_LINK="`readlink /usr/lib/libGL.so.1.2.0 2>/dev/null`"
  421.      if [[ "${LIB_LINK}" = "/usr/lib/fglrx/fglrx-libGL.so.1.2" || "${LIB_LINK}" = "fglrx/fglrx-libGL.so.1.2" ]]; then
  422.          echo "amd"
  423. -    elif [[ "${LIB_LINK}" = "/usr/lib/mesa/libGL.so.1.2.0" ||  "${LIB_LINK}" = "/usr/lib/mesa/libGL.so.1" || "${LIB_LINK}" = "/usr/lib/mesa/libGL.so" ]]; then
  424. +    elif [[ "${LIB_LINK}" = "/usr/lib/mesa/libGL.so.1.2.0" || "${LIB_LINK}" = "mesa/libGL.so.1.2.0" ]]; then
  425.          echo "intel"
  426.      else
  427.          echo "unknown"
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
 
Top