upgpkg: mesa-nosystemd-13.0.0rc2-1

5 files changed, 84 insertions, 210 deletions

diff --git a/.SRCINFO b/.SRCINFO
index edfe2831ce42..a100eac23f67 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Oct 10 18:45:34 UTC 2016
+# Sat Oct 29 23:29:39 UTC 2016
 pkgbase = mesa-nosystemd
-	pkgver = 12.0.3
-	pkgrel = 3
+	pkgver = 13.0.0rc2
+	pkgrel = 1
 	url = http://mesa3d.sourceforge.net
 	arch = i686
 	arch = x86_64
@@ -28,26 +28,21 @@ pkgbase = mesa-nosystemd
 	makedepends = libgcrypt
 	makedepends = libclc
 	makedepends = clang
-	source = ftp://ftp.freedesktop.org/pub/mesa/12.0.3/mesa-12.0.3.tar.xz
-	source = ftp://ftp.freedesktop.org/pub/mesa/12.0.3/mesa-12.0.3.tar.xz.sig
+	source = ftp://ftp.freedesktop.org/pub/mesa/13.0.0/mesa-13.0.0-rc2.tar.xz
+	source = ftp://ftp.freedesktop.org/pub/mesa/13.0.0/mesa-13.0.0-rc2.tar.xz.sig
 	source = LICENSE
 	source = remove-libpthread-stubs.patch
-	source = 0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch
-	source = 0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch
-	sha256sums = 1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1
+	sha256sums = ef26031a79b915e1643b0ffe5354f8ae774cd445f12b342abac63438f9735a43
 	sha256sums = SKIP
 	sha256sums = 7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2
-	sha256sums = d82c329e89754266eb1538df29b94d33692a66e3b6882b2cee78f4d5aab4a39c
-	sha256sums = 52eb98eb6c9c644383d9743692aea302d84c4f89cfaa7a276b9276befc2d9780
-	sha256sums = 96ad07e241d16802b14b14ca3d6965fa7f4f4b8c678d62ba375291910dce3b4a
+	sha256sums = 75ab53ad44b95204c788a2988e97a5cb963bdbf6072a5466949a2afb79821c8f
 
 pkgname = opencl-mesa-nosystemd
 	pkgdesc = OpenCL support for AMD/ATI Radeon mesa drivers
 	depends = expat
 	depends = libdrm
-	depends = elfutils
-	depends = libxfixes
-	depends = libxext
+	depends = libelf
+	depends = libgcrypt
 	depends = opencl-icd-loader
 	depends = libclc
 	depends = clang
@@ -61,18 +56,35 @@ pkgname = vulkan-intel-nosystemd
 	depends = vulkan-icd-loader
 	depends = libgcrypt
 	depends = wayland
-	depends = libxcb
+	depends = libx11
+	depends = libxshmfence
 	provides = vulkan-intel
 	conflicts = vulkan-intel
 	replaces = vulkan-intel
 
+pkgname = vulkan-radeon-nosystemd
+	pkgdesc = Radeon's Vulkan mesa driver
+	depends = vulkan-icd-loader
+	depends = libgcrypt
+	depends = wayland
+	depends = libx11
+	depends = libxshmfence
+	depends = libelf
+	depends = libdrm
+	depends = llvm-libs
+	provides = vulkan-radeon
+	conflicts = vulkan-radeon
+	replaces = vulkan-radeon
+
 pkgname = libva-mesa-driver-nosystemd
 	pkgdesc = VA-API implementation for gallium
 	depends = libdrm
 	depends = libx11
 	depends = llvm-libs
 	depends = expat
-	depends = elfutils
+	depends = libelf
+	depends = libgcrypt
+	depends = libxshmfence
 	provides = libva-mesa-driver
 	conflicts = libva-mesa-driver
 	replaces = libva-mesa-driver
@@ -83,7 +95,9 @@ pkgname = mesa-vdpau-nosystemd
 	depends = libx11
 	depends = llvm-libs
 	depends = expat
