mesa: update to 12.0.3

6 files changed, 250 insertions, 42 deletions

diff --git a/abs/core/mesa/0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch b/abs/core/mesa/0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch
new file mode 100644
index 0000000..8f8c536
--- /dev/null
+++ b/abs/core/mesa/0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch
@@ -0,0 +1,91 @@
+From 0247e5ee3edd546b8598082d5b45d110f61853d0 Mon Sep 17 00:00:00 2001
+From: Martin Peres <martin.peres@linux.intel.com>
+Date: Thu, 6 Oct 2016 17:07:22 +0300
+Subject: [PATCH 1/2] loader/dri3: add get_dri_screen() to the vtable
+
+This allows querying the current active screen from the
+loader's common code.
+
+Cc: mesa-stable@lists.freedesktop.org
+Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+Signed-off-by: Martin Peres <martin.peres@linux.intel.com>
+---
+ src/egl/drivers/dri2/platform_x11_dri3.c | 12 ++++++++++++
+ src/glx/dri3_glx.c                       | 11 +++++++++++
+ src/loader/loader_dri3_helper.h          |  1 +
+ 3 files changed, 24 insertions(+)
+
+diff --git a/src/egl/drivers/dri2/platform_x11_dri3.c b/src/egl/drivers/dri2/platform_x11_dri3.c
+index 31649fe..d93f5bc 100644
+--- a/src/egl/drivers/dri2/platform_x11_dri3.c
++++ b/src/egl/drivers/dri2/platform_x11_dri3.c
+@@ -103,6 +103,17 @@ egl_dri3_get_dri_context(struct loader_dri3_drawable *draw)
+    return dri2_ctx->dri_context;
+ }
+ 
++static __DRIscreen *
++egl_dri3_get_dri_screen(struct loader_dri3_drawable *draw)
++{
++   _EGLContext *ctx = _eglGetCurrentContext();
++   struct dri2_egl_context *dri2_ctx;
++   if (!ctx)
++      return NULL;
++   dri2_ctx = dri2_egl_context(ctx);
++   return dri2_egl_display(dri2_ctx->base.Resource.Display)->dri_screen;
++}
++
+ static void
+ egl_dri3_flush_drawable(struct loader_dri3_drawable *draw, unsigned flags)
+ {
+@@ -119,6 +130,7 @@ static struct loader_dri3_vtable egl_dri3_vtable = {
+    .set_drawable_size = egl_dri3_set_drawable_size,
+    .in_current_context = egl_dri3_in_current_context,
+    .get_dri_context = egl_dri3_get_dri_context,
++   .get_dri_screen = egl_dri3_get_dri_screen,
+    .flush_drawable = egl_dri3_flush_drawable,
+    .show_fps = NULL,
+ };
+diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
+index 90d7bba..51b6b1c 100644
+--- a/src/glx/dri3_glx.c
++++ b/src/glx/dri3_glx.c
+@@ -132,6 +132,16 @@ glx_dri3_get_dri_context(struct loader_dri3_drawable *draw)
+    return (gc != &dummyContext) ? dri3Ctx->driContext : NULL;
+ }
+ 
++static __DRIscreen *
++glx_dri3_get_dri_screen(struct loader_dri3_drawable *draw)
++{
++   struct glx_context *gc = __glXGetCurrentContext();
++   struct dri3_context *pcp = (struct dri3_context *) gc;
++   struct dri3_screen *psc = (struct dri3_screen *) pcp->base.psc;
++
++   return (gc != &dummyContext && psc) ? psc->driScreen : NULL;
++}
++
+ static void
+ glx_dri3_flush_drawable(struct loader_dri3_drawable *draw, unsigned flags)
+ {
+@@ -169,6 +179,7 @@ static struct loader_dri3_vtable glx_dri3_vtable = {
+    .set_drawable_size = glx_dri3_set_drawable_size,
+    .in_current_context = glx_dri3_in_current_context,
+    .get_dri_context = glx_dri3_get_dri_context,
++   .get_dri_screen = glx_dri3_get_dri_screen,
+    .flush_drawable = glx_dri3_flush_drawable,
+    .show_fps = glx_dri3_show_fps,
+ };
+diff --git a/src/loader/loader_dri3_helper.h b/src/loader/loader_dri3_helper.h
+index 5b8fd1d..658e190 100644
+--- a/src/loader/loader_dri3_helper.h
++++ b/src/loader/loader_dri3_helper.h
+@@ -103,6 +103,7 @@ struct loader_dri3_vtable {
+    void (*set_drawable_size)(struct loader_dri3_drawable *, int, int);
+    bool (*in_current_context)(struct loader_dri3_drawable *);
+    __DRIcontext *(*get_dri_context)(struct loader_dri3_drawable *);
++   __DRIscreen *(*get_dri_screen)(struct loader_dri3_drawable *);
+    void (*flush_drawable)(struct loader_dri3_drawable *, unsigned);
+    void (*show_fps)(struct loader_dri3_drawable *, uint64_t);
+ };
+-- 
+2.10.0
+
diff --git a/abs/core/mesa/0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch b/abs/core/mesa/0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch
new file mode 100644
index 0000000..893872b
--- /dev/null
+++ b/abs/core/mesa/0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch
@@ -0,0 +1,59 @@
+From a599b1c2037ac8aca6c92350c8a7b3e42c81deaa Mon Sep 17 00:00:00 2001
+From: Martin Peres <martin.peres@linux.intel.com>
+Date: Thu, 6 Oct 2016 17:10:35 +0300
+Subject: [PATCH 2/2] loader/dri3: import prime buffers in the currently-bound
+ screen
+
+This tries to mirrors the codepath taken by DRI2 in IntelSetTexBuffer2()
+and fixes many applications when using DRI3:
+ - Totem with libva on hw-accelerated decoding
+ - obs-studio, using Window Capture (Xcomposite) as a Source
+ - gstreamer with VAAPI
+
+v2:
+ - introduce get_dri_screen() in the dri3 loader's vtable (krh)
+
+Tested-by: Timo Aaltonen <tjaalton@ubuntu.com>
+Tested-by: Ionut Biru <biru.ionut@gmail.com>
+Cc: mesa-stable@lists.freedesktop.org
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71759
+Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+Signed-off-by: Martin Peres <martin.peres@linux.intel.com>
+---
+ src/loader/loader_dri3_helper.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c
+index 3ce0352..8179297 100644
+--- a/src/loader/loader_dri3_helper.c
++++ b/src/loader/loader_dri3_helper.c
+@@ -1117,6 +1117,7 @@ dri3_get_pixmap_buffer(__DRIdrawable *driDrawable, unsigned int format,
+    xcb_sync_fence_t                     sync_fence;
+    struct xshmfence                     *shm_fence;
+    int                                  fence_fd;
++   __DRIscreen                          *cur_screen;
+ 
+    if (buffer)
+       return buffer;
+@@ -1147,8 +1148,17 @@ dri3_get_pixmap_buffer(__DRIdrawable *driDrawable, unsigned int format,
+    if (!bp_reply)
+       goto no_image;
+ 
++   /* Get the currently-bound screen or revert to using the drawable's screen if
++    * no contexts are currently bound. The latter case is at least necessary for
++    * obs-studio, when using Window Capture (Xcomposite) as a Source.
++    */
++   cur_screen = draw->vtable->get_dri_screen(draw);
++   if (!cur_screen) {
++       cur_screen = draw->dri_screen;
++   }
++
+    buffer->image = loader_dri3_create_image(draw->conn, bp_reply, format,
+-                                            draw->dri_screen, draw->ext->image,
++                                            cur_screen, draw->ext->image,
+                                             buffer);
+    if (!buffer->image)
+       goto no_image;
+-- 
+2.10.0
+
diff --git a/abs/core/mesa/PKGBUILD b/abs/core/mesa/PKGBUILD
index c0e0a1a..16ab271 100644
--- a/abs/core/mesa/PKGBUILD
+++ b/abs/core/mesa/PKGBUILD
@@ -3,9 +3,9 @@
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
-pkgname=('opencl-mesa' 'libva-mesa-driver' 'mesa-vdpau' 'mesa' 'mesa-libgl')
-pkgver=11.1.1
-pkgrel=1
+pkgname=('opencl-mesa' 'vulkan-intel' 'libva-mesa-driver' 'mesa-vdpau' 'mesa' 'mesa-libgl')
+pkgver=12.0.3
+pkgrel=3
 arch=('i686' 'x86_64')
 makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
              'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm'
@@ -13,42 +13,59 @@ makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'd
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/mesa-${pkgver}.tar.xz{,.sig}
-        LICENSE)
-sha256sums=('64db074fc514136b5fb3890111f0d50604db52f0b1e94ba3fcb0fe8668a7fd20'
+        LICENSE
+        remove-libpthread-stubs.patch
+        0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch
+        0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch
+        llvm-39.patch)
+sha256sums=('1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1'
             'SKIP'
-            '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2')
+            '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
+            'd82c329e89754266eb1538df29b94d33692a66e3b6882b2cee78f4d5aab4a39c'
+            '52eb98eb6c9c644383d9743692aea302d84c4f89cfaa7a276b9276befc2d9780'
+            '96ad07e241d16802b14b14ca3d6965fa7f4f4b8c678d62ba375291910dce3b4a'
+            '9156cb5cbfe287ecaeb4c97af44eaa677d28d3b659d309a6c5706bc9eefbfa16')
 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
+  patch -Np0 -i ../llvm-39.patch
+
+  # Now mesa checks for libpthread-stubs - so remove the check
+  patch -Np1 -i ../remove-libpthread-stubs.patch
+  
+  # fix FS#50240 - https://bugs.freedesktop.org/show_bug.cgi?id=71759
+  # merged upstream
+  patch -Np1 -i ../0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch
+  patch -Np1 -i ../0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch
+
+  autoreconf -fiv
 }
 
 build() {
   cd ${srcdir}/?esa-*
 
-  #autoreconf -vfi # our automake is far too new for their build system :)
-
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \
+    --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl \
     --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
     --with-egl-platforms=x11,drm,wayland \
+    --with-vulkan-drivers=intel \
     --with-sha1=libgcrypt \
-    --enable-llvm-shared-libs \
-    --enable-egl \
-    --enable-gbm \
+    --disable-xvmc \
     --enable-gallium-llvm \
+    --enable-llvm-shared-libs \
     --enable-shared-glapi \
+    --enable-egl \
     --enable-glx \
     --enable-glx-tls \
-    --enable-dri \
-    --enable-osmesa \
     --enable-gles1 \
     --enable-gles2 \
+    --enable-gbm \
+    --enable-dri \
+    --enable-osmesa \
     --enable-texture-float \
     --enable-xa \
     --enable-vdpau \
@@ -57,8 +74,6 @@ build() {
     --enable-opencl --enable-opencl-icd \
     --with-clang-libdir=/usr/lib
 
-    # --help
-
   make
 
   # fake installation
@@ -72,22 +87,37 @@ package_opencl-mesa() {
   optdepends=('opencl-headers: headers necessary for OpenCL development')
   
   install -m755 -d ${pkgdir}/etc
-  mv -v ${srcdir}/fakeinstall/etc/OpenCL ${pkgdir}/etc/
+  cp -rv ${srcdir}/fakeinstall/etc/OpenCL ${pkgdir}/etc/
   
   install -m755 -d ${pkgdir}/usr/lib/gallium-pipe
-  mv -v ${srcdir}/fakeinstall/usr/lib/lib*OpenCL* ${pkgdir}/usr/lib/
-  mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_{r600,radeonsi}.so ${pkgdir}/usr/lib/gallium-pipe/
+  cp -rv ${srcdir}/fakeinstall/usr/lib/lib*OpenCL* ${pkgdir}/usr/lib/
+  cp -rv ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_{r600,radeonsi}.so ${pkgdir}/usr/lib/gallium-pipe/
 
   install -m755 -d "${pkgdir}/usr/share/licenses/opencl-mesa"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/opencl-mesa/"
 }
 
+package_vulkan-intel() {
+  pkgdesc="Intel's Vulkan mesa driver"
+  depends=('vulkan-icd-loader' 'libgcrypt' 'wayland' 'libxcb')
+  
+  install -m755 -d ${pkgdir}/usr/share
+  mv -v ${srcdir}/fakeinstall/usr/share/vulkan ${pkgdir}/usr/share/
+
+  install -m755 -d ${pkgdir}/usr/{include/vulkan,lib}
+  mv -v ${srcdir}/fakeinstall/usr/lib/libvulkan_intel.so ${pkgdir}/usr/lib/
+  mv -v ${srcdir}/fakeinstall/usr/include/vulkan/vulkan_intel.h ${pkgdir}/usr/include/vulkan
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/vulkan-intel"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/vulkan-intel/"
+}
+
 package_libva-mesa-driver() {
   pkgdesc="VA-API implementation for gallium"
   depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'elfutils')
 
   install -m755 -d ${pkgdir}/usr/lib
-  mv -v ${srcdir}/fakeinstall/usr/lib/dri ${pkgdir}/usr/lib
+  cp -rv ${srcdir}/fakeinstall/usr/lib/dri ${pkgdir}/usr/lib
    
   install -m755 -d "${pkgdir}/usr/share/licenses/libva-mesa-driver"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libva-mesa-driver/"
@@ -98,7 +128,7 @@ package_mesa-vdpau() {
   depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'elfutils')
 
   install -m755 -d ${pkgdir}/usr/lib
-  mv -v ${srcdir}/fakeinstall/usr/lib/vdpau ${pkgdir}/usr/lib
+  cp -rv ${srcdir}/fakeinstall/usr/lib/vdpau ${pkgdir}/usr/lib
    
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa-vdpau"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vdpau/"
@@ -111,32 +141,35 @@ package_mesa() {
   optdepends=('opengl-man-pages: for the OpenGL API man pages'
               'mesa-vdpau: for accelerated video playback'
               'libva-mesa-driver: for accelerated video playback')
-  provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel'
-            'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri')
-  conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel'
-             'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri')
-  replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel'
-            'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri')
+  provides=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri')
+  conflicts=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri')
+  replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri')
 
   install -m755 -d ${pkgdir}/etc
