diff options
| -rw-r--r-- | abs/core/mesa/PKGBUILD | 26 | ||||
| -rw-r--r-- | abs/core/mesa/workaround-for-robustness-and-reset-with-intel.patch | 15 |
2 files changed, 17 insertions, 24 deletions
diff --git a/abs/core/mesa/PKGBUILD b/abs/core/mesa/PKGBUILD index a94cdf6..c0e0a1a 100644 --- a/abs/core/mesa/PKGBUILD +++ b/abs/core/mesa/PKGBUILD @@ -4,25 +4,32 @@ pkgbase=mesa pkgname=('opencl-mesa' 'libva-mesa-driver' 'mesa-vdpau' 'mesa' 'mesa-libgl') -pkgver=10.4.0 +pkgver=11.1.1 pkgrel=1 arch=('i686' 'x86_64') -makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' +makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm' - 'systemd' 'libomxil-bellagio' 'libclc' 'clang') + 'systemd' 'libomxil-bellagio' 'libgcrypt' 'libclc' 'clang') url="http://mesa3d.sourceforge.net" license=('custom') -source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2{,.sig} -#source=(ftp://ftp.freedesktop.org/pub/mesa/10.3/MesaLib-${pkgver}.tar.bz2{,.sig} +source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/mesa-${pkgver}.tar.xz{,.sig} LICENSE) -sha256sums=('98a7dff3a1a6708c79789de8b9a05d8042e867067f70e8f30387c15026233219' +sha256sums=('64db074fc514136b5fb3890111f0d50604db52f0b1e94ba3fcb0fe8668a7fd20' 'SKIP' '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2') +validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com> + +prepare() { + cd ${srcdir}/?esa-* + + # Fix detection of libLLVM when built with CMake + sed -i 's/LLVM_SO_NAME=.*/LLVM_SO_NAME=LLVM/' configure +} build() { cd ${srcdir}/?esa-* - autoreconf -vfi # our automake is far too new for their build system :) + #autoreconf -vfi # our automake is far too new for their build system :) ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -30,6 +37,7 @@ build() { --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \ --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ --with-egl-platforms=x11,drm,wayland \ + --with-sha1=libgcrypt \ --enable-llvm-shared-libs \ --enable-egl \ --enable-gbm \ @@ -60,7 +68,7 @@ build() { package_opencl-mesa() { pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers" - depends=('expat' 'libdrm' 'elfutils' 'libxfixes' 'libxext' 'libcl' 'libclc' 'clang') + depends=('expat' 'libdrm' 'elfutils' 'libxfixes' 'libxext' 'opencl-icd-loader' 'libclc' 'clang') optdepends=('opencl-headers: headers necessary for OpenCL development') install -m755 -d ${pkgdir}/etc @@ -99,7 +107,7 @@ package_mesa-vdpau() { package_mesa() { pkgdesc="an open-source implementation of the OpenGL specification" depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'systemd' 'elfutils' - 'libomxil-bellagio' 'expat' 'libtxc_dxtn' 'llvm-libs') + 'libomxil-bellagio' 'expat' 'libgcrypt' 'libtxc_dxtn' 'llvm-libs') optdepends=('opengl-man-pages: for the OpenGL API man pages' 'mesa-vdpau: for accelerated video playback' 'libva-mesa-driver: for accelerated video playback') diff --git a/abs/core/mesa/workaround-for-robustness-and-reset-with-intel.patch b/abs/core/mesa/workaround-for-robustness-and-reset-with-intel.patch deleted file mode 100644 index dc4a213..0000000 --- a/abs/core/mesa/workaround-for-robustness-and-reset-with-intel.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c -index e113654..5790680 100644 ---- a/src/mesa/drivers/dri/i965/brw_context.c -+++ b/src/mesa/drivers/dri/i965/brw_context.c -@@ -645,7 +645,7 @@ brwCreateContext(gl_api api, - - brw_init_driver_functions(brw, &functions); - -- if (notify_reset) -+ if (notify_reset && brw->gen >= 6) - functions.GetGraphicsResetStatus = brw_get_graphics_reset_status; - - struct gl_context *ctx = &brw->ctx; - - |