commit: b085d303cc7518439df9fc78ddaaccbfa96c345e Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Thu Jul 11 15:34:44 2024 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Thu Jul 11 15:37:54 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b085d303
media-libs/libva: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> media-libs/libva/Manifest | 1 - .../files/clang-17-version-script-check-fix.patch | 62 ------------------- media-libs/libva/libva-2.20.0.ebuild | 71 ---------------------- 3 files changed, 134 deletions(-) diff --git a/media-libs/libva/Manifest b/media-libs/libva/Manifest index 9e846cbb2b19..8fe428bd4787 100644 --- a/media-libs/libva/Manifest +++ b/media-libs/libva/Manifest @@ -1,2 +1 @@ -DIST libva-2.20.0.tar.gz 280079 BLAKE2B bb1b7f8757d068765fa69e57e8747e0bbd61ea0874bd42d27e0a99786cad2a4a81d7c20a28ff977cebcef54cd8cafa6c0493c18b563ad1ab47a9c3190d0cd1c6 SHA512 85f4aa6b6e9173d407ca3987745f985d0f898091f14c947a928b6db662a03b5cfe82483901690d81618697fe17a2c41ff6694a611f3654d5ab06840da987e40d DIST libva-2.21.0.tar.gz 281515 BLAKE2B bd430162b07987d8982d8f81296e94623efea68624f34b7e159ebefeb37a2b062f2c0d809e16e76c172d6c2df11b59691174fb9a1d65d0938949ac2a025b746c SHA512 93654bb892e0e269d7682a1344fe6f7298432d1f2b347396c63aa1bd84ac0f707af34950a93098fe86a9bc8986fc9f97f75f0f15d8495ffd2caf8cf0eed9612c 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 deleted file mode 100644 index 670b8c80a881..000000000000 --- a/media-libs/libva/files/clang-17-version-script-check-fix.patch +++ /dev/null @@ -1,62 +0,0 @@ -Upstream URL: https://github.com/intel/libva/pull/732 -From 17e07d17ba723a6b5822390afacdd3ccd976ecd2 Mon Sep 17 00:00:00 2001 -From: Violet Purcell <[email protected]> -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 <[email protected]> ---- - 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 deleted file mode 100644 index 6b90d7162477..000000000000 --- a/media-libs/libva/libva-2.20.0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson-multilib optfeature - -DESCRIPTION="Video Acceleration (VA) API for Linux" -HOMEPAGE="https://01.org/linuxmedia/vaapi"; - -if [[ ${PV} = *9999 ]] ; then - inherit git-r3 - EGIT_BRANCH=master - EGIT_REPO_URI="https://github.com/intel/libva"; -else - SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm64 ~loong ~mips ppc64 ~riscv x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="MIT" -SLOT="0/$(ver_cut 1)" -IUSE="wayland X" - -RDEPEND=" - >=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}] - wayland? ( - >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] - ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] - x11-libs/libxcb:=[${MULTILIB_USEDEP}] - ) -" -DEPEND=" - ${RDEPEND} - X? ( x11-base/xorg-proto ) -" -BDEPEND=" - wayland? ( dev-util/wayland-scanner ) - virtual/pkgconfig -" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/va/va_x11.h - /usr/include/va/va_dri2.h - /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" - -Ddisable_drm=false - -Dwith_x11=$(usex X) - -Dwith_glx=no - -Dwith_wayland=$(usex wayland) - -Denable_docs=false - ) - meson_src_configure -} - -pkg_postinst() { - optfeature_header - optfeature "Older Intel GPU support up to Gen8" media-libs/libva-intel-driver - optfeature "Newer Intel GPU support from Gen9+" media-libs/libva-intel-media-driver -}