-	depends = elfutils
+	depends = libelf
+	depends = libgcrypt
+	depends = libxshmfence
 	provides = mesa-vdpau
 	conflicts = mesa-vdpau
 	replaces = mesa-vdpau
@@ -95,10 +109,8 @@ pkgname = mesa-nosystemd
 	depends = libxxf86vm
 	depends = libxdamage
 	depends = libxshmfence
-	depends = libudev.so
-	depends = elfutils
+	depends = libelf
 	depends = libomxil-bellagio
-	depends = expat
 	depends = libgcrypt
 	depends = libtxc_dxtn
 	depends = llvm-libs
diff --git a/0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch b/0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch
deleted file mode 100644
index 8f8c536699a4..000000000000
--- a/0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-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/0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch b/0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch
deleted file mode 100644
index 893872b933f3..000000000000
--- a/0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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/PKGBUILD b/PKGBUILD
index 4f13fab36f38..9e73919e3bde 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,26 +4,23 @@
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa-nosystemd
-pkgname=('opencl-mesa-nosystemd' 'vulkan-intel-nosystemd' 'libva-mesa-driver-nosystemd' 'mesa-vdpau-nosystemd' 'mesa-nosystemd' 'mesa-libgl-nosystemd')
-pkgver=12.0.3
-pkgrel=3
+pkgname=('opencl-mesa-nosystemd' 'vulkan-intel-nosystemd' 'vulkan-radeon-nosystemd' 'libva-mesa-driver-nosystemd' 'mesa-vdpau-nosystemd' 'mesa-nosystemd' 'mesa-libgl-nosystemd')
+pkgver=13.0.0rc2
+pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
              'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm'
              'libudev.so' 'libomxil-bellagio' 'libgcrypt' 'libclc' 'clang')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/mesa-${pkgver}.tar.xz{,.sig}
+#source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/mesa-${pkgver}.tar.xz{,.sig}
+source=(ftp://ftp.freedesktop.org/pub/mesa/13.0.0/mesa-13.0.0-rc2.tar.xz{,.sig}
         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)
