[gentoo-commits] repo/gentoo:master commit in: media-libs/libva-intel-driver/, media-libs/libva-intel-driver/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/libva-intel-driver/, media-libs/libva-intel-driver/files/

[Matt Turner]

commit:     6c75f36712a8ee942e50295838c9e6fbed939fe2
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 20 16:32:28 2025 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jul 20 16:40:07 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c75f367

media-libs/libva-intel-driver: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-libs/libva-intel-driver/Manifest             |  1 -
 .../files/2.4.1-Make-wl_drm-optional.patch         | 52 ------------------
 .../libva-intel-driver-2.4.1-r6.ebuild             | 64 ----------------------
 3 files changed, 117 deletions(-)

diff --git a/media-libs/libva-intel-driver/Manifest b/media-libs/libva-intel-driver/Manifest
index 3dfa37e4f599..fd4137ed6a3a 100644
--- a/media-libs/libva-intel-driver/Manifest
+++ b/media-libs/libva-intel-driver/Manifest
@@ -1,2 +1 @@
-DIST intel-vaapi-driver-2.4.1.tar.bz2 2889762 BLAKE2B 25888ac7a1a42233c4b0269bd910c5161f99bf22c932b46e20c8c77ed0404bf99702dd9f11b73bc0fd76a3b012ffa1de6c6133cbd7be880428235de9cfcc6ad8 SHA512 1e9dc81ecd0b3640fccd1fb827a0ade0a1e5bbabe375130df159849e47ce98c8e879c65ddaaae11d16e916be76b507be69bc0c813494e37e7fca86b0b897a94f
 DIST libva-intel-driver-2.4.4.tar.gz 3936212 BLAKE2B b4b212285b35deb5cb3311a8d5cb39aa226442ed2f94bb043749eaef28b925eee3819d4ea4900a2ad5bfc98dcc9403af40cca7d77e7dfff531337d1d575587eb SHA512 a43c4117fc8a73e1b2f64aad7150dfa9d349b6f835a30db54bed842e249bd9525aaf27cd3a6e9c3570971a14917ab5d72ae960de5347e04034c426f52dd5599a

diff --git a/media-libs/libva-intel-driver/files/2.4.1-Make-wl_drm-optional.patch b/media-libs/libva-intel-driver/files/2.4.1-Make-wl_drm-optional.patch
deleted file mode 100644
index 4cc3ee2017c4..000000000000
--- a/media-libs/libva-intel-driver/files/2.4.1-Make-wl_drm-optional.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-https://bugs.gentoo.org/941253
-https://github.com/intel/intel-vaapi-driver/pull/566
-
-From 1c3c43371d45e1d072faa9a5cd850c1722a06569 Mon Sep 17 00:00:00 2001
-From: Simon Ser <contact@emersion.fr>
-Date: Mon, 11 Mar 2024 23:48:17 +0100
-Subject: [PATCH] Make wl_drm optional
-
-Don't error out when vtable->wl_interface is NULL.
-
-Fetching wl_drm_interface from libEGL used to work but doesn't
-anymore: it's now a private symbol (wayland-scanner private-code).
----
- src/i965_output_wayland.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/i965_output_wayland.c b/src/i965_output_wayland.c
-index a6120b7..a002cae 100644
---- a/src/i965_output_wayland.c
-+++ b/src/i965_output_wayland.c
-@@ -154,7 +154,7 @@ registry_handle_global(
-     struct va_wl_output * const wl_output = i965->wl_output;
-     struct wl_vtable * const wl_vtable = &wl_output->vtable;
- 
--    if (strcmp(interface, "wl_drm") == 0) {
-+    if (strcmp(interface, "wl_drm") == 0 && wl_vtable->drm_interface) {
-         wl_output->wl_drm_name = name;
-         wl_output->wl_drm = registry_bind(wl_vtable, wl_output->wl_registry,
-                                           name, wl_vtable->drm_interface,
-@@ -472,6 +472,7 @@ i965_output_wayland_init(VADriverContextP ctx)
- 
-     wl_vtable = &i965->wl_output->vtable;
- 
-+    /* drm_interface is optional */
-     if (vtable->wl_interface)
-         wl_vtable->drm_interface = vtable->wl_interface;
-     else {
-@@ -483,9 +484,8 @@ i965_output_wayland_init(VADriverContextP ctx)
-         }
- 
-         dso_handle = i965->wl_output->libegl_handle;
--        if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable),
--                             libegl_symbols))
--            goto error;
-+        dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable),
-+                        libegl_symbols);
-     }
- 
-     i965->wl_output->libwl_client_handle = dso_open(LIBWAYLAND_CLIENT_NAME);
--- 
-2.45.2
-

diff --git a/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r6.ebuild b/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r6.ebuild
deleted file mode 100644
index 824e056d80f1..000000000000
--- a/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="intel-vaapi-driver"
-if [[ ${PV} = *9999* ]] ; then # Live ebuild
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/intel/intel-vaapi-driver"
-fi
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="HW video decode support for Intel integrated graphics"
-HOMEPAGE="https://github.com/intel/intel-vaapi-driver"
-if [[ ${PV} != *9999* ]] ; then
-	SRC_URI="https://github.com/intel/${MY_PN}/releases/download/${PV}/${MY_PN}-${PV}.tar.bz2"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="hybrid wayland X"
-RESTRICT="test" # No tests
-
-RDEPEND="
-	>=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}]
-	>=media-libs/libva-2.4.0:=[X?,wayland?,${MULTILIB_USEDEP}]
-
-	hybrid? (
-		>=media-libs/intel-hybrid-codec-driver-2.0.0[X?,wayland?]
-	)
-
-	wayland? (
-		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-9.1.6[egl(+),${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-Make-wl_drm-optional.patch
-)
-
-src_prepare() {
-	default
-	sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(use_enable hybrid hybrid-codec)
-		$(use_enable wayland)
-		$(use_enable X x11)
-	)
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	find "${D}" -name "*.la" -delete || die
-}