mesa: Update to 20.1.4
This commit is contained in:
parent
f0162e9821
commit
4d74b0bfaa
|
@ -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
|
||||
|
|
|
@ -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
|
|
@ -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
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
From 158c45a9a2555afca5adcfcebfa8e2dd3ff75507 Mon Sep 17 00:00:00 2001
|
||||
From: q66 <daniel@octaforge.org>
|
||||
Date: Sat, 7 Mar 2020 05:00:24 +0100
|
||||
Subject: [PATCH] depend on sha1_h in src/vulkan/overlay-layer
|
||||
|
||||
Without this, the dependency ordering gets messed up and during
|
||||
highly parallel builds the git_sha1.h file gets generated later
|
||||
than overlay-layer is compiled. That results in build errors like:
|
||||
|
||||
overlay.cpp:31:10: fatal error: git_sha1.h: No such file or directory
|
||||
---
|
||||
src/vulkan/overlay-layer/meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git src/vulkan/overlay-layer/meson.build src/vulkan/overlay-layer/meson.build
|
||||
index 5b553d0..51e053e 100644
|
||||
--- src/vulkan/overlay-layer/meson.build
|
||||
+++ src/vulkan/overlay-layer/meson.build
|
||||
@@ -38,7 +38,7 @@ vklayer_files = files(
|
||||
|
||||
vklayer_mesa_overlay = shared_library(
|
||||
'VkLayer_MESA_overlay',
|
||||
- vklayer_files, overlay_spv,
|
||||
+ [vklayer_files, sha1_h], overlay_spv,
|
||||
c_args : [c_vis_args, no_override_init_args, vulkan_wsi_args],
|
||||
cpp_args : [cpp_vis_args, vulkan_wsi_args],
|
||||
dependencies : [idep_vulkan_util, idep_mesautil, vulkan_wsi_deps, libimgui_core_dep, dep_dl],
|
||||
--
|
||||
2.25.1
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'mesa'
|
||||
pkgname=mesa
|
||||
version=20.1.2
|
||||
version=20.1.4
|
||||
revision=1
|
||||
wrksrc="mesa-${version}"
|
||||
build_style=meson
|
||||
|
@ -21,9 +21,9 @@ short_desc="Graphics library similar to SGI's OpenGL"
|
|||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
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=283dff72814c8a80ce1ff8271e3f055895d26f4da3f4362acc49193e635780cb
|
||||
checksum=6800271c2be2a0447510eb4e9b67edd9521859a4d565310617c4b359eb6799fe
|
||||
|
||||
build_options="wayland"
|
||||
build_options_default="wayland"
|
||||
|
|
Loading…
Reference in New Issue