Date: Friday, May 18, 2018 @ 09:37:52 Author: lcarlier Revision: 324263
upgpkg: lib32-mesa 18.0.4-1 upstream update 18.0.4 Added: lib32-mesa/trunk/0001-glvnd-fix-gl.pc.patch lib32-mesa/trunk/0002-meson-Add-library-versions-to-swr-drivers.patch lib32-mesa/trunk/0003-meson-Version-libMesaOpenCL-like-autotools-does.patch lib32-mesa/trunk/0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch Modified: lib32-mesa/trunk/PKGBUILD Deleted: lib32-mesa/trunk/0001-glvnd-fix-gl-dot-pc.patch lib32-mesa/trunk/0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch lib32-mesa/trunk/0004-meson-Add-library-versions-to-swr-drivers.patch lib32-mesa/trunk/0005-meson-Version-libMesaOpenCL-like-autotools-does.patch --------------------------------------------------------------------------------+ 0001-glvnd-fix-gl-dot-pc.patch | 12 - 0001-glvnd-fix-gl.pc.patch | 26 +++ 0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch | 14 - 0002-meson-Add-library-versions-to-swr-drivers.patch | 71 +++++++++ 0003-meson-Version-libMesaOpenCL-like-autotools-does.patch | 43 +++++ 0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch | 73 ++++++++++ 0004-meson-Add-library-versions-to-swr-drivers.patch | 71 --------- 0005-meson-Version-libMesaOpenCL-like-autotools-does.patch | 43 ----- PKGBUILD | 37 ++--- 9 files changed, 232 insertions(+), 158 deletions(-) Deleted: 0001-glvnd-fix-gl-dot-pc.patch =================================================================== --- 0001-glvnd-fix-gl-dot-pc.patch 2018-05-18 08:22:09 UTC (rev 324262) +++ 0001-glvnd-fix-gl-dot-pc.patch 2018-05-18 09:37:52 UTC (rev 324263) @@ -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@GL_LIB@ -+Libs: -L${libdir} -lGL - Libs.private: @GL_PC_LIB_PRIV@ - Cflags: -I${includedir} @GL_PC_CFLAGS@ - glx_tls: @GLX_TLS@ Added: 0001-glvnd-fix-gl.pc.patch =================================================================== --- 0001-glvnd-fix-gl.pc.patch (rev 0) +++ 0001-glvnd-fix-gl.pc.patch 2018-05-18 09:37:52 UTC (rev 324263) @@ -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 + Deleted: 0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch =================================================================== --- 0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch 2018-05-18 08:22:09 UTC (rev 324262) +++ 0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch 2018-05-18 09:37:52 UTC (rev 324263) @@ -1,14 +0,0 @@ -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++) { Added: 0002-meson-Add-library-versions-to-swr-drivers.patch =================================================================== --- 0002-meson-Add-library-versions-to-swr-drivers.patch (rev 0) +++ 0002-meson-Add-library-versions-to-swr-drivers.patch 2018-05-18 09:37:52 UTC (rev 324263) @@ -0,0 +1,71 @@ +From 4edc0c6290ea4e848c5142b6807ebc5c809fecef Mon Sep 17 00:00:00 2001 +Message-Id: <4edc0c6290ea4e848c5142b6807ebc5c809fecef.1526409254.git.jan.steff...@gmail.com> +In-Reply-To: <a9554de2a6028540fa12a7ebdab4daf2b46010fa.1526409254.git.jan.steff...@gmail.com> +References: <a9554de2a6028540fa12a7ebdab4daf2b46010fa.1526409254.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 2/4] 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.17.0 + Added: 0003-meson-Version-libMesaOpenCL-like-autotools-does.patch =================================================================== --- 0003-meson-Version-libMesaOpenCL-like-autotools-does.patch (rev 0) +++ 0003-meson-Version-libMesaOpenCL-like-autotools-does.patch 2018-05-18 09:37:52 UTC (rev 324263) @@ -0,0 +1,43 @@ +From 7bafcb1b39b03110ba5a375635d7b6b5ecf98bc4 Mon Sep 17 00:00:00 2001 +Message-Id: <7bafcb1b39b03110ba5a375635d7b6b5ecf98bc4.1526409254.git.jan.steff...@gmail.com> +In-Reply-To: <a9554de2a6028540fa12a7ebdab4daf2b46010fa.1526409254.git.jan.steff...@gmail.com> +References: <a9554de2a6028540fa12a7ebdab4daf2b46010fa.1526409254.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 3/4] 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.17.0 + Added: 0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch =================================================================== --- 0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch (rev 0) +++ 0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch 2018-05-18 09:37:52 UTC (rev 324263) @@ -0,0 +1,73 @@ +From 5abc129c70cac08104fb7f8c757bc30afe8e8803 Mon Sep 17 00:00:00 2001 +Message-Id: <5abc129c70cac08104fb7f8c757bc30afe8e8803.1526409254.git.jan.steff...@gmail.com> +In-Reply-To: <a9554de2a6028540fa12a7ebdab4daf2b46010fa.1526409254.git.jan.steff...@gmail.com> +References: <a9554de2a6028540fa12a7ebdab4daf2b46010fa.1526409254.git.jan.steff...@gmail.com> +From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mic...@daenzer.net> +Date: Tue, 8 May 2018 11:42:05 +0200 +Subject: [PATCH 4/4] loader_dri3: Variant 2: Wait for pending swaps to + complete before drawable_fini. + +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. +--- + src/loader/loader_dri3_helper.c | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c +index 2e3b6c619e..e1eecb70a9 100644 +--- a/src/loader/loader_dri3_helper.c ++++ b/src/loader/loader_dri3_helper.c +@@ -365,9 +365,18 @@ 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; ++ + switch (ce->mode) { + case XCB_PRESENT_COMPLETE_MODE_FLIP: + draw->flipping = true; +-- +2.17.0 + Deleted: 0004-meson-Add-library-versions-to-swr-drivers.patch =================================================================== --- 0004-meson-Add-library-versions-to-swr-drivers.patch 2018-05-18 08:22:09 UTC (rev 324262) +++ 0004-meson-Add-library-versions-to-swr-drivers.patch 2018-05-18 09:37:52 UTC (rev 324263) @@ -1,71 +0,0 @@ -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 - Deleted: 0005-meson-Version-libMesaOpenCL-like-autotools-does.patch =================================================================== --- 0005-meson-Version-libMesaOpenCL-like-autotools-does.patch 2018-05-18 08:22:09 UTC (rev 324262) +++ 0005-meson-Version-libMesaOpenCL-like-autotools-does.patch 2018-05-18 09:37:52 UTC (rev 324263) @@ -1,43 +0,0 @@ -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 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-05-18 08:22:09 UTC (rev 324262) +++ PKGBUILD 2018-05-18 09:37:52 UTC (rev 324263) @@ -5,8 +5,8 @@ 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 +pkgver=18.0.4 +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' @@ -15,20 +15,21 @@ 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' + 0001-glvnd-fix-gl.pc.patch + 0002-meson-Add-library-versions-to-swr-drivers.patch + 0003-meson-Version-libMesaOpenCL-like-autotools-does.patch + 0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch) +sha512sums=('f9a14be46c209661ceb318add1611481445d13b47e95c7a5d2a5e5ecfdd5d2c3fa9c2b16b30035bbb8d61ccc7cb65bfa6698ac8b040273e5ab045a951a67752c' 'SKIP' 'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7' - '75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028' - '19b980db37675732d28978318074ca172ef862de7fdcae2c82ef16dc411c709c8598b044a828e7e260d86d23f644485abcc6a0aaf5e04b9c05dce22d0c7e3716' - '0f5da6e48885713c7ddef9e5715e178e0a499bcb622d7f19e15b9e4b4647331d7bf14829218b6ab80f17bae90fd95b8df6a0a81203d8081686805ca5329531ff' - 'd3c01f61a0a0cc2f01e66e0126ad8b6386d4a53c1dc1b3b134800e4cd25507e458bac860cbed10cf4b46b04e8d50aba233870587b89c058fffd57436b48289bf') + '2f40198eff47664c831c56e8a63f60a4d1b815cf697e6bdb0be39e6d9c5df043857f6264b7cd2ccf46c07626186c565144e80f4214b5f7936ef7024c47201437' + 'c3f3baf8a5f480ce64b321c031e31c0d5819732ca34647ac545d0fd7fafa40ad4dcf1e1ec8d574754e0a44bf0cdc462ed8709c8d9b58a17e01c6ba5b4c5e91c6' + 'a2062f8a5259aabed1aa20df6a8510f0f3e914cb6bba72751249b3295285596bb7615063a7a7b7870f9f4489d0e6b774f0bced2bdde49a1aa9df6a44976462d1' + '572901a1e9cacfacfc8c4cc3cd077a626d4aeda8c8a58f6085bae827cba8a2d4d99af1dafbb5a9296b6ebf3120e2b05a084fe1c96093074befe62597319384a1') 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>" + 'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895' # Juan Antonio Suárez Romero (Igalia, S.L.) <jasua...@igalia.com>" + 'A5CC9FEC93F2F837CB044912336909B6B25FADFA') # Juan A. Suarez Romero <jasua...@igalia.com> prepare() { cd mesa-${pkgver} @@ -35,16 +36,16 @@ # glvnd support patches - from Fedora # non-upstreamed ones - patch -Np1 -i ../0001-glvnd-fix-gl-dot-pc.patch + patch -Np1 -i ../0001-glvnd-fix-gl.pc.patch + # Upstreamed meson fixes + patch -Np1 -i ../0002-meson-Add-library-versions-to-swr-drivers.patch + patch -Np1 -i ../0003-meson-Version-libMesaOpenCL-like-autotools-does.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 + patch -Np1 -i ../0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch } build() {