From: Jan Palus Date: Sat, 30 May 2020 09:16:54 +0000 (+0200) Subject: up to 20.1.0 X-Git-Tag: auto/th/Mesa-20.1.0-1 X-Git-Url: http://git.pld-linux.org/?p=packages%2FMesa.git;a=commitdiff_plain;h=a6948a6 up to 20.1.0 --- diff --git a/Mesa.spec b/Mesa.spec index c36db4b..27c003b 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -69,18 +69,16 @@ Summary: Free OpenGL implementation Summary(pl.UTF-8): Wolnodostępna implementacja standardu OpenGL Name: Mesa -Version: 20.0.7 -Release: 2 +Version: 20.1.0 +Release: 1 License: MIT (core) and others - see license.html file Group: X11/Libraries #Source0: ftp://ftp.freedesktop.org/pub/mesa/mesa-%{version}.tar.xz ## Source0-md5: 7c61a801311fb8d2f7b3cceb7b5cf308 Source0: https://gitlab.freedesktop.org/mesa/mesa/-/archive/mesa-%{version}/mesa-mesa-%{version}.tar.bz2 -# Source0-md5: 1939a279f9683a4ca6573872ed77a070 +# Source0-md5: 5a14e44bef70d04b48a8d34fced1384e Patch0: nouveau_no_rtti.patch Patch1: i9x5-tex-ignore-the-diff-between-GL_TEXTURE_2D-and-GL_TEXTURE_RECTANGLE.patch -Patch2: llvm10.patch -Patch3: gcc10.patch URL: http://www.mesa3d.org/ %{?with_opencl_spirv:BuildRequires: SPIRV-LLVM-Translator-devel >= 0.2.1} %{?with_gallium_zink:BuildRequires: Vulkan-Loader-devel} @@ -1367,8 +1365,6 @@ radv - eksperymentalny sterownik Vulkan dla GPU firmy AMD. %setup -q -n mesa-mesa-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %if %{with opencl} diff --git a/gcc10.patch b/gcc10.patch deleted file mode 100644 index cb1a8f5..0000000 --- a/gcc10.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 283e815339a15fa99039c69f1e225269790ae955 Mon Sep 17 00:00:00 2001 -From: Pierre-Eric Pelloux-Prayer -Date: Thu, 5 Mar 2020 09:37:58 +0100 -Subject: [PATCH 1/2] omx: fix build with gcc 10 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -bellagio/omx header files reference a global variable without the -extern keyworkd. -Now that gcc-10 enables the '-fno-common' by default the build fails. -Since these are external headers we can't easily fix them, so for -now build the omx module with the '-fcommon' flag to keep the -previous behavior. - -See https://gitlab.freedesktop.org/mesa/mesa/issues/2385 - -Reviewed-by: Michel Dänzer -Part-of: ---- - src/gallium/state_trackers/omx/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gallium/state_trackers/omx/meson.build b/src/gallium/state_trackers/omx/meson.build -index 3aa82090c91..987d3e23c84 100644 ---- a/src/gallium/state_trackers/omx/meson.build -+++ b/src/gallium/state_trackers/omx/meson.build -@@ -65,7 +65,7 @@ endif - libomx_st = static_library( - 'omx_st', - files_omx, -- c_args : [c_vis_args], -+ c_args : [c_vis_args, '-fcommon'], - include_directories : inc_st_omx, - dependencies : dep_st_omx, - ) --- -2.26.2 - - -From 33b255e107b470b8d2ea5bd96d82c613244aaf47 Mon Sep 17 00:00:00 2001 -From: Pierre-Eric Pelloux-Prayer -Date: Thu, 5 Mar 2020 11:00:28 +0100 -Subject: [PATCH 2/2] meson: enable -fno-common by default -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This flag is enabled by default starting with gcc 10. -All the compilation issues have been fixed, so use it by default -to make sure we're not introducing regressions. - -Reviewed-by: Michel Dänzer -Tested-by: Marge Bot -Part-of: ---- - meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/meson.build b/meson.build -index 1484e7fec5d..bf306605645 100644 ---- a/meson.build -+++ b/meson.build -@@ -958,6 +958,7 @@ else - '-fno-math-errno', - '-fno-trapping-math', - '-Qunused-arguments', -+ '-fno-common', - ] - # MinGW chokes on format specifiers and I can't get it all working - if not (cc.get_id() == 'gcc' and host_machine.system() == 'windows') --- -2.26.2 - diff --git a/llvm10.patch b/llvm10.patch deleted file mode 100644 index 1f1fb34..0000000 --- a/llvm10.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- mesa-mesa-20.0.5/src/gallium/targets/opencl/meson.build.orig 2020-04-22 23:35:13.000000000 +0200 -+++ mesa-mesa-20.0.5/src/gallium/targets/opencl/meson.build 2020-04-25 17:05:51.190967800 +0200 -@@ -31,6 +31,13 @@ endif - - llvm_libdir = dep_llvm.get_configtool_variable('libdir') - -+polly_dep = null_dep -+polly_isl_dep = null_dep -+if dep_llvm.version().version_compare('>=10.0.0') -+ polly_dep = cpp.find_library('Polly', dirs : llvm_libdir, required : false) -+ polly_isl_dep = cpp.find_library('PollyISL', dirs : llvm_libdir, required : false) -+endif -+ - opencl_libname = with_opencl_icd ? 'MesaOpenCL' : 'OpenCL' - - dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false) -@@ -49,6 +56,7 @@ if not dep_clang.found() - cpp.find_library('clangEdit', dirs : llvm_libdir), - cpp.find_library('clangLex', dirs : llvm_libdir), - cpp.find_library('clangBasic', dirs : llvm_libdir), -+ polly_dep, polly_isl_dep, - ] - endif -