From 810a894aa342bd26aecce22ed721435798fa56e6 Mon Sep 17 00:00:00 2001 From: Nicu Borta Date: Thu, 9 Jul 2020 21:07:24 +0300 Subject: [PATCH 1/2] mesa: Update to 20.1.3, fix patches --- srcpkgs/mesa/patches/add-use-elf-tls.patch | 10 +++++----- srcpkgs/mesa/patches/clover-ppc64-cpp14.patch | 13 ------------- srcpkgs/mesa/patches/fix-libXvMC-versioning.patch | 15 --------------- srcpkgs/mesa/template | 4 ++-- 4 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 srcpkgs/mesa/patches/clover-ppc64-cpp14.patch delete mode 100644 srcpkgs/mesa/patches/fix-libXvMC-versioning.patch diff --git a/srcpkgs/mesa/patches/add-use-elf-tls.patch b/srcpkgs/mesa/patches/add-use-elf-tls.patch index 08d15e6a2cf..d5b933d586d 100644 --- a/srcpkgs/mesa/patches/add-use-elf-tls.patch +++ b/srcpkgs/mesa/patches/add-use-elf-tls.patch @@ -2,19 +2,19 @@ Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966 Status: Not fixed upstream diff --git meson.build meson.build -index 4afd8ca..ab9b365 100644 +index d228de0..972cd79 100644 --- meson.build +++ meson.build -@@ -387,7 +387,8 @@ +@@ -392,7 +392,8 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat endif # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. --if host_machine.system() != 'windows' and (not with_platform_android or get_option('platform-sdk-version') >= 29) +-if not ['windows', 'freebsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) +with_use_elf_tls = get_option('use-elf-tls') -+if host_machine.system() != 'windows' and with_use_elf_tls and (not with_platform_android or get_option('platform-sdk-version') >= 29) ++if not ['windows', 'freebsd'].contains(host_machine.system()) and with_use_elf_tls and (not with_platform_android or get_option('platform-sdk-version') >= 29) pre_args += '-DUSE_ELF_TLS' endif - + diff --git meson_options.txt meson_options.txt index b768c15..2533220 100644 --- meson_options.txt diff --git a/srcpkgs/mesa/patches/clover-ppc64-cpp14.patch b/srcpkgs/mesa/patches/clover-ppc64-cpp14.patch deleted file mode 100644 index b7eef76959a..00000000000 --- a/srcpkgs/mesa/patches/clover-ppc64-cpp14.patch +++ /dev/null @@ -1,13 +0,0 @@ -LLVM10 headers need C++14, so override the override. - ---- meson.build -+++ meson.build -@@ -730,7 +730,7 @@ if _opencl != 'disabled' - #error "AltiVec not enabled" - #endif''', - name : 'Altivec') -- clover_cpp_std += ['cpp_std=gnu++11'] -+ clover_cpp_std += ['cpp_std=gnu++14'] - endif - else - dep_clc = null_dep diff --git a/srcpkgs/mesa/patches/fix-libXvMC-versioning.patch b/srcpkgs/mesa/patches/fix-libXvMC-versioning.patch deleted file mode 100644 index b2f507bc76e..00000000000 --- a/srcpkgs/mesa/patches/fix-libXvMC-versioning.patch +++ /dev/null @@ -1,15 +0,0 @@ -Source: maxice8 -Upstream: no -Reason: restores versioning of libXvMC drivers that was on autotools - ---- src/gallium/targets/xvmc/meson.build -+++ src/gallium/targets/xvmc/meson.build -@@ -51,7 +51,7 @@ libxvmc_gallium = shared_library( - - foreach d : [[with_gallium_r600, 'r600'], [with_gallium_nouveau, 'nouveau']] - if d[0] -- xvmc_drivers += 'libXvMC@0@.so'.format(d[1]) -+ xvmc_drivers += 'libXvMC@0@.so.1.0.0'.format(d[1]) - endif - endforeach - diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template index 21218e86f3c..dc90f485b87 100644 --- a/srcpkgs/mesa/template +++ b/srcpkgs/mesa/template @@ -1,6 +1,6 @@ # Template file for 'mesa' pkgname=mesa -version=20.1.2 +version=20.1.3 revision=1 wrksrc="mesa-${version}" build_style=meson @@ -23,7 +23,7 @@ license="MIT, LGPL-2.1-or-later" homepage="https://www.mesa3d.org/" changelog="https://www.mesa3d.org/relnotes/${version}.html" distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" -checksum=283dff72814c8a80ce1ff8271e3f055895d26f4da3f4362acc49193e635780cb +checksum=9872b8d46bee822177ffbe4292addff7bdb84cefc1fe776b8e6b2881a8362bf1 build_options="wayland" build_options_default="wayland" From c52ff4aa621c9971ba797e5cc0f18a4ffadd43f4 Mon Sep 17 00:00:00 2001 From: Nicu Borta Date: Thu, 9 Jul 2020 23:41:44 +0300 Subject: [PATCH 2/2] mesa: fix changelog link in template --- srcpkgs/mesa/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template index dc90f485b87..6e3246a8ffb 100644 --- a/srcpkgs/mesa/template +++ b/srcpkgs/mesa/template @@ -21,7 +21,7 @@ short_desc="Graphics library similar to SGI's OpenGL" maintainer="Juan RP " license="MIT, LGPL-2.1-or-later" homepage="https://www.mesa3d.org/" -changelog="https://www.mesa3d.org/relnotes/${version}.html" +changelog="https://docs.mesa3d.org/relnotes/${version}.html" distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" checksum=9872b8d46bee822177ffbe4292addff7bdb84cefc1fe776b8e6b2881a8362bf1