diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-10-22 04:04:46 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-10-22 04:04:46 +0100 |
| commit | a15e8dc7444560123d7d4be1bccb19afd5b611d0 (patch) | |
| tree | 6e26ee0323c09494a66d0f78c4b81e305bb0d096 /media-libs/libva-intel-driver | |
| parent | 3dc4de6331223493015f198dc61854af604da86c (diff) | |
gentoo auto-resync : 22:10:2024 - 04:04:46
Diffstat (limited to 'media-libs/libva-intel-driver')
| -rw-r--r-- | media-libs/libva-intel-driver/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/libva-intel-driver/files/2.4.1-Make-wl_drm-optional.patch | 52 | ||||
| -rw-r--r-- | media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r5.ebuild (renamed from media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r4.ebuild) | 4 |
3 files changed, 58 insertions, 1 deletions
diff --git a/media-libs/libva-intel-driver/Manifest b/media-libs/libva-intel-driver/Manifest index bc2093b85d7f..98cc9b9fe802 100644 --- a/media-libs/libva-intel-driver/Manifest +++ b/media-libs/libva-intel-driver/Manifest @@ -1,4 +1,5 @@ +AUX 2.4.1-Make-wl_drm-optional.patch 1929 BLAKE2B 7e157bfb8b2c968376b9fc2b77718b29c8e1f25a1156bd793e0076b85c582897ccdb6b79fe6cc60b08fb5f2526e47fe04c97c6f1e28a3af468a739d90c6ba7b7 SHA512 b6d5a711b782eca3da786711f7b1d0c0b0c6d42d11723bcc0b1fc6f017bef289acf7d41b68ffb294d9e7f1bc616d36c7da5e155f77bcf36f963d3bc0ba84fe7a DIST intel-vaapi-driver-2.4.1.tar.bz2 2889762 BLAKE2B 25888ac7a1a42233c4b0269bd910c5161f99bf22c932b46e20c8c77ed0404bf99702dd9f11b73bc0fd76a3b012ffa1de6c6133cbd7be880428235de9cfcc6ad8 SHA512 1e9dc81ecd0b3640fccd1fb827a0ade0a1e5bbabe375130df159849e47ce98c8e879c65ddaaae11d16e916be76b507be69bc0c813494e37e7fca86b0b897a94f -EBUILD libva-intel-driver-2.4.1-r4.ebuild 1432 BLAKE2B 80fee8c5f431ad22d7bf8c1c6e87329683f5c94be2e93615945d310d792bdca76d4af1a57e1f0e57678320436367cf4b1f30433103be6a89a1734d05bec977bd SHA512 5e80f6d6d1587649952d06b59c513960d0786985102f5c7f6e986afccd1fbdd0fb74c4d012ef4417d7546a17ad4ae6c171c68bd93bc6f1ae7d5dc92dff3bac71 +EBUILD libva-intel-driver-2.4.1-r5.ebuild 1493 BLAKE2B 80af7a717424e11416e54931ff3988bdd6e4538cadfacbdcd0ca54f47047c5168a21bd521a41558ded5f734d1a0b711dfb55cd44124193de7f0f8f3dc351ace1 SHA512 435734caf3c92bcfe93feb61654f5b088ec315a0b83739b476eb0728c96586bb63f5230353c448ad874258cbfe2dea11396e8df4b3bd832350e13c2fa01c4b80 EBUILD libva-intel-driver-9999.ebuild 1434 BLAKE2B 187b9f9c37d5e17fddf9669e112b869ce7054836e40186902f7d4740c0e6b381468f6bab4879b79a4f0d5ccd0973faaec51698c4cb8bfc4bab801feac757e6ce SHA512 3869a58a3a4a76e9c58cebf2a8ce55862eabc3da676617b3183cd59fc9d6d39a661db872b7e82cc6f9a0caa61928700a6a309da1d2ab5abc0e4d6907f073dfed MISC metadata.xml 490 BLAKE2B 1a66bd19f05f0c21849b8fe57ffc8f8e153af9a963e045b0c23050734a4aa506b920b91fb4606306f0850514df4465ef6f448042c0c339b61f75d7d6904e0ce7 SHA512 5bf8d70288c3b63678f6adafbf0a3284385e9122e4acf50455741e0472dd8fe1b8eb6d41ea92056cb2da462c31aa812b061297427dc9de1853539dbf762d7cef 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 new file mode 100644 index 000000000000..4cc3ee2017c4 --- /dev/null +++ b/media-libs/libva-intel-driver/files/2.4.1-Make-wl_drm-optional.patch @@ -0,0 +1,52 @@ +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-r4.ebuild b/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r5.ebuild index 4a0de8f43ac2..493e54089192 100644 --- a/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r4.ebuild +++ b/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r5.ebuild @@ -40,6 +40,10 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${PV}-Make-wl_drm-optional.patch +) + src_prepare() { eapply_user sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die |