gentoo auto-resync : 07:05:2024 - 00:00:56

3 files changed, 52 insertions, 1 deletions

diff --git a/media-libs/libva/Manifest b/media-libs/libva/Manifest
index 13fbe634d9c8..8043a0ab6570 100644
--- a/media-libs/libva/Manifest
+++ b/media-libs/libva/Manifest
@@ -1,7 +1,8 @@
 AUX clang-17-version-script-check-fix.patch 2112 BLAKE2B 7be78047996e71ae144b160a0f860d5e0559a927a172962595a3a8b14c9b4af13e87ef515c7e749fe225e1ceb74077d660628853ce0b01001a599fec326e5f78 SHA512 29b202a999d1342574eb40b5d1259b5db857de4a4e8929c0ca02ead0707546063b95c28d67bcb3ee94174340760d5b0aab189653e2bbad45b93b6793588053d4
+AUX libva-2.21.0-no-undefined-version.patch 1686 BLAKE2B 91423e339768f6efcd1a3704dd697c53f0e9459477cc2e967e12642d28ec46b27b98440ab7119764981e0cee2410112af2b6597f9e3c7c8e61340d20d1202d49 SHA512 da0aa0a288cc434f3ad143fc5f375d76ec8ea9125befb2f7eb628da0c4e95ddc833a167eff69fa9e2653a8e379fbb8cce80c27eccbd9d8ccc368280dbb485123
 DIST libva-2.20.0.tar.gz 280079 BLAKE2B bb1b7f8757d068765fa69e57e8747e0bbd61ea0874bd42d27e0a99786cad2a4a81d7c20a28ff977cebcef54cd8cafa6c0493c18b563ad1ab47a9c3190d0cd1c6 SHA512 85f4aa6b6e9173d407ca3987745f985d0f898091f14c947a928b6db662a03b5cfe82483901690d81618697fe17a2c41ff6694a611f3654d5ab06840da987e40d
 DIST libva-2.21.0.tar.gz 281515 BLAKE2B bd430162b07987d8982d8f81296e94623efea68624f34b7e159ebefeb37a2b062f2c0d809e16e76c172d6c2df11b59691174fb9a1d65d0938949ac2a025b746c SHA512 93654bb892e0e269d7682a1344fe6f7298432d1f2b347396c63aa1bd84ac0f707af34950a93098fe86a9bc8986fc9f97f75f0f15d8495ffd2caf8cf0eed9612c
 EBUILD libva-2.20.0.ebuild 1640 BLAKE2B c54dad2a9bec5c1e8982d355c59aa9204af5d2212cbd92e3aeac5a4908ef1a715d97d3f44c3f3b4532d8a0433c0287817021b05ee993dc02eced1fe7858e3e79 SHA512 6c52e382deebfc7b7efb621f065b49c1380f93316e0b48bde9d9b9c388ca989bbf55e9d9843dcda2cf7bd8a6c299d5d738e7c09e2a5319d198a859676176ffdd
-EBUILD libva-2.21.0.ebuild 1572 BLAKE2B e6b687a2785d8b51e160cea54857e80008bf6535c59b45353fdfb724ff1fd316e40fc4017f3e86c584775fa6b81bd906068ee920aa5aec729f25faf712188fd9 SHA512 33d93daafd781a1c3159af648df3673a02067441fded438f3aefd933713de32e5457f16c9e2bfee6cb59dc1e00ef70423c2655ab694dd2b296f4fa83b867e1c0
+EBUILD libva-2.21.0.ebuild 1640 BLAKE2B 1162148d43511638b5b8c930fcf1a371ec9f1f699d3d590ff04ad1e614de7b34251733cbf48945e00af4a7976495cb65c80b05948921b2daaeea20e552743eee SHA512 f2c8c9ae66102b031f2f7ba5b6971d38da30afd412a045a8df8c24b9579b09d334c41c746b50a835142093de4bc0dc245256a6caf80ea7de15e36877dba69be6
 EBUILD libva-9999.ebuild 1544 BLAKE2B 3b5b3112bafca3f8e6efdf15f214135cb7e8d4ebc0a64040bcd6ab39a4f40fbd4df03af84101f25280780768512706a25568361187c9c3684332211b36b54a8f SHA512 cbb0614ff00b592a4ca71561acab24d5c1053bab5ed7a8c75353a0b1e3182c589035019536254dd44bc2377b841bd77fb2fcd45d2e9dbe4e7951e8cc5c4740f7
 MISC metadata.xml 332 BLAKE2B ee8f4e2f059c3b81126ce55575cfb267c783c37e84bfd39b4564b5f0615da7d6d7efda0bd1fe3c547aa81ff3a6de056bf2555d5049d15bc33aab16c0e2a7271d SHA512 dfa43788c2b4701dde7eacecacdd4a372b192fb98ba8d471a5226eb15b20acb89e564358aa75a1673956005ed904b9e34135ff77d230b1bee95731d61198aef0
