Date: Friday, September 8, 2017 @ 08:57:52 Author: lcarlier Revision: 305040
archrelease: copy trunk to testing-i686, testing-x86_64 Added: mesa/repos/testing-i686/0001-Fix-linkage-against-shared-glapi.patch (from rev 305039, mesa/trunk/0001-Fix-linkage-against-shared-glapi.patch) mesa/repos/testing-i686/0002-glvnd-fix-gl-dot-pc.patch (from rev 305039, mesa/trunk/0002-glvnd-fix-gl-dot-pc.patch) mesa/repos/testing-i686/LICENSE (from rev 305039, mesa/trunk/LICENSE) mesa/repos/testing-i686/PKGBUILD (from rev 305039, mesa/trunk/PKGBUILD) mesa/repos/testing-i686/glibc_dropped_xlocale.h.diff (from rev 305039, mesa/trunk/glibc_dropped_xlocale.h.diff) mesa/repos/testing-x86_64/0001-Fix-linkage-against-shared-glapi.patch (from rev 305039, mesa/trunk/0001-Fix-linkage-against-shared-glapi.patch) mesa/repos/testing-x86_64/0002-glvnd-fix-gl-dot-pc.patch (from rev 305039, mesa/trunk/0002-glvnd-fix-gl-dot-pc.patch) mesa/repos/testing-x86_64/LICENSE (from rev 305039, mesa/trunk/LICENSE) mesa/repos/testing-x86_64/PKGBUILD (from rev 305039, mesa/trunk/PKGBUILD) mesa/repos/testing-x86_64/glibc_dropped_xlocale.h.diff (from rev 305039, mesa/trunk/glibc_dropped_xlocale.h.diff) Deleted: mesa/repos/testing-i686/0001-Fix-linkage-against-shared-glapi.patch mesa/repos/testing-i686/0002-glvnd-fix-gl-dot-pc.patch mesa/repos/testing-i686/LICENSE mesa/repos/testing-i686/PKGBUILD mesa/repos/testing-i686/glibc_dropped_xlocale.h.diff mesa/repos/testing-x86_64/0001-Fix-linkage-against-shared-glapi.patch mesa/repos/testing-x86_64/0002-glvnd-fix-gl-dot-pc.patch mesa/repos/testing-x86_64/LICENSE mesa/repos/testing-x86_64/PKGBUILD mesa/repos/testing-x86_64/glibc_dropped_xlocale.h.diff ------------------------------------------------------------+ /0001-Fix-linkage-against-shared-glapi.patch | 52 + /0002-glvnd-fix-gl-dot-pc.patch | 24 /LICENSE | 164 ++++ /PKGBUILD | 396 +++++++++++ /glibc_dropped_xlocale.h.diff | 286 +++++++ testing-i686/0001-Fix-linkage-against-shared-glapi.patch | 26 testing-i686/0002-glvnd-fix-gl-dot-pc.patch | 12 testing-i686/LICENSE | 82 -- testing-i686/PKGBUILD | 198 ----- testing-i686/glibc_dropped_xlocale.h.diff | 143 --- testing-x86_64/0001-Fix-linkage-against-shared-glapi.patch | 26 testing-x86_64/0002-glvnd-fix-gl-dot-pc.patch | 12 testing-x86_64/LICENSE | 82 -- testing-x86_64/PKGBUILD | 198 ----- testing-x86_64/glibc_dropped_xlocale.h.diff | 143 --- 15 files changed, 922 insertions(+), 922 deletions(-) Deleted: testing-i686/0001-Fix-linkage-against-shared-glapi.patch =================================================================== --- testing-i686/0001-Fix-linkage-against-shared-glapi.patch 2017-09-08 08:57:41 UTC (rev 305039) +++ testing-i686/0001-Fix-linkage-against-shared-glapi.patch 2017-09-08 08:57:52 UTC (rev 305040) @@ -1,26 +0,0 @@ -From 1b5a187c3c31513ae39cd2a917a3234c2c5f87fc Mon Sep 17 00:00:00 2001 -From: Adam Jackson <a...@redhat.com> -Date: Wed, 12 Oct 2016 13:41:33 -0400 -Subject: [PATCH] Fix linkage against shared glapi - -Signed-off-by: Adam Jackson <a...@redhat.com> ---- - src/gallium/targets/osmesa/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am -index 5d39486..04add87 100644 ---- a/src/gallium/targets/osmesa/Makefile.am -+++ b/src/gallium/targets/osmesa/Makefile.am -@@ -63,7 +63,7 @@ lib@OSMESA_LIB@_la_LIBADD = \ - $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ - $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \ - $(top_builddir)/src/gallium/state_trackers/osmesa/libosmesa.la \ -- $(top_builddir)/src/mapi/glapi/libglapi.la \ -+ $(top_builddir)/src/mapi/shared-glapi/libglapi.la \ - $(SHARED_GLAPI_LIB) \ - $(OSMESA_LIB_DEPS) \ - $(CLOCK_LIB) --- -2.9.3 - Copied: mesa/repos/testing-i686/0001-Fix-linkage-against-shared-glapi.patch (from rev 305039, mesa/trunk/0001-Fix-linkage-against-shared-glapi.patch) =================================================================== --- testing-i686/0001-Fix-linkage-against-shared-glapi.patch (rev 0) +++ testing-i686/0001-Fix-linkage-against-shared-glapi.patch 2017-09-08 08:57:52 UTC (rev 305040) @@ -0,0 +1,26 @@ +From 1b5a187c3c31513ae39cd2a917a3234c2c5f87fc Mon Sep 17 00:00:00 2001 +From: Adam Jackson <a...@redhat.com> +Date: Wed, 12 Oct 2016 13:41:33 -0400 +Subject: [PATCH] Fix linkage against shared glapi + +Signed-off-by: Adam Jackson <a...@redhat.com> +--- + src/gallium/targets/osmesa/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am +index 5d39486..04add87 100644 +--- a/src/gallium/targets/osmesa/Makefile.am ++++ b/src/gallium/targets/osmesa/Makefile.am +@@ -63,7 +63,7 @@ lib@OSMESA_LIB@_la_LIBADD = \ + $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ + $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \ + $(top_builddir)/src/gallium/state_trackers/osmesa/libosmesa.la \ +- $(top_builddir)/src/mapi/glapi/libglapi.la \ ++ $(top_builddir)/src/mapi/shared-glapi/libglapi.la \ + $(SHARED_GLAPI_LIB) \ + $(OSMESA_LIB_DEPS) \ + $(CLOCK_LIB) +-- +2.9.3 + Deleted: testing-i686/0002-glvnd-fix-gl-dot-pc.patch =================================================================== --- testing-i686/0002-glvnd-fix-gl-dot-pc.patch 2017-09-08 08:57:41 UTC (rev 305039) +++ testing-i686/0002-glvnd-fix-gl-dot-pc.patch 2017-09-08 08:57:52 UTC (rev 305040) @@ -1,12 +0,0 @@ -diff -up mesa-12.0.3/src/mesa/gl.pc.in.jx mesa-12.0.3/src/mesa/gl.pc.in ---- mesa-12.0.3/src/mesa/gl.pc.in.jx 2016-01-18 02:39:26.000000000 -0500 -+++ mesa-12.0.3/src/mesa/gl.pc.in 2016-10-25 13:06:44.013159358 -0400 -@@ -7,7 +7,7 @@ Name: gl - Description: Mesa OpenGL library - Requires.private: @GL_PC_REQ_PRIV@ - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -l@GL_LIB@ -+Libs: -L${libdir} -lGL - Libs.private: @GL_PC_LIB_PRIV@ - Cflags: -I${includedir} @GL_PC_CFLAGS@ - glx_tls: @GLX_TLS@ Copied: mesa/repos/testing-i686/0002-glvnd-fix-gl-dot-pc.patch (from rev 305039, mesa/trunk/0002-glvnd-fix-gl-dot-pc.patch) =================================================================== --- testing-i686/0002-glvnd-fix-gl-dot-pc.patch (rev 0) +++ testing-i686/0002-glvnd-fix-gl-dot-pc.patch 2017-09-08 08:57:52 UTC (rev 305040) @@ -0,0 +1,12 @@ +diff -up mesa-12.0.3/src/mesa/gl.pc.in.jx mesa-12.0.3/src/mesa/gl.pc.in +--- mesa-12.0.3/src/mesa/gl.pc.in.jx 2016-01-18 02:39:26.000000000 -0500 ++++ mesa-12.0.3/src/mesa/gl.pc.in 2016-10-25 13:06:44.013159358 -0400 +@@ -7,7 +7,7 @@ Name: gl + Description: Mesa OpenGL library + Requires.private: @GL_PC_REQ_PRIV@ + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -l@GL_LIB@ ++Libs: -L${libdir} -lGL + Libs.private: @GL_PC_LIB_PRIV@ + Cflags: -I${includedir} @GL_PC_CFLAGS@ + glx_tls: @GLX_TLS@ Deleted: testing-i686/LICENSE =================================================================== --- testing-i686/LICENSE 2017-09-08 08:57:41 UTC (rev 305039) +++ testing-i686/LICENSE 2017-09-08 08:57:52 UTC (rev 305040) @@ -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: mesa/repos/testing-i686/LICENSE (from rev 305039, mesa/trunk/LICENSE) =================================================================== --- testing-i686/LICENSE (rev 0) +++ testing-i686/LICENSE 2017-09-08 08:57:52 UTC (rev 305040) @@ -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: testing-i686/PKGBUILD =================================================================== --- testing-i686/PKGBUILD 2017-09-08 08:57:41 UTC (rev 305039) +++ testing-i686/PKGBUILD 2017-09-08 08:57:52 UTC (rev 305040) @@ -1,198 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> -# Maintainer: Andreas Radke <andy...@archlinux.org> - -pkgbase=mesa -pkgname=('opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa') -pkgver=17.2.0 -pkgrel=1 -arch=('i686' 'x86_64') -makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' - 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' - 'elfutils' 'llvm' 'libomxil-bellagio' 'libclc' 'clang' 'libglvnd' 'libunwind' 'lm_sensors') -url="https://www.mesa3d.org/" -license=('custom') -source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig} - LICENSE - 0002-glvnd-fix-gl-dot-pc.patch - glibc_dropped_xlocale.h.diff) -sha256sums=('3123448f770eae58bc73e15480e78909defb892f10ab777e9116c9b218094943' - 'SKIP' - '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' - '64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966' - '6de2adc3dde36d098bfe9977f5052c13e1b2e80a913e4c83d520b2e5349ddbd0') -validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.veli...@gmail.com> -validpgpkeys+=('946D09B5E4C9845E63075FF1D961C596A7203456') # Andres Gomez <ta...@igalia.com> -validpgpkeys+=('E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio Suárez Romero (Igalia, S.L.) <jasua...@igalia.com>" - -prepare() { - cd ${srcdir}/mesa-${pkgver} - - # glvnd support patches - from Fedora - # non-upstreamed ones - patch -Np1 -i ../0002-glvnd-fix-gl-dot-pc.patch - - # glibc 2.26 dropped xlocale.h leading to corrupted video - # https://bugs.archlinux.org/task/55244 / https://bugs.freedesktop.org/show_bug.cgi?id=102454 - patch -Np1 -i ../glibc_dropped_xlocale.h.diff - - autoreconf -fiv -} - -build() { - cd ${srcdir}/mesa-${pkgver} - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl,swr \ - --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ - --with-platforms=x11,drm,wayland \ - --with-vulkan-drivers=intel,radeon \ - --disable-xvmc \ - --enable-llvm \ - --enable-llvm-shared-libs \ - --enable-shared-glapi \ - --enable-libglvnd \ - --enable-libunwind \ - --enable-lmsensors \ - --enable-egl \ - --enable-glx \ - --enable-glx-tls \ - --enable-gles1 \ - --enable-gles2 \ - --enable-gbm \ - --enable-dri \ - --enable-gallium-osmesa \ - --enable-gallium-extra-hud \ - --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' 'libelf' 'lm_sensors' 'libunwind' 'libclc' 'clang') - optdepends=('opencl-headers: headers necessary for OpenCL development') - provides=('opencl-driver') - - 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=('wayland' 'libx11' 'libxshmfence') - provides=('vulkan-driver') - - 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/ - 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_vulkan-radeon() { - pkgdesc="Radeon's Vulkan mesa driver" - depends=('wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'llvm-libs') - provides=('vulkan-driver') - - 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() { - pkgdesc="VA-API implementation for gallium" - depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'lm_sensors' 'libunwind') - - 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' 'libelf' 'libxshmfence' 'lm_sensors' 'libunwind') - - 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' 'libelf' - 'libomxil-bellagio' 'libtxc_dxtn' 'libunwind' 'llvm-libs' 'lm_sensors' 'libglvnd') - 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' 'mesa-libgl' 'opengl-driver') - conflicts=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'mesa-libgl') - replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'mesa-libgl') - backup=('etc/drirc') - - install -m755 -d ${pkgdir}/etc - cp -rv ${srcdir}/fakeinstall/etc/drirc ${pkgdir}/etc - - install -m755 -d ${pkgdir}/usr/share/glvnd/egl_vendor.d - cp -rv ${srcdir}/fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json ${pkgdir}/usr/share/glvnd/egl_vendor.d/ - - 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/lib/libswrAVX*.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 - - # libglvnd support - cp -rv ${srcdir}/fakeinstall/usr/lib/libGLX_mesa.so* ${pkgdir}/usr/lib/ - cp -rv ${srcdir}/fakeinstall/usr/lib/libEGL_mesa.so* ${pkgdir}/usr/lib/ - # indirect rendering - ln -s /usr/lib/libGLX_mesa.so.0 ${pkgdir}/usr/lib/libGLX_indirect.so.0 - - install -m755 -d "${pkgdir}/usr/share/licenses/mesa" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" -} Copied: mesa/repos/testing-i686/PKGBUILD (from rev 305039, mesa/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2017-09-08 08:57:52 UTC (rev 305040) @@ -0,0 +1,198 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Maintainer: Andreas Radke <andy...@archlinux.org> + +pkgbase=mesa +pkgname=('opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa') +pkgver=17.2.0 +pkgrel=2 +arch=('i686' 'x86_64') +makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' + 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' + 'elfutils' 'llvm' 'libomxil-bellagio' 'libclc' 'clang' 'libglvnd' 'libunwind' 'lm_sensors') +url="https://www.mesa3d.org/" +license=('custom') +source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig} + LICENSE + 0002-glvnd-fix-gl-dot-pc.patch + glibc_dropped_xlocale.h.diff) +sha256sums=('3123448f770eae58bc73e15480e78909defb892f10ab777e9116c9b218094943' + 'SKIP' + '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' + '64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966' + '6de2adc3dde36d098bfe9977f5052c13e1b2e80a913e4c83d520b2e5349ddbd0') +validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.veli...@gmail.com> +validpgpkeys+=('946D09B5E4C9845E63075FF1D961C596A7203456') # Andres Gomez <ta...@igalia.com> +validpgpkeys+=('E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio Suárez Romero (Igalia, S.L.) <jasua...@igalia.com>" + +prepare() { + cd ${srcdir}/mesa-${pkgver} + + # glvnd support patches - from Fedora + # non-upstreamed ones + patch -Np1 -i ../0002-glvnd-fix-gl-dot-pc.patch + + # glibc 2.26 dropped xlocale.h leading to corrupted video + # https://bugs.archlinux.org/task/55244 / https://bugs.freedesktop.org/show_bug.cgi?id=102454 + patch -Np1 -i ../glibc_dropped_xlocale.h.diff + + autoreconf -fiv +} + +build() { + cd ${srcdir}/mesa-${pkgver} + + ./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-platforms=x11,drm,wayland \ + --with-vulkan-drivers=intel,radeon \ + --disable-xvmc \ + --enable-llvm \ + --enable-llvm-shared-libs \ + --enable-shared-glapi \ + --enable-libglvnd \ + --enable-libunwind \ + --enable-lmsensors \ + --enable-egl \ + --enable-glx \ + --enable-glx-tls \ + --enable-gles1 \ + --enable-gles2 \ + --enable-gbm \ + --enable-dri \ + --enable-gallium-osmesa \ + --enable-gallium-extra-hud \ + --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' 'libelf' 'lm_sensors' 'libunwind' 'libclc' 'clang') + optdepends=('opencl-headers: headers necessary for OpenCL development') + provides=('opencl-driver') + + 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=('wayland' 'libx11' 'libxshmfence') + provides=('vulkan-driver') + + 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/ + 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_vulkan-radeon() { + pkgdesc="Radeon's Vulkan mesa driver" + depends=('wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'llvm-libs') + provides=('vulkan-driver') + + 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() { + pkgdesc="VA-API implementation for gallium" + depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'lm_sensors' 'libunwind') + + 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' 'libelf' 'libxshmfence' 'lm_sensors' 'libunwind') + + 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' 'libelf' + 'libomxil-bellagio' 'libtxc_dxtn' 'libunwind' 'llvm-libs' 'lm_sensors' 'libglvnd') + 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' 'mesa-libgl' 'opengl-driver') + conflicts=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'mesa-libgl') + replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'mesa-libgl') + backup=('etc/drirc') + + install -m755 -d ${pkgdir}/etc + cp -rv ${srcdir}/fakeinstall/etc/drirc ${pkgdir}/etc + + install -m755 -d ${pkgdir}/usr/share/glvnd/egl_vendor.d + cp -rv ${srcdir}/fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json ${pkgdir}/usr/share/glvnd/egl_vendor.d/ + + 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/lib/libswrAVX*.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 + + # libglvnd support + cp -rv ${srcdir}/fakeinstall/usr/lib/libGLX_mesa.so* ${pkgdir}/usr/lib/ + cp -rv ${srcdir}/fakeinstall/usr/lib/libEGL_mesa.so* ${pkgdir}/usr/lib/ + # indirect rendering + ln -s /usr/lib/libGLX_mesa.so.0 ${pkgdir}/usr/lib/libGLX_indirect.so.0 + + install -m755 -d "${pkgdir}/usr/share/licenses/mesa" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" +} Deleted: testing-i686/glibc_dropped_xlocale.h.diff =================================================================== --- testing-i686/glibc_dropped_xlocale.h.diff 2017-09-08 08:57:41 UTC (rev 305039) +++ testing-i686/glibc_dropped_xlocale.h.diff 2017-09-08 08:57:52 UTC (rev 305040) @@ -1,143 +0,0 @@ -From 49b428470e28ae6ab22083e43fa41abf622f3b0d Mon Sep 17 00:00:00 2001 -From: Eric Engestrom <eric.engest...@imgtec.com> -Date: Thu, 31 Aug 2017 16:55:56 +0000 -Subject: util: improve compiler guard - -Glibc 2.26 has dropped xlocale.h, but the functions needed (strtod_l() -and strdof_l()) can be found in stdlib.h. -Improve the detection method to allow newer builds to still make use of -the locale-setting. - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102454 -Cc: Laurent Carlier <lordhea...@gmail.com> -Cc: Emil Velikov <emil.l.veli...@gmail.com> -Cc: Rob Herring <r...@kernel.org> -Signed-off-by: Eric Engestrom <eric.engest...@imgtec.com> -Reviewed-by: Laurent Carlier <lordhea...@gmail.com> -Reviewed-by: Jose Fonseca <jfons...@vmware.com> - -diff --git a/configure.ac b/configure.ac -index ac64a38..fb6037e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -795,6 +795,27 @@ AC_CHECK_HEADER([sys/sysctl.h], [DEFINES="$DEFINES -DHAVE_SYS_SYSCTL_H"]) - AC_CHECK_FUNC([strtof], [DEFINES="$DEFINES -DHAVE_STRTOF"]) - AC_CHECK_FUNC([mkostemp], [DEFINES="$DEFINES -DHAVE_MKOSTEMP"]) - -+AC_MSG_CHECKING([whether strtod has locale support]) -+AC_LINK_IFELSE([AC_LANG_SOURCE([[ -+ #define _GNU_SOURCE -+ #include <stdlib.h> -+ #include <locale.h> -+ #ifdef HAVE_XLOCALE_H -+ #include <xlocale.h> -+ #endif -+ int main() { -+ locale_t loc = newlocale(LC_CTYPE_MASK, "C", NULL); -+ const char *s = "1.0"; -+ char *end; -+ double d = strtod_l(s, end, loc); -+ float f = strtof_l(s, end, loc); -+ freelocale(loc); -+ return 0; -+ }]])], -+ [DEFINES="$DEFINES -DHAVE_STRTOD_L"]; -+ AC_MSG_RESULT([yes]), -+ AC_MSG_RESULT([no])) -+ - dnl Check to see if dlopen is in default libraries (like Solaris, which - dnl has it in libc), or if libdl is needed to get it. - AC_CHECK_FUNC([dlopen], [DEFINES="$DEFINES -DHAVE_DLOPEN"], -diff --git a/scons/gallium.py b/scons/gallium.py -index c8e47a3..1e35ef4 100755 ---- a/scons/gallium.py -+++ b/scons/gallium.py -@@ -157,6 +157,19 @@ def check_header(env, header): - env = conf.Finish() - return have_header - -+def check_functions(env, functions): -+ '''Check if all of the functions exist''' -+ -+ conf = SCons.Script.Configure(env) -+ have_functions = True -+ -+ for function in functions: -+ if not conf.CheckFunc(function): -+ have_functions = False -+ -+ env = conf.Finish() -+ return have_functions -+ - def check_prog(env, prog): - """Check whether this program exists.""" - -@@ -339,6 +352,9 @@ def generate(env): - if check_header(env, 'xlocale.h'): - cppdefines += ['HAVE_XLOCALE_H'] - -+ if check_functions(env, ['strtod_l', 'strtof_l']): -+ cppdefines += ['HAVE_STRTOD_L'] -+ - if platform == 'windows': - cppdefines += [ - 'WIN32', -diff --git a/src/util/strtod.c b/src/util/strtod.c -index ea7d395..de695d6 100644 ---- a/src/util/strtod.c -+++ b/src/util/strtod.c -@@ -26,12 +26,12 @@ - - #include <stdlib.h> - --#ifdef _GNU_SOURCE -+#if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L) - #include <locale.h> - #ifdef HAVE_XLOCALE_H - #include <xlocale.h> --static locale_t loc; - #endif -+static locale_t loc; - #endif - - #include "strtod.h" -@@ -40,7 +40,7 @@ static locale_t loc; - void - _mesa_locale_init(void) - { --#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H) -+#if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L) - loc = newlocale(LC_CTYPE_MASK, "C", NULL); - #endif - } -@@ -48,7 +48,7 @@ _mesa_locale_init(void) - void - _mesa_locale_fini(void) - { --#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H) -+#if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L) - freelocale(loc); - #endif - } -@@ -60,7 +60,7 @@ _mesa_locale_fini(void) - double - _mesa_strtod(const char *s, char **end) - { --#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H) -+#if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L) - return strtod_l(s, end, loc); - #else - return strtod(s, end); -@@ -75,7 +75,7 @@ _mesa_strtod(const char *s, char **end) - float - _mesa_strtof(const char *s, char **end) - { --#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H) -+#if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L) - return strtof_l(s, end, loc); - #elif defined(HAVE_STRTOF) - return strtof(s, end); --- -cgit v0.10.2 - - Copied: mesa/repos/testing-i686/glibc_dropped_xlocale.h.diff (from rev 305039, mesa/trunk/glibc_dropped_xlocale.h.diff) =================================================================== --- testing-i686/glibc_dropped_xlocale.h.diff (rev 0) +++ testing-i686/glibc_dropped_xlocale.h.diff 2017-09-08 08:57:52 UTC (rev 305040) @@ -0,0 +1,143 @@ +From 49b428470e28ae6ab22083e43fa41abf622f3b0d Mon Sep 17 00:00:00 2001 +From: Eric Engestrom <eric.engest...@imgtec.com> +Date: Thu, 31 Aug 2017 16:55:56 +0000 +Subject: util: improve compiler guard + +Glibc 2.26 has dropped xlocale.h, but the functions needed (strtod_l() +and strdof_l()) can be found in stdlib.h. +Improve the detection method to allow newer builds to still make use of +the locale-setting. + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102454 +Cc: Laurent Carlier <lordhea...@gmail.com> +Cc: Emil Velikov <emil.l.veli...@gmail.com> +Cc: Rob Herring <r...@kernel.org> +Signed-off-by: Eric Engestrom <eric.engest...@imgtec.com> +Reviewed-by: Laurent Carlier <lordhea...@gmail.com> +Reviewed-by: Jose Fonseca <jfons...@vmware.com> + +diff --git a/configure.ac b/configure.ac +index ac64a38..fb6037e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -795,6 +795,27 @@ AC_CHECK_HEADER([sys/sysctl.h], [DEFINES="$DEFINES -DHAVE_SYS_SYSCTL_H"]) + AC_CHECK_FUNC([strtof], [DEFINES="$DEFINES -DHAVE_STRTOF"]) + AC_CHECK_FUNC([mkostemp], [DEFINES="$DEFINES -DHAVE_MKOSTEMP"]) + ++AC_MSG_CHECKING([whether strtod has locale support]) ++AC_LINK_IFELSE([AC_LANG_SOURCE([[ ++ #define _GNU_SOURCE ++ #include <stdlib.h> ++ #include <locale.h> ++ #ifdef HAVE_XLOCALE_H ++ #include <xlocale.h> ++ #endif ++ int main() { ++ locale_t loc = newlocale(LC_CTYPE_MASK, "C", NULL); ++ const char *s = "1.0"; ++ char *end; ++ double d = strtod_l(s, end, loc); ++ float f = strtof_l(s, end, loc); ++ freelocale(loc); ++ return 0; ++ }]])], ++ [DEFINES="$DEFINES -DHAVE_STRTOD_L"]; ++ AC_MSG_RESULT([yes]), ++ AC_MSG_RESULT([no])) ++ + dnl Check to see if dlopen is in default libraries (like Solaris, which + dnl has it in libc), or if libdl is needed to get it. + AC_CHECK_FUNC([dlopen], [DEFINES="$DEFINES -DHAVE_DLOPEN"], +diff --git a/scons/gallium.py b/scons/gallium.py +index c8e47a3..1e35ef4 100755 +--- a/scons/gallium.py ++++ b/scons/gallium.py +@@ -157,6 +157,19 @@ def check_header(env, header): + env = conf.Finish() + return have_header + ++def check_functions(env, functions): ++ '''Check if all of the functions exist''' ++ ++ conf = SCons.Script.Configure(env) ++ have_functions = True ++ ++ for function in functions: ++ if not conf.CheckFunc(function): ++ have_functions = False ++ ++ env = conf.Finish() ++ return have_functions ++ + def check_prog(env, prog): + """Check whether this program exists.""" + +@@ -339,6 +352,9 @@ def generate(env): + if check_header(env, 'xlocale.h'): + cppdefines += ['HAVE_XLOCALE_H'] + ++ if check_functions(env, ['strtod_l', 'strtof_l']): ++ cppdefines += ['HAVE_STRTOD_L'] ++ + if platform == 'windows': + cppdefines += [ + 'WIN32', +diff --git a/src/util/strtod.c b/src/util/strtod.c +index ea7d395..de695d6 100644 +--- a/src/util/strtod.c ++++ b/src/util/strtod.c +@@ -26,12 +26,12 @@ + + #include <stdlib.h> + +-#ifdef _GNU_SOURCE ++#if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L) + #include <locale.h> + #ifdef HAVE_XLOCALE_H + #include <xlocale.h> +-static locale_t loc; + #endif ++static locale_t loc; + #endif + + #include "strtod.h" +@@ -40,7 +40,7 @@ static locale_t loc; + void + _mesa_locale_init(void) + { +-#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H) ++#if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L) + loc = newlocale(LC_CTYPE_MASK, "C", NULL); + #endif + } +@@ -48,7 +48,7 @@ _mesa_locale_init(void) + void + _mesa_locale_fini(void) + { +-#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H) ++#if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L) + freelocale(loc); + #endif + } +@@ -60,7 +60,7 @@ _mesa_locale_fini(void) + double + _mesa_strtod(const char *s, char **end) + { +-#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H) ++#if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L) + return strtod_l(s, end, loc); + #else + return strtod(s, end); +@@ -75,7 +75,7 @@ _mesa_strtod(const char *s, char **end) + float + _mesa_strtof(const char *s, char **end) + { +-#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H) ++#if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L) + return strtof_l(s, end, loc); + #elif defined(HAVE_STRTOF) + return strtof(s, end); +-- +cgit v0.10.2 + + Deleted: testing-x86_64/0001-Fix-linkage-against-shared-glapi.patch =================================================================== --- testing-x86_64/0001-Fix-linkage-against-shared-glapi.patch 2017-09-08 08:57:41 UTC (rev 305039) +++ testing-x86_64/0001-Fix-linkage-against-shared-glapi.patch 2017-09-08 08:57:52 UTC (rev 305040) @@ -1,26 +0,0 @@ -From 1b5a187c3c31513ae39cd2a917a3234c2c5f87fc Mon Sep 17 00:00:00 2001 -From: Adam Jackson <a...@redhat.com> -Date: Wed, 12 Oct 2016 13:41:33 -0400 -Subject: [PATCH] Fix linkage against shared glapi - -Signed-off-by: Adam Jackson <a...@redhat.com> ---- - src/gallium/targets/osmesa/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am -index 5d39486..04add87 100644 ---- a/src/gallium/targets/osmesa/Makefile.am -+++ b/src/gallium/targets/osmesa/Makefile.am -@@ -63,7 +63,7 @@ lib@OSMESA_LIB@_la_LIBADD = \ - $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ - $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \ - $(top_builddir)/src/gallium/state_trackers/osmesa/libosmesa.la \ -- $(top_builddir)/src/mapi/glapi/libglapi.la \ -+ $(top_builddir)/src/mapi/shared-glapi/libglapi.la \ - $(SHARED_GLAPI_LIB) \ - $(OSMESA_LIB_DEPS) \ - $(CLOCK_LIB) --- -2.9.3 - Copied: mesa/repos/testing-x86_64/0001-Fix-linkage-against-shared-glapi.patch (from rev 305039, mesa/trunk/0001-Fix-linkage-against-shared-glapi.patch) =================================================================== --- testing-x86_64/0001-Fix-linkage-against-shared-glapi.patch (rev 0) +++ testing-x86_64/0001-Fix-linkage-against-shared-glapi.patch 2017-09-08 08:57:52 UTC (rev 305040) @@ -0,0 +1,26 @@ +From 1b5a187c3c31513ae39cd2a917a3234c2c5f87fc Mon Sep 17 00:00:00 2001 +From: Adam Jackson <a...@redhat.com> +Date: Wed, 12 Oct 2016 13:41:33 -0400 +Subject: [PATCH] Fix linkage against shared glapi + +Signed-off-by: Adam Jackson <a...@redhat.com> +--- + src/gallium/targets/osmesa/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am +index 5d39486..04add87 100644 +--- a/src/gallium/targets/osmesa/Makefile.am ++++ b/src/gallium/targets/osmesa/Makefile.am +@@ -63,7 +63,7 @@ lib@OSMESA_LIB@_la_LIBADD = \ + $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ + $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \ + $(top_builddir)/src/gallium/state_trackers/osmesa/libosmesa.la \ +- $(top_builddir)/src/mapi/glapi/libglapi.la \ ++ $(top_builddir)/src/mapi/shared-glapi/libglapi.la \ + $(SHARED_GLAPI_LIB) \ + $(OSMESA_LIB_DEPS) \ + $(CLOCK_LIB) +-- +2.9.3 + Deleted: testing-x86_64/0002-glvnd-fix-gl-dot-pc.patch =================================================================== --- testing-x86_64/0002-glvnd-fix-gl-dot-pc.patch 2017-09-08 08:57:41 UTC (rev 305039) +++ testing-x86_64/0002-glvnd-fix-gl-dot-pc.patch 2017-09-08 08:57:52 UTC (rev 305040) @@ -1,12 +0,0 @@ -diff -up mesa-12.0.3/src/mesa/gl.pc.in.jx mesa-12.0.3/src/mesa/gl.pc.in ---- mesa-12.0.3/src/mesa/gl.pc.in.jx 2016-01-18 02:39:26.000000000 -0500 -+++ mesa-12.0.3/src/mesa/gl.pc.in 2016-10-25 13:06:44.013159358 -0400 -@@ -7,7 +7,7 @@ Name: gl - Description: Mesa OpenGL library - Requires.private: @GL_PC_REQ_PRIV@ - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -l@GL_LIB@ -+Libs: -L${libdir} -lGL - Libs.private: @GL_PC_LIB_PRIV@ - Cflags: -I${includedir} @GL_PC_CFLAGS@ - glx_tls: @GLX_TLS@ Copied: mesa/repos/testing-x86_64/0002-glvnd-fix-gl-dot-pc.patch (from rev 305039, mesa/trunk/0002-glvnd-fix-gl-dot-pc.patch) =================================================================== --- testing-x86_64/0002-glvnd-fix-gl-dot-pc.patch (rev 0) +++ testing-x86_64/0002-glvnd-fix-gl-dot-pc.patch 2017-09-08 08:57:52 UTC (rev 305040) @@ -0,0 +1,12 @@ +diff -up mesa-12.0.3/src/mesa/gl.pc.in.jx mesa-12.0.3/src/mesa/gl.pc.in +--- mesa-12.0.3/src/mesa/gl.pc.in.jx 2016-01-18 02:39:26.000000000 -0500 ++++ mesa-12.0.3/src/mesa/gl.pc.in 2016-10-25 13:06:44.013159358 -0400 +@@ -7,7 +7,7 @@ Name: gl + Description: Mesa OpenGL library + Requires.private: @GL_PC_REQ_PRIV@ + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -l@GL_LIB@ ++Libs: -L${libdir} -lGL + Libs.private: @GL_PC_LIB_PRIV@ + Cflags: -I${includedir} @GL_PC_CFLAGS@ + glx_tls: @GLX_TLS@ Deleted: testing-x86_64/LICENSE =================================================================== --- testing-x86_64/LICENSE 2017-09-08 08:57:41 UTC (rev 305039) +++ testing-x86_64/LICENSE 2017-09-08 08:57:52 UTC (rev 305040) @@ -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: mesa/repos/testing-x86_64/LICENSE (from rev 305039, mesa/trunk/LICENSE) =================================================================== --- testing-x86_64/LICENSE (rev 0) +++ testing-x86_64/LICENSE 2017-09-08 08:57:52 UTC (rev 305040) @@ -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: testing-x86_64/PKGBUILD =================================================================== --- testing-x86_64/PKGBUILD 2017-09-08 08:57:41 UTC (rev 305039) +++ testing-x86_64/PKGBUILD 2017-09-08 08:57:52 UTC (rev 305040) @@ -1,198 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> -# Maintainer: Andreas Radke <andy...@archlinux.org> - -pkgbase=mesa -pkgname=('opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa') -pkgver=17.2.0 -pkgrel=1 -arch=('i686' 'x86_64') -makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' - 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' - 'elfutils' 'llvm' 'libomxil-bellagio' 'libclc' 'clang' 'libglvnd' 'libunwind' 'lm_sensors') -url="https://www.mesa3d.org/" -license=('custom') -source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig} - LICENSE - 0002-glvnd-fix-gl-dot-pc.patch - glibc_dropped_xlocale.h.diff) -sha256sums=('3123448f770eae58bc73e15480e78909defb892f10ab777e9116c9b218094943' - 'SKIP' - '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' - '64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966' - '6de2adc3dde36d098bfe9977f5052c13e1b2e80a913e4c83d520b2e5349ddbd0') -validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.veli...@gmail.com> -validpgpkeys+=('946D09B5E4C9845E63075FF1D961C596A7203456') # Andres Gomez <ta...@igalia.com> -validpgpkeys+=('E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio Suárez Romero (Igalia, S.L.) <jasua...@igalia.com>" - -prepare() { - cd ${srcdir}/mesa-${pkgver} - - # glvnd support patches - from Fedora - # non-upstreamed ones - patch -Np1 -i ../0002-glvnd-fix-gl-dot-pc.patch - - # glibc 2.26 dropped xlocale.h leading to corrupted video - # https://bugs.archlinux.org/task/55244 / https://bugs.freedesktop.org/show_bug.cgi?id=102454 - patch -Np1 -i ../glibc_dropped_xlocale.h.diff - - autoreconf -fiv -} - -build() { - cd ${srcdir}/mesa-${pkgver} - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl,swr \ - --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ - --with-platforms=x11,drm,wayland \ - --with-vulkan-drivers=intel,radeon \ - --disable-xvmc \ - --enable-llvm \ - --enable-llvm-shared-libs \ - --enable-shared-glapi \ - --enable-libglvnd \ - --enable-libunwind \ - --enable-lmsensors \ - --enable-egl \ - --enable-glx \ - --enable-glx-tls \ - --enable-gles1 \ - --enable-gles2 \ - --enable-gbm \ - --enable-dri \ - --enable-gallium-osmesa \ - --enable-gallium-extra-hud \ - --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' 'libelf' 'lm_sensors' 'libunwind' 'libclc' 'clang') - optdepends=('opencl-headers: headers necessary for OpenCL development') - provides=('opencl-driver') - - 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=('wayland' 'libx11' 'libxshmfence') - provides=('vulkan-driver') - - 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/ - 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_vulkan-radeon() { - pkgdesc="Radeon's Vulkan mesa driver" - depends=('wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'llvm-libs') - provides=('vulkan-driver') - - 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() { - pkgdesc="VA-API implementation for gallium" - depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'lm_sensors' 'libunwind') - - 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' 'libelf' 'libxshmfence' 'lm_sensors' 'libunwind') - - 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' 'libelf' - 'libomxil-bellagio' 'libtxc_dxtn' 'libunwind' 'llvm-libs' 'lm_sensors' 'libglvnd') - 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' 'mesa-libgl' 'opengl-driver') - conflicts=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'mesa-libgl') - replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'mesa-libgl') - backup=('etc/drirc') - - install -m755 -d ${pkgdir}/etc - cp -rv ${srcdir}/fakeinstall/etc/drirc ${pkgdir}/etc - - install -m755 -d ${pkgdir}/usr/share/glvnd/egl_vendor.d - cp -rv ${srcdir}/fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json ${pkgdir}/usr/share/glvnd/egl_vendor.d/ - - 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/lib/libswrAVX*.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 - - # libglvnd support - cp -rv ${srcdir}/fakeinstall/usr/lib/libGLX_mesa.so* ${pkgdir}/usr/lib/ - cp -rv ${srcdir}/fakeinstall/usr/lib/libEGL_mesa.so* ${pkgdir}/usr/lib/ - # indirect rendering - ln -s /usr/lib/libGLX_mesa.so.0 ${pkgdir}/usr/lib/libGLX_indirect.so.0 - - install -m755 -d "${pkgdir}/usr/share/licenses/mesa" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" -} Copied: mesa/repos/testing-x86_64/PKGBUILD (from rev 305039, mesa/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2017-09-08 08:57:52 UTC (rev 305040) @@ -0,0 +1,198 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Maintainer: Andreas Radke <andy...@archlinux.org> + +pkgbase=mesa +pkgname=('opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa') +pkgver=17.2.0 +pkgrel=2 +arch=('i686' 'x86_64') +makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' + 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' + 'elfutils' 'llvm' 'libomxil-bellagio' 'libclc' 'clang' 'libglvnd' 'libunwind' 'lm_sensors') +url="https://www.mesa3d.org/" +license=('custom') +source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig} + LICENSE + 0002-glvnd-fix-gl-dot-pc.patch + glibc_dropped_xlocale.h.diff) +sha256sums=('3123448f770eae58bc73e15480e78909defb892f10ab777e9116c9b218094943' + 'SKIP' + '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' + '64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966' + '6de2adc3dde36d098bfe9977f5052c13e1b2e80a913e4c83d520b2e5349ddbd0') +validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.veli...@gmail.com> +validpgpkeys+=('946D09B5E4C9845E63075FF1D961C596A7203456') # Andres Gomez <ta...@igalia.com> +validpgpkeys+=('E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio Suárez Romero (Igalia, S.L.) <jasua...@igalia.com>" + +prepare() { + cd ${srcdir}/mesa-${pkgver} + + # glvnd support patches - from Fedora + # non-upstreamed ones + patch -Np1 -i ../0002-glvnd-fix-gl-dot-pc.patch + + # glibc 2.26 dropped xlocale.h leading to corrupted video + # https://bugs.archlinux.org/task/55244 / https://bugs.freedesktop.org/show_bug.cgi?id=102454 + patch -Np1 -i ../glibc_dropped_xlocale.h.diff + + autoreconf -fiv +} + +build() { + cd ${srcdir}/mesa-${pkgver} + + ./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-platforms=x11,drm,wayland \ + --with-vulkan-drivers=intel,radeon \ + --disable-xvmc \ + --enable-llvm \ + --enable-llvm-shared-libs \ + --enable-shared-glapi \ + --enable-libglvnd \ + --enable-libunwind \ + --enable-lmsensors \ + --enable-egl \ + --enable-glx \ + --enable-glx-tls \ + --enable-gles1 \ + --enable-gles2 \ + --enable-gbm \ + --enable-dri \ + --enable-gallium-osmesa \ + --enable-gallium-extra-hud \ + --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' 'libelf' 'lm_sensors' 'libunwind' 'libclc' 'clang') + optdepends=('opencl-headers: headers necessary for OpenCL development') + provides=('opencl-driver') + + 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=('wayland' 'libx11' 'libxshmfence') + provides=('vulkan-driver') + + 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/ + 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_vulkan-radeon() { + pkgdesc="Radeon's Vulkan mesa driver" + depends=('wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'llvm-libs') + provides=('vulkan-driver') + + 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() { + pkgdesc="VA-API implementation for gallium" + depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'lm_sensors' 'libunwind') + + 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' 'libelf' 'libxshmfence' 'lm_sensors' 'libunwind') + + 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' 'libelf' + 'libomxil-bellagio' 'libtxc_dxtn' 'libunwind' 'llvm-libs' 'lm_sensors' 'libglvnd') + 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' 'mesa-libgl' 'opengl-driver') + conflicts=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'mesa-libgl') + replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'mesa-libgl') + backup=('etc/drirc') + + install -m755 -d ${pkgdir}/etc + cp -rv ${srcdir}/fakeinstall/etc/drirc ${pkgdir}/etc + + install -m755 -d ${pkgdir}/usr/share/glvnd/egl_vendor.d + cp -rv ${srcdir}/fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json ${pkgdir}/usr/share/glvnd/egl_vendor.d/ + + 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/lib/libswrAVX*.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 + + # libglvnd support + cp -rv ${srcdir}/fakeinstall/usr/lib/libGLX_mesa.so* ${pkgdir}/usr/lib/ + cp -rv ${srcdir}/fakeinstall/usr/lib/libEGL_mesa.so* ${pkgdir}/usr/lib/ + # indirect rendering + ln -s /usr/lib/libGLX_mesa.so.0 ${pkgdir}/usr/lib/libGLX_indirect.so.0 + + install -m755 -d "${pkgdir}/usr/share/licenses/mesa" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" +} Deleted: testing-x86_64/glibc_dropped_xlocale.h.diff =================================================================== --- testing-x86_64/glibc_dropped_xlocale.h.diff 2017-09-08 08:57:41 UTC (rev 305039) +++ testing-x86_64/glibc_dropped_xlocale.h.diff 2017-09-08 08:57:52 UTC (rev 305040) @@ -1,143 +0,0 @@ -From 49b428470e28ae6ab22083e43fa41abf622f3b0d Mon Sep 17 00:00:00 2001 -From: Eric Engestrom <eric.engest...@imgtec.com> -Date: Thu, 31 Aug 2017 16:55:56 +0000 -Subject: util: improve compiler guard - -Glibc 2.26 has dropped xlocale.h, but the functions needed (strtod_l() -and strdof_l()) can be found in stdlib.h. -Improve the detection method to allow newer builds to still make use of -the locale-setting. - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102454 -Cc: Laurent Carlier <lordhea...@gmail.com> -Cc: Emil Velikov <emil.l.veli...@gmail.com> -Cc: Rob Herring <r...@kernel.org> -Signed-off-by: Eric Engestrom <eric.engest...@imgtec.com> -Reviewed-by: Laurent Carlier <lordhea...@gmail.com> -Reviewed-by: Jose Fonseca <jfons...@vmware.com> - -diff --git a/configure.ac b/configure.ac -index ac64a38..fb6037e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -795,6 +795,27 @@ AC_CHECK_HEADER([sys/sysctl.h], [DEFINES="$DEFINES -DHAVE_SYS_SYSCTL_H"]) - AC_CHECK_FUNC([strtof], [DEFINES="$DEFINES -DHAVE_STRTOF"]) - AC_CHECK_FUNC([mkostemp], [DEFINES="$DEFINES -DHAVE_MKOSTEMP"]) - -+AC_MSG_CHECKING([whether strtod has locale support]) -+AC_LINK_IFELSE([AC_LANG_SOURCE([[ -+ #define _GNU_SOURCE -+ #include <stdlib.h> -+ #include <locale.h> -+ #ifdef HAVE_XLOCALE_H -+ #include <xlocale.h> -+ #endif -+ int main() { -+ locale_t loc = newlocale(LC_CTYPE_MASK, "C", NULL); -+ const char *s = "1.0"; -+ char *end; -+ double d = strtod_l(s, end, loc); -+ float f = strtof_l(s, end, loc); -+ freelocale(loc); -+ return 0; -+ }]])], -+ [DEFINES="$DEFINES -DHAVE_STRTOD_L"]; -+ AC_MSG_RESULT([yes]), -+ AC_MSG_RESULT([no])) -+ - dnl Check to see if dlopen is in default libraries (like Solaris, which - dnl has it in libc), or if libdl is needed to get it. - AC_CHECK_FUNC([dlopen], [DEFINES="$DEFINES -DHAVE_DLOPEN"], -diff --git a/scons/gallium.py b/scons/gallium.py -index c8e47a3..1e35ef4 100755 ---- a/scons/gallium.py -+++ b/scons/gallium.py -@@ -157,6 +157,19 @@ def check_header(env, header): - env = conf.Finish() - return have_header - -+def check_functions(env, functions): -+ '''Check if all of the functions exist''' -+ -+ conf = SCons.Script.Configure(env) -+ have_functions = True -+ -+ for function in functions: -+ if not conf.CheckFunc(function): -+ have_functions = False -+ -+ env = conf.Finish() -+ return have_functions -+ - def check_prog(env, prog): - """Check whether this program exists.""" - -@@ -339,6 +352,9 @@ def generate(env): - if check_header(env, 'xlocale.h'): - cppdefines += ['HAVE_XLOCALE_H'] - -+ if check_functions(env, ['strtod_l', 'strtof_l']): -+ cppdefines += ['HAVE_STRTOD_L'] -+ - if platform == 'windows': - cppdefines += [ - 'WIN32', -diff --git a/src/util/strtod.c b/src/util/strtod.c -index ea7d395..de695d6 100644 ---- a/src/util/strtod.c -+++ b/src/util/strtod.c -@@ -26,12 +26,12 @@ - - #include <stdlib.h> - --#ifdef _GNU_SOURCE -+#if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L) - #include <locale.h> - #ifdef HAVE_XLOCALE_H - #include <xlocale.h> --static locale_t loc; - #endif -+static locale_t loc; - #endif - - #include "strtod.h" -@@ -40,7 +40,7 @@ static locale_t loc; - void - _mesa_locale_init(void) - { --#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H) -+#if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L) - loc = newlocale(LC_CTYPE_MASK, "C", NULL); - #endif - } -@@ -48,7 +48,7 @@ _mesa_locale_init(void) - void - _mesa_locale_fini(void) - { --#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H) -+#if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L) - freelocale(loc); - #endif - } -@@ -60,7 +60,7 @@ _mesa_locale_fini(void) - double - _mesa_strtod(const char *s, char **end) - { --#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H) -+#if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L) - return strtod_l(s, end, loc); - #else - return strtod(s, end); -@@ -75,7 +75,7 @@ _mesa_strtod(const char *s, char **end) - float - _mesa_strtof(const char *s, char **end) - { --#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H) -+#if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L) - return strtof_l(s, end, loc); - #elif defined(HAVE_STRTOF) - return strtof(s, end); --- -cgit v0.10.2 - - Copied: mesa/repos/testing-x86_64/glibc_dropped_xlocale.h.diff (from rev 305039, mesa/trunk/glibc_dropped_xlocale.h.diff) =================================================================== --- testing-x86_64/glibc_dropped_xlocale.h.diff (rev 0) +++ testing-x86_64/glibc_dropped_xlocale.h.diff 2017-09-08 08:57:52 UTC (rev 305040) @@ -0,0 +1,143 @@ +From 49b428470e28ae6ab22083e43fa41abf622f3b0d Mon Sep 17 00:00:00 2001 +From: Eric Engestrom <eric.engest...@imgtec.com> +Date: Thu, 31 Aug 2017 16:55:56 +0000 +Subject: util: improve compiler guard + +Glibc 2.26 has dropped xlocale.h, but the functions needed (strtod_l() +and strdof_l()) can be found in stdlib.h. +Improve the detection method to allow newer builds to still make use of +the locale-setting. + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102454 +Cc: Laurent Carlier <lordhea...@gmail.com> +Cc: Emil Velikov <emil.l.veli...@gmail.com> +Cc: Rob Herring <r...@kernel.org> +Signed-off-by: Eric Engestrom <eric.engest...@imgtec.com> +Reviewed-by: Laurent Carlier <lordhea...@gmail.com> +Reviewed-by: Jose Fonseca <jfons...@vmware.com> + +diff --git a/configure.ac b/configure.ac +index ac64a38..fb6037e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -795,6 +795,27 @@ AC_CHECK_HEADER([sys/sysctl.h], [DEFINES="$DEFINES -DHAVE_SYS_SYSCTL_H"]) + AC_CHECK_FUNC([strtof], [DEFINES="$DEFINES -DHAVE_STRTOF"]) + AC_CHECK_FUNC([mkostemp], [DEFINES="$DEFINES -DHAVE_MKOSTEMP"]) + ++AC_MSG_CHECKING([whether strtod has locale support]) ++AC_LINK_IFELSE([AC_LANG_SOURCE([[ ++ #define _GNU_SOURCE ++ #include <stdlib.h> ++ #include <locale.h> ++ #ifdef HAVE_XLOCALE_H ++ #include <xlocale.h> ++ #endif ++ int main() { ++ locale_t loc = newlocale(LC_CTYPE_MASK, "C", NULL); ++ const char *s = "1.0"; ++ char *end; ++ double d = strtod_l(s, end, loc); ++ float f = strtof_l(s, end, loc); ++ freelocale(loc); ++ return 0; ++ }]])], ++ [DEFINES="$DEFINES -DHAVE_STRTOD_L"]; ++ AC_MSG_RESULT([yes]), ++ AC_MSG_RESULT([no])) ++ + dnl Check to see if dlopen is in default libraries (like Solaris, which + dnl has it in libc), or if libdl is needed to get it. + AC_CHECK_FUNC([dlopen], [DEFINES="$DEFINES -DHAVE_DLOPEN"], +diff --git a/scons/gallium.py b/scons/gallium.py +index c8e47a3..1e35ef4 100755 +--- a/scons/gallium.py ++++ b/scons/gallium.py +@@ -157,6 +157,19 @@ def check_header(env, header): + env = conf.Finish() + return have_header + ++def check_functions(env, functions): ++ '''Check if all of the functions exist''' ++ ++ conf = SCons.Script.Configure(env) ++ have_functions = True ++ ++ for function in functions: ++ if not conf.CheckFunc(function): ++ have_functions = False ++ ++ env = conf.Finish() ++ return have_functions ++ + def check_prog(env, prog): + """Check whether this program exists.""" + +@@ -339,6 +352,9 @@ def generate(env): + if check_header(env, 'xlocale.h'): + cppdefines += ['HAVE_XLOCALE_H'] + ++ if check_functions(env, ['strtod_l', 'strtof_l']): ++ cppdefines += ['HAVE_STRTOD_L'] ++ + if platform == 'windows': + cppdefines += [ + 'WIN32', +diff --git a/src/util/strtod.c b/src/util/strtod.c +index ea7d395..de695d6 100644 +--- a/src/util/strtod.c ++++ b/src/util/strtod.c +@@ -26,12 +26,12 @@ + + #include <stdlib.h> + +-#ifdef _GNU_SOURCE ++#if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L) + #include <locale.h> + #ifdef HAVE_XLOCALE_H + #include <xlocale.h> +-static locale_t loc; + #endif ++static locale_t loc; + #endif + + #include "strtod.h" +@@ -40,7 +40,7 @@ static locale_t loc; + void + _mesa_locale_init(void) + { +-#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H) ++#if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L) + loc = newlocale(LC_CTYPE_MASK, "C", NULL); + #endif + } +@@ -48,7 +48,7 @@ _mesa_locale_init(void) + void + _mesa_locale_fini(void) + { +-#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H) ++#if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L) + freelocale(loc); + #endif + } +@@ -60,7 +60,7 @@ _mesa_locale_fini(void) + double + _mesa_strtod(const char *s, char **end) + { +-#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H) ++#if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L) + return strtod_l(s, end, loc); + #else + return strtod(s, end); +@@ -75,7 +75,7 @@ _mesa_strtod(const char *s, char **end) + float + _mesa_strtof(const char *s, char **end) + { +-#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H) ++#if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L) + return strtof_l(s, end, loc); + #elif defined(HAVE_STRTOF) + return strtof(s, end); +-- +cgit v0.10.2 + +