Date: Monday, September 5, 2016 @ 18:59:45 Author: lcarlier Revision: 188597
archrelease: copy trunk to multilib-x86_64 Added: lib32-mesa/repos/multilib-x86_64/LICENSE (from rev 188596, lib32-mesa/trunk/LICENSE) lib32-mesa/repos/multilib-x86_64/PKGBUILD (from rev 188596, lib32-mesa/trunk/PKGBUILD) lib32-mesa/repos/multilib-x86_64/remove-libpthread-stubs.patch (from rev 188596, lib32-mesa/trunk/remove-libpthread-stubs.patch) Deleted: lib32-mesa/repos/multilib-x86_64/0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch lib32-mesa/repos/multilib-x86_64/0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch lib32-mesa/repos/multilib-x86_64/0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch lib32-mesa/repos/multilib-x86_64/LICENSE lib32-mesa/repos/multilib-x86_64/PKGBUILD lib32-mesa/repos/multilib-x86_64/remove-libpthread-stubs.patch -----------------------------------------------------------+ 0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch | 17 0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch | 76 --- 0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch | 38 - LICENSE | 164 +++--- PKGBUILD | 288 +++++------- remove-libpthread-stubs.patch | 28 - 6 files changed, 234 insertions(+), 377 deletions(-) Deleted: 0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch =================================================================== --- 0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch 2016-09-05 18:59:36 UTC (rev 188596) +++ 0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch 2016-09-05 18:59:45 UTC (rev 188597) @@ -1,17 +0,0 @@ -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, Deleted: 0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch =================================================================== --- 0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch 2016-09-05 18:59:36 UTC (rev 188596) +++ 0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch 2016-09-05 18:59:45 UTC (rev 188597) @@ -1,76 +0,0 @@ -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 - Deleted: 0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch =================================================================== --- 0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch 2016-09-05 18:59:36 UTC (rev 188596) +++ 0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch 2016-09-05 18:59:45 UTC (rev 188597) @@ -1,38 +0,0 @@ -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 - Deleted: LICENSE =================================================================== --- LICENSE 2016-09-05 18:59:36 UTC (rev 188596) +++ LICENSE 2016-09-05 18:59:45 UTC (rev 188597) @@ -1,82 +0,0 @@ -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: lib32-mesa/repos/multilib-x86_64/LICENSE (from rev 188596, lib32-mesa/trunk/LICENSE) =================================================================== --- LICENSE (rev 0) +++ LICENSE 2016-09-05 18:59:45 UTC (rev 188597) @@ -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 Deleted: PKGBUILD =================================================================== --- PKGBUILD 2016-09-05 18:59:36 UTC (rev 188596) +++ PKGBUILD 2016-09-05 18:59:45 UTC (rev 188597) @@ -1,150 +0,0 @@ -# $Id$ -# Contributor: Jan de Groot <j...@archlinux.org> -# Contributor: Andreas Radke <andy...@archlinux.org> - -pkgbase=lib32-mesa -pkgname=('lib32-mesa-vdpau' 'lib32-mesa' 'lib32-mesa-libgl') -pkgver=12.0.1 -pkgrel=5 -arch=('x86_64') -makedepends=('python2-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto' - 'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'gcc-multilib' 'lib32-elfutils' 'lib32-llvm' 'lib32-systemd' - 'lib32-libvdpau' 'lib32-wayland') -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) -sha256sums=('bab24fb79f78c876073527f515ed871fc9c81d816f66c8a0b051d8d653896389' - 'SKIP' - '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' - 'd82c329e89754266eb1538df29b94d33692a66e3b6882b2cee78f4d5aab4a39c' - 'ccc8ea7f4e38f2dc26fd29150929e943aac5bc9b56bd3eddec882c6ccd1d64a5' - 'f6c17257e96182ce51b85ef75cef4f6c205b00dfbf8fc1089cd77c4a3eda6981' - 'c1b650d2b3512d5f8f463f1974a28ed6b88e7e1936c5cfe1034ab97696d1de14') -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 - patch -Np1 -i ../0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch - - autoreconf -fiv -} - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - export LLVM_CONFIG="/usr/bin/llvm-config32" - - cd ${srcdir}/?esa-* - - ./configure \ - --build=i686-pc-linux-gnu --host=i686-pc-linux-gnu \ - --libdir=/usr/lib32 \ - --prefix=/usr \ - --sysconfdir=/etc \ - --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,virgl \ - --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ - --with-egl-platforms=x11,drm,wayland \ - --enable-gallium-llvm \ - --enable-llvm-shared-libs \ - --enable-shared-glapi \ - --enable-glx-tls \ - --enable-egl \ - --enable-glx \ - --enable-gles1 \ - --enable-gles2 \ - --enable-gbm \ - --enable-dri \ - --enable-osmesa \ - --enable-texture-float \ - --enable-nine \ - --enable-vdpau - - make - - mkdir $srcdir/fakeinstall - make DESTDIR=${srcdir}/fakeinstall install -} - -package_lib32-mesa-vdpau() { - pkgdesc="Mesa VDPAU drivers (32-bit)" - depends=('lib32-libdrm' 'lib32-libx11' 'lib32-expat' 'lib32-llvm-libs' 'lib32-elfutils') - - install -m755 -d ${pkgdir}/usr/lib32 - mv -v ${srcdir}/fakeinstall/usr/lib32/vdpau ${pkgdir}/usr/lib32 - - install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau/" -} - -package_lib32-mesa() { - pkgdesc="an open-source implementation of the OpenGL specification (32-bit)" - depends=('lib32-libdrm' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-systemd' - 'lib32-elfutils' 'lib32-llvm-libs' 'lib32-wayland' 'lib32-libtxc_dxtn' 'lib32-expat' 'mesa') - optdepends=('opengl-man-pages: for the OpenGL API man pages' - 'lib32-mesa-vdpau: for accelerated video playback') - provides=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri') - conflicts=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri') - replaces=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri') - - install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri - # ati-dri, nouveay-dri, intel-dri, swrast - mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/* ${pkgdir}/usr/lib32/xorg/modules/dri - - install -m755 -d ${pkgdir}/usr/lib32 - mv -v ${srcdir}/fakeinstall/usr/lib32/d3d ${pkgdir}/usr/lib32 - mv -v ${srcdir}/fakeinstall/usr/lib32/*.so* ${pkgdir}/usr/lib32/ - - mv -v ${srcdir}/fakeinstall/usr/lib32/pkgconfig ${pkgdir}/usr/lib32/ - - install -m755 -d ${pkgdir}/usr/lib32/mesa - # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ? - mv -v ${pkgdir}/usr/lib32/libGL.so* ${pkgdir}/usr/lib32/mesa/ - mv -v ${pkgdir}/usr/lib32/libEGL.so* ${pkgdir}/usr/lib32/mesa/ - mv -v ${pkgdir}/usr/lib32/libGLES*.so* ${pkgdir}/usr/lib32/mesa/ - - install -m755 -d "${pkgdir}/usr/share/licenses" - ln -s mesa "$pkgdir/usr/share/licenses/lib32-mesa" -} - -package_lib32-mesa-libgl() { - pkgdesc="Mesa 3-D graphics library (32-bit)" - depends=('lib32-mesa') - provides=('lib32-libgl' 'lib32-libegl' 'lib32-libgles') - conflicts=('lib32-libgl' 'lib32-libegl' 'lib32-libgles') - - install -m755 -d ${pkgdir}/usr/lib32 - - ln -s /usr/lib32/mesa/libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so.1.2.0 - ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so.1 - ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so - - ln -s /usr/lib32/mesa/libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so.1.0.0 - ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so.1 - ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so - - ln -s /usr/lib32/mesa/libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so.1.1.0 - ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so.1 - ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so - - ln -s /usr/lib32/mesa/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so.2.0.0 - ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so.2 - ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so - - install -m755 -d "${pkgdir}/usr/share/licenses" - ln -s lib32-mesa "${pkgdir}/usr/share/licenses/lib32-mesa-libgl" -} Copied: lib32-mesa/repos/multilib-x86_64/PKGBUILD (from rev 188596, lib32-mesa/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2016-09-05 18:59:45 UTC (rev 188597) @@ -0,0 +1,138 @@ +# $Id$ +# Contributor: Jan de Groot <j...@archlinux.org> +# Contributor: Andreas Radke <andy...@archlinux.org> + +pkgbase=lib32-mesa +pkgname=('lib32-mesa-vdpau' 'lib32-mesa' 'lib32-mesa-libgl') +pkgver=12.0.2 +pkgrel=1 +arch=('x86_64') +makedepends=('python2-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto' + 'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'gcc-multilib' 'lib32-elfutils' 'lib32-llvm' 'lib32-systemd' + 'lib32-libvdpau' 'lib32-wayland') +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) +sha256sums=('d957a5cc371dcd7ff2aa0d87492f263aece46f79352f4520039b58b1f32552cb' + 'SKIP' + '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' + 'd82c329e89754266eb1538df29b94d33692a66e3b6882b2cee78f4d5aab4a39c') +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 + + autoreconf -fiv +} + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + export LLVM_CONFIG="/usr/bin/llvm-config32" + + cd ${srcdir}/?esa-* + + ./configure \ + --build=i686-pc-linux-gnu --host=i686-pc-linux-gnu \ + --libdir=/usr/lib32 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ + --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,virgl \ + --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ + --with-egl-platforms=x11,drm,wayland \ + --enable-gallium-llvm \ + --enable-llvm-shared-libs \ + --enable-shared-glapi \ + --enable-glx-tls \ + --enable-egl \ + --enable-glx \ + --enable-gles1 \ + --enable-gles2 \ + --enable-gbm \ + --enable-dri \ + --enable-osmesa \ + --enable-texture-float \ + --enable-nine \ + --enable-vdpau + + make + + mkdir $srcdir/fakeinstall + make DESTDIR=${srcdir}/fakeinstall install +} + +package_lib32-mesa-vdpau() { + pkgdesc="Mesa VDPAU drivers (32-bit)" + depends=('lib32-libdrm' 'lib32-libx11' 'lib32-expat' 'lib32-llvm-libs' 'lib32-elfutils') + + install -m755 -d ${pkgdir}/usr/lib32 + mv -v ${srcdir}/fakeinstall/usr/lib32/vdpau ${pkgdir}/usr/lib32 + + install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau/" +} + +package_lib32-mesa() { + pkgdesc="an open-source implementation of the OpenGL specification (32-bit)" + depends=('lib32-libdrm' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-systemd' + 'lib32-elfutils' 'lib32-llvm-libs' 'lib32-wayland' 'lib32-libtxc_dxtn' 'lib32-expat' 'mesa') + optdepends=('opengl-man-pages: for the OpenGL API man pages' + 'lib32-mesa-vdpau: for accelerated video playback') + provides=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri') + conflicts=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri') + replaces=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri') + + install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri + # ati-dri, nouveay-dri, intel-dri, swrast + mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/* ${pkgdir}/usr/lib32/xorg/modules/dri + + install -m755 -d ${pkgdir}/usr/lib32 + mv -v ${srcdir}/fakeinstall/usr/lib32/d3d ${pkgdir}/usr/lib32 + mv -v ${srcdir}/fakeinstall/usr/lib32/*.so* ${pkgdir}/usr/lib32/ + + mv -v ${srcdir}/fakeinstall/usr/lib32/pkgconfig ${pkgdir}/usr/lib32/ + + install -m755 -d ${pkgdir}/usr/lib32/mesa + # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ? + mv -v ${pkgdir}/usr/lib32/libGL.so* ${pkgdir}/usr/lib32/mesa/ + mv -v ${pkgdir}/usr/lib32/libEGL.so* ${pkgdir}/usr/lib32/mesa/ + mv -v ${pkgdir}/usr/lib32/libGLES*.so* ${pkgdir}/usr/lib32/mesa/ + + install -m755 -d "${pkgdir}/usr/share/licenses" + ln -s mesa "$pkgdir/usr/share/licenses/lib32-mesa" +} + +package_lib32-mesa-libgl() { + pkgdesc="Mesa 3-D graphics library (32-bit)" + depends=('lib32-mesa') + provides=('lib32-libgl' 'lib32-libegl' 'lib32-libgles') + conflicts=('lib32-libgl' 'lib32-libegl' 'lib32-libgles') + + install -m755 -d ${pkgdir}/usr/lib32 + + ln -s /usr/lib32/mesa/libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so.1.2.0 + ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so.1 + ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so + + ln -s /usr/lib32/mesa/libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so.1.0.0 + ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so.1 + ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so + + ln -s /usr/lib32/mesa/libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so.1.1.0 + ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so.1 + ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so + + ln -s /usr/lib32/mesa/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so.2.0.0 + ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so.2 + ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so + + install -m755 -d "${pkgdir}/usr/share/licenses" + ln -s lib32-mesa "${pkgdir}/usr/share/licenses/lib32-mesa-libgl" +} Deleted: remove-libpthread-stubs.patch =================================================================== --- remove-libpthread-stubs.patch 2016-09-05 18:59:36 UTC (rev 188596) +++ remove-libpthread-stubs.patch 2016-09-05 18:59:45 UTC (rev 188597) @@ -1,14 +0,0 @@ -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: lib32-mesa/repos/multilib-x86_64/remove-libpthread-stubs.patch (from rev 188596, lib32-mesa/trunk/remove-libpthread-stubs.patch) =================================================================== --- remove-libpthread-stubs.patch (rev 0) +++ remove-libpthread-stubs.patch 2016-09-05 18:59:45 UTC (rev 188597) @@ -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],