[arch-commits] Commit in lib32-mesa/repos (5 files)
Evangelos Foutras
foutrelis at archlinux.org
Sun Sep 10 01:35:31 UTC 2017
Date: Sunday, September 10, 2017 @ 01:35:30
Author: foutrelis
Revision: 256717
archrelease: copy trunk to multilib-staging-x86_64
Added:
lib32-mesa/repos/multilib-staging-x86_64/
lib32-mesa/repos/multilib-staging-x86_64/0002-glvnd-fix-gl-dot-pc.patch
(from rev 256716, lib32-mesa/trunk/0002-glvnd-fix-gl-dot-pc.patch)
lib32-mesa/repos/multilib-staging-x86_64/LICENSE
(from rev 256716, lib32-mesa/trunk/LICENSE)
lib32-mesa/repos/multilib-staging-x86_64/PKGBUILD
(from rev 256716, lib32-mesa/trunk/PKGBUILD)
lib32-mesa/repos/multilib-staging-x86_64/glibc_dropped_xlocale.h.diff
(from rev 256716, lib32-mesa/trunk/glibc_dropped_xlocale.h.diff)
--------------------------------+
0002-glvnd-fix-gl-dot-pc.patch | 12 ++
LICENSE | 82 ++++++++++++++++++
PKGBUILD | 172 +++++++++++++++++++++++++++++++++++++++
glibc_dropped_xlocale.h.diff | 143 ++++++++++++++++++++++++++++++++
4 files changed, 409 insertions(+)
Copied: lib32-mesa/repos/multilib-staging-x86_64/0002-glvnd-fix-gl-dot-pc.patch (from rev 256716, lib32-mesa/trunk/0002-glvnd-fix-gl-dot-pc.patch)
===================================================================
--- multilib-staging-x86_64/0002-glvnd-fix-gl-dot-pc.patch (rev 0)
+++ multilib-staging-x86_64/0002-glvnd-fix-gl-dot-pc.patch 2017-09-10 01:35:30 UTC (rev 256717)
@@ -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 at GL_LIB@
++Libs: -L${libdir} -lGL
+ Libs.private: @GL_PC_LIB_PRIV@
+ Cflags: -I${includedir} @GL_PC_CFLAGS@
+ glx_tls: @GLX_TLS@
Copied: lib32-mesa/repos/multilib-staging-x86_64/LICENSE (from rev 256716, lib32-mesa/trunk/LICENSE)
===================================================================
--- multilib-staging-x86_64/LICENSE (rev 0)
+++ multilib-staging-x86_64/LICENSE 2017-09-10 01:35:30 UTC (rev 256717)
@@ -0,0 +1,82 @@
+Disclaimer
+
+Mesa is a 3-D graphics library with an API which is very similar to
+that of OpenGL*
+To the extent that Mesa utilizes the OpenGL command syntax or state
+machine, it is being used with authorization from Silicon Graphics,
+Inc.(SGI). However, the author does not possess an OpenGL license
+from SGI, and makes no claim that Mesa is in any way a compatible
+replacement for OpenGL or associated with SGI. Those who want a
+licensed implementation of OpenGL should contact a licensed
+vendor.
+
+Please do not refer to the library as MesaGL (for legal
+reasons). It's just Mesa or The Mesa 3-D graphics
+library
+
+* OpenGL is a trademark of Silicon Graphics Incorporated.
+
+License / Copyright Information
+
+The Mesa distribution consists of several components. Different copyrights
+and licenses apply to different components. For example, GLUT is copyrighted
+by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
+device drivers are copyrighted by their authors. See below for a list of
+Mesa's main components and the license for each.
+
+The core Mesa library is licensed according to the terms of the MIT license.
+This allows integration with the XFree86, Xorg and DRI projects.
+
+The default Mesa license is as follows:
+
+Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Attention, Contributors
+
+When contributing to the Mesa project you must agree to the licensing terms
+of the component to which you're contributing.
+The following section lists the primary components of the Mesa distribution
+and their respective licenses.
+
+
+Mesa Component Licenses
+
+Component Location Primary Author License
+----------------------------------------------------------------------------
+Main Mesa code src/mesa/ Brian Paul Mesa (MIT)
+
+Device drivers src/mesa/drivers/* See drivers See drivers
+
+Ext headers include/GL/glext.h SGI SGI Free B
+ include/GL/glxext.h
+
+GLUT src/glut/ Mark Kilgard Mark's copyright
+
+Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL
+
+SGI GLU library src/glu/sgi/ SGI SGI Free B
+
+demo programs progs/demos/ various see source files
+
+X demos progs/xdemos/ Brian Paul see source files
+
+SGI demos progs/samples/ SGI SGI copyright
+
+RedBook demos progs/redbook/ SGI SGI copyright
Copied: lib32-mesa/repos/multilib-staging-x86_64/PKGBUILD (from rev 256716, lib32-mesa/trunk/PKGBUILD)
===================================================================
--- multilib-staging-x86_64/PKGBUILD (rev 0)
+++ multilib-staging-x86_64/PKGBUILD 2017-09-10 01:35:30 UTC (rev 256717)
@@ -0,0 +1,172 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=lib32-mesa
+pkgname=('lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau' 'lib32-mesa')
+pkgver=17.2.0
+pkgrel=2
+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-libelf' 'lib32-llvm' 'lib32-libvdpau'
+ 'lib32-libva' 'lib32-wayland' 'wayland-protocols' 'lib32-libglvnd' 'lib32-lm_sensors')
+url="http://mesa3d.sourceforge.net"
+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.velikov at gmail.com>
+validpgpkeys+=('946D09B5E4C9845E63075FF1D961C596A7203456') # "Andres Gomez <tanty at igalia.com>"
+validpgpkeys+=('E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez at 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() {
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+ export LLVM_CONFIG="/usr/bin/llvm-config32"
+
+ cd ${srcdir}/mesa-${pkgver}
+
+ ./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,svga,swrast,virgl \
+ --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
+ --with-platforms=x11,drm,wayland \
+ --with-vulkan-drivers=intel,radeon \
+ --disable-xvmc \
+ --disable-libunwind \
+ --enable-libglvnd \
+ --enable-llvm \
+ --enable-llvm-shared-libs \
+ --enable-shared-glapi \
+ --enable-lmsensors \
+ --enable-glx-tls \
+ --enable-egl \
+ --enable-glx \
+ --enable-gles1 \
+ --enable-gles2 \
+ --enable-gbm \
+ --enable-dri \
+ --enable-gallium-osmesa \
+ --enable-gallium-extra-hud \
+ --enable-texture-float \
+ --enable-nine \
+ --enable-vdpau
+
+ make
+
+ mkdir $srcdir/fakeinstall
+ make DESTDIR=${srcdir}/fakeinstall install
+}
+
+package_lib32-vulkan-intel() {
+ pkgdesc="Intel's Vulkan mesa driver (32-bit)"
+ depends=('lib32-wayland' 'lib32-libx11' 'lib32-gcc-libs' 'lib32-libxshmfence')
+ provides=('lib32-vulkan-driver')
+
+ install -m755 -d ${pkgdir}/usr/share/vulkan/icd.d
+ cp -rv ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/
+
+ install -m755 -d ${pkgdir}/usr/lib32
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/libvulkan_intel.so ${pkgdir}/usr/lib32/
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/lib32-vulkan-intel"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-vulkan-intel/"
+}
+
+package_lib32-vulkan-radeon() {
+ pkgdesc="Radeon's Vulkan mesa driver (32-bit)"
+ depends=('lib32-wayland' 'lib32-libx11' 'lib32-llvm-libs' 'lib32-libdrm' 'lib32-libelf' 'lib32-libxshmfence')
+ provides=('lib32-vulkan-driver')
+
+ install -m755 -d ${pkgdir}/usr/share/vulkan/icd.d
+ cp -rv ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/
+
+ install -m755 -d ${pkgdir}/usr/lib32
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/libvulkan_radeon.so ${pkgdir}/usr/lib32/
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/lib32-vulkan-radeon"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-vulkan-radeon/"
+}
+
+package_lib32-libva-mesa-driver() {
+ pkgdesc="VA-API implementation for gallium (32-bit)"
+ depends=('lib32-libdrm' 'lib32-libx11' 'lib32-expat' 'lib32-llvm-libs' 'lib32-libelf' 'lib32-lm_sensors'
+ 'lib32-libxshmfence')
+
+ install -m755 -d ${pkgdir}/usr/lib32
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/dri ${pkgdir}/usr/lib32
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/lib32-libva-mesa-driver"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-libva-mesa-driver/"
+}
+
+package_lib32-mesa-vdpau() {
+ pkgdesc="Mesa VDPAU drivers (32-bit)"
+ depends=('lib32-libdrm' 'lib32-libx11' 'lib32-expat' 'lib32-llvm-libs' 'lib32-libelf' 'lib32-lm_sensors'
+ 'lib32-libxshmfence')
+
+ install -m755 -d ${pkgdir}/usr/lib32
+ cp -rv ${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-lm_sensors'
+ 'lib32-libelf' 'lib32-llvm-libs' 'lib32-wayland' 'lib32-libtxc_dxtn' 'lib32-libglvnd' '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' 'lib32-mesa-libgl' 'lib32-opengl-driver')
+ conflicts=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri' 'lib32-mesa-libgl')
+ replaces=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri' 'lib32-mesa-libgl')
+
+ install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
+ # ati-dri, nouveay-dri, intel-dri, swrast
+ cp -av ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/* ${pkgdir}/usr/lib32/xorg/modules/dri
+
+ install -m755 -d ${pkgdir}/usr/lib32
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/d3d ${pkgdir}/usr/lib32
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/lib{gbm,glapi}.so* ${pkgdir}/usr/lib32/
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/libOSMesa.so* ${pkgdir}/usr/lib32/
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/libwayland*.so* ${pkgdir}/usr/lib32/
+ #cp -rv ${srcdir}/fakeinstall/usr/lib32/libswrAVX*.so* ${pkgdir}/usr/lib32/
+
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/pkgconfig ${pkgdir}/usr/lib32/
+
+ # libglvnd support
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/libGLX_mesa.so* ${pkgdir}/usr/lib32/
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/libEGL_mesa.so* ${pkgdir}/usr/lib32/
+ # indirect rendering
+ ln -s /usr/lib32/libGLX_mesa.so.0 ${pkgdir}/usr/lib32/libGLX_indirect.so.0
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa/"
+}
Copied: lib32-mesa/repos/multilib-staging-x86_64/glibc_dropped_xlocale.h.diff (from rev 256716, lib32-mesa/trunk/glibc_dropped_xlocale.h.diff)
===================================================================
--- multilib-staging-x86_64/glibc_dropped_xlocale.h.diff (rev 0)
+++ multilib-staging-x86_64/glibc_dropped_xlocale.h.diff 2017-09-10 01:35:30 UTC (rev 256717)
@@ -0,0 +1,143 @@
+From 49b428470e28ae6ab22083e43fa41abf622f3b0d Mon Sep 17 00:00:00 2001
+From: Eric Engestrom <eric.engestrom at 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 <lordheavym at gmail.com>
+Cc: Emil Velikov <emil.l.velikov at gmail.com>
+Cc: Rob Herring <robh at kernel.org>
+Signed-off-by: Eric Engestrom <eric.engestrom at imgtec.com>
+Reviewed-by: Laurent Carlier <lordheavym at gmail.com>
+Reviewed-by: Jose Fonseca <jfonseca at 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
+
+
More information about the arch-commits
mailing list