diff --git a/srcpkgs/libGL/patches/llvm.patch b/srcpkgs/libGL/patches/llvm.patch
deleted file mode 100644
index 28ab543c4d7..00000000000
--- a/srcpkgs/libGL/patches/llvm.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 82e0bbd01abfb2073519941d9893fa6ac05fb58c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Vedran=20Mileti=C4=87?= <vedran@miletic.net>
-Date: Tue, 21 Jun 2016 01:17:49 +0200
-Subject: clover: Fix build against clang SVN >= r273191
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-setLangDefaults() now requires PreprocessorOptions as an argument.
-
-Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
-
---- src/gallium/state_trackers/clover/llvm/invocation.cpp
-+++ src/gallium/state_trackers/clover/llvm/invocation.cpp
-@@ -207,7 +207,7 @@ namespace {
- c.getDiagnosticOpts().ShowCarets = false;
- c.getInvocation().setLangDefaults(c.getLangOpts(), clang::IK_OpenCL,
- #if HAVE_LLVM >= 0x0309
-- llvm::Triple(triple),
-+ llvm::Triple(triple), c.getPreprocessorOpts(),
- #endif
- clang::LangStandard::lang_opencl11);
- c.createDiagnostics(
diff --git a/srcpkgs/libGL/patches/remove-libpthread-stubs.patch b/srcpkgs/libGL/patches/remove-libpthread-stubs.patch
index d02d97087ed..642b915cc8b 100644
--- a/srcpkgs/libGL/patches/remove-libpthread-stubs.patch
+++ b/srcpkgs/libGL/patches/remove-libpthread-stubs.patch
@@ -1,13 +1,13 @@
---- configure.ac 2016-05-25 15:37:44.191643017 +0200
-+++ configure.ac 2016-05-25 15:42:20.861654709 +0200
-@@ -813,10 +813,6 @@
- dnl pkgconfig files.
- test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread"
+diff --git configure.ac configure.ac
+index 54416b4..8a708d3 100644
+--- configure.ac
++++ configure.ac
+@@ -824,7 +824,7 @@ test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread"
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
--
- dnl SELinux awareness.
- AC_ARG_ENABLE([selinux],
- [AS_HELP_STRING([--enable-selinux],
+ dnl pthread-stubs is mandatory on targets where it exists
+ case "$host_os" in
+-cygwin* )
++cygwin* | linux* )
+ pthread_stubs_possible="no"
+ ;;
+ * )
diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template
index 3353a862078..d061bbde4de 100644
--- a/srcpkgs/libGL/template
+++ b/srcpkgs/libGL/template
@@ -1,6 +1,6 @@
# Template build file for 'libGL'.
pkgname=libGL
-version=12.0.3
+version=13.0.0
revision=1
wrksrc="mesa-${version}"
build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.mesa3d.org/"
license="MIT, LGPL-2.1"
distfiles="https://mesa.freedesktop.org/archive/${version}/mesa-${version}.tar.xz"
-checksum=1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1
+checksum=94edb4ebff82066a68be79d9c2627f15995e1fe10f67ab3fc63deb842027d727
hostmakedepends="
automake libtool flex pkg-config llvm python-Mako libxml2-python wayland-devel"
@@ -27,13 +27,13 @@ conf_files="/etc/drirc"
# Set subpackages manually to set proper rdeps in 32bit pkgs.
subpackages="libglapi libgbm libEGL libGLES libOSMesa libwayland-egl"
-# XXX intel vulkan support: vulkan-icd-loader needs to be packaged.
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*)
# Enable all x86 drivers.
configure_args+=" --with-gallium-drivers=r300,r600,radeonsi,svga,swrast,nouveau,virgl"
configure_args+=" --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast"
configure_args+=" --enable-xa --enable-dri3 --enable-nine"
+ configure_args+=" --with-vulkan-drivers=intel,radeon"
configure_args+=" --enable-opencl --enable-opencl-icd --enable-r600-llvm-compiler"
hostmakedepends+=" clang libclc-git"
subpackages+=" libxatracker mesa-ati-dri mesa-intel-dri mesa-nouveau-dri"
@@ -150,12 +150,16 @@ mesa-ati-dri_package() {
vmove "usr/lib/gallium-pipe/pipe_r[36]00.so"
vmove usr/lib/gallium-pipe/pipe_radeonsi.so
vmove usr/lib/dri/r*
+ vmove "usr/share/vulkan/icd.d/radeon_icd*.json"
+ vmove "usr/lib/libvulkan_radeon.so"
}
}
mesa-intel-dri_package() {
short_desc="Mesa DRI drivers for Intel GPUs"
pkg_install() {
vmove "usr/lib/xorg/modules/drivers/i9[16]5_dri.*"
+ vmove "usr/share/vulkan/icd.d/intel_icd*.json"
+ vmove "usr/lib/libvulkan_intel.so"
}
}
mesa-nouveau-dri_package() {
@@ -189,3 +193,4 @@ mesa-opencl_package() {
vmove "usr/lib/lib*OpenCL*"
}
}
+