-  mv -v ${srcdir}/fakeinstall/etc/drirc ${pkgdir}/etc
+  cp -rv ${srcdir}/fakeinstall/etc/drirc ${pkgdir}/etc
   
   install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
   # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast
-  mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/* ${pkgdir}/usr/lib/xorg/modules/dri
+  cp -av ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/* ${pkgdir}/usr/lib/xorg/modules/dri
    
-  mv -v ${srcdir}/fakeinstall/usr/lib/bellagio  ${pkgdir}/usr/lib
-  mv -v ${srcdir}/fakeinstall/usr/lib/d3d  ${pkgdir}/usr/lib
-  mv -v ${srcdir}/fakeinstall/usr/lib/*.so* ${pkgdir}/usr/lib/
-
-  mv -v ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr
-  mv -v ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/
+  cp -rv ${srcdir}/fakeinstall/usr/lib/bellagio  ${pkgdir}/usr/lib
+  cp -rv ${srcdir}/fakeinstall/usr/lib/d3d  ${pkgdir}/usr/lib
+  cp -rv ${srcdir}/fakeinstall/usr/lib/lib{gbm,glapi}.so* ${pkgdir}/usr/lib/
+  cp -rv ${srcdir}/fakeinstall/usr/lib/libOSMesa.so* ${pkgdir}/usr/lib/
+  cp -rv ${srcdir}/fakeinstall/usr/lib/libwayland*.so* ${pkgdir}/usr/lib/
+  cp -rv ${srcdir}/fakeinstall/usr/lib/libxatracker.so* ${pkgdir}/usr/lib/
+
+  cp -rv ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr
+  cp -rv ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/
   
+  # remove vulkan headers
+  rm -rf ${pkgdir}/usr/include/vulkan
+
   install -m755 -d ${pkgdir}/usr/lib/mesa
   # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
-  mv -v ${pkgdir}/usr/lib/libGL.so* 	${pkgdir}/usr/lib/mesa/
-  mv -v ${pkgdir}/usr/lib/libEGL.so* 	${pkgdir}/usr/lib/mesa/
-  mv -v ${pkgdir}/usr/lib/libGLES*.so*	${pkgdir}/usr/lib/mesa/
+  cp -rv ${srcdir}/fakeinstall/usr/lib/libGL.so* 	${pkgdir}/usr/lib/mesa/
+  cp -rv ${srcdir}/fakeinstall/usr/lib/libEGL.so* 	${pkgdir}/usr/lib/mesa/
+  cp -rv ${srcdir}/fakeinstall/usr/lib/libGLES*.so*	${pkgdir}/usr/lib/mesa/
 
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
@@ -145,8 +178,8 @@ package_mesa() {
 package_mesa-libgl() {
   pkgdesc="Mesa 3-D graphics library"
   depends=('mesa')
-  provides=('libgl')
-  replaces=('libgl')
+  provides=('libgl' 'libgles' 'libegl')
+  conflicts=('libgl' 'libgles' 'libegl')
  
   # See FS#26284
   install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
diff --git a/abs/core/mesa/__changelog b/abs/core/mesa/__changelog
new file mode 100644
index 0000000..2d07d92
--- /dev/null
+++ b/abs/core/mesa/__changelog
@@ -0,0 +1 @@
+PKGBUILD: add llvm-39.patch
diff --git a/abs/core/mesa/llvm-39.patch b/abs/core/mesa/llvm-39.patch
new file mode 100644
index 0000000..4cdbb73
--- /dev/null
+++ b/abs/core/mesa/llvm-39.patch
@@ -0,0 +1,10 @@
+--- src/gallium/state_trackers/clover/llvm/invocation.cpp	2016-09-18 14:21:11.960782381 +0200
++++ src/gallium/state_trackers/clover/llvm/invocation.cpp	2016-09-18 14:22:59.743093983 +0200
+@@ -208,6 +208,7 @@
+       c.getInvocation().setLangDefaults(c.getLangOpts(), clang::IK_OpenCL,
+ #if HAVE_LLVM >= 0x0309
+                                         llvm::Triple(triple),
++					c.getPreprocessorOpts(),
+ #endif
+                                         clang::LangStandard::lang_opencl11);
+       c.createDiagnostics(
diff --git a/abs/core/mesa/remove-libpthread-stubs.patch b/abs/core/mesa/remove-libpthread-stubs.patch
new file mode 100644
index 0000000..5b44d03
--- /dev/null
+++ b/abs/core/mesa/remove-libpthread-stubs.patch
@@ -0,0 +1,14 @@
+diff -ur mesa-orig/configure.ac mesa-origb/configure.ac
+--- mesa-orig/configure.ac	2016-05-25 15:37:44.191643017 +0200
++++ mesa-origb/configure.ac	2016-05-25 15:42:20.861654709 +0200
+@@ -813,10 +813,6 @@
+ dnl pkgconfig files.
+ 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],