[arch-commits] Commit in lib32-mesa/trunk (4 files)
Laurent Carlier
lcarlier at archlinux.org
Sat Mar 31 08:40:49 UTC 2018
Date: Saturday, March 31, 2018 @ 08:40:48
Author: lcarlier
Revision: 313590
upgpkg: lib32-mesa 18.0.0-1
upstream update 18.0.0
Added:
lib32-mesa/trunk/fix-install.diff
lib32-mesa/trunk/fix-versions.diff
Modified:
lib32-mesa/trunk/LICENSE
lib32-mesa/trunk/PKGBUILD
-------------------+
LICENSE | 87 +++++++++++-----------
PKGBUILD | 198 ++++++++++++++++++++++++++++------------------------
fix-install.diff | 29 +++++++
fix-versions.diff | 74 +++++++++++++++++++
4 files changed, 256 insertions(+), 132 deletions(-)
Modified: LICENSE
===================================================================
--- LICENSE 2018-03-31 04:23:42 UTC (rev 313589)
+++ LICENSE 2018-03-31 08:40:48 UTC (rev 313590)
@@ -1,33 +1,34 @@
+The Mesa 3D Graphics Library
+
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.
+ 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
+ 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.
+ * 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, 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 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 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:
+ The default Mesa license is as follows:
Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
@@ -44,39 +45,39 @@
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.
+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.
+ 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)
+Component Location License
+------------------------------------------------------------------
+Main Mesa code src/mesa/ MIT
-Device drivers src/mesa/drivers/* See drivers See drivers
+Device drivers src/mesa/drivers/* MIT, generally
-Ext headers include/GL/glext.h SGI SGI Free B
+Gallium code src/gallium/ MIT
+
+Ext headers include/GL/glext.h Khronos
include/GL/glxext.h
-GLUT src/glut/ Mark Kilgard Mark's copyright
+GLX client code src/glx/ SGI Free Software License B
-Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL
+C11 thread include/c11/threads*.h Boost (permissive) emulation
-SGI GLU library src/glu/sgi/ SGI SGI Free B
+ In general, consult the source files for license terms.
-demo programs progs/demos/ various see source files
+References
-X demos progs/xdemos/ Brian Paul see source files
-
-SGI demos progs/samples/ SGI SGI copyright
-
-RedBook demos progs/redbook/ SGI SGI copyright
+ 1. https://www.opengl.org/
+ 2. https://www.sgi.com/
+ 3. https://www.sgi.com/
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-03-31 04:23:42 UTC (rev 313589)
+++ PKGBUILD 2018-03-31 08:40:48 UTC (rev 313590)
@@ -5,33 +5,43 @@
pkgbase=lib32-mesa
pkgname=('lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau' 'lib32-mesa')
-pkgver=17.3.7
+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')
+ '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)
-sha256sums=('0595904a8fba65a8fe853a84ad3c940205503b94af41e8ceed245fada777ac1e'
+ 0001-glvnd-fix-gl-dot-pc.patch
+ fix-install.diff
+ fix-versions.diff)
+sha512sums=('1494bb09357896a2505b3dcfec772268e28c765804f21e144948a314f1d79d99ff9f21062ef5860eb5a5a568b305a9c954585924a7ac8890fe1ebd8df3bcc396'
'SKIP'
- '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
- '64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966')
-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>"
-
+ '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 ${srcdir}/mesa-${pkgver}
+ cd mesa-${pkgver}
# glvnd support patches - from Fedora
# non-upstreamed ones
patch -Np1 -i ../0001-glvnd-fix-gl-dot-pc.patch
- autoreconf -fiv
+ # 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() {
@@ -40,56 +50,67 @@
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 \
+ arch-meson mesa-$pkgver build \
--libdir=/usr/lib32 \
- --prefix=/usr \
- --sysconfdir=/etc \
- --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
+ -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
- make
+ # Print config
+ meson configure build
- mkdir $srcdir/fakeinstall
- make DESTDIR=${srcdir}/fakeinstall install
+ 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-gcc-libs' 'lib32-libxshmfence')
+ depends=('lib32-wayland' 'lib32-libx11' 'lib32-libdrm' '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 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 -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/"
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
}
package_lib32-vulkan-radeon() {
@@ -97,42 +118,32 @@
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 fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json
+ _install fakeinstall/usr/lib32/libvulkan_radeon.so
- install -m755 -d "${pkgdir}/usr/share/licenses/lib32-vulkan-radeon"
- install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-vulkan-radeon/"
+ 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-lm_sensors'
- 'lib32-libxshmfence')
+ depends=('lib32-libdrm' 'lib32-libx11' 'lib32-expat' 'lib32-llvm-libs' 'lib32-libelf' 'lib32-libxshmfence')
- install -m755 -d ${pkgdir}/usr/lib32/dri
- cp -av ${srcdir}/fakeinstall/usr/lib32/dri/*_drv_video.so ${pkgdir}/usr/lib32/dri
+ _install fakeinstall/usr/lib32/dri/*_drv_video.so
- install -m755 -d "${pkgdir}/usr/share/licenses/lib32-libva-mesa-driver"
- install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-libva-mesa-driver/"
+ 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-lm_sensors'
- 'lib32-libxshmfence')
+ depends=('lib32-libdrm' 'lib32-libx11' 'lib32-expat' 'lib32-llvm-libs' 'lib32-libelf' 'lib32-libxshmfence')
- install -m755 -d ${pkgdir}/usr/lib32/vdpau
- cp -av ${srcdir}/fakeinstall/usr/lib32/vdpau/* ${pkgdir}/usr/lib32/vdpau
+ _install fakeinstall/usr/lib32/vdpau
- install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau"
- install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau/"
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
}
package_lib32-mesa() {
- pkgdesc="an open-source implementation of the OpenGL specification (32-bit)"
+ 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'
@@ -141,25 +152,34 @@
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/dri
- # ati-dri, nouveay-dri, intel-dri, swrast
- cp -av ${srcdir}/fakeinstall/usr/lib32/dri/*_dri.so ${pkgdir}/usr/lib32/dri
+ # 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*
- 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/
+ # in libglvnd
+ rm -v fakeinstall/usr/lib32/libGLESv{1_CM,2}.so*
+
+ _install fakeinstall/usr/lib32/pkgconfig
- cp -rv ${srcdir}/fakeinstall/usr/lib32/pkgconfig ${pkgdir}/usr/lib32/
+ # libglvnd support
+ _install fakeinstall/usr/lib32/libGLX_mesa.so*
+ _install fakeinstall/usr/lib32/libEGL_mesa.so*
- # 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/"
+ 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
}
Added: fix-install.diff
===================================================================
--- fix-install.diff (rev 0)
+++ fix-install.diff 2018-03-31 08:40:48 UTC (rev 313590)
@@ -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)
+
+
Added: fix-versions.diff
===================================================================
--- fix-versions.diff (rev 0)
+++ fix-versions.diff 2018-03-31 08:40:48 UTC (rev 313590)
@@ -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