Guest User

mesa-18.0.4.patch

a guest
May 19th, 2018
403
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/PKGBUILD b/PKGBUILD
  2. index ed68300..8ae150e 100644
  3. --- a/PKGBUILD
  4. +++ b/PKGBUILD
  5. @@ -5,39 +5,49 @@
  6.  
  7.  pkgbase=mesa-noglvnd
  8.  pkgname=('opencl-mesa-noglvnd' 'vulkan-intel-noglvnd' 'vulkan-radeon-noglvnd' 'libva-mesa-driver-noglvnd' 'mesa-vdpau-noglvnd' 'mesa-noglvnd' 'mesa-libgl-noglvnd')
  9. -pkgver=18.0.2
  10. +pkgver=18.0.4
  11.  pkgrel=1
  12.  arch=('x86_64')
  13.  makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto'
  14. -             'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm'
  15. -             'libomxil-bellagio' 'libclc' 'clang' 'libunwind' 'lm_sensors' 'meson') # 'libglvnd')
  16. +             'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols'
  17. +             'elfutils' 'llvm' 'libomxil-bellagio' 'libclc' 'clang' 'libunwind' 'lm_sensors' # 'libglvnd'
  18. +             'meson')
  19.  url="https://www.mesa3d.org/"
  20.  license=('custom')
  21.  source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
  22.          LICENSE
  23. -        0002-glvnd-fix-gl-dot-pc.patch
  24. -        0004-meson-Add-library-versions-to-swr-drivers.patch
  25. -        0005-meson-Version-libMesaOpenCL-like-autotools-does.patch)
  26. -sha512sums=('77d24d01c4c22596d28421aeb74932ff232730a4f556ae1a2e8777ece2876e4e352679575385c065505df4a2a83d2c1cf30db92dcf88038417e36a2768332d7e'
  27. +        0001-glvnd-fix-gl.pc.patch
  28. +        0002-meson-Add-library-versions-to-swr-drivers.patch
  29. +        0003-meson-Version-libMesaOpenCL-like-autotools-does.patch
  30. +        0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch)
  31. +sha512sums=('f9a14be46c209661ceb318add1611481445d13b47e95c7a5d2a5e5ecfdd5d2c3fa9c2b16b30035bbb8d61ccc7cb65bfa6698ac8b040273e5ab045a951a67752c'
  32.              'SKIP'
  33.              'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7'
  34. -            '75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028'
  35. -            '0f5da6e48885713c7ddef9e5715e178e0a499bcb622d7f19e15b9e4b4647331d7bf14829218b6ab80f17bae90fd95b8df6a0a81203d8081686805ca5329531ff'
  36. -            'd3c01f61a0a0cc2f01e66e0126ad8b6386d4a53c1dc1b3b134800e4cd25507e458bac860cbed10cf4b46b04e8d50aba233870587b89c058fffd57436b48289bf')
  37. +            '2f40198eff47664c831c56e8a63f60a4d1b815cf697e6bdb0be39e6d9c5df043857f6264b7cd2ccf46c07626186c565144e80f4214b5f7936ef7024c47201437'
  38. +            'c3f3baf8a5f480ce64b321c031e31c0d5819732ca34647ac545d0fd7fafa40ad4dcf1e1ec8d574754e0a44bf0cdc462ed8709c8d9b58a17e01c6ba5b4c5e91c6'
  39. +            'a2062f8a5259aabed1aa20df6a8510f0f3e914cb6bba72751249b3295285596bb7615063a7a7b7870f9f4489d0e6b774f0bced2bdde49a1aa9df6a44976462d1'
  40. +            '572901a1e9cacfacfc8c4cc3cd077a626d4aeda8c8a58f6085bae827cba8a2d4d99af1dafbb5a9296b6ebf3120e2b05a084fe1c96093074befe62597319384a1')
  41.  validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <emil.l.velikov@gmail.com>
  42.                '946D09B5E4C9845E63075FF1D961C596A7203456'  # Andres Gomez <tanty@igalia.com>
  43. -              'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez@igalia.com>"
  44. +              'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895'  # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez@igalia.com>"
  45. +              'A5CC9FEC93F2F837CB044912336909B6B25FADFA') # Juan A. Suarez Romero <jasuarez@igalia.com>
  46.  
  47.  prepare() {
  48.    cd ${srcdir}/mesa-${pkgver}
  49.  
  50.    # glvnd support patches - from Fedora
  51.    # non-upstreamed ones
  52. -  patch -Np1 -i ../0002-glvnd-fix-gl-dot-pc.patch
  53. +  patch -Np1 -i ../0001-glvnd-fix-gl.pc.patch
  54.  
  55.    # Upstreamed meson fixes
  56. -  patch -Np1 -i ../0004-meson-Add-library-versions-to-swr-drivers.patch
  57. -  patch -Np1 -i ../0005-meson-Version-libMesaOpenCL-like-autotools-does.patch
  58. +  patch -Np1 -i ../0002-meson-Add-library-versions-to-swr-drivers.patch
  59. +  patch -Np1 -i ../0003-meson-Version-libMesaOpenCL-like-autotools-does.patch
  60. +
  61. +  # experimental patch, should fix FS#58549
  62. +  # variant 2 patch should fix FS#58605
  63. +  # see https://bugs.freedesktop.org/show_bug.cgi?id=106351
  64. +  # and https://patchwork.freedesktop.org/series/42687/
  65. +  patch -Np1 -i ../0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch
  66.  }
  67.  
  68.  build() {
  69. @@ -180,7 +190,7 @@ package_mesa-noglvnd() {
  70.    _install fakeinstall/usr/lib/d3d
  71.    _install fakeinstall/usr/lib/lib{gbm,glapi}.so*
  72.    _install fakeinstall/usr/lib/libOSMesa.so*
  73. -  _install fakeinstall/usr/lib/libwayland*.so*
  74. +#  _install fakeinstall/usr/lib/libwayland*.so*
  75.    _install fakeinstall/usr/lib/libxatracker.so*
  76.    _install fakeinstall/usr/lib/libswrAVX*.so*
  77.  
  78. @@ -190,6 +200,10 @@ package_mesa-noglvnd() {
  79.    # in vulkan-headers
  80.    rm -rv fakeinstall/usr/include/vulkan
  81.  
  82. +  # in wayland
  83. +  rm -v fakeinstall/usr/lib/libwayland-egl.so*
  84. +  rm -v fakeinstall/usr/lib/pkgconfig/wayland-egl.pc
  85. +
  86.    install -m755 -d ${pkgdir}/usr/lib/mesa
  87.    # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
  88.    mv -v ${srcdir}/fakeinstall/usr/lib/libGL.so*    ${pkgdir}/usr/lib/mesa/
RAW Paste Data

Adblocker detected! Please consider disabling it...

We've detected AdBlock Plus or some other adblocking software preventing Pastebin.com from fully loading.

We don't have any obnoxious sound, or popup ads, we actively block these annoying types of ads!

Please add Pastebin.com to your ad blocker whitelist or disable your adblocking software.

×