meson: Rename dri-vdpau.dyn to dri.dyn
authorFeng Jiang <jiangfeng@kylinos.cn>
Wed, 9 Aug 2023 01:42:16 +0000 (09:42 +0800)
committerMarge Bot <emma+marge@anholt.net>
Wed, 16 Aug 2023 16:57:54 +0000 (16:57 +0000)
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 <marek.olsak@amd.com>
Signed-off-by: Feng Jiang <jiangfeng@kylinos.cn>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24569>

src/gallium/targets/dri.dyn [moved from src/gallium/targets/dri-vdpau.dyn with 100% similarity]
src/gallium/targets/dri/meson.build
src/gallium/targets/va/meson.build
src/gallium/targets/vdpau/meson.build

index 010999d..da7265a 100644 (file)
@@ -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(
index dc772ef..653ee8d 100644 (file)
@@ -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 = [
index 442784b..0779937 100644 (file)
@@ -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 = [