Date: Wednesday, August 3, 2016 @ 14:43:31 Author: lcarlier Revision: 272965
archrelease: copy trunk to testing-i686, testing-x86_64 Added: mesa/repos/testing-i686/ mesa/repos/testing-i686/0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch (from rev 272964, mesa/trunk/0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch) mesa/repos/testing-i686/0001-i965-import-prime-buffers-in-the-current-context-not.patch (from rev 272964, mesa/trunk/0001-i965-import-prime-buffers-in-the-current-context-not.patch) mesa/repos/testing-i686/0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch (from rev 272964, mesa/trunk/0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch) mesa/repos/testing-i686/0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch (from rev 272964, mesa/trunk/0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch) mesa/repos/testing-i686/LICENSE (from rev 272964, mesa/trunk/LICENSE) mesa/repos/testing-i686/PKGBUILD (from rev 272964, mesa/trunk/PKGBUILD) mesa/repos/testing-i686/remove-libpthread-stubs.patch (from rev 272964, mesa/trunk/remove-libpthread-stubs.patch) mesa/repos/testing-x86_64/ mesa/repos/testing-x86_64/0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch (from rev 272964, mesa/trunk/0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch) mesa/repos/testing-x86_64/0001-i965-import-prime-buffers-in-the-current-context-not.patch (from rev 272964, mesa/trunk/0001-i965-import-prime-buffers-in-the-current-context-not.patch) mesa/repos/testing-x86_64/0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch (from rev 272964, mesa/trunk/0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch) mesa/repos/testing-x86_64/0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch (from rev 272964, mesa/trunk/0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch) mesa/repos/testing-x86_64/LICENSE (from rev 272964, mesa/trunk/LICENSE) mesa/repos/testing-x86_64/PKGBUILD (from rev 272964, mesa/trunk/PKGBUILD) mesa/repos/testing-x86_64/remove-libpthread-stubs.patch (from rev 272964, mesa/trunk/remove-libpthread-stubs.patch) --------------------------------------------------------------------------------+ testing-i686/0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch | 17 testing-i686/0001-i965-import-prime-buffers-in-the-current-context-not.patch | 66 +++ testing-i686/0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch | 76 +++ testing-i686/0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch | 38 + testing-i686/LICENSE | 82 +++ testing-i686/PKGBUILD | 208 ++++++++++ testing-i686/remove-libpthread-stubs.patch | 14 testing-x86_64/0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch | 17 testing-x86_64/0001-i965-import-prime-buffers-in-the-current-context-not.patch | 66 +++ testing-x86_64/0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch | 76 +++ testing-x86_64/0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch | 38 + testing-x86_64/LICENSE | 82 +++ testing-x86_64/PKGBUILD | 208 ++++++++++ testing-x86_64/remove-libpthread-stubs.patch | 14 14 files changed, 1002 insertions(+) Copied: mesa/repos/testing-i686/0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch (from rev 272964, mesa/trunk/0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch) =================================================================== --- testing-i686/0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch (rev 0) +++ testing-i686/0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch 2016-08-03 14:43:31 UTC (rev 272965) @@ -0,0 +1,17 @@ +diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +index 7564119..38e2c4a 100644 +--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp ++++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +@@ -6058,7 +6058,11 @@ st_translate_program( + inputSemanticName[i], inputSemanticIndex[i], + interpMode[i], 0, interpLocation[i], + array_id, array_size); +- i += array_size - 1; ++ ++ GLuint base_attr = inputSlotToAttr[i]; ++ while (i + 1 < numInputs && ++ inputSlotToAttr[i + 1] < base_attr + array_size) ++ ++i; + } + else { + t->inputs[i] = ureg_DECL_fs_input_cyl_centroid(ureg, Copied: mesa/repos/testing-i686/0001-i965-import-prime-buffers-in-the-current-context-not.patch (from rev 272964, mesa/trunk/0001-i965-import-prime-buffers-in-the-current-context-not.patch) =================================================================== --- testing-i686/0001-i965-import-prime-buffers-in-the-current-context-not.patch (rev 0) +++ testing-i686/0001-i965-import-prime-buffers-in-the-current-context-not.patch 2016-08-03 14:43:31 UTC (rev 272965) @@ -0,0 +1,66 @@ +From e180e9e3c830d3611a6cf7d32e988b4c28d20942 Mon Sep 17 00:00:00 2001 +From: Martin Peres <martin.pe...@linux.intel.com> +Date: Wed, 3 Aug 2016 12:58:23 +0300 +Subject: [PATCH] i965: import prime buffers in the current context, not screen + +This 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 + +Cc: mesa-sta...@lists.freedesktop.org +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71759 +Signed-off-by: Martin Peres <martin.pe...@linux.intel.com> +--- + src/mesa/drivers/dri/i965/intel_screen.c | 25 +++++++++++++++++++++++-- + 1 file changed, 23 insertions(+), 2 deletions(-) + +diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c +index ae51c40..169d578 100644 +--- a/src/mesa/drivers/dri/i965/intel_screen.c ++++ b/src/mesa/drivers/dri/i965/intel_screen.c +@@ -702,8 +702,11 @@ intel_create_image_from_fds(__DRIscreen *screen, + int *fds, int num_fds, int *strides, int *offsets, + void *loaderPrivate) + { ++ GET_CURRENT_CONTEXT(ctx); + struct intel_screen *intelScreen = screen->driverPrivate; ++ struct brw_context *brw = brw_context(ctx); + struct intel_image_format *f; ++ dri_bufmgr *bufmgr; + __DRIimage *image; + int i, index; + +@@ -744,8 +747,26 @@ intel_create_image_from_fds(__DRIscreen *screen, + size = end; + } + +- image->bo = drm_intel_bo_gem_create_from_prime(intelScreen->bufmgr, +- fds[0], size); ++ /* Let's import the buffer into the current context instead of the current ++ * screen as some applications like gstreamer, totem, or obs create multiple ++ * X connections which end up creating multiple screens and thus multiple ++ * buffer managers. They then proceed to use a different X connection than ++ * the one used by the currently-bound context to call GLXBindTexImageExt() ++ * which should then import the buffer in the current bound context and not ++ * the current screen. This is done properly upstairs for texture management ++ * so we need to mirror this behaviour if we don't want the kernel rejecting ++ * our pushbuffers as the buffer would not have been imported by the same ++ * buffer manager that sent the pushbuffer referencing it. ++ * ++ * If there is no context currently bound, then revert to using the screen's ++ * buffer manager and hope for the best... ++ */ ++ if (brw) ++ bufmgr = brw->bufmgr; ++ else ++ bufmgr = intelScreen->bufmgr; ++ ++ image->bo = drm_intel_bo_gem_create_from_prime(bufmgr, fds[0], size); + if (image->bo == NULL) { + free(image); + return NULL; +-- +2.9.0 + Copied: mesa/repos/testing-i686/0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch (from rev 272964, mesa/trunk/0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch) =================================================================== --- testing-i686/0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch (rev 0) +++ testing-i686/0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch 2016-08-03 14:43:31 UTC (rev 272965) @@ -0,0 +1,76 @@ +From 9ce52baf7f479d506bcea17a371dcf2fad92f139 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koe...@amd.com> +Date: Wed, 13 Jul 2016 14:54:31 +0200 +Subject: [PATCH] st/mesa: fix reference counting bug in st_vdpau +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Otherwise we leak the resources created for the DMA-buf descriptors. + +Signed-off-by: Christian König <christian.koe...@amd.com> +Cc: 12.0 <mesa-sta...@lists.freedesktop.org> +Tested-and-Reviewed by: Leo Liu <leo....@amd.com> +Ack-by: Tom St Denis <tom.stde...@amd.com> +--- + src/mesa/state_tracker/st_vdpau.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/mesa/state_tracker/st_vdpau.c b/src/mesa/state_tracker/st_vdpau.c +index dffa52f..4f599dd 100644 +--- a/src/mesa/state_tracker/st_vdpau.c ++++ b/src/mesa/state_tracker/st_vdpau.c +@@ -65,6 +65,7 @@ st_vdpau_video_surface_gallium(struct gl_context *ctx, const void *vdpSurface, + + struct pipe_video_buffer *buffer; + struct pipe_sampler_view **samplers; ++ struct pipe_resource *res = NULL; + + getProcAddr = (void *)ctx->vdpGetProcAddress; + if (getProcAddr(device, VDP_FUNC_ID_VIDEO_SURFACE_GALLIUM, (void**)&f)) +@@ -82,7 +83,8 @@ st_vdpau_video_surface_gallium(struct gl_context *ctx, const void *vdpSurface, + if (!sv) + return NULL; + +- return sv->texture; ++ pipe_resource_reference(&res, sv->texture); ++ return res; + } + + static struct pipe_resource * +@@ -90,13 +92,15 @@ st_vdpau_output_surface_gallium(struct gl_context *ctx, const void *vdpSurface) + { + int (*getProcAddr)(uint32_t device, uint32_t id, void **ptr); + uint32_t device = (uintptr_t)ctx->vdpDevice; ++ struct pipe_resource *res = NULL; + VdpOutputSurfaceGallium *f; + + getProcAddr = (void *)ctx->vdpGetProcAddress; + if (getProcAddr(device, VDP_FUNC_ID_OUTPUT_SURFACE_GALLIUM, (void**)&f)) + return NULL; + +- return f((uintptr_t)vdpSurface); ++ pipe_resource_reference(&res, f((uintptr_t)vdpSurface)); ++ return res; + } + + static struct pipe_resource * +@@ -208,6 +212,7 @@ st_vdpau_map_surface(struct gl_context *ctx, GLenum target, GLenum access, + /* do we have different screen objects ? */ + if (res->screen != st->pipe->screen) { + _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUMapSurfacesNV"); ++ pipe_resource_reference(&res, NULL); + return; + } + +@@ -241,6 +246,7 @@ st_vdpau_map_surface(struct gl_context *ctx, GLenum target, GLenum access, + stObj->surface_format = res->format; + + _mesa_dirty_texobj(ctx, texObj); ++ pipe_resource_reference(&res, NULL); + } + + static void +-- +2.9.0 + Copied: mesa/repos/testing-i686/0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch (from rev 272964, mesa/trunk/0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch) =================================================================== --- testing-i686/0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch (rev 0) +++ testing-i686/0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch 2016-08-03 14:43:31 UTC (rev 272965) @@ -0,0 +1,38 @@ +From 134d6e4e4f980d738361bfcae1daedb8cc58b5df Mon Sep 17 00:00:00 2001 +From: Leo Liu <leo....@amd.com> +Date: Thu, 14 Jul 2016 09:19:59 -0400 +Subject: [PATCH] vl/dri3: fix a memory leak from front buffer + +Inspired by fix for mem leak of vdpau interop, resource_from_handle +set texture reference count, that need to be decreased and released, +recall there is a similar case for DRI3, that is with VA-API glx +extension, there is temporary TFP(texture from pixmap), we target it +through dma-buf. leak happens when without count down the reference. + +Checked and found with mpv vo=opengl case, there only one static TFP, +the leak happens once, but for totem player using gstreamer VA-API glx, +the dynamic TFP for each frame, so leak quite a bit. + +This fixes mem leak for mpv and totem. + +Signed-off-by: Leo Liu <leo....@amd.com> +Cc: "12.0" <mesa-sta...@lists.freedesktop.org> +--- + src/gallium/auxiliary/vl/vl_winsys_dri3.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/gallium/auxiliary/vl/vl_winsys_dri3.c b/src/gallium/auxiliary/vl/vl_winsys_dri3.c +index f7f572e..493e645 100644 +--- a/src/gallium/auxiliary/vl/vl_winsys_dri3.c ++++ b/src/gallium/auxiliary/vl/vl_winsys_dri3.c +@@ -89,6 +89,7 @@ dri3_free_front_buffer(struct vl_dri3_screen *scrn, + { + xcb_sync_destroy_fence(scrn->conn, buffer->sync_fence); + xshmfence_unmap_shm(buffer->shm_fence); ++ pipe_resource_reference(&buffer->texture, NULL); + FREE(buffer); + } + +-- +2.9.0 + Copied: mesa/repos/testing-i686/LICENSE (from rev 272964, mesa/trunk/LICENSE) =================================================================== --- testing-i686/LICENSE (rev 0) +++ testing-i686/LICENSE 2016-08-03 14:43:31 UTC (rev 272965) @@ -0,0 +1,82 @@ +Disclaimer + +Mesa is a 3-D graphics library with an API which is very similar to +that of OpenGL* +To the extent that Mesa utilizes the OpenGL command syntax or state +machine, it is being used with authorization from Silicon Graphics, +Inc.(SGI). However, the author does not possess an OpenGL license +from SGI, and makes no claim that Mesa is in any way a compatible +replacement for OpenGL or associated with SGI. Those who want a +licensed implementation of OpenGL should contact a licensed +vendor. + +Please do not refer to the library as MesaGL (for legal +reasons). It's just Mesa or The Mesa 3-D graphics +library + +* OpenGL is a trademark of Silicon Graphics Incorporated. + +License / Copyright Information + +The Mesa distribution consists of several components. Different copyrights +and licenses apply to different components. For example, GLUT is copyrighted +by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa +device drivers are copyrighted by their authors. See below for a list of +Mesa's main components and the license for each. + +The core Mesa library is licensed according to the terms of the MIT license. +This allows integration with the XFree86, Xorg and DRI projects. + +The default Mesa license is as follows: + +Copyright (C) 1999-2007 Brian Paul All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Attention, Contributors + +When contributing to the Mesa project you must agree to the licensing terms +of the component to which you're contributing. +The following section lists the primary components of the Mesa distribution +and their respective licenses. + + +Mesa Component Licenses + +Component Location Primary Author License +---------------------------------------------------------------------------- +Main Mesa code src/mesa/ Brian Paul Mesa (MIT) + +Device drivers src/mesa/drivers/* See drivers See drivers + +Ext headers include/GL/glext.h SGI SGI Free B + include/GL/glxext.h + +GLUT src/glut/ Mark Kilgard Mark's copyright + +Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL + +SGI GLU library src/glu/sgi/ SGI SGI Free B + +demo programs progs/demos/ various see source files + +X demos progs/xdemos/ Brian Paul see source files + +SGI demos progs/samples/ SGI SGI copyright + +RedBook demos progs/redbook/ SGI SGI copyright Copied: mesa/repos/testing-i686/PKGBUILD (from rev 272964, mesa/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2016-08-03 14:43:31 UTC (rev 272965) @@ -0,0 +1,208 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Maintainer: Andreas Radke <andy...@archlinux.org> + +pkgbase=mesa +pkgname=('opencl-mesa' 'vulkan-intel' 'libva-mesa-driver' 'mesa-vdpau' 'mesa' 'mesa-libgl') +pkgver=12.0.1 +pkgrel=6 +arch=('i686' 'x86_64') +makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' + 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm' + 'systemd' '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} + LICENSE + remove-libpthread-stubs.patch + 0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch + 0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch + 0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch + 0001-i965-import-prime-buffers-in-the-current-context-not.patch) +sha256sums=('bab24fb79f78c876073527f515ed871fc9c81d816f66c8a0b051d8d653896389' + 'SKIP' + '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' + 'd82c329e89754266eb1538df29b94d33692a66e3b6882b2cee78f4d5aab4a39c' + 'ccc8ea7f4e38f2dc26fd29150929e943aac5bc9b56bd3eddec882c6ccd1d64a5' + 'f6c17257e96182ce51b85ef75cef4f6c205b00dfbf8fc1089cd77c4a3eda6981' + 'c1b650d2b3512d5f8f463f1974a28ed6b88e7e1936c5cfe1034ab97696d1de14' + '6d6159b9080d75f653dbd43284b5138264612a7f4b895c37859f984d1ea2246d') +validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.veli...@gmail.com> + +prepare() { + cd ${srcdir}/?esa-* + + # Now mesa checks for libpthread-stubs - so remove the check + patch -Np1 -i ../remove-libpthread-stubs.patch + + # fix memory leaks - merged upstream + patch -Np1 -i ../0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch + patch -Np1 -i ../0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch + # fix rendering in overlord series games - merged upstream + patch -Np1 -i ../0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch + # fix https://bugs.freedesktop.org/show_bug.cgi?id=71759 / FS#50240 + patch -Np1 -i ../0001-i965-import-prime-buffers-in-the-current-context-not.patch + + autoreconf -fiv +} + +build() { + cd ${srcdir}/?esa-* + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-dri-driverdir=/usr/lib/xorg/modules/dri \ + --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-gallium-llvm \ + --enable-llvm-shared-libs \ + --enable-shared-glapi \ + --enable-egl \ + --enable-glx \ + --enable-glx-tls \ + --enable-gles1 \ + --enable-gles2 \ + --enable-gbm \ + --enable-dri \ + --enable-osmesa \ + --enable-texture-float \ + --enable-xa \ + --enable-vdpau \ + --enable-omx \ + --enable-nine \ + --enable-opencl --enable-opencl-icd \ + --with-clang-libdir=/usr/lib + + make + + # fake installation + mkdir $srcdir/fakeinstall + make DESTDIR=${srcdir}/fakeinstall install +} + +package_opencl-mesa() { + pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers" + depends=('expat' 'libdrm' 'elfutils' 'libxfixes' 'libxext' 'opencl-icd-loader' 'libclc' 'clang') + optdepends=('opencl-headers: headers necessary for OpenCL development') + + install -m755 -d ${pkgdir}/etc + cp -rv ${srcdir}/fakeinstall/etc/OpenCL ${pkgdir}/etc/ + + install -m755 -d ${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 + 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/" +} + +package_mesa-vdpau() { + pkgdesc="Mesa VDPAU drivers" + depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'elfutils') + + install -m755 -d ${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/" +} + +package_mesa() { + pkgdesc="an open-source implementation of the OpenGL specification" + depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'systemd' 'elfutils' + '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') + 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 + 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 + cp -av ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/* ${pkgdir}/usr/lib/xorg/modules/dri + + 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 ? + 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/" +} + +package_mesa-libgl() { + pkgdesc="Mesa 3-D graphics library" + depends=('mesa') + provides=('libgl' 'libgles' 'libegl') + conflicts=('libgl' 'libgles' 'libegl') + + # See FS#26284 + install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions" + ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" + + ln -s /usr/lib/mesa/libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1.2.0 + ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1 + ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so + + ln -s /usr/lib/mesa/libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1.0.0 + ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1 + ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so + + ln -s /usr/lib/mesa/libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0 + ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1 + ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so + + ln -s /usr/lib/mesa/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2.0.0 + ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2 + ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so + + install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/" +} Copied: mesa/repos/testing-i686/remove-libpthread-stubs.patch (from rev 272964, mesa/trunk/remove-libpthread-stubs.patch) =================================================================== --- testing-i686/remove-libpthread-stubs.patch (rev 0) +++ testing-i686/remove-libpthread-stubs.patch 2016-08-03 14:43:31 UTC (rev 272965) @@ -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], Copied: mesa/repos/testing-x86_64/0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch (from rev 272964, mesa/trunk/0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch) =================================================================== --- testing-x86_64/0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch (rev 0) +++ testing-x86_64/0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch 2016-08-03 14:43:31 UTC (rev 272965) @@ -0,0 +1,17 @@ +diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +index 7564119..38e2c4a 100644 +--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp ++++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +@@ -6058,7 +6058,11 @@ st_translate_program( + inputSemanticName[i], inputSemanticIndex[i], + interpMode[i], 0, interpLocation[i], + array_id, array_size); +- i += array_size - 1; ++ ++ GLuint base_attr = inputSlotToAttr[i]; ++ while (i + 1 < numInputs && ++ inputSlotToAttr[i + 1] < base_attr + array_size) ++ ++i; + } + else { + t->inputs[i] = ureg_DECL_fs_input_cyl_centroid(ureg, Copied: mesa/repos/testing-x86_64/0001-i965-import-prime-buffers-in-the-current-context-not.patch (from rev 272964, mesa/trunk/0001-i965-import-prime-buffers-in-the-current-context-not.patch) =================================================================== --- testing-x86_64/0001-i965-import-prime-buffers-in-the-current-context-not.patch (rev 0) +++ testing-x86_64/0001-i965-import-prime-buffers-in-the-current-context-not.patch 2016-08-03 14:43:31 UTC (rev 272965) @@ -0,0 +1,66 @@ +From e180e9e3c830d3611a6cf7d32e988b4c28d20942 Mon Sep 17 00:00:00 2001 +From: Martin Peres <martin.pe...@linux.intel.com> +Date: Wed, 3 Aug 2016 12:58:23 +0300 +Subject: [PATCH] i965: import prime buffers in the current context, not screen + +This 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 + +Cc: mesa-sta...@lists.freedesktop.org +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71759 +Signed-off-by: Martin Peres <martin.pe...@linux.intel.com> +--- + src/mesa/drivers/dri/i965/intel_screen.c | 25 +++++++++++++++++++++++-- + 1 file changed, 23 insertions(+), 2 deletions(-) + +diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c +index ae51c40..169d578 100644 +--- a/src/mesa/drivers/dri/i965/intel_screen.c ++++ b/src/mesa/drivers/dri/i965/intel_screen.c +@@ -702,8 +702,11 @@ intel_create_image_from_fds(__DRIscreen *screen, + int *fds, int num_fds, int *strides, int *offsets, + void *loaderPrivate) + { ++ GET_CURRENT_CONTEXT(ctx); + struct intel_screen *intelScreen = screen->driverPrivate; ++ struct brw_context *brw = brw_context(ctx); + struct intel_image_format *f; ++ dri_bufmgr *bufmgr; + __DRIimage *image; + int i, index; + +@@ -744,8 +747,26 @@ intel_create_image_from_fds(__DRIscreen *screen, + size = end; + } + +- image->bo = drm_intel_bo_gem_create_from_prime(intelScreen->bufmgr, +- fds[0], size); ++ /* Let's import the buffer into the current context instead of the current ++ * screen as some applications like gstreamer, totem, or obs create multiple ++ * X connections which end up creating multiple screens and thus multiple ++ * buffer managers. They then proceed to use a different X connection than ++ * the one used by the currently-bound context to call GLXBindTexImageExt() ++ * which should then import the buffer in the current bound context and not ++ * the current screen. This is done properly upstairs for texture management ++ * so we need to mirror this behaviour if we don't want the kernel rejecting ++ * our pushbuffers as the buffer would not have been imported by the same ++ * buffer manager that sent the pushbuffer referencing it. ++ * ++ * If there is no context currently bound, then revert to using the screen's ++ * buffer manager and hope for the best... ++ */ ++ if (brw) ++ bufmgr = brw->bufmgr; ++ else ++ bufmgr = intelScreen->bufmgr; ++ ++ image->bo = drm_intel_bo_gem_create_from_prime(bufmgr, fds[0], size); + if (image->bo == NULL) { + free(image); + return NULL; +-- +2.9.0 + Copied: mesa/repos/testing-x86_64/0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch (from rev 272964, mesa/trunk/0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch) =================================================================== --- testing-x86_64/0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch (rev 0) +++ testing-x86_64/0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch 2016-08-03 14:43:31 UTC (rev 272965) @@ -0,0 +1,76 @@ +From 9ce52baf7f479d506bcea17a371dcf2fad92f139 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koe...@amd.com> +Date: Wed, 13 Jul 2016 14:54:31 +0200 +Subject: [PATCH] st/mesa: fix reference counting bug in st_vdpau +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Otherwise we leak the resources created for the DMA-buf descriptors. + +Signed-off-by: Christian König <christian.koe...@amd.com> +Cc: 12.0 <mesa-sta...@lists.freedesktop.org> +Tested-and-Reviewed by: Leo Liu <leo....@amd.com> +Ack-by: Tom St Denis <tom.stde...@amd.com> +--- + src/mesa/state_tracker/st_vdpau.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/mesa/state_tracker/st_vdpau.c b/src/mesa/state_tracker/st_vdpau.c +index dffa52f..4f599dd 100644 +--- a/src/mesa/state_tracker/st_vdpau.c ++++ b/src/mesa/state_tracker/st_vdpau.c +@@ -65,6 +65,7 @@ st_vdpau_video_surface_gallium(struct gl_context *ctx, const void *vdpSurface, + + struct pipe_video_buffer *buffer; + struct pipe_sampler_view **samplers; ++ struct pipe_resource *res = NULL; + + getProcAddr = (void *)ctx->vdpGetProcAddress; + if (getProcAddr(device, VDP_FUNC_ID_VIDEO_SURFACE_GALLIUM, (void**)&f)) +@@ -82,7 +83,8 @@ st_vdpau_video_surface_gallium(struct gl_context *ctx, const void *vdpSurface, + if (!sv) + return NULL; + +- return sv->texture; ++ pipe_resource_reference(&res, sv->texture); ++ return res; + } + + static struct pipe_resource * +@@ -90,13 +92,15 @@ st_vdpau_output_surface_gallium(struct gl_context *ctx, const void *vdpSurface) + { + int (*getProcAddr)(uint32_t device, uint32_t id, void **ptr); + uint32_t device = (uintptr_t)ctx->vdpDevice; ++ struct pipe_resource *res = NULL; + VdpOutputSurfaceGallium *f; + + getProcAddr = (void *)ctx->vdpGetProcAddress; + if (getProcAddr(device, VDP_FUNC_ID_OUTPUT_SURFACE_GALLIUM, (void**)&f)) + return NULL; + +- return f((uintptr_t)vdpSurface); ++ pipe_resource_reference(&res, f((uintptr_t)vdpSurface)); ++ return res; + } + + static struct pipe_resource * +@@ -208,6 +212,7 @@ st_vdpau_map_surface(struct gl_context *ctx, GLenum target, GLenum access, + /* do we have different screen objects ? */ + if (res->screen != st->pipe->screen) { + _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUMapSurfacesNV"); ++ pipe_resource_reference(&res, NULL); + return; + } + +@@ -241,6 +246,7 @@ st_vdpau_map_surface(struct gl_context *ctx, GLenum target, GLenum access, + stObj->surface_format = res->format; + + _mesa_dirty_texobj(ctx, texObj); ++ pipe_resource_reference(&res, NULL); + } + + static void +-- +2.9.0 + Copied: mesa/repos/testing-x86_64/0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch (from rev 272964, mesa/trunk/0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch) =================================================================== --- testing-x86_64/0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch (rev 0) +++ testing-x86_64/0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch 2016-08-03 14:43:31 UTC (rev 272965) @@ -0,0 +1,38 @@ +From 134d6e4e4f980d738361bfcae1daedb8cc58b5df Mon Sep 17 00:00:00 2001 +From: Leo Liu <leo....@amd.com> +Date: Thu, 14 Jul 2016 09:19:59 -0400 +Subject: [PATCH] vl/dri3: fix a memory leak from front buffer + +Inspired by fix for mem leak of vdpau interop, resource_from_handle +set texture reference count, that need to be decreased and released, +recall there is a similar case for DRI3, that is with VA-API glx +extension, there is temporary TFP(texture from pixmap), we target it +through dma-buf. leak happens when without count down the reference. + +Checked and found with mpv vo=opengl case, there only one static TFP, +the leak happens once, but for totem player using gstreamer VA-API glx, +the dynamic TFP for each frame, so leak quite a bit. + +This fixes mem leak for mpv and totem. + +Signed-off-by: Leo Liu <leo....@amd.com> +Cc: "12.0" <mesa-sta...@lists.freedesktop.org> +--- + src/gallium/auxiliary/vl/vl_winsys_dri3.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/gallium/auxiliary/vl/vl_winsys_dri3.c b/src/gallium/auxiliary/vl/vl_winsys_dri3.c +index f7f572e..493e645 100644 +--- a/src/gallium/auxiliary/vl/vl_winsys_dri3.c ++++ b/src/gallium/auxiliary/vl/vl_winsys_dri3.c +@@ -89,6 +89,7 @@ dri3_free_front_buffer(struct vl_dri3_screen *scrn, + { + xcb_sync_destroy_fence(scrn->conn, buffer->sync_fence); + xshmfence_unmap_shm(buffer->shm_fence); ++ pipe_resource_reference(&buffer->texture, NULL); + FREE(buffer); + } + +-- +2.9.0 + Copied: mesa/repos/testing-x86_64/LICENSE (from rev 272964, mesa/trunk/LICENSE) =================================================================== --- testing-x86_64/LICENSE (rev 0) +++ testing-x86_64/LICENSE 2016-08-03 14:43:31 UTC (rev 272965) @@ -0,0 +1,82 @@ +Disclaimer + +Mesa is a 3-D graphics library with an API which is very similar to +that of OpenGL* +To the extent that Mesa utilizes the OpenGL command syntax or state +machine, it is being used with authorization from Silicon Graphics, +Inc.(SGI). However, the author does not possess an OpenGL license +from SGI, and makes no claim that Mesa is in any way a compatible +replacement for OpenGL or associated with SGI. Those who want a +licensed implementation of OpenGL should contact a licensed +vendor. + +Please do not refer to the library as MesaGL (for legal +reasons). It's just Mesa or The Mesa 3-D graphics +library + +* OpenGL is a trademark of Silicon Graphics Incorporated. + +License / Copyright Information + +The Mesa distribution consists of several components. Different copyrights +and licenses apply to different components. For example, GLUT is copyrighted +by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa +device drivers are copyrighted by their authors. See below for a list of +Mesa's main components and the license for each. + +The core Mesa library is licensed according to the terms of the MIT license. +This allows integration with the XFree86, Xorg and DRI projects. + +The default Mesa license is as follows: + +Copyright (C) 1999-2007 Brian Paul All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Attention, Contributors + +When contributing to the Mesa project you must agree to the licensing terms +of the component to which you're contributing. +The following section lists the primary components of the Mesa distribution +and their respective licenses. + + +Mesa Component Licenses + +Component Location Primary Author License +---------------------------------------------------------------------------- +Main Mesa code src/mesa/ Brian Paul Mesa (MIT) + +Device drivers src/mesa/drivers/* See drivers See drivers + +Ext headers include/GL/glext.h SGI SGI Free B + include/GL/glxext.h + +GLUT src/glut/ Mark Kilgard Mark's copyright + +Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL + +SGI GLU library src/glu/sgi/ SGI SGI Free B + +demo programs progs/demos/ various see source files + +X demos progs/xdemos/ Brian Paul see source files + +SGI demos progs/samples/ SGI SGI copyright + +RedBook demos progs/redbook/ SGI SGI copyright Copied: mesa/repos/testing-x86_64/PKGBUILD (from rev 272964, mesa/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2016-08-03 14:43:31 UTC (rev 272965) @@ -0,0 +1,208 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Maintainer: Andreas Radke <andy...@archlinux.org> + +pkgbase=mesa +pkgname=('opencl-mesa' 'vulkan-intel' 'libva-mesa-driver' 'mesa-vdpau' 'mesa' 'mesa-libgl') +pkgver=12.0.1 +pkgrel=6 +arch=('i686' 'x86_64') +makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' + 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm' + 'systemd' '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} + LICENSE + remove-libpthread-stubs.patch + 0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch + 0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch + 0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch + 0001-i965-import-prime-buffers-in-the-current-context-not.patch) +sha256sums=('bab24fb79f78c876073527f515ed871fc9c81d816f66c8a0b051d8d653896389' + 'SKIP' + '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' + 'd82c329e89754266eb1538df29b94d33692a66e3b6882b2cee78f4d5aab4a39c' + 'ccc8ea7f4e38f2dc26fd29150929e943aac5bc9b56bd3eddec882c6ccd1d64a5' + 'f6c17257e96182ce51b85ef75cef4f6c205b00dfbf8fc1089cd77c4a3eda6981' + 'c1b650d2b3512d5f8f463f1974a28ed6b88e7e1936c5cfe1034ab97696d1de14' + '6d6159b9080d75f653dbd43284b5138264612a7f4b895c37859f984d1ea2246d') +validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.veli...@gmail.com> + +prepare() { + cd ${srcdir}/?esa-* + + # Now mesa checks for libpthread-stubs - so remove the check + patch -Np1 -i ../remove-libpthread-stubs.patch + + # fix memory leaks - merged upstream + patch -Np1 -i ../0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch + patch -Np1 -i ../0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch + # fix rendering in overlord series games - merged upstream + patch -Np1 -i ../0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch + # fix https://bugs.freedesktop.org/show_bug.cgi?id=71759 / FS#50240 + patch -Np1 -i ../0001-i965-import-prime-buffers-in-the-current-context-not.patch + + autoreconf -fiv +} + +build() { + cd ${srcdir}/?esa-* + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-dri-driverdir=/usr/lib/xorg/modules/dri \ + --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-gallium-llvm \ + --enable-llvm-shared-libs \ + --enable-shared-glapi \ + --enable-egl \ + --enable-glx \ + --enable-glx-tls \ + --enable-gles1 \ + --enable-gles2 \ + --enable-gbm \ + --enable-dri \ + --enable-osmesa \ + --enable-texture-float \ + --enable-xa \ + --enable-vdpau \ + --enable-omx \ + --enable-nine \ + --enable-opencl --enable-opencl-icd \ + --with-clang-libdir=/usr/lib + + make + + # fake installation + mkdir $srcdir/fakeinstall + make DESTDIR=${srcdir}/fakeinstall install +} + +package_opencl-mesa() { + pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers" + depends=('expat' 'libdrm' 'elfutils' 'libxfixes' 'libxext' 'opencl-icd-loader' 'libclc' 'clang') + optdepends=('opencl-headers: headers necessary for OpenCL development') + + install -m755 -d ${pkgdir}/etc + cp -rv ${srcdir}/fakeinstall/etc/OpenCL ${pkgdir}/etc/ + + install -m755 -d ${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 + 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/" +} + +package_mesa-vdpau() { + pkgdesc="Mesa VDPAU drivers" + depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'elfutils') + + install -m755 -d ${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/" +} + +package_mesa() { + pkgdesc="an open-source implementation of the OpenGL specification" + depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'systemd' 'elfutils' + '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') + 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 + 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 + cp -av ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/* ${pkgdir}/usr/lib/xorg/modules/dri + + 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 ? + 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/" +} + +package_mesa-libgl() { + pkgdesc="Mesa 3-D graphics library" + depends=('mesa') + provides=('libgl' 'libgles' 'libegl') + conflicts=('libgl' 'libgles' 'libegl') + + # See FS#26284 + install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions" + ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" + + ln -s /usr/lib/mesa/libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1.2.0 + ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1 + ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so + + ln -s /usr/lib/mesa/libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1.0.0 + ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1 + ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so + + ln -s /usr/lib/mesa/libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0 + ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1 + ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so + + ln -s /usr/lib/mesa/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2.0.0 + ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2 + ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so + + install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/" +} Copied: mesa/repos/testing-x86_64/remove-libpthread-stubs.patch (from rev 272964, mesa/trunk/remove-libpthread-stubs.patch) =================================================================== --- testing-x86_64/remove-libpthread-stubs.patch (rev 0) +++ testing-x86_64/remove-libpthread-stubs.patch 2016-08-03 14:43:31 UTC (rev 272965) @@ -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],