gentoo auto-resync : 17:01:2024 - 08:06:37

3 files changed, 69 insertions, 2 deletions

diff --git a/media-libs/libva/Manifest b/media-libs/libva/Manifest
index 932bf423a18c..b953fbebf69d 100644
--- a/media-libs/libva/Manifest
+++ b/media-libs/libva/Manifest
@@ -1,4 +1,5 @@
+AUX clang-17-version-script-check-fix.patch 2112 BLAKE2B 7be78047996e71ae144b160a0f860d5e0559a927a172962595a3a8b14c9b4af13e87ef515c7e749fe225e1ceb74077d660628853ce0b01001a599fec326e5f78 SHA512 29b202a999d1342574eb40b5d1259b5db857de4a4e8929c0ca02ead0707546063b95c28d67bcb3ee94174340760d5b0aab189653e2bbad45b93b6793588053d4
 DIST libva-2.20.0.tar.gz 280079 BLAKE2B bb1b7f8757d068765fa69e57e8747e0bbd61ea0874bd42d27e0a99786cad2a4a81d7c20a28ff977cebcef54cd8cafa6c0493c18b563ad1ab47a9c3190d0cd1c6 SHA512 85f4aa6b6e9173d407ca3987745f985d0f898091f14c947a928b6db662a03b5cfe82483901690d81618697fe17a2c41ff6694a611f3654d5ab06840da987e40d
-EBUILD libva-2.20.0.ebuild 1572 BLAKE2B f82ca4f628107ec9df521da5a1c491190e5306e0ec88e039d8a4a865533e1cb82c9884921b2c08bb3e8c7414f69df088aeec1c2bada90f448b9b91578e859061 SHA512 e7ee23f8f730ce4becac3b8bcbcb7a5d9abc125ba323def3a8afa4b0b546f4d39e2fae9f47aebcab0693e86a44923e2bd53c065b6179c17c569c38489eedcb58
+EBUILD libva-2.20.0.ebuild 1640 BLAKE2B c54dad2a9bec5c1e8982d355c59aa9204af5d2212cbd92e3aeac5a4908ef1a715d97d3f44c3f3b4532d8a0433c0287817021b05ee993dc02eced1fe7858e3e79 SHA512 6c52e382deebfc7b7efb621f065b49c1380f93316e0b48bde9d9b9c388ca989bbf55e9d9843dcda2cf7bd8a6c299d5d738e7c09e2a5319d198a859676176ffdd
 EBUILD libva-9999.ebuild 1544 BLAKE2B 3b5b3112bafca3f8e6efdf15f214135cb7e8d4ebc0a64040bcd6ab39a4f40fbd4df03af84101f25280780768512706a25568361187c9c3684332211b36b54a8f SHA512 cbb0614ff00b592a4ca71561acab24d5c1053bab5ed7a8c75353a0b1e3182c589035019536254dd44bc2377b841bd77fb2fcd45d2e9dbe4e7951e8cc5c4740f7
 MISC metadata.xml 332 BLAKE2B ee8f4e2f059c3b81126ce55575cfb267c783c37e84bfd39b4564b5f0615da7d6d7efda0bd1fe3c547aa81ff3a6de056bf2555d5049d15bc33aab16c0e2a7271d SHA512 dfa43788c2b4701dde7eacecacdd4a372b192fb98ba8d471a5226eb15b20acb89e564358aa75a1673956005ed904b9e34135ff77d230b1bee95731d61198aef0
diff --git a/media-libs/libva/files/clang-17-version-script-check-fix.patch b/media-libs/libva/files/clang-17-version-script-check-fix.patch
new file mode 100644
index 000000000000..670b8c80a881
--- /dev/null
+++ b/media-libs/libva/files/clang-17-version-script-check-fix.patch
@@ -0,0 +1,62 @@
+Upstream URL: https://github.com/intel/libva/pull/732
+From 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>
+---
+ conftest.syms  | 6 ++++++
+ meson.build    | 6 ++++++
+ va/meson.build | 2 +-
+ 3 files changed, 13 insertions(+), 1 deletion(-)
+ create mode 100644 conftest.syms
+
+diff --git a/conftest.syms b/conftest.syms
+new file mode 100644
+index 000000000..7d8590ff3
+--- /dev/null
++++ b/conftest.syms
+@@ -0,0 +1,6 @@
++VERSION_1 {
++    global:
++        main;
++    local:
++        *;
++};
+diff --git a/meson.build b/meson.build
+index 6acf90676..b37a85119 100644
+--- 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')
+diff --git a/va/meson.build b/va/meson.build
+index 372ae89ff..33c6cc8d3 100644
+--- 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.20.0.ebuild b/media-libs/libva/libva-2.20.0.ebuild
index 26ee296ce8db..6b90d7162477 100644
--- a/media-libs/libva/libva-2.20.0.ebuild
+++ b/media-libs/libva/libva-2.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -48,6 +48,10 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/va/va_dricommon.h
 )
 
+PATCHES=(
+	"${FILESDIR}/clang-17-version-script-check-fix.patch"
+)
+
 multilib_src_configure() {
 	local emesonargs=(
 		-Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers"