[arch-commits] Commit in lib32-mesa/repos/multilib-testing-x86_64 (10 files)
Laurent Carlier
lcarlier at archlinux.org
Sun Apr 1 06:35:00 UTC 2018
Date: Sunday, April 1, 2018 @ 06:34:59
Author: lcarlier
Revision: 313707
archrelease: copy trunk to multilib-testing-x86_64
Added:
lib32-mesa/repos/multilib-testing-x86_64/0001-glvnd-fix-gl-dot-pc.patch
(from rev 313706, lib32-mesa/trunk/0001-glvnd-fix-gl-dot-pc.patch)
lib32-mesa/repos/multilib-testing-x86_64/LICENSE
(from rev 313706, lib32-mesa/trunk/LICENSE)
lib32-mesa/repos/multilib-testing-x86_64/PKGBUILD
(from rev 313706, lib32-mesa/trunk/PKGBUILD)
lib32-mesa/repos/multilib-testing-x86_64/fix-install.diff
(from rev 313706, lib32-mesa/trunk/fix-install.diff)
lib32-mesa/repos/multilib-testing-x86_64/fix-versions.diff
(from rev 313706, lib32-mesa/trunk/fix-versions.diff)
Deleted:
lib32-mesa/repos/multilib-testing-x86_64/0001-glvnd-fix-gl-dot-pc.patch
lib32-mesa/repos/multilib-testing-x86_64/LICENSE
lib32-mesa/repos/multilib-testing-x86_64/PKGBUILD
lib32-mesa/repos/multilib-testing-x86_64/fix-install.diff
lib32-mesa/repos/multilib-testing-x86_64/fix-versions.diff
--------------------------------+
0001-glvnd-fix-gl-dot-pc.patch | 24 +-
LICENSE | 166 ++++++++---------
PKGBUILD | 369 +++++++++++++++++++--------------------
fix-install.diff | 58 +++---
fix-versions.diff | 148 +++++++--------
5 files changed, 382 insertions(+), 383 deletions(-)
Deleted: 0001-glvnd-fix-gl-dot-pc.patch
===================================================================
--- 0001-glvnd-fix-gl-dot-pc.patch 2018-04-01 06:34:52 UTC (rev 313706)
+++ 0001-glvnd-fix-gl-dot-pc.patch 2018-04-01 06:34:59 UTC (rev 313707)
@@ -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 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-testing-x86_64/0001-glvnd-fix-gl-dot-pc.patch (from rev 313706, lib32-mesa/trunk/0001-glvnd-fix-gl-dot-pc.patch)
===================================================================
--- 0001-glvnd-fix-gl-dot-pc.patch (rev 0)
+++ 0001-glvnd-fix-gl-dot-pc.patch 2018-04-01 06:34:59 UTC (rev 313707)
@@ -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@
Deleted: LICENSE
===================================================================
--- LICENSE 2018-04-01 06:34:52 UTC (rev 313706)
+++ LICENSE 2018-04-01 06:34:59 UTC (rev 313707)
@@ -1,83 +0,0 @@
-The Mesa 3D Graphics Library
-
-Disclaimer
-
- Mesa is a 3-D graphics library with an API which is very similar to
- that of [1]OpenGL.* To the extent that Mesa utilizes the OpenGL command
- syntax or state machine, it is being used with authorization from
- [2]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 [3]Silicon Graphics Incorporated.
-
-License / Copyright Information
-
- The Mesa distribution consists of several components. Different
- copyrights and licenses apply to different components. For example, the
- GLX client code uses the SGI Free Software License B, and 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
-THE AUTHORS OR COPYRIGHT HOLDERS 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 License
-------------------------------------------------------------------
-Main Mesa code src/mesa/ MIT
-
-Device drivers src/mesa/drivers/* MIT, generally
-
-Gallium code src/gallium/ MIT
-
-Ext headers include/GL/glext.h Khronos
- include/GL/glxext.h
-
-GLX client code src/glx/ SGI Free Software License B
-
-C11 thread include/c11/threads*.h Boost (permissive) emulation
-
- In general, consult the source files for license terms.
-
-References
-
- 1. https://www.opengl.org/
- 2. https://www.sgi.com/
- 3. https://www.sgi.com/
Copied: lib32-mesa/repos/multilib-testing-x86_64/LICENSE (from rev 313706, lib32-mesa/trunk/LICENSE)
===================================================================
--- LICENSE (rev 0)
+++ LICENSE 2018-04-01 06:34:59 UTC (rev 313707)
@@ -0,0 +1,83 @@
+The Mesa 3D Graphics Library
+
+Disclaimer
+
+ Mesa is a 3-D graphics library with an API which is very similar to
+ that of [1]OpenGL.* To the extent that Mesa utilizes the OpenGL command
+ syntax or state machine, it is being used with authorization from
+ [2]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 [3]Silicon Graphics Incorporated.
+
+License / Copyright Information
+
+ The Mesa distribution consists of several components. Different
+ copyrights and licenses apply to different components. For example, the
+ GLX client code uses the SGI Free Software License B, and 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
+THE AUTHORS OR COPYRIGHT HOLDERS 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 License
+------------------------------------------------------------------
+Main Mesa code src/mesa/ MIT
+
+Device drivers src/mesa/drivers/* MIT, generally
+
+Gallium code src/gallium/ MIT
+
+Ext headers include/GL/glext.h Khronos
+ include/GL/glxext.h
+
+GLX client code src/glx/ SGI Free Software License B
+
+C11 thread include/c11/threads*.h Boost (permissive) emulation
+
+ In general, consult the source files for license terms.
+
+References
+
+ 1. https://www.opengl.org/
+ 2. https://www.sgi.com/
+ 3. https://www.sgi.com/
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-04-01 06:34:52 UTC (rev 313706)
+++ PKGBUILD 2018-04-01 06:34:59 UTC (rev 313707)
@@ -1,185 +0,0 @@
-# $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=18.0.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-libva' 'lib32-wayland' 'wayland-protocols' 'lib32-libglvnd' 'lib32-lm_sensors' 'meson')
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
- LICENSE
- 0001-glvnd-fix-gl-dot-pc.patch
- fix-install.diff
- fix-versions.diff)
-sha512sums=('1494bb09357896a2505b3dcfec772268e28c765804f21e144948a314f1d79d99ff9f21062ef5860eb5a5a568b305a9c954585924a7ac8890fe1ebd8df3bcc396'
- 'SKIP'
- 'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7'
- '75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028'
- 'da32ac3b025282c584bfc962723151b6e11887e59e35086c616a987cb3a471051d60f2b303a91f37106ebb75621cbd9b3f560036f5beb88518cfe9d75c45ee03'
- '7ab28153780c5fa0f443873a627201e7d434991e5ce18ef2a05f678aa4561e172b2ad9a56fb01b72a8482bba650e26a08df10b4d4d6bb696c523f73196a47e39')
-validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.velikov at gmail.com>
- '946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez <tanty at igalia.com>
- 'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez at igalia.com>"
-
-prepare() {
- cd mesa-${pkgver}
-
- # glvnd support patches - from Fedora
- # non-upstreamed ones
- patch -Np1 -i ../0001-glvnd-fix-gl-dot-pc.patch
-
- # fix symlinks created for vdpau drivers to be relative
- # this is upstreamable
- patch -Np1 -i ../fix-install.diff
-
- # fix library versioning
- # this is upstreamable
- patch -Np1 -i ../fix-versions.diff
-}
-
-build() {
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
- export LLVM_CONFIG="/usr/bin/llvm-config32"
-
- arch-meson mesa-$pkgver build \
- --libdir=/usr/lib32 \
- -D b_lto=false \
- -D platforms=x11,wayland,drm,surfaceless \
- -D dri-drivers=i915,i965,r100,r200,nouveau \
- -D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,swr \
- -D vulkan-drivers=amd,intel \
- -D swr-arches=avx,avx2 \
- -D dri3=true \
- -D egl=true \
- -D gallium-extra-hud=true \
- -D gallium-nine=true \
- -D gallium-omx=false \
- -D gallium-opencl=disabled \
- -D gallium-va=true \
- -D gallium-vdpau=true \
- -D gallium-xa=true \
- -D gallium-xvmc=false \
- -D gbm=true \
- -D gles1=true \
- -D gles2=true \
- -D glvnd=true \
- -D glx=dri \
- -D libunwind=false \
- -D llvm=true \
- -D lmsensors=true \
- -D osmesa=gallium \
- -D shared-glapi=true \
- -D texture-float=true \
- -D valgrind=false
-
- # Print config
- meson configure build
-
- ninja -C build
-
- # fake installation to be seperated into packages
- # outside of fakeroot but mesa doesn't need to chown/mod
- DESTDIR="${srcdir}/fakeinstall" ninja -C build install
-}
-
-_install() {
- local src f dir
- for src; do
- f="${src#fakeinstall/}"
- dir="${pkgdir}/${f%/*}"
- install -m755 -d "${dir}"
- mv -v "${src}" "${dir}/"
- done
-}
-
-package_lib32-vulkan-intel() {
- pkgdesc="Intel's Vulkan mesa driver (32-bit)"
- depends=('lib32-wayland' 'lib32-libx11' 'lib32-libdrm' 'lib32-libxshmfence')
- provides=('lib32-vulkan-driver')
-
- _install fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json
- _install fakeinstall/usr/lib32/libvulkan_intel.so
- _install fakeinstall/usr/include/vulkan/vulkan_intel.h
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-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 fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json
- _install fakeinstall/usr/lib32/libvulkan_radeon.so
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-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-libxshmfence')
-
- _install fakeinstall/usr/lib32/dri/*_drv_video.so
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_lib32-mesa-vdpau() {
- pkgdesc="Mesa VDPAU drivers (32-bit)"
- depends=('lib32-libdrm' 'lib32-libx11' 'lib32-expat' 'lib32-llvm-libs' 'lib32-libelf' 'lib32-libxshmfence')
-
- _install fakeinstall/usr/lib32/vdpau
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-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-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')
-
- # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast
- _install fakeinstall/usr/lib32/dri/*_dri.so
-
- _install fakeinstall/usr/lib32/d3d
- _install fakeinstall/usr/lib32/lib{gbm,glapi}.so*
- _install fakeinstall/usr/lib32/libOSMesa.so*
- _install fakeinstall/usr/lib32/libwayland*.so*
- _install fakeinstall/usr/lib32/libxatracker.so*
- _install fakeinstall/usr/lib32/libswrAVX*.so*
-
- # in libglvnd
- rm -v fakeinstall/usr/lib32/libGLESv{1_CM,2}.so*
-
- _install fakeinstall/usr/lib32/pkgconfig
-
- # libglvnd support
- _install fakeinstall/usr/lib32/libGLX_mesa.so*
- _install fakeinstall/usr/lib32/libEGL_mesa.so*
-
- # indirect rendering
- ln -s /usr/lib32/libGLX_mesa.so.0 "${pkgdir}/usr/lib32/libGLX_indirect.so.0"
-
- rm -rv fakeinstall/etc
- rm -rv fakeinstall/usr/include
- rm -rv fakeinstall/usr/share
-
- # make sure there are no files left to install
- find fakeinstall -depth -print0 | xargs -0 rmdir
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
Copied: lib32-mesa/repos/multilib-testing-x86_64/PKGBUILD (from rev 313706, lib32-mesa/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-04-01 06:34:59 UTC (rev 313707)
@@ -0,0 +1,184 @@
+# $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=18.0.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' 'meson')
+url="http://mesa3d.sourceforge.net"
+license=('custom')
+source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
+ LICENSE
+ 0001-glvnd-fix-gl-dot-pc.patch
+ fix-install.diff
+ fix-versions.diff)
+sha512sums=('1494bb09357896a2505b3dcfec772268e28c765804f21e144948a314f1d79d99ff9f21062ef5860eb5a5a568b305a9c954585924a7ac8890fe1ebd8df3bcc396'
+ 'SKIP'
+ 'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7'
+ '75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028'
+ 'da32ac3b025282c584bfc962723151b6e11887e59e35086c616a987cb3a471051d60f2b303a91f37106ebb75621cbd9b3f560036f5beb88518cfe9d75c45ee03'
+ '7ab28153780c5fa0f443873a627201e7d434991e5ce18ef2a05f678aa4561e172b2ad9a56fb01b72a8482bba650e26a08df10b4d4d6bb696c523f73196a47e39')
+validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.velikov at gmail.com>
+ '946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez <tanty at igalia.com>
+ 'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez at igalia.com>"
+
+prepare() {
+ cd mesa-${pkgver}
+
+ # glvnd support patches - from Fedora
+ # non-upstreamed ones
+ patch -Np1 -i ../0001-glvnd-fix-gl-dot-pc.patch
+
+ # fix symlinks created for vdpau drivers to be relative
+ # this is upstreamable
+ patch -Np1 -i ../fix-install.diff
+
+ # fix library versioning
+ # this is upstreamable
+ patch -Np1 -i ../fix-versions.diff
+}
+
+build() {
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+ export LLVM_CONFIG="/usr/bin/llvm-config32"
+
+ arch-meson mesa-$pkgver build \
+ --libdir=/usr/lib32 \
+ -D b_lto=false \
+ -D platforms=x11,wayland,drm,surfaceless \
+ -D dri-drivers=i915,i965,r100,r200,nouveau \
+ -D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,swr \
+ -D vulkan-drivers=amd,intel \
+ -D swr-arches=avx,avx2 \
+ -D dri3=true \
+ -D egl=true \
+ -D gallium-extra-hud=true \
+ -D gallium-nine=true \
+ -D gallium-omx=false \
+ -D gallium-opencl=disabled \
+ -D gallium-va=true \
+ -D gallium-vdpau=true \
+ -D gallium-xa=true \
+ -D gallium-xvmc=false \
+ -D gbm=true \
+ -D gles1=true \
+ -D gles2=true \
+ -D glvnd=true \
+ -D glx=dri \
+ -D libunwind=false \
+ -D llvm=true \
+ -D lmsensors=true \
+ -D osmesa=gallium \
+ -D shared-glapi=true \
+ -D texture-float=true \
+ -D valgrind=false
+
+ # Print config
+ meson configure build
+
+ ninja -C build
+
+ # fake installation to be seperated into packages
+ # outside of fakeroot but mesa doesn't need to chown/mod
+ DESTDIR="${srcdir}/fakeinstall" ninja -C build install
+}
+
+_install() {
+ local src f dir
+ for src; do
+ f="${src#fakeinstall/}"
+ dir="${pkgdir}/${f%/*}"
+ install -m755 -d "${dir}"
+ mv -v "${src}" "${dir}/"
+ done
+}
+
+package_lib32-vulkan-intel() {
+ pkgdesc="Intel's Vulkan mesa driver (32-bit)"
+ depends=('lib32-wayland' 'lib32-libx11' 'lib32-libdrm' 'lib32-libxshmfence')
+ provides=('lib32-vulkan-driver')
+
+ _install fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json
+ _install fakeinstall/usr/lib32/libvulkan_intel.so
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+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 fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json
+ _install fakeinstall/usr/lib32/libvulkan_radeon.so
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+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-libxshmfence')
+
+ _install fakeinstall/usr/lib32/dri/*_drv_video.so
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_lib32-mesa-vdpau() {
+ pkgdesc="Mesa VDPAU drivers (32-bit)"
+ depends=('lib32-libdrm' 'lib32-libx11' 'lib32-expat' 'lib32-llvm-libs' 'lib32-libelf' 'lib32-libxshmfence')
+
+ _install fakeinstall/usr/lib32/vdpau
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+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-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')
+
+ # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast
+ _install fakeinstall/usr/lib32/dri/*_dri.so
+
+ _install fakeinstall/usr/lib32/d3d
+ _install fakeinstall/usr/lib32/lib{gbm,glapi}.so*
+ _install fakeinstall/usr/lib32/libOSMesa.so*
+ _install fakeinstall/usr/lib32/libwayland*.so*
+ _install fakeinstall/usr/lib32/libxatracker.so*
+ _install fakeinstall/usr/lib32/libswrAVX*.so*
+
+ # in libglvnd
+ rm -v fakeinstall/usr/lib32/libGLESv{1_CM,2}.so*
+
+ _install fakeinstall/usr/lib32/pkgconfig
+
+ # libglvnd support
+ _install fakeinstall/usr/lib32/libGLX_mesa.so*
+ _install fakeinstall/usr/lib32/libEGL_mesa.so*
+
+ # indirect rendering
+ ln -s /usr/lib32/libGLX_mesa.so.0 "${pkgdir}/usr/lib32/libGLX_indirect.so.0"
+
+ rm -rv fakeinstall/etc
+ rm -rv fakeinstall/usr/include
+ rm -rv fakeinstall/usr/share
+
+ # make sure there are no files left to install
+ find fakeinstall -depth -print0 | xargs -0 rmdir
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
Deleted: fix-install.diff
===================================================================
--- fix-install.diff 2018-04-01 06:34:52 UTC (rev 313706)
+++ fix-install.diff 2018-04-01 06:34:59 UTC (rev 313707)
@@ -1,29 +0,0 @@
-diff -u -r mesa/bin/install_megadrivers.py mesa-patched/bin/install_megadrivers.py
---- mesa/bin/install_megadrivers.py 2018-03-27 19:35:14.000000000 +0200
-+++ mesa-patched/bin/install_megadrivers.py 2018-03-28 10:27:15.898280592 +0200
-@@ -50,18 +50,13 @@
- print('installing {} to {}'.format(args.megadriver, driver))
- os.link(master, driver)
-
-- try:
-- ret = os.getcwd()
-- os.chdir(to)
--
-- name, ext = os.path.splitext(each)
-- while ext != '.so':
-- if os.path.exists(name):
-- os.unlink(name)
-- os.symlink(driver, name)
-- name, ext = os.path.splitext(name)
-- finally:
-- os.chdir(ret)
-+ name, ext = os.path.splitext(each)
-+ while ext != '.so':
-+ symlink = os.path.join(to, name)
-+ if os.path.exists(symlink):
-+ os.unlink(symlink)
-+ os.symlink(each, symlink)
-+ name, ext = os.path.splitext(name)
- os.unlink(master)
-
-
Copied: lib32-mesa/repos/multilib-testing-x86_64/fix-install.diff (from rev 313706, lib32-mesa/trunk/fix-install.diff)
===================================================================
--- fix-install.diff (rev 0)
+++ fix-install.diff 2018-04-01 06:34:59 UTC (rev 313707)
@@ -0,0 +1,29 @@
+diff -u -r mesa/bin/install_megadrivers.py mesa-patched/bin/install_megadrivers.py
+--- mesa/bin/install_megadrivers.py 2018-03-27 19:35:14.000000000 +0200
++++ mesa-patched/bin/install_megadrivers.py 2018-03-28 10:27:15.898280592 +0200
+@@ -50,18 +50,13 @@
+ print('installing {} to {}'.format(args.megadriver, driver))
+ os.link(master, driver)
+
+- try:
+- ret = os.getcwd()
+- os.chdir(to)
+-
+- name, ext = os.path.splitext(each)
+- while ext != '.so':
+- if os.path.exists(name):
+- os.unlink(name)
+- os.symlink(driver, name)
+- name, ext = os.path.splitext(name)
+- finally:
+- os.chdir(ret)
++ name, ext = os.path.splitext(each)
++ while ext != '.so':
++ symlink = os.path.join(to, name)
++ if os.path.exists(symlink):
++ os.unlink(symlink)
++ os.symlink(each, symlink)
++ name, ext = os.path.splitext(name)
+ os.unlink(master)
+
+
Deleted: fix-versions.diff
===================================================================
--- fix-versions.diff 2018-04-01 06:34:52 UTC (rev 313706)
+++ fix-versions.diff 2018-04-01 06:34:59 UTC (rev 313707)
@@ -1,74 +0,0 @@
-diff -u -r mesa/src/gallium/drivers/swr/meson.build mesa-patched/src/gallium/drivers/swr/meson.build
---- mesa/src/gallium/drivers/swr/meson.build 2018-03-27 19:35:15.000000000 +0200
-+++ mesa-patched/src/gallium/drivers/swr/meson.build 2018-03-28 11:27:05.025710444 +0200
-@@ -198,6 +198,7 @@
- link_args : [ld_args_gc_sections],
- include_directories : [swr_incs],
- dependencies : [dep_thread, dep_llvm],
-+ version : '0.0.0',
- install : true,
- )
- endif
-@@ -230,6 +231,7 @@
- link_args : [ld_args_gc_sections],
- include_directories : [swr_incs],
- dependencies : [dep_thread, dep_llvm],
-+ version : '0.0.0',
- install : true,
- )
- endif
-@@ -257,6 +259,7 @@
- link_args : [ld_args_gc_sections],
- include_directories : [swr_incs],
- dependencies : [dep_thread, dep_llvm],
-+ version : '0.0.0',
- install : true,
- )
- endif
-@@ -281,6 +284,7 @@
- link_args : [ld_args_gc_sections],
- include_directories : [swr_incs],
- dependencies : [dep_thread, dep_llvm],
-+ version : '0.0.0',
- install : true,
- )
- endif
-diff -u -r mesa/src/gallium/targets/opencl/meson.build mesa-patched/src/gallium/targets/opencl/meson.build
---- mesa/src/gallium/targets/opencl/meson.build 2018-03-27 19:35:15.000000000 +0200
-+++ mesa-patched/src/gallium/targets/opencl/meson.build 2018-03-28 11:28:56.345996522 +0200
-@@ -20,7 +20,6 @@
-
- opencl_link_args = []
- opencl_link_deps = []
--opencl_version = '1.0'
-
- if with_ld_version_script
- opencl_link_args += [
-@@ -55,14 +54,14 @@
- cpp.find_library('clangLex', dirs : llvm_libdir),
- cpp.find_library('clangBasic', dirs : llvm_libdir),
- ],
-- version : opencl_version,
-+ version : '1.0.0',
- install : true,
- )
-
- if with_opencl_icd
- _config = configuration_data()
- _config.set('OPENCL_LIBNAME', 'MesaOpenCL')
-- _config.set('OPENCL_VERSION', opencl_version)
-+ _config.set('OPENCL_VERSION', '1.0')
- configure_file(
- configuration : _config,
- input : 'mesa.icd.in',
-diff -u -r mesa/src/gallium/targets/xa/meson.build mesa-patched/src/gallium/targets/xa/meson.build
---- mesa/src/gallium/targets/xa/meson.build 2018-03-27 19:35:15.000000000 +0200
-+++ mesa-patched/src/gallium/targets/xa/meson.build 2018-03-28 11:10:32.110287167 +0200
-@@ -49,6 +49,7 @@
- dependencies : [
- dep_thread, driver_nouveau, driver_i915, driver_svga, driver_freedreno,
- ],
-+ version : '2.3.0',
- install : true,
- )
-
Copied: lib32-mesa/repos/multilib-testing-x86_64/fix-versions.diff (from rev 313706, lib32-mesa/trunk/fix-versions.diff)
===================================================================
--- fix-versions.diff (rev 0)
+++ fix-versions.diff 2018-04-01 06:34:59 UTC (rev 313707)
@@ -0,0 +1,74 @@
+diff -u -r mesa/src/gallium/drivers/swr/meson.build mesa-patched/src/gallium/drivers/swr/meson.build
+--- mesa/src/gallium/drivers/swr/meson.build 2018-03-27 19:35:15.000000000 +0200
++++ mesa-patched/src/gallium/drivers/swr/meson.build 2018-03-28 11:27:05.025710444 +0200
+@@ -198,6 +198,7 @@
+ link_args : [ld_args_gc_sections],
+ include_directories : [swr_incs],
+ dependencies : [dep_thread, dep_llvm],
++ version : '0.0.0',
+ install : true,
+ )
+ endif
+@@ -230,6 +231,7 @@
+ link_args : [ld_args_gc_sections],
+ include_directories : [swr_incs],
+ dependencies : [dep_thread, dep_llvm],
++ version : '0.0.0',
+ install : true,
+ )
+ endif
+@@ -257,6 +259,7 @@
+ link_args : [ld_args_gc_sections],
+ include_directories : [swr_incs],
+ dependencies : [dep_thread, dep_llvm],
++ version : '0.0.0',
+ install : true,
+ )
+ endif
+@@ -281,6 +284,7 @@
+ link_args : [ld_args_gc_sections],
+ include_directories : [swr_incs],
+ dependencies : [dep_thread, dep_llvm],
++ version : '0.0.0',
+ install : true,
+ )
+ endif
+diff -u -r mesa/src/gallium/targets/opencl/meson.build mesa-patched/src/gallium/targets/opencl/meson.build
+--- mesa/src/gallium/targets/opencl/meson.build 2018-03-27 19:35:15.000000000 +0200
++++ mesa-patched/src/gallium/targets/opencl/meson.build 2018-03-28 11:28:56.345996522 +0200
+@@ -20,7 +20,6 @@
+
+ opencl_link_args = []
+ opencl_link_deps = []
+-opencl_version = '1.0'
+
+ if with_ld_version_script
+ opencl_link_args += [
+@@ -55,14 +54,14 @@
+ cpp.find_library('clangLex', dirs : llvm_libdir),
+ cpp.find_library('clangBasic', dirs : llvm_libdir),
+ ],
+- version : opencl_version,
++ version : '1.0.0',
+ install : true,
+ )
+
+ if with_opencl_icd
+ _config = configuration_data()
+ _config.set('OPENCL_LIBNAME', 'MesaOpenCL')
+- _config.set('OPENCL_VERSION', opencl_version)
++ _config.set('OPENCL_VERSION', '1.0')
+ configure_file(
+ configuration : _config,
+ input : 'mesa.icd.in',
+diff -u -r mesa/src/gallium/targets/xa/meson.build mesa-patched/src/gallium/targets/xa/meson.build
+--- mesa/src/gallium/targets/xa/meson.build 2018-03-27 19:35:15.000000000 +0200
++++ mesa-patched/src/gallium/targets/xa/meson.build 2018-03-28 11:10:32.110287167 +0200
+@@ -49,6 +49,7 @@
+ dependencies : [
+ dep_thread, driver_nouveau, driver_i915, driver_svga, driver_freedreno,
+ ],
++ version : '2.3.0',
+ install : true,
+ )
+
More information about the arch-commits
mailing list