diff --git a/media-libs/libva/files/libva-2.21.0-no-undefined-version.patch b/media-libs/libva/files/libva-2.21.0-no-undefined-version.patch
new file mode 100644
index 000000000000..007540bdb535
--- /dev/null
+++ b/media-libs/libva/files/libva-2.21.0-no-undefined-version.patch
@@ -0,0 +1,46 @@
+From https://github.com/intel/libva/commit/17e07d17ba723a6b5822390afacdd3ccd976ecd2 Mon Sep 17 00:00:00 2001
+From: Violet Purcell <vimproved@inventati.org>
+Date: Sun, 1 Oct 2023 16:34:19 -0400
+Subject: [PATCH] va: Fix -Wl,--version-script check with LLD 17
+
+LLD 17 uses --no-undefined-version by default, so the check currently
+fails due to vaCreateSurface being undefined. This commit replaces that
+check with a generic check in the top level meson.build, using the
+conftest.syms file.
+
+Signed-off-by: Violet Purcell <vimproved@inventati.org>
+--- /dev/null
++++ b/conftest.syms
+@@ -0,0 +1,6 @@
++VERSION_1 {
++    global:
++        main;
++    local:
++        *;
++};
+--- a/meson.build
++++ b/meson.build
+@@ -87,6 +87,12 @@ dl_dep = cc.find_library('dl', required : false)
+ WITH_DRM = not get_option('disable_drm') and (host_machine.system() != 'windows')
+ libdrm_dep = dependency('libdrm', version : '>= 2.4.60', required : (host_machine.system() != 'windows'))
+ 
++ld_supports_version_script = cc.links(
++  'int main() { return 0; }',
++  name : '-Wl,--version-script',
++  args : ['-shared', '-Wl,--version-script,' + '@0@/@1@'.format(meson.current_source_dir(), 'conftest.syms')]
++)
++
+ WITH_X11 = false
+ if get_option('with_x11') != 'no'
+   x11_dep = dependency('x11', required : get_option('with_x11') == 'yes')
+--- a/va/meson.build
++++ b/va/meson.build
+@@ -60,7 +60,7 @@ libva_sym_arg = '-Wl,-version-script,' + '@0@/@1@'.format(meson.current_source_d
+ 
+ libva_link_args = []
+ libva_link_depends = []
+-if cc.links('', name: '-Wl,--version-script', args: ['-shared', libva_sym_arg])
++if ld_supports_version_script
+   libva_link_args = libva_sym_arg
+   libva_link_depends = libva_sym
+ endif
diff --git a/media-libs/libva/libva-2.21.0.ebuild b/media-libs/libva/libva-2.21.0.ebuild
index bb3076a9aee2..eb524d366807 100644
--- a/media-libs/libva/libva-2.21.0.ebuild
+++ b/media-libs/libva/libva-2.21.0.ebuild
@@ -48,6 +48,10 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/va/va_dricommon.h
 )
 
+PATCHES=(
+	"${FILESDIR}/libva-2.21.0-no-undefined-version.patch"
+)
+
 multilib_src_configure() {
 	local emesonargs=(
 		-Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers"