Date: Tuesday, May 22, 2018 @ 08:29:39 Author: lcarlier Revision: 326875
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.pc.patch (from rev 326874, lib32-mesa/trunk/0001-glvnd-fix-gl.pc.patch) lib32-mesa/repos/multilib-testing-x86_64/0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch (from rev 326874, lib32-mesa/trunk/0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch) lib32-mesa/repos/multilib-testing-x86_64/LICENSE (from rev 326874, lib32-mesa/trunk/LICENSE) lib32-mesa/repos/multilib-testing-x86_64/PKGBUILD (from rev 326874, lib32-mesa/trunk/PKGBUILD) -----------------------------------------------------------------+ 0001-glvnd-fix-gl.pc.patch | 26 + 0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch | 74 ++++ LICENSE | 83 ++++ PKGBUILD | 182 ++++++++++ 4 files changed, 365 insertions(+) Copied: lib32-mesa/repos/multilib-testing-x86_64/0001-glvnd-fix-gl.pc.patch (from rev 326874, lib32-mesa/trunk/0001-glvnd-fix-gl.pc.patch) =================================================================== --- multilib-testing-x86_64/0001-glvnd-fix-gl.pc.patch (rev 0) +++ multilib-testing-x86_64/0001-glvnd-fix-gl.pc.patch 2018-05-22 08:29:39 UTC (rev 326875) @@ -0,0 +1,26 @@ +From a9554de2a6028540fa12a7ebdab4daf2b46010fa Mon Sep 17 00:00:00 2001 +Message-Id: <a9554de2a6028540fa12a7ebdab4daf2b46010fa.1526409254.git.jan.steff...@gmail.com> +From: Unknown <> +Date: Tue, 15 May 2018 20:10:53 +0200 +Subject: [PATCH 1/4] glvnd: fix gl.pc + +--- + src/mesa/gl.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/mesa/gl.pc.in b/src/mesa/gl.pc.in +index 181724b97b..8c7b7da8d7 100644 +--- a/src/mesa/gl.pc.in ++++ b/src/mesa/gl.pc.in +@@ -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@ +-- +2.17.0 + Copied: lib32-mesa/repos/multilib-testing-x86_64/0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch (from rev 326874, lib32-mesa/trunk/0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch) =================================================================== --- multilib-testing-x86_64/0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch (rev 0) +++ multilib-testing-x86_64/0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch 2018-05-22 08:29:39 UTC (rev 326875) @@ -0,0 +1,74 @@ +From patchwork Tue May 8 09:42:05 2018 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [Mesa-dev, + 2/2] loader_dri3: Variant 2: Wait for pending swaps to complete + before drawable_fini. +From: =?utf-8?q?Michel_D=C3=A4nzer?= <mic...@daenzer.net> +X-Patchwork-Id: 221466 +Message-Id: <ad7564c6-1e1b-8322-3e5c-d8045e181...@daenzer.net> +To: Mario Kleiner <mario.kleiner...@gmail.com>, + Mike Lothian <m...@fireburn.co.uk> +Cc: ML mesa-dev <mesa-...@lists.freedesktop.org>, + ML xorg-devel <xorg-de...@lists.x.org> +Date: Tue, 8 May 2018 11:42:05 +0200 + +On 2018-05-05 06:25 AM, Mario Kleiner wrote: +> On Sat, May 5, 2018 at 4:08 AM, Mike Lothian <m...@fireburn.co.uk> wrote: +>> I definately saw the steam bug with patch 1 but not with plasmashell, +>> I started seeing it with patch 2 but it seemed to fix itself +> +> I had two hangs of kwin_x11 within the last 6 hours when alt-tabbing +> between windows, where it got stuck in the +> loader_dri3_swapbuffer_barrier() from patch 1/2. Not sure how that is +> possible, or if the stacktrace was misleading, because i had to VT +> switch to a text console to attach the debugger and this might be just +> a side effect of that. But if it is true, then patch 1/2 would not be +> it. Also 1/2 has a potential performance impact, whereas 2/2 doesn't. +> However 2/2 would also need more work, as i can think of more complex +> scenarios where it would filter the wrong events, although not in the +> case of plasmashell or steam. Probably we'd need to sacrifice a few +> sbc bits in the Present events serial field to transport a unique tag +> for each incarnation of the loader_dri3_drawable, like a mini-hash of +> the draw->eid. Ugly ugly... + +How about the below? + +Idle notify events shouldn't need special treatment, since the pixmap +XIDs of the buffers will be different between loader_dri3_drawable +incarnations, aren't they? + + +This still leaves the issue that the SBC moves backwards, which could +theoretically result in hangs with apps using glXWaitForSbcOML. Fixing +that would probably require changing the loader_dri3_drawable lifetime +cycle, which would probably be very invasive, if feasible at all. Maybe +we don't need to care about that for the time being, until there's a +real world app running into it. + +diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c +index 6db8303d26d..f0ff2f07bde 100644 +--- a/src/loader/loader_dri3_helper.c ++++ b/src/loader/loader_dri3_helper.c +@@ -370,9 +370,17 @@ dri3_handle_present_event(struct loader_dri3_drawable *draw, + * checking for wrap. + */ + if (ce->kind == XCB_PRESENT_COMPLETE_KIND_PIXMAP) { +- draw->recv_sbc = (draw->send_sbc & 0xffffffff00000000LL) | ce->serial; +- if (draw->recv_sbc > draw->send_sbc) +- draw->recv_sbc -= 0x100000000; ++ uint64_t recv_sbc = (draw->send_sbc & 0xffffffff00000000LL) | ce->serial; ++ ++ /* Only assume wraparound if that results in exactly the previous ++ * SBC + 1, otherwise ignore received SBC > sent SBC (those are ++ * probably from a previous loader_dri3_drawable instance) to avoid ++ * calculating bogus target MSC values in loader_dri3_swap_buffers_msc ++ */ ++ if (recv_sbc <= draw->send_sbc) ++ draw->recv_sbc = recv_sbc; ++ else if (recv_sbc == (draw->recv_sbc + 0x100000001ULL)) ++ draw->recv_sbc = recv_sbc - 0x100000000ULL; + + /* When moving from flip to copy, we assume that we can allocate in + * a more optimal way if we don't need to cater for the display Copied: lib32-mesa/repos/multilib-testing-x86_64/LICENSE (from rev 326874, lib32-mesa/trunk/LICENSE) =================================================================== --- multilib-testing-x86_64/LICENSE (rev 0) +++ multilib-testing-x86_64/LICENSE 2018-05-22 08:29:39 UTC (rev 326875) @@ -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 326874, lib32-mesa/trunk/PKGBUILD) =================================================================== --- multilib-testing-x86_64/PKGBUILD (rev 0) +++ multilib-testing-x86_64/PKGBUILD 2018-05-22 08:29:39 UTC (rev 326875) @@ -0,0 +1,182 @@ +# $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.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-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.pc.patch + 0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch) +sha512sums=('8b26af2df8b94373cbc339521974cd568c1d4ff4204986ee7b439e4cf3ebe14d822ea081a7769b68eca9263b7bc6dbca01836b8bb0d6495d2e2614c4e3d601ad' + 'SKIP' + 'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7' + '2f40198eff47664c831c56e8a63f60a4d1b815cf697e6bdb0be39e6d9c5df043857f6264b7cd2ccf46c07626186c565144e80f4214b5f7936ef7024c47201437' + '724912f9b0fef29caa956efa413276bca6d2299a1a7dd648550d08cab81aaa01682b2cfc9a1f47963b4c4d3c7a86a57a0058888453f7723b45ada5fc858cd09d') +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>" + 'A5CC9FEC93F2F837CB044912336909B6B25FADFA' # Juan A. Suarez Romero <jasua...@igalia.com> + '71C4B75620BC75708B4BDB254C95FAAB3EB073EC') # Dylan Baker <dy...@pnwbakers.com> + +prepare() { + cd mesa-${pkgver} + + # glvnd support patches - from Fedora + # non-upstreamed ones + patch -Np1 -i ../0001-glvnd-fix-gl.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 ../0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.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=disabled \ + -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 +}