Date: Sunday, May 13, 2018 @ 16:18:04 Author: lcarlier Revision: 321609
archrelease: copy trunk to multilib-testing-x86_64 Added: lib32-mesa/repos/multilib-testing-x86_64/ lib32-mesa/repos/multilib-testing-x86_64/0001-glvnd-fix-gl-dot-pc.patch (from rev 321608, lib32-mesa/trunk/0001-glvnd-fix-gl-dot-pc.patch) lib32-mesa/repos/multilib-testing-x86_64/0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch (from rev 321608, lib32-mesa/trunk/0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch) lib32-mesa/repos/multilib-testing-x86_64/0004-meson-Add-library-versions-to-swr-drivers.patch (from rev 321608, lib32-mesa/trunk/0004-meson-Add-library-versions-to-swr-drivers.patch) lib32-mesa/repos/multilib-testing-x86_64/0005-meson-Version-libMesaOpenCL-like-autotools-does.patch (from rev 321608, lib32-mesa/trunk/0005-meson-Version-libMesaOpenCL-like-autotools-does.patch) lib32-mesa/repos/multilib-testing-x86_64/LICENSE (from rev 321608, lib32-mesa/trunk/LICENSE) lib32-mesa/repos/multilib-testing-x86_64/PKGBUILD (from rev 321608, lib32-mesa/trunk/PKGBUILD) --------------------------------------------------------------------------------+ 0001-glvnd-fix-gl-dot-pc.patch | 12 0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch | 14 0004-meson-Add-library-versions-to-swr-drivers.patch | 71 +++ 0005-meson-Version-libMesaOpenCL-like-autotools-does.patch | 43 ++ LICENSE | 83 ++++ PKGBUILD | 188 ++++++++++ 6 files changed, 411 insertions(+) Copied: lib32-mesa/repos/multilib-testing-x86_64/0001-glvnd-fix-gl-dot-pc.patch (from rev 321608, lib32-mesa/trunk/0001-glvnd-fix-gl-dot-pc.patch) =================================================================== --- multilib-testing-x86_64/0001-glvnd-fix-gl-dot-pc.patch (rev 0) +++ multilib-testing-x86_64/0001-glvnd-fix-gl-dot-pc.patch 2018-05-13 16:18:04 UTC (rev 321609) @@ -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@ Copied: lib32-mesa/repos/multilib-testing-x86_64/0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch (from rev 321608, lib32-mesa/trunk/0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch) =================================================================== --- multilib-testing-x86_64/0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch (rev 0) +++ multilib-testing-x86_64/0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch 2018-05-13 16:18:04 UTC (rev 321609) @@ -0,0 +1,14 @@ +diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c +index 6bb11c4..7bd79af 100644 +--- a/src/loader/loader_dri3_helper.c ++++ b/src/loader/loader_dri3_helper.c +@@ -234,6 +234,9 @@ loader_dri3_drawable_fini(struct loader_dri3_drawable *draw) + { + int i; + ++ if (draw->special_event) ++ loader_dri3_swapbuffer_barrier(draw); ++ + draw->ext->core->destroyDrawable(draw->dri_drawable); + + for (i = 0; i < ARRAY_SIZE(draw->buffers); i++) { Copied: lib32-mesa/repos/multilib-testing-x86_64/0004-meson-Add-library-versions-to-swr-drivers.patch (from rev 321608, lib32-mesa/trunk/0004-meson-Add-library-versions-to-swr-drivers.patch) =================================================================== --- multilib-testing-x86_64/0004-meson-Add-library-versions-to-swr-drivers.patch (rev 0) +++ multilib-testing-x86_64/0004-meson-Add-library-versions-to-swr-drivers.patch 2018-05-13 16:18:04 UTC (rev 321609) @@ -0,0 +1,71 @@ +From cd56731b2c63532d6ed97f7b39afa5977936b3bc Mon Sep 17 00:00:00 2001 +Message-Id: <cd56731b2c63532d6ed97f7b39afa5977936b3bc.1523725229.git.jan.steff...@gmail.com> +In-Reply-To: <ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.git.jan.steff...@gmail.com> +References: <ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.git.jan.steff...@gmail.com> +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +Date: Sat, 14 Apr 2018 18:43:23 +0200 +Subject: [PATCH 4/5] meson: Add library versions to swr drivers + +This is for parity with autotools. + +Signed-off-by: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +--- + src/gallium/drivers/swr/meson.build | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/gallium/drivers/swr/meson.build b/src/gallium/drivers/swr/meson.build +index 43e1c5cc50..a6dbd7a3f6 100644 +--- a/src/gallium/drivers/swr/meson.build ++++ b/src/gallium/drivers/swr/meson.build +@@ -198,6 +198,7 @@ if with_swr_arches.contains('avx') + 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 @@ if with_swr_arches.contains('avx2') + link_args : [ld_args_gc_sections], + include_directories : [swr_incs], + dependencies : [dep_thread, dep_llvm], ++ version : '0.0.0', + install : true, + ) + endif +@@ -257,30 +259,32 @@ if with_swr_arches.contains('knl') + link_args : [ld_args_gc_sections], + include_directories : [swr_incs], + dependencies : [dep_thread, dep_llvm], ++ version : '0.0.0', + install : true, + ) + endif + + if with_swr_arches.contains('skx') + swr_skx_args = cpp.first_supported_argument( + '-target-cpu=x86-skylake', '-march=skylake-avx512', '-xCORE-AVX512', + prefix : ''' + #if !defined(__AVX512F__) || !defined(__AVX512BW__) + # error + #endif ''', + ) + if swr_skx_args == [] + error('Cannot find SKX support for swr.') + endif + + swr_arch_defines += '-DHAVE_SWR_SKX' + swr_arch_libs += shared_library( + 'swrSKX', + [files_swr_common, files_swr_arch], + cpp_args : [swr_cpp_args, swr_skx_args, '-DKNOB_ARCH=KNOB_ARCH_AVX512'], + link_args : [ld_args_gc_sections], + include_directories : [swr_incs], + dependencies : [dep_thread, dep_llvm], ++ version : '0.0.0', + install : true, + ) + endif +-- +2.16.2 + Copied: lib32-mesa/repos/multilib-testing-x86_64/0005-meson-Version-libMesaOpenCL-like-autotools-does.patch (from rev 321608, lib32-mesa/trunk/0005-meson-Version-libMesaOpenCL-like-autotools-does.patch) =================================================================== --- multilib-testing-x86_64/0005-meson-Version-libMesaOpenCL-like-autotools-does.patch (rev 0) +++ multilib-testing-x86_64/0005-meson-Version-libMesaOpenCL-like-autotools-does.patch 2018-05-13 16:18:04 UTC (rev 321609) @@ -0,0 +1,43 @@ +From 064f328419936a8a5df2b0474ae76196d92e6fa0 Mon Sep 17 00:00:00 2001 +Message-Id: <064f328419936a8a5df2b0474ae76196d92e6fa0.1523725229.git.jan.steff...@gmail.com> +In-Reply-To: <ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.git.jan.steff...@gmail.com> +References: <ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.git.jan.steff...@gmail.com> +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +Date: Sat, 14 Apr 2018 18:49:14 +0200 +Subject: [PATCH 5/5] meson: Version libMesaOpenCL like autotools does + +This is for parity with autotools. It names the library +libMesaOpenCL.so.1.0.0 and points mesa.icd to the .1 symlink. + +opencl_version now matches configure.ac's OPENCL_VERSION. + +Signed-off-by: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +--- + src/gallium/targets/opencl/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build +index bebe0547d4..317ad8dab4 100644 +--- a/src/gallium/targets/opencl/meson.build ++++ b/src/gallium/targets/opencl/meson.build +@@ -20,7 +20,7 @@ + + opencl_link_args = [] + opencl_link_deps = [] +-opencl_version = '1.0' ++opencl_version = '1' + + if with_ld_version_script + opencl_link_args += [ +@@ -55,7 +55,7 @@ libopencl = shared_library( + cpp.find_library('clangLex', dirs : llvm_libdir), + cpp.find_library('clangBasic', dirs : llvm_libdir), + ], +- version : opencl_version, ++ version : '@0@.0.0'.format(opencl_version), + install : true, + ) + +-- +2.16.2 + Copied: lib32-mesa/repos/multilib-testing-x86_64/LICENSE (from rev 321608, lib32-mesa/trunk/LICENSE) =================================================================== --- multilib-testing-x86_64/LICENSE (rev 0) +++ multilib-testing-x86_64/LICENSE 2018-05-13 16:18:04 UTC (rev 321609) @@ -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/ Copied: lib32-mesa/repos/multilib-testing-x86_64/PKGBUILD (from rev 321608, lib32-mesa/trunk/PKGBUILD) =================================================================== --- multilib-testing-x86_64/PKGBUILD (rev 0) +++ multilib-testing-x86_64/PKGBUILD 2018-05-13 16:18:04 UTC (rev 321609) @@ -0,0 +1,188 @@ +# $Id$ +# Maintainer: Laurent Carlier <lordhea...@gmail.com> +# Contributor: Jan de Groot <j...@archlinux.org> +# Contributor: Andreas Radke <andy...@archlinux.org> + +pkgbase=lib32-mesa +pkgname=('lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau' 'lib32-mesa') +pkgver=18.0.3 +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 + 0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch + 0004-meson-Add-library-versions-to-swr-drivers.patch + 0005-meson-Version-libMesaOpenCL-like-autotools-does.patch) +sha512sums=('decd050bab049d17bcde3f832d4da0ffdb80f147c99377a162739bbe72fd6fd32b51e56e6fc66895b8c30fc19a1815bae164b21aa557816c3998ad18c1ffca2d' + 'SKIP' + 'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7' + '75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028' + '19b980db37675732d28978318074ca172ef862de7fdcae2c82ef16dc411c709c8598b044a828e7e260d86d23f644485abcc6a0aaf5e04b9c05dce22d0c7e3716' + '0f5da6e48885713c7ddef9e5715e178e0a499bcb622d7f19e15b9e4b4647331d7bf14829218b6ab80f17bae90fd95b8df6a0a81203d8081686805ca5329531ff' + 'd3c01f61a0a0cc2f01e66e0126ad8b6386d4a53c1dc1b3b134800e4cd25507e458bac860cbed10cf4b46b04e8d50aba233870587b89c058fffd57436b48289bf') +validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.veli...@gmail.com> + '946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez <ta...@igalia.com> + 'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio Suárez Romero (Igalia, S.L.) <jasua...@igalia.com>" + +prepare() { + cd mesa-${pkgver} + + # glvnd support patches - from Fedora + # non-upstreamed ones + patch -Np1 -i ../0001-glvnd-fix-gl-dot-pc.patch + + # experimental patch, should fix FS#58549 + # see https://bugs.freedesktop.org/show_bug.cgi?id=106351 + # and https://patchwork.freedesktop.org/series/42687/ + patch -Np1 -i ../0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch + + # Upstreamed meson fixes + patch -Np1 -i ../0004-meson-Add-library-versions-to-swr-drivers.patch + patch -Np1 -i ../0005-meson-Version-libMesaOpenCL-like-autotools-does.patch +} + +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 b_ndebug=true \ + -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 +}