From ad40073e4e58fe77f95f835f635258f672d9541a Mon Sep 17 00:00:00 2001 From: Feng Jiang Date: Wed, 9 Aug 2023 09:42:16 +0800 Subject: [PATCH] meson: Rename dri-vdpau.dyn to dri.dyn MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit File 'src/gallium/targets/dri-vdpau.dyn' is now shared by multiple targets and not just VDPAU, so renamed it to 'dri.dyn' as suggested by Marek Olšák. Related link: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23177#note_2030493 Suggested-by: Marek Olšák Signed-off-by: Feng Jiang Reviewed-by: Marek Olšák Part-of: --- src/gallium/targets/{dri-vdpau.dyn => dri.dyn} | 0 src/gallium/targets/dri/meson.build | 4 ++-- src/gallium/targets/va/meson.build | 4 ++-- src/gallium/targets/vdpau/meson.build | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) rename src/gallium/targets/{dri-vdpau.dyn => dri.dyn} (100%) diff --git a/src/gallium/targets/dri-vdpau.dyn b/src/gallium/targets/dri.dyn similarity index 100% rename from src/gallium/targets/dri-vdpau.dyn rename to src/gallium/targets/dri.dyn diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build index 010999d..da7265a 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -33,8 +33,8 @@ if with_ld_version_script gallium_dri_link_depends += files('dri.sym') endif if with_ld_dynamic_list - gallium_dri_ld_args += ['-Wl,--dynamic-list', join_paths(meson.current_source_dir(), '../dri-vdpau.dyn')] - gallium_dri_link_depends += files('../dri-vdpau.dyn') + gallium_dri_ld_args += ['-Wl,--dynamic-list', join_paths(meson.current_source_dir(), '../dri.dyn')] + gallium_dri_link_depends += files('../dri.dyn') endif libgallium_dri = shared_library( diff --git a/src/gallium/targets/va/meson.build b/src/gallium/targets/va/meson.build index dc772ef..653ee8d 100644 --- a/src/gallium/targets/va/meson.build +++ b/src/gallium/targets/va/meson.build @@ -31,8 +31,8 @@ if with_ld_version_script va_link_depends += files('va.sym') endif if with_ld_dynamic_list - va_link_args += ['-Wl,--dynamic-list', join_paths(meson.current_source_dir(), '../dri-vdpau.dyn')] - va_link_depends += files('../dri-vdpau.dyn') + va_link_args += ['-Wl,--dynamic-list', join_paths(meson.current_source_dir(), '../dri.dyn')] + va_link_depends += files('../dri.dyn') endif link_with_libva_gallium = [ diff --git a/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build index 442784b..0779937 100644 --- a/src/gallium/targets/vdpau/meson.build +++ b/src/gallium/targets/vdpau/meson.build @@ -31,8 +31,8 @@ if with_ld_version_script vdpau_link_depends += files('vdpau.sym') endif if with_ld_dynamic_list - vdpau_link_args += ['-Wl,--dynamic-list', join_paths(meson.current_source_dir(), '../dri-vdpau.dyn')] - vdpau_link_depends += files('../dri-vdpau.dyn') + vdpau_link_args += ['-Wl,--dynamic-list', join_paths(meson.current_source_dir(), '../dri.dyn')] + vdpau_link_depends += files('../dri.dyn') endif link_with_libvdpau_gallium = [ -- 2.7.4