-sha256sums=('1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1'
+        remove-libpthread-stubs.patch)
+sha256sums=('ef26031a79b915e1643b0ffe5354f8ae774cd445f12b342abac63438f9735a43'
             'SKIP'
             '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
-            'd82c329e89754266eb1538df29b94d33692a66e3b6882b2cee78f4d5aab4a39c'
-            '52eb98eb6c9c644383d9743692aea302d84c4f89cfaa7a276b9276befc2d9780'
-            '96ad07e241d16802b14b14ca3d6965fa7f4f4b8c678d62ba375291910dce3b4a')
+            '75ab53ad44b95204c788a2988e97a5cb963bdbf6072a5466949a2afb79821c8f')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com>
 
 prepare() {
@@ -31,11 +28,6 @@ prepare() {
 
   # 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
 }
@@ -49,7 +41,7 @@ build() {
     --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-vulkan-drivers=intel,radeon \
     --with-sha1=libgcrypt \
     --disable-xvmc \
     --enable-gallium-llvm \
@@ -68,7 +60,8 @@ build() {
     --enable-vdpau \
     --enable-omx \
     --enable-nine \
-    --enable-opencl --enable-opencl-icd \
+    --enable-opencl \
+    --enable-opencl-icd \
     --with-clang-libdir=/usr/lib
 
   make
@@ -80,7 +73,7 @@ build() {
 
 package_opencl-mesa-nosystemd() {
   pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers"
-  depends=('expat' 'libdrm' 'elfutils' 'libxfixes' 'libxext' 'opencl-icd-loader' 'libclc' 'clang')
+  depends=('expat' 'libdrm' 'libelf' 'libgcrypt' 'opencl-icd-loader' 'libclc' 'clang')
   provides=('opencl-mesa')
   conflicts=('opencl-mesa')
   replaces=('opencl-mesa')
@@ -99,13 +92,13 @@ package_opencl-mesa-nosystemd() {
 
 package_vulkan-intel-nosystemd() {
   pkgdesc="Intel's Vulkan mesa driver"
-  depends=('vulkan-icd-loader' 'libgcrypt' 'wayland' 'libxcb')
+  depends=('vulkan-icd-loader' 'libgcrypt' 'wayland' 'libx11' 'libxshmfence')
   provides=('vulkan-intel')
   conflicts=('vulkan-intel')
   replaces=('vulkan-intel')
-  
-  install -m755 -d ${pkgdir}/usr/share
-  mv -v ${srcdir}/fakeinstall/usr/share/vulkan ${pkgdir}/usr/share/
+
+  install -m755 -d ${pkgdir}/usr/share/vulkan/icd.d
+  mv -v ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/
 
   install -m755 -d ${pkgdir}/usr/{include/vulkan,lib}
   mv -v ${srcdir}/fakeinstall/usr/lib/libvulkan_intel.so ${pkgdir}/usr/lib/
@@ -115,12 +108,31 @@ package_vulkan-intel-nosystemd() {
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/vulkan-intel/"
 }
 
+package_vulkan-radeon-nosystemd() {
+  pkgdesc="Radeon's Vulkan mesa driver"
+  depends=('vulkan-icd-loader' 'libgcrypt' 'wayland' 'libx11' 'libxshmfence' 'libelf'
+           'libdrm' 'llvm-libs')
+  provides=('vulkan-radeon')
+  conflicts=('vulkan-radeon')
+  replaces=('vulkan-radeon')
+
+  install -m755 -d ${pkgdir}/usr/share/vulkan/icd.d
+  mv -v ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/
+
+  install -m755 -d ${pkgdir}/usr/lib
+  mv -v ${srcdir}/fakeinstall/usr/lib/libvulkan_radeon.so ${pkgdir}/usr/lib/
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/vulkan-radeon"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/vulkan-radeon/"
+}
+
 package_libva-mesa-driver-nosystemd() {
   pkgdesc="VA-API implementation for gallium"
-  depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'elfutils')
+  depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libgcrypt' 'libxshmfence')
   provides=('libva-mesa-driver')
   conflicts=('libva-mesa-driver')
   replaces=('libva-mesa-driver')
+
   install -m755 -d ${pkgdir}/usr/lib
   cp -rv ${srcdir}/fakeinstall/usr/lib/dri ${pkgdir}/usr/lib
    
@@ -130,10 +142,11 @@ package_libva-mesa-driver-nosystemd() {
 
 package_mesa-vdpau-nosystemd() {
   pkgdesc="Mesa VDPAU drivers"
-  depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'elfutils')
+  depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libgcrypt' 'libxshmfence')
   provides=('mesa-vdpau')
   conflicts=('mesa-vdpau')
   replaces=('mesa-vdpau')
+
   install -m755 -d ${pkgdir}/usr/lib
   cp -rv ${srcdir}/fakeinstall/usr/lib/vdpau ${pkgdir}/usr/lib
    
@@ -143,8 +156,8 @@ package_mesa-vdpau-nosystemd() {
 
 package_mesa-nosystemd() {
   pkgdesc="an open-source implementation of the OpenGL specification"
-  depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libudev.so' 'elfutils' 
-           'libomxil-bellagio' 'expat' 'libgcrypt' 'libtxc_dxtn' 'llvm-libs')
+  depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf' 
+           'libomxil-bellagio' 'libgcrypt' 'libtxc_dxtn' 'llvm-libs')
   optdepends=('opengl-man-pages: for the OpenGL API man pages'
               'mesa-vdpau-nosystemd: for accelerated video playback'
               'libva-mesa-driver-nosystemd: for accelerated video playback')
diff --git a/remove-libpthread-stubs.patch b/remove-libpthread-stubs.patch
index 5b44d03cc4fd..efe8aaddd097 100644
--- a/remove-libpthread-stubs.patch
+++ b/remove-libpthread-stubs.patch
@@ -1,14 +1,13 @@
-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"
+diff --git a/configure.ac b/configure.ac
+index 54416b4..8a708d3 100644
+--- a/configure.ac
++++ b/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"
+     ;;
+ * )