[arch-commits] Commit in lib32-mesa/repos (6 files)
Laurent Carlier
lcarlier at archlinux.org
Wed May 17 05:27:08 UTC 2017
Date: Wednesday, May 17, 2017 @ 05:27:08
Author: lcarlier
Revision: 228356
archrelease: copy trunk to multilib-testing-x86_64
Added:
lib32-mesa/repos/multilib-testing-x86_64/
lib32-mesa/repos/multilib-testing-x86_64/0001-Fix-linkage-against-shared-glapi.patch
(from rev 228355, lib32-mesa/trunk/0001-Fix-linkage-against-shared-glapi.patch)
lib32-mesa/repos/multilib-testing-x86_64/0001-glxglvnddispatch-Add-missing-dispatch-for-GetDriverC.patch
(from rev 228355, lib32-mesa/trunk/0001-glxglvnddispatch-Add-missing-dispatch-for-GetDriverC.patch)
lib32-mesa/repos/multilib-testing-x86_64/LICENSE
(from rev 228355, lib32-mesa/trunk/LICENSE)
lib32-mesa/repos/multilib-testing-x86_64/PKGBUILD
(from rev 228355, lib32-mesa/trunk/PKGBUILD)
lib32-mesa/repos/multilib-testing-x86_64/glvnd-fix-gl-dot-pc.patch
(from rev 228355, lib32-mesa/trunk/glvnd-fix-gl-dot-pc.patch)
-----------------------------------------------------------------+
0001-Fix-linkage-against-shared-glapi.patch | 26 +
0001-glxglvnddispatch-Add-missing-dispatch-for-GetDriverC.patch | 88 +++++
LICENSE | 82 +++++
PKGBUILD | 160 ++++++++++
glvnd-fix-gl-dot-pc.patch | 12
5 files changed, 368 insertions(+)
Copied: lib32-mesa/repos/multilib-testing-x86_64/0001-Fix-linkage-against-shared-glapi.patch (from rev 228355, lib32-mesa/trunk/0001-Fix-linkage-against-shared-glapi.patch)
===================================================================
--- multilib-testing-x86_64/0001-Fix-linkage-against-shared-glapi.patch (rev 0)
+++ multilib-testing-x86_64/0001-Fix-linkage-against-shared-glapi.patch 2017-05-17 05:27:08 UTC (rev 228356)
@@ -0,0 +1,26 @@
+From 1b5a187c3c31513ae39cd2a917a3234c2c5f87fc Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Wed, 12 Oct 2016 13:41:33 -0400
+Subject: [PATCH] Fix linkage against shared glapi
+
+Signed-off-by: Adam Jackson <ajax at 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 at 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: lib32-mesa/repos/multilib-testing-x86_64/0001-glxglvnddispatch-Add-missing-dispatch-for-GetDriverC.patch (from rev 228355, lib32-mesa/trunk/0001-glxglvnddispatch-Add-missing-dispatch-for-GetDriverC.patch)
===================================================================
--- multilib-testing-x86_64/0001-glxglvnddispatch-Add-missing-dispatch-for-GetDriverC.patch (rev 0)
+++ multilib-testing-x86_64/0001-glxglvnddispatch-Add-missing-dispatch-for-GetDriverC.patch 2017-05-17 05:27:08 UTC (rev 228356)
@@ -0,0 +1,88 @@
+From efa4f2ebc1e788c3f1cfcf3842058cf838171653 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede at redhat.com>
+Date: Mon, 20 Mar 2017 08:41:26 +0100
+Subject: [PATCH] glxglvnddispatch: Add missing dispatch for GetDriverConfig
+
+Together with some fixes to xdriinfo this fixes xdriinfo not working
+with glvnd.
+
+Since apps (xdriinfo) expect GetDriverConfig to work without going to
+need through the dance to setup a glxcontext (which is a reasonable
+expectation IMHO), the dispatch for this ends up significantly different
+then any other dispatch function.
+
+This patch gets the job done, but I'm not really happy with how this
+patch turned out, suggestions for a better fix are welcome.
+
+Cc: Kyle Brenneman <kbrenneman at nvidia.com>
+Signed-off-by: Hans de Goede <hdegoede at redhat.com>
+---
+ src/glx/g_glxglvnddispatchfuncs.c | 18 ++++++++++++++++++
+ src/glx/g_glxglvnddispatchindices.h | 1 +
+ 2 files changed, 19 insertions(+)
+
+diff --git a/src/glx/g_glxglvnddispatchfuncs.c b/src/glx/g_glxglvnddispatchfuncs.c
+index b5e3398..040cdf8 100644
+--- a/src/glx/g_glxglvnddispatchfuncs.c
++++ b/src/glx/g_glxglvnddispatchfuncs.c
+@@ -4,6 +4,7 @@
+ */
+ #include <stdlib.h>
+
++#include "glxclient.h"
+ #include "glxglvnd.h"
+ #include "glxglvnddispatchfuncs.h"
+ #include "g_glxglvnddispatchindices.h"
+@@ -50,6 +51,7 @@ const char * const __glXDispatchTableStrings[DI_LAST_INDEX] = {
+ __ATTRIB(GetCurrentDisplayEXT),
+ // glXGetCurrentDrawable implemented by libglvnd
+ // glXGetCurrentReadDrawable implemented by libglvnd
++ __ATTRIB(GetDriverConfig),
+ // glXGetFBConfigAttrib implemented by libglvnd
+ __ATTRIB(GetFBConfigAttribSGIX),
+ __ATTRIB(GetFBConfigFromVisualSGIX),
+@@ -334,6 +336,21 @@ static Display *dispatch_GetCurrentDisplayEXT(void)
+
+
+
++static const char *dispatch_GetDriverConfig(const char *driverName)
++{
++ /*
++ * The options are constant for a given driverName, so we do not need
++ * a context (and apps expect to be able to call this without one).
++ */
++#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
++ return glXGetDriverConfig(driverName);
++#else
++ return NULL;
++#endif
++}
++
++
++
+ static int dispatch_GetFBConfigAttribSGIX(Display *dpy, GLXFBConfigSGIX config,
+ int attribute, int *value_return)
+ {
+@@ -939,6 +956,7 @@ const void * const __glXDispatchFunctions[DI_LAST_INDEX + 1] = {
+ __ATTRIB(DestroyGLXPbufferSGIX),
+ __ATTRIB(GetContextIDEXT),
+ __ATTRIB(GetCurrentDisplayEXT),
++ __ATTRIB(GetDriverConfig),
+ __ATTRIB(GetFBConfigAttribSGIX),
+ __ATTRIB(GetFBConfigFromVisualSGIX),
+ __ATTRIB(GetMscRateOML),
+diff --git a/src/glx/g_glxglvnddispatchindices.h b/src/glx/g_glxglvnddispatchindices.h
+index 05a2c8c..3ba50a7 100644
+--- a/src/glx/g_glxglvnddispatchindices.h
++++ b/src/glx/g_glxglvnddispatchindices.h
+@@ -39,6 +39,7 @@ typedef enum __GLXdispatchIndex {
+ DI_GetCurrentDisplayEXT,
+ // GetCurrentDrawable implemented by libglvnd
+ // GetCurrentReadDrawable implemented by libglvnd
++ DI_GetDriverConfig,
+ // GetFBConfigAttrib implemented by libglvnd
+ DI_GetFBConfigAttribSGIX,
+ DI_GetFBConfigFromVisualSGIX,
+--
+2.9.3
+
Copied: lib32-mesa/repos/multilib-testing-x86_64/LICENSE (from rev 228355, lib32-mesa/trunk/LICENSE)
===================================================================
--- multilib-testing-x86_64/LICENSE (rev 0)
+++ multilib-testing-x86_64/LICENSE 2017-05-17 05:27:08 UTC (rev 228356)
@@ -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-testing-x86_64/PKGBUILD (from rev 228355, lib32-mesa/trunk/PKGBUILD)
===================================================================
--- multilib-testing-x86_64/PKGBUILD (rev 0)
+++ multilib-testing-x86_64/PKGBUILD 2017-05-17 05:27:08 UTC (rev 228356)
@@ -0,0 +1,160 @@
+# $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-mesa-vdpau' 'lib32-mesa')
+pkgver=17.1.0
+pkgrel=1
+arch=('x86_64')
+makedepends=('python2-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto'
+ 'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'gcc-multilib' 'lib32-libelf' 'lib32-llvm' 'lib32-libvdpau'
+ 'lib32-wayland' 'lib32-libglvnd' 'lib32-lm_sensors')
+url="http://mesa3d.sourceforge.net"
+license=('custom')
+source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
+ LICENSE
+ 0001-Fix-linkage-against-shared-glapi.patch
+ 0001-glxglvnddispatch-Add-missing-dispatch-for-GetDriverC.patch
+ glvnd-fix-gl-dot-pc.patch)
+sha256sums=('cf234a6ed4764673886b6661553b54675776ef0898f774716173cec890ac3b17'
+ 'SKIP'
+ '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
+ 'c68d1522f9bce4ce31c92aa7a688da49f13043f5bb2254795b76dea8f47130b7'
+ '4a0620f9197a65f830e3c512faba374a4bde45fee9e11f82321774c24d08232d'
+ '64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966')
+validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov at gmail.com>
+validpgpkeys+=('946D09B5E4C9845E63075FF1D961C596A7203456') # "Andres Gomez <tanty at igalia.com>"
+
+prepare() {
+ cd ${srcdir}/mesa-${pkgver}
+
+ # glvnd support patches - from Fedora
+ # non-upstreamed ones
+ patch -Np1 -i ../glvnd-fix-gl-dot-pc.patch
+ patch -Np1 -i ../0001-Fix-linkage-against-shared-glapi.patch
+ patch -Np1 -i ../0001-glxglvnddispatch-Add-missing-dispatch-for-GetDriverC.patch
+
+ autoreconf -fiv
+}
+
+build() {
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+ export LLVM_CONFIG="/usr/bin/llvm-config32"
+
+ cd ${srcdir}/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,swr \
+ --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-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-testing-x86_64/glvnd-fix-gl-dot-pc.patch (from rev 228355, lib32-mesa/trunk/glvnd-fix-gl-dot-pc.patch)
===================================================================
--- multilib-testing-x86_64/glvnd-fix-gl-dot-pc.patch (rev 0)
+++ multilib-testing-x86_64/glvnd-fix-gl-dot-pc.patch 2017-05-17 05:27:08 UTC (rev 228356)
@@ -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@
More information about the arch-commits
mailing list