From 35c7832d66998b113375ab48b2b6c96a60d529a2 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Nov 19 2023 23:09:02 +0000 Subject: Bump to asahi-20231120 pre-release tag --- diff --git a/gallium-Avoid-empty-version-scripts-in-pipe-loader.patch b/gallium-Avoid-empty-version-scripts-in-pipe-loader.patch deleted file mode 100644 index b93509c..0000000 --- a/gallium-Avoid-empty-version-scripts-in-pipe-loader.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 7571b6c6781fab6504214565d4a616fb1ca25107 Mon Sep 17 00:00:00 2001 -From: Janne Grunau -Date: Sat, 18 Nov 2023 12:23:26 +0100 -Subject: [PATCH 1/1] gallium: Avoid empty version scripts in pipe-loader - -The code produces version scripts with an empty global node for diabled -drivers. This is reported as syntax error by the linker. -The root cause of the problem is that the version scripts are -accumulated in the out of foreach `pipe_loader_link_args` although they -should be only used once for their driver specific loader shared -library. - -Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10166 -Fixes: 667de678a06 ("gallium: Fix undefined symbols in version scripts") -Signed-off-by: Janne Grunau ---- - src/gallium/targets/pipe-loader/meson.build | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/src/gallium/targets/pipe-loader/meson.build b/src/gallium/targets/pipe-loader/meson.build -index ee34d79492b..b288c2c73ac 100644 ---- a/src/gallium/targets/pipe-loader/meson.build -+++ b/src/gallium/targets/pipe-loader/meson.build -@@ -80,11 +80,13 @@ foreach x : pipe_loaders - - pipe_sym = configure_file(input : 'pipe.sym.in', output : 'pipe_@0@.sym'.format(x[1]), configuration : pipe_sym_config) - -+ cur_pipe_loader_link_args = pipe_loader_link_args -+ cur_pipe_loader_link_deps = pipe_loader_link_deps - if with_ld_version_script -- pipe_loader_link_args += [ -+ cur_pipe_loader_link_args += [ - '-Wl,--version-script', join_paths(meson.current_build_dir(), 'pipe_@0@.sym'.format(x[1])) - ] -- pipe_loader_link_deps += pipe_sym -+ cur_pipe_loader_link_deps += pipe_sym - endif - - if x[0] -@@ -94,8 +96,8 @@ foreach x : pipe_loaders - c_args : [pipe_loader_comp_args, '-DPIPE_LOADER_DYNAMIC=1'], - cpp_args : [pipe_loader_comp_args], - gnu_symbol_visibility : 'hidden', -- link_args : pipe_loader_link_args, -- link_depends : pipe_loader_link_deps, -+ link_args : cur_pipe_loader_link_args, -+ link_depends : cur_pipe_loader_link_deps, - include_directories : pipe_loader_incs, - link_with : [pipe_loader_link_with, x[3]], - dependencies : [idep_mesautil, idep_nir, dep_thread, x[2]], --- -2.42.1 - diff --git a/gallium-Do-not-create-pipe-loader-version-scripts-fo.patch b/gallium-Do-not-create-pipe-loader-version-scripts-fo.patch deleted file mode 100644 index 479ec44..0000000 --- a/gallium-Do-not-create-pipe-loader-version-scripts-fo.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 2091515a70a07c3e4b80cb7637a2194790e285bb Mon Sep 17 00:00:00 2001 -From: Janne Grunau -Date: Sun, 19 Nov 2023 09:34:59 +0100 -Subject: [PATCH 2/2] gallium: Do not create pipe-loader version scripts for - disabled drivers - -They are not going to be used without shared library to build. - -Fixes: 667de678a06 ("gallium: Fix undefined symbols in version scripts") -Signed-off-by: Janne Grunau -Part-of: ---- - src/gallium/targets/pipe-loader/meson.build | 36 +++++++++++---------- - 1 file changed, 19 insertions(+), 17 deletions(-) - -diff --git a/src/gallium/targets/pipe-loader/meson.build b/src/gallium/targets/pipe-loader/meson.build -index b7a04c9d7226..943faec469d0 100644 ---- a/src/gallium/targets/pipe-loader/meson.build -+++ b/src/gallium/targets/pipe-loader/meson.build -@@ -63,6 +63,10 @@ pipe_loaders = [ - ] - - foreach x : pipe_loaders -+ if not x[0] -+ continue -+ endif -+ - pipe_sym_config = configuration_data() - - foreach d : [[x[1] in ['r300', 'r600', 'radeonsi'], 'radeon_drm_winsys_create'], -@@ -88,21 +92,19 @@ foreach x : pipe_loaders - cur_pipe_loader_link_deps += pipe_sym - endif - -- if x[0] -- shared_library( -- 'pipe_@0@'.format(x[1]), -- 'pipe_@0@.c'.format(x[1]), -- c_args : [pipe_loader_comp_args, '-DPIPE_LOADER_DYNAMIC=1'], -- cpp_args : [pipe_loader_comp_args], -- gnu_symbol_visibility : 'hidden', -- link_args : cur_pipe_loader_link_args, -- link_depends : cur_pipe_loader_link_deps, -- include_directories : pipe_loader_incs, -- link_with : [pipe_loader_link_with, x[3]], -- dependencies : [idep_mesautil, idep_nir, dep_thread, x[2]], -- name_prefix : '', -- install : true, -- install_dir : pipe_loader_install_dir, -- ) -- endif -+ shared_library( -+ 'pipe_@0@'.format(x[1]), -+ 'pipe_@0@.c'.format(x[1]), -+ c_args : [pipe_loader_comp_args, '-DPIPE_LOADER_DYNAMIC=1'], -+ cpp_args : [pipe_loader_comp_args], -+ gnu_symbol_visibility : 'hidden', -+ link_args : cur_pipe_loader_link_args, -+ link_depends : cur_pipe_loader_link_deps, -+ include_directories : pipe_loader_incs, -+ link_with : [pipe_loader_link_with, x[3]], -+ dependencies : [idep_mesautil, idep_nir, dep_thread, x[2]], -+ name_prefix : '', -+ install : true, -+ install_dir : pipe_loader_install_dir, -+ ) - endforeach --- -2.41.0 - diff --git a/gallium-Fix-i915-pipe-loader-build.patch b/gallium-Fix-i915-pipe-loader-build.patch deleted file mode 100644 index c581c28..0000000 --- a/gallium-Fix-i915-pipe-loader-build.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b2da38413f5aaef0c225dcf730cfcd0d338d2f3e Mon Sep 17 00:00:00 2001 -From: Janne Grunau -Date: Sun, 19 Nov 2023 09:06:11 +0100 -Subject: [PATCH 1/2] gallium: Fix i915 pipe-loader build - -'i915' was missing from the list of drivers for the 'driver_descriptor' -descriptor symbol. Rather than maintaining a second list of drivers add -the 'driver_descriptor' symbol for all drivers except swrast. - -Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10171 -Fixes: 667de678a06 ("gallium: Fix undefined symbols in version scripts") -Signed-off-by: Janne Grunau -Part-of: ---- - src/gallium/targets/pipe-loader/meson.build | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/gallium/targets/pipe-loader/meson.build b/src/gallium/targets/pipe-loader/meson.build -index b288c2c73acb..b7a04c9d7226 100644 ---- a/src/gallium/targets/pipe-loader/meson.build -+++ b/src/gallium/targets/pipe-loader/meson.build -@@ -66,10 +66,9 @@ foreach x : pipe_loaders - pipe_sym_config = configuration_data() - - foreach d : [[x[1] in ['r300', 'r600', 'radeonsi'], 'radeon_drm_winsys_create'], -- [x[1] in ['vmwgfx', 'r600', 'r300', 'nouveau', 'msm', 'kmsro', 'iris', 'crocus', 'radeonsi'], -- 'driver_descriptor'], - [x[1] == 'radeonsi', 'amdgpu_winsys_create'], - [x[1] == 'radeonsi' and with_llvm, 'ac_init_shared_llvm_once'], -+ [x[1] != 'swrast', 'driver_descriptor'], - [x[1] == 'swrast', 'swrast_driver_descriptor']] - if d[0] - pipe_sym_config.set(d[1], d[1] + ';') --- -2.41.0 - diff --git a/mesa.spec b/mesa.spec index 40dbef5..647858c 100644 --- a/mesa.spec +++ b/mesa.spec @@ -61,7 +61,7 @@ %global vulkan_drivers swrast%{?base_vulkan}%{?intel_platform_vulkan}%{?extra_platform_vulkan} -%global asahi_mesa_ver 20231118 +%global asahi_mesa_ver 20231120 %global git_tag asahi-%{asahi_mesa_ver} %global basever 24.0.0 %global ver %{basever}-asahipre%{asahi_mesa_ver} @@ -82,9 +82,6 @@ Source0: https://gitlab.freedesktop.org/asahi/mesa/-/archive/%{git_tag}/m Source1: Mesa-MLAA-License-Clarification-Email.txt Patch10: gnome-shell-glthread-disable.patch -Patch20: gallium-Avoid-empty-version-scripts-in-pipe-loader.patch -Patch21: gallium-Fix-i915-pipe-loader-build.patch -Patch22: gallium-Do-not-create-pipe-loader-version-scripts-fo.patch BuildRequires: meson >= 1.2.0 BuildRequires: gcc diff --git a/rpkg.conf b/rpkg.conf index b459747..47d2279 100644 --- a/rpkg.conf +++ b/rpkg.conf @@ -1,2 +1,2 @@ [lookaside] -download_url = https://gitlab.freedesktop.org/asahi/mesa/-/archive/asahi-20231118/%(filename)s +download_url = https://gitlab.freedesktop.org/asahi/mesa/-/archive/asahi-20231120/%(filename)s diff --git a/sources b/sources index 707d66e..6849913 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-asahi-20231118.tar.gz) = 4c72fb517eda7a8935c49824de97521b001942511659c250070732b8d405a9cb55885beafb21b810770e36d2e6528664cd5fbf505326234f58771365b1be9e7a +SHA512 (mesa-asahi-20231120.tar.gz) = f45cad8e4084c1c23364015e88dcfb2f5af5630b77960902330cb825cb3046ed92ac6634ab03f09bd44c3bad402ab8663b8bc2aa57706410fe7d7a1b7e38e206