gentoo auto-resync : 16:10:2022 - 07:52:23

author: V3n3RiX <venerix@koprulu.sector> 2022-10-16 07:52:23 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-10-16 07:52:23 +0100
commit: c7c046a33897c533b949ee76326d620f5e07f2e9 (patch)
tree: 9cefb49f93bb8be42c9129fdf95d7ab846751826 /media-libs
parent: 6144cd2e90f8e3623912112050c8d2025de44f0a (diff)
51 files changed, 1208 insertions, 32 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 0d45d366e748..7073e23d79ef 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index d3bc4877afde..29b3a85a8a71 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,4 +1,4 @@
 AUX avidemux-core-2.7.6-ffmpeg-flags.patch 303 BLAKE2B 9b8a1f14bb7ce12c48f96f732228fb97783e8dd79a9e7f8fa4913a1536f93f0eb384c92946816e78f65ba5cb31a062de95992069d43bc5f28468d017d39a2bcb SHA512 25d41f677c71a76528f2b09ff06643a38cf04de6c32c8c4f272ace7043d373670abbf85cf7219a2a3f65d23f9eba314fdecf1938b9550f6b916b25711a95aea2
 DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
-EBUILD avidemux-core-2.7.8.ebuild 2541 BLAKE2B 3537d030bf9a2c3227c2f145b2c339fb2207dfe79be2a13bbd3403849732e6cdbbb581f83fa9aa09e021f48cb2a84b7f064571322811317fa767cbf282b9dada SHA512 dd0157d43d6ca0a747279c07e02fd8648bbeb23ac6300beab16b9c0516360773ef22712503327a07cc452633dc446d7188c97d9f1d70412ee84d2bebacf7bfe8
+EBUILD avidemux-core-2.7.8.ebuild 2543 BLAKE2B f3cd069695b889965b17e49a4b27558ad4ab2192d93ecdb1389fd6ce817eefd85e66b1ea52179a6c99e9e0c71e5d88625220a25ddec7d0a38b38649dc090e8c3 SHA512 9d134fd799e3d725bc0c5e24350513ca44df1b6662ed4075169e5e6f3a8eb2dda695970e232d26f1f7762a08f2872a13cf6786214d81b1f759f28b41b6c475de
 MISC metadata.xml 445 BLAKE2B e50f517d52c143a715503c3f235371a7e03de54e6eba1da6eac8101cdf28392247ed4fd80c2abc51639394c5883b9c123810597ac9499bba0760ed34ebb0013a SHA512 414df3edeaa635e37cbab1a7de5edb214f258e16f89bb32f5d820474017e54f2f3eab48929e505ea9fa8b6aca1f7e608cc558ca6147e605272c2fe644798597b
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild
index 7d5a2d52c24c..062fa0231f9c 100644
--- a/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild
@@ -22,7 +22,7 @@ DEPEND="
 	dev-db/sqlite:3
 	sdl? ( media-libs/libsdl:0 )
 	system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] )
-	vaapi? ( x11-libs/libva:0= )
+	vaapi? ( media-libs/libva:0= )
 	vdpau? ( x11-libs/libvdpau:0 )
 	xv? ( x11-libs/libXv:0 )
 "
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 37815a7a7d73..4f9eef7cba44 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -6,4 +6,4 @@ DIST intel-gmmlib-22.2.0.tar.gz 820145 BLAKE2B 6b7966c71a24344f4525cb676aae12c79
 EBUILD gmmlib-22.1.8.ebuild 795 BLAKE2B 6bcec2581a34ec5a169eaa3508c8d7e6085865b6df1d2746db4c114eeebfd082636a3bb1aad3c6f72bc00a87effc4e32921f8d315ee58db95d71a495be00afcc SHA512 d366ef04a77026dbb3d1cae5d4e4bf74846cb6a4b7842c218f04889d0e0a0450d3ad28016a3492f5ff723dff4ac16bfd00e2d618bfb7e3400a4e841451d6c7f8
 EBUILD gmmlib-22.2.0.ebuild 796 BLAKE2B 229b1cfde21427a045a0bbf7b93428bdd4173e447055201feb6d808b7406101de1a67f4a228ffb4206ec7b3941dcb894a9a91dd0d7777954640de1615c0a8429 SHA512 11ad5fbe1a2975e13233434673ccb36960f4a7517a5b0a45c8e35aa8a77e886a89c8e304c87d7e0e0d2eba250f12170eca460b0789ab5c9eea780c7fe641fa6e
 EBUILD gmmlib-9999.ebuild 875 BLAKE2B e3b152fddf160615a384564528294e34a3e974cbca2c449c5f0c8eb35be42b0a5effca7c5f5206e0e557f1b3e97631285da731dededed27e61581bb0994236aa SHA512 c5c5798eb82b6ad5872c0b52888cb2ee3effd989b0aa1fa8b3c000c3f9842d8789e350b718d2a78c9ca465b63b90b2873eadae0528ebda3a9435b1729388b849
-MISC metadata.xml 602 BLAKE2B 3dd974d0293b434877d26265e65ff26cf3b024556b22614012e31169cf7230703f092310cbd4b7bdcf82da4f439e0590f49279e3adbd845de08e7320996032b1 SHA512 48b892b2ad978c1736f8487ea6c3020ba9b94fe0f77306c6c3c48c8d320d04fa513a28bfcb60b991870503fe6dcf7fbf7848e840fd6470c382b4a808bab5b159
+MISC metadata.xml 401 BLAKE2B b8c3f2935afa450ec0eeedd745e91b14ed18386a87edc77d17894db4764b681cf1c1b80bac714662f506a9092813525f2365aad31d01b64dd8709da2df6c07f4 SHA512 ce6959033b6682ab01f830b869c972fcb774d241bca62faed86f6e1705eb2f6a7615f8781c7c75118ac5fd6bae096c08cf6a2e965429bbdcbe9f598ae67f91f7
diff --git a/media-libs/gmmlib/metadata.xml b/media-libs/gmmlib/metadata.xml
index 79f6bc657e59..5b6eb8041eb8 100644
--- a/media-libs/gmmlib/metadata.xml
+++ b/media-libs/gmmlib/metadata.xml
@@ -2,15 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>media-video@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>k2k@narod.ru</email>
-		<name>Evgeny Grin</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>conikost@gentoo.org</email>
-		<name>Conrad Kostecki</name>
+		<email>vaapi@gentoo.org</email>
+		<name>VA-API Project</name>
 	</maintainer>
 	<use>
 		<flag name="custom-cflags">Do not override user CFLAGS like -march, -msse and similar with lib defaults. Not tested by upstream.</flag>
diff --git a/media-libs/intel-hybrid-codec-driver/Manifest b/media-libs/intel-hybrid-codec-driver/Manifest
new file mode 100644
index 000000000000..1bc7b09e467d
--- /dev/null
+++ b/media-libs/intel-hybrid-codec-driver/Manifest
@@ -0,0 +1,8 @@
+AUX intel-hybrid-codec-driver-2.0.0-gcc10-fix.patch 460 BLAKE2B 94a225338835403788383b845ec4048608966170671944f73975dbee3e95ae49c943a32fbec0d59008f230186342fafb27af1f214664cd6f239f3d4eebb45a1c SHA512 bebaa765d3d97c5568fccfaa465fb13b717681b1846acce94dc7b45ba9ea48f017fce125f937b433e2eeec63985e3a555748277fedf8777ca0693acee78a4fed
+AUX intel-hybrid-codec-driver-2.0.0-invalid-read-fix.patch 1672 BLAKE2B 94e08496fd654fcb57d083ab72311ac29791ad488f2d55d92aba63b872a526563e015a3dfa48ebef957fed18372bf6e3be068e42bfa571c585d76bc1a42bfb01 SHA512 7efb4c30078b2c03f5ff15c48983d68971e95f0ae9eb637953b7ce972c21fb66ec04cbf30862ec2bc3200703d4d8994678022497c7a85a644404bf2f71095291
+AUX intel-hybrid-codec-driver-2.0.0-nullptr-fix.patch 907 BLAKE2B a894473043bf929d21bac2cfaacab5c3404dc82f1019c96909ab328be946c31034ba6cb5cd9ea60a234f3f0b44c6b48c49c49499f2c7cb7a34885237540dcbea SHA512 b450126fd487cee7b157ff08f01e83dbf8ed571f6938ff84e5c71fff174ff6b0826e7ce02b2604a58ce38baf7a6e0eb93cc430f719b02de1630bda499f4a8930
+AUX intel-hybrid-codec-driver-2.0.0-vadriverinit-fix.patch 447 BLAKE2B bcb9c088436c468732eb33991e2db50efe5bc51ab3ecbd1da814c71379ecf13980f53b327ed93022e0a83967fd1864ca08e707d0b22c0c1a41e4b63e9840c894 SHA512 440e909ad090d7fd5d07fcccbd288c9422c32df38704ec24f8ce513341229023a288638828b63f2174afd6460be79abc158b528a10f33fcb81f9f9cfcab4dbd8
+AUX intel-hybrid-codec-driver-2.0.0-x11-fix.patch 1915 BLAKE2B e203b5573494d7da4d1f17841a41c396012638f3bdea01796b821ea63f4fc4dadf9aebdd9c78cd2c613773528f8dcb719ff2f9c61dee2eca7e48896339579106 SHA512 bc9f985370a94e9dd1e41d9c091a5ed0a59c225094b8e16a4d669086aaef59b50e597ad4584d6a04f00a5095439896023fa5a2b901441d778cf2468f358a2b0a
+DIST intel-hybrid-codec-driver-2.0.0.tar.gz 1332637 BLAKE2B c02a54a12ad3b9d35bd4e15f9ffaecc8cd33750ab2eea73c8e4140ada1c666cd9a2b43725b44a22050f8140ffe2810ca87802854afb4c251cb879f219da8db6b SHA512 1d4e2c41d30892e07a3d2c83977725fca6fc20d887bead41109a0936fa9b4848131e4460cca8efe792f2815fcc9622d38d0a5e117a54403708e1132f1112d37a
+EBUILD intel-hybrid-codec-driver-2.0.0.ebuild 1223 BLAKE2B caee6e281d26f215e6698264ca6d6f619b7fe6aac0a6f228569052d28cc9689adab25f20025fc9f2ad859a25a9860083bc6a978731b160c69d6a42965b51107b SHA512 9e1828a60d2677839ee28fc0929cbc2ba03597b96236269f2514c5b6e14bdc8d5454784df063eb01158fa4df8f21f0f8dbcf49d894d82aec2cfab9d12cacb2bb
+MISC metadata.xml 593 BLAKE2B e6fcb9ac5b9b51f1c2b03f03a221b8333a190c7ba1b7ea36de4a1e4d61ef1e9593784ed6d500de87f618d286d3a921fa59f1a0482185677ce2bb961b3abdeac0 SHA512 ebe0afe41278366116f6e7a12039de8f09961fee1807370a63e0e459fceefbe6fca67a5fdfcb3f3892e457b8d211a6b48b48d6f335e197b61a86d2f33ac03779
diff --git a/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-gcc10-fix.patch b/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-gcc10-fix.patch
new file mode 100644
index 000000000000..0c170579857f
--- /dev/null
+++ b/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-gcc10-fix.patch
@@ -0,0 +1,11 @@
+--- intel-hybrid-driver/src/media_drv_common.h  2020-05-26 23:18:02.279795861 +0100
++++ intel-hybrid-driver-new/src/media_drv_common.h      2020-05-26 23:19:11.316101524 +0100
+@@ -39,6 +39,6 @@
+ #define BRC_INIT_IGNORE_PICTURE_HEADER_SIZE     0x2000
+ #define BRC_INIT_DISABLE_MBBRC                  0x8000
+ 
+-UINT SEARCH_PATH_TABLE[2][8][16];
+-UINT ME_CURBE_INIT_DATA[30];
++extern UINT SEARCH_PATH_TABLE[2][8][16];
++extern UINT ME_CURBE_INIT_DATA[30];
+ #endif
diff --git a/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-invalid-read-fix.patch b/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-invalid-read-fix.patch
new file mode 100644
index 000000000000..e410a8cc89c5
--- /dev/null
+++ b/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-invalid-read-fix.patch
@@ -0,0 +1,39 @@
+diff --git a/src/media_drv_gen75_render.c b/src/media_drv_gen75_render.c
+index a3d60ff..51b1442 100644
+--- a/src/media_drv_gen75_render.c
++++ b/src/media_drv_gen75_render.c
+@@ -1453,7 +1453,7 @@ media_drv_gen75_render_init(VADriverContextP ctx)
+ 
+     if (IS_HASWELL (drv_ctx->drv_data.device_id)) {
+         memcpy(render_state->render_kernels, render_kernels_gen7_haswell,
+-               sizeof(render_state->render_kernels));
++               sizeof(render_kernels_gen7_haswell));
+         render_state->render_put_surface = gen7_render_put_surface;
+         render_state->render_put_subpicture = gen7_render_put_subpicture;
+     } else {
+diff --git a/src/media_drv_gen8_render.c b/src/media_drv_gen8_render.c
+index 42005ea..da349cc 100644
+--- a/src/media_drv_gen8_render.c
++++ b/src/media_drv_gen8_render.c
+@@ -1741,7 +1741,7 @@ media_drv_gen8_render_init(VADriverContextP ctx)
+     render_state->max_wm_threads = 64;
+ 
+     memcpy(render_state->render_kernels, render_kernels_gen8,
+-           sizeof(render_state->render_kernels));
++           sizeof(render_kernels_gen8));
+ 
+     kernel_size = 4096;
+ 
+diff --git a/src/media_drv_hw_g75.c b/src/media_drv_hw_g75.c
+index 57eddbd..080cd86 100644
+--- a/src/media_drv_hw_g75.c
++++ b/src/media_drv_hw_g75.c
+@@ -3325,7 +3325,7 @@ media_set_curbe_vp8_me (VP8_ME_CURBE_PARAMS * params)
+   MEDIA_CURBE_DATA_ME *cmd = (MEDIA_CURBE_DATA_ME *) params->curbe_cmd_buff;
+ 
+   media_drv_memcpy (cmd, sizeof (MEDIA_CURBE_DATA_ME), ME_CURBE_INIT_DATA,
+-		    sizeof (MEDIA_CURBE_DATA_ME));
++		    sizeof (ME_CURBE_INIT_DATA));
+   me_mode =
+     params->
+     me_16x_enabled ? (params->me_16x ? ME16x_BEFORE_ME4x : ME4x_AFTER_ME16x) :
diff --git a/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-nullptr-fix.patch b/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-nullptr-fix.patch
new file mode 100644
index 000000000000..84562584b6a2
--- /dev/null
+++ b/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-nullptr-fix.patch
@@ -0,0 +1,21 @@
+diff --git a/src/vp9hdec/decode_hybrid_vp9.cpp b/src/vp9hdec/decode_hybrid_vp9.cpp
+index 1baf339..7a086e2 100644
+--- a/src/vp9hdec/decode_hybrid_vp9.cpp
++++ b/src/vp9hdec/decode_hybrid_vp9.cpp
+@@ -3289,9 +3289,16 @@ VAStatus Intel_HybridVp9Decode_HostVldRenderCb (
+ 
+     // Reset padding flag of current frame and update surface dimension
+     surface = SURFACE(pMdfDecodeFrame->ucCurrIndex);
++    if ((surface == NULL) || (surface->private_data == NULL))
++        return VA_STATUS_ERROR_INVALID_PARAMETER;
++
+     pFrameSource = (INTEL_DECODE_HYBRID_VP9_MDF_FRAME_SOURCE *)(surface->private_data);
+     pCurrFrame = &(pFrameSource->Frame);
+     pFrameSource->bHasPadding = false;
++
++    if (pCurrFrame->pMdfSurface == NULL)
++        return VA_STATUS_ERROR_INVALID_PARAMETER;
++
+     pCurrFrame->pMdfSurface->SetSurfaceStateDimensions(
+         pMdfDecodeFrame->dwWidth,
+         pMdfDecodeFrame->dwHeight);
diff --git a/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-vadriverinit-fix.patch b/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-vadriverinit-fix.patch
new file mode 100644
index 000000000000..5177e1448539
--- /dev/null
+++ b/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-vadriverinit-fix.patch
@@ -0,0 +1,13 @@
+--- intel-hybrid-driver/src/media_drv_init.c
++++ intel-hybrid-driver-new/src/media_drv_init.c
+@@ -2764,9 +2764,9 @@ va_driver_init (VADriverContextP ctx)
+   return ret;
+ }
+
+-VAStatus DLL_EXPORT __vaDriverInit_0_34 (VADriverContextP ctx);
++VAStatus DLL_EXPORT VA_DRIVER_INIT_FUNC (VADriverContextP ctx);
+ VAStatus
+-__vaDriverInit_0_34 (VADriverContextP ctx)
++VA_DRIVER_INIT_FUNC (VADriverContextP ctx)
+ {
+   VAStatus ret = VA_STATUS_ERROR_UNKNOWN;
diff --git a/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-x11-fix.patch b/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-x11-fix.patch
new file mode 100644
index 000000000000..2422e4d1721b
--- /dev/null
+++ b/media-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-x11-fix.patch
@@ -0,0 +1,54 @@
+From b3b4d9a3a08d48bf6022723908a22255cc271ab7 Mon Sep 17 00:00:00 2001
+From: Daniel Charles <daniel.charles@intel.com>
+Date: Fri, 4 May 2018 09:56:10 -0700
+Subject: [PATCH] driver_init: load libva-x11.so for any ABI version
+
+with libva > 2.0.0 hybrid driver can operate with it as well
+so make this load generic to libva installed version
+
+Signed-off-by: Daniel Charles <daniel.charles@intel.com>
+---
+ src/media_drv_output_dri.c | 10 ++++++++++
+ src/media_drv_output_dri.h |  2 +-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/src/media_drv_output_dri.c b/src/media_drv_output_dri.c
+index 42299b8..bbd9713 100644
+--- a/src/media_drv_output_dri.c
++++ b/src/media_drv_output_dri.c
+@@ -105,6 +105,15 @@ media_output_dri_init (VADriverContextP ctx)
+   struct dri_vtable *dri_vtable;
+
+   static const struct dso_symbol symbols[] = {
++#if VA_CHECK_VERSION(1,0,0)
++    {"va_dri_get_drawable",
++     offsetof (struct dri_vtable, get_drawable)},
++    {"va_dri_get_rendering_buffer",
++     offsetof (struct dri_vtable, get_rendering_buffer)},
++    {"va_dri_swap_buffer",
++     offsetof (struct dri_vtable, swap_buffer)},
++    {NULL,}
++#else
+     {"dri_get_drawable",
+      offsetof (struct dri_vtable, get_drawable)},
+     {"dri_get_rendering_buffer",
+@@ -112,6 +121,7 @@ media_output_dri_init (VADriverContextP ctx)
+     {"dri_swap_buffer",
+      offsetof (struct dri_vtable, swap_buffer)},
+     {NULL,}
++#endif
+   };
+
+   drv_ctx->dri_output =
+diff --git a/src/media_drv_output_dri.h b/src/media_drv_output_dri.h
+index 0d6ccf0..889861c 100644
+--- a/src/media_drv_output_dri.h
++++ b/src/media_drv_output_dri.h
+@@ -30,7 +30,7 @@
+ #define _MEDIA__DRIVER_OUT_DRI_H
+ #include <stdbool.h>
+ #include "media_drv_defines.h"
+-#define LIBVA_X11_NAME "libva-x11.so.1"
++#define LIBVA_X11_NAME "libva-x11.so.2"
+ VOID media_output_dri_terminate (VADriverContextP ctx);
+ BOOL media_output_dri_init (VADriverContextP ctx);
diff --git a/media-libs/intel-hybrid-codec-driver/intel-hybrid-codec-driver-2.0.0.ebuild b/media-libs/intel-hybrid-codec-driver/intel-hybrid-codec-driver-2.0.0.ebuild
new file mode 100644
index 000000000000..94677eae42f6
--- /dev/null
+++ b/media-libs/intel-hybrid-codec-driver/intel-hybrid-codec-driver-2.0.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_64 )
+EGIT_COMMIT="edead0c17e2818bc0fee0ea644f85ab81bbe6f7a"
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Libva support for older hardware accelerated encode/decode on Haswell and newer"
+HOMEPAGE="https://github.com/intel/intel-hybrid-driver"
+SRC_URI="https://github.com/intel/intel-hybrid-driver/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/intel-hybrid-driver-${EGIT_COMMIT}"
+
+KEYWORDS="~amd64 ~amd64-linux"
+LICENSE="MIT"
+SLOT="0"
+IUSE="wayland X"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	>=x11-libs/cmrt-1.0.6
+	>=x11-libs/libdrm-2.4.45
+	>=media-libs/libva-1.0.16[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc10-fix.patch"
+	"${FILESDIR}/${P}-vadriverinit-fix.patch"
+	"${FILESDIR}/${P}-x11-fix.patch"
+	"${FILESDIR}/${P}-nullptr-fix.patch"
+	"${FILESDIR}/${P}-invalid-read-fix.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/media-libs/intel-hybrid-codec-driver/metadata.xml b/media-libs/intel-hybrid-codec-driver/metadata.xml
new file mode 100644
index 000000000000..b93334ee2543
--- /dev/null
+++ b/media-libs/intel-hybrid-codec-driver/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <maintainer type="person" proxied="yes">
+    <email>kaichun.ning@gmail.com</email>
+    <name>Kai-Chun Ning</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">intel/intel-hybrid-driver</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-libs/intel-mediasdk/Manifest b/media-libs/intel-mediasdk/Manifest
index 7403bb44c43a..d5a17f312ea4 100644
--- a/media-libs/intel-mediasdk/Manifest
+++ b/media-libs/intel-mediasdk/Manifest
@@ -1,5 +1,5 @@
 AUX intel-mediasdk-20.3.0-missing-limits-include.patch 751 BLAKE2B a43734984dad9be29ae79677c05d20c245e704d6cef9c6d69d06d38973eb2dadae34cbcba74a120061dfeef6bc10a5ca76fd9a252d35c25025158aaf251bc122 SHA512 a5a681d43613a20b9c8cd1549d6b4fa4288c401716cd95ab08e314855fea01acc24d4fc0f5c687a002ca2440b7eb4f14c64c727b2b0382ca9c99ab8981e051b3
 DIST intel-mediasdk-20.3.0.tar.gz 10810941 BLAKE2B 5c5bc1a8444b6780ee7ea13711e7c59f62e8c9d8a7577ff848a6fbc5fc416d3e03580fe44dd9df7a506c19dd677986804a055cb16b34a06a55897623d25298d5 SHA512 2bd2604e6f17aeeea661352fd52c19b0ff2361919ad67b858287e507e0356cc805f1d22b39ff28294d303efefc33e10c2c5912d774f1bc40751c2c6c3c9e90c4
-EBUILD intel-mediasdk-20.3.0-r1.ebuild 975 BLAKE2B 89348fe099e7cc04aca1cf0783db27a23db5c4b38bcbb01608c7127d9ca3e276818b13dd3f56335dd2e19f0c277059de25d8874e5ae04aa08dbac606ba3bf7d5 SHA512 86f3a0092e8108bf824e7d66d4060e65444140728a3937bd0490ee3fd5d6c8ec7cae901b0a2ca01ebdb9c1f0dcfdf03d2345dbebd1811461fcac24dadf073b8d
-EBUILD intel-mediasdk-9999.ebuild 905 BLAKE2B 6d20e929400fa7bbdfa328167d1bb77630ff1f0db2c429689759d3684ef7bdd6a98abc35abc2afc296fcee22f6db40ea85f4e8227658790ad8ed2a7c209d7bef SHA512 0a1111fd1d60b63b922322d89f308ea5cf4e999425cc679e11e5e2a852fd684b6780a08be98023005026979677dbbe3dca9a603769169a3d9e995641aff4ff1e
+EBUILD intel-mediasdk-20.3.0-r1.ebuild 977 BLAKE2B a0fc7ba641c489b6fc913c3a3439b22ae3a881a5e07b995d7e3323dfabebdabd448d747dc7fcd5fdb0214a11391e08c5352afd9777ef9866d9b2121382fe5368 SHA512 2b283475c4657604815cb54c71d27ebe4bcf8901aaae2e369b5a5f64adff8a691d0b39c1a65e35a108c85d03046d3d0ab9a40c168cad597d316f6ac786333267
+EBUILD intel-mediasdk-9999.ebuild 907 BLAKE2B d86e90af518afdcd9e684a0ea04321efcc570d2bd448082ea8a68c61add886b9ca3527bcdbae4f923197b571439003d42ded7ced523ce68ed08d4fc58cf3bceb SHA512 d1d10dd6502d805c8f54285601d4f9d71fa2c3891d7eb1ac257861b0ada4723b908f952fb7337b4eef438788ad78743a240c9d9c5c48ce36bd02bde41de4dc69
 MISC metadata.xml 221 BLAKE2B a8ae02758e29edcbb6f3c9de4eb354eec3dcd1b3d5917639ac518b4085c61eb86187e0046a8076d21ce9fccbf76b9c98e0b3816bbea3f479a1955df68f1ff6c7 SHA512 56dcb24730cb51ba02e3cf46bf03dd27ac4f3afb5781bbf9984100dad25aacee64a13f667de0c988aab9059fb7487e3835f995aa9c515a9680dd8534d30f0d17
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-20.3.0-r1.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-20.3.0-r1.ebuild
index 2849dead015e..0e5426e4bf7a 100644
--- a/media-libs/intel-mediasdk/intel-mediasdk-20.3.0-r1.ebuild
+++ b/media-libs/intel-mediasdk/intel-mediasdk-20.3.0-r1.ebuild
@@ -29,7 +29,7 @@ SLOT="0"
 # x11-libs/libdrm[video_cards_intel] for intel_bufmgr.h in samples
 # bug #805224
 DEPEND="
-	>=x11-libs/libva-intel-media-driver-${PV}
+	>=media-libs/libva-intel-media-driver-${PV}
 	x11-libs/libdrm[video_cards_intel]
 "
 RDEPEND="${DEPEND}"
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
index 33349a103358..5e9ab6853a42 100644
--- a/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
+++ b/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
@@ -29,7 +29,7 @@ SLOT="0"
 # x11-libs/libdrm[video_cards_intel] for intel_bufmgr.h in samples
 # bug #805224
 DEPEND="
-	>=x11-libs/libva-intel-media-driver-${PV}
+	>=media-libs/libva-intel-media-driver-${PV}
 	x11-libs/libdrm[video_cards_intel]
 "
 RDEPEND="${DEPEND}"
diff --git a/media-libs/libva-compat/Manifest b/media-libs/libva-compat/Manifest
new file mode 100644
index 000000000000..4d146b008632
--- /dev/null
+++ b/media-libs/libva-compat/Manifest
@@ -0,0 +1,3 @@
+DIST libva-1.8.3.tar.gz 186915 BLAKE2B 10713e3bd7aaefc033490fc9ef6485ec50774f274f09e9e06fd1479b882b221791375533a6826e5db9a758f2acd74f913a478da61fe32250a3e2d9c0062739fc SHA512 f2f360876d8443a22a3434aa1ac7ec5aa6d4b3cc1f13f475ef74e716f5937acc43e02f9a8b858b5b7b6539da3731f763843d45664cc19c70e81d8b87e93659ea
+EBUILD libva-compat-1.8.3-r2.ebuild 1665 BLAKE2B 67c0d68b8e85eafab1746394f89b56ed66813e2aff7920d28f7c6a536aaf54fe3723c647054ddc9e72ff0205ac78f7fbd5b1a9c4ce074fcf1b400c43b8fbb771 SHA512 f4d3987d1ac86d84baf45b97794c660d09812ba25fe489ad2d58e27e096fadbd307c84b0a1fc4bd8985e0a1e72b1c96ebe728e5ec2f64c0fcb53eee0724e27ab
+MISC metadata.xml 440 BLAKE2B e8071d75c17e53b38897201da353284933b04c5337f01404b2c80c6edf571d47b2e2b92f85451097aba5db421f5dca1a254d24425e096067c270b8aa0e732ae3 SHA512 eafd1feaee7adcd7903c26d9efd0cdadb118c2af683d3158a68a7f931eba83367d8702253b6ebfbea45001009f225a6b15f0cca8d8a2b303f757fb0d7d499541
diff --git a/media-libs/libva-compat/libva-compat-1.8.3-r2.ebuild b/media-libs/libva-compat/libva-compat-1.8.3-r2.ebuild
new file mode 100644
index 000000000000..618ec9f2bc42
--- /dev/null
+++ b/media-libs/libva-compat/libva-compat-1.8.3-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal optfeature
+
+MY_PN="${PN%-compat}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+SRC_URI="https://github.com/01org/libva/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="+drm egl opengl wayland X"
+
+RDEPEND=">=x11-libs/libdrm-2.4.46[${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}]
+	)
+	egl? ( >=media-libs/mesa-9.1.6[egl(+),${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+	!media-libs/libva:0/0"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="|| ( drm wayland X )
+		opengl? ( X )"
+
+S="${WORKDIR}/${MY_P}"
+DOCS=( NEWS )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		$(use_enable opengl glx)
+		$(use_enable X x11)
+		$(use_enable wayland)
+		$(use_enable egl)
+		$(use_enable drm)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake -C va DESTDIR="${D}" install-libLTLIBRARIES
+	rm -vf "${ED}"/usr/$(get_libdir)/*.{la,so} || die
+}
+
+pkg_postinst() {
+	optfeature_header
+	optfeature "Older Intel GPU support" media-libs/libva-intel-driver
+	optfeature "Newer Intel GPU support" media-libs/libva-intel-media-driver
+}
diff --git a/media-libs/libva-compat/metadata.xml b/media-libs/libva-compat/metadata.xml
new file mode 100644
index 000000000000..e454a2831910
--- /dev/null
+++ b/media-libs/libva-compat/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<use>
+		<flag name="egl">Enables EGL support.</flag>
+		<flag name="drm">Enables VA/DRM API support.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">intel/libva</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-libs/libva-intel-driver/Manifest b/media-libs/libva-intel-driver/Manifest
new file mode 100644
index 000000000000..980af2e655ec
--- /dev/null
+++ b/media-libs/libva-intel-driver/Manifest
@@ -0,0 +1,5 @@
+DIST intel-vaapi-driver-2.4.1.tar.bz2 2889762 BLAKE2B 25888ac7a1a42233c4b0269bd910c5161f99bf22c932b46e20c8c77ed0404bf99702dd9f11b73bc0fd76a3b012ffa1de6c6133cbd7be880428235de9cfcc6ad8 SHA512 1e9dc81ecd0b3640fccd1fb827a0ade0a1e5bbabe375130df159849e47ce98c8e879c65ddaaae11d16e916be76b507be69bc0c813494e37e7fca86b0b897a94f
+EBUILD libva-intel-driver-2.4.1-r3.ebuild 1313 BLAKE2B 6fadfb7331f0dbc3da6fde1e123d8e72512dc4bd3ac2be46c7bd88153bb38549b671b298eb4670b1afeb7a9fc434c34eb74bb3cf8200577f08b8194f61b52a0d SHA512 46198b827580c4d98e3da4689dcf695872b5cd44e45e5f8432a2e885c1d6189bef6bee632bc36dc3f1605cb74a7cc240c5db8b588f8aeafe01dbb1fb078076d0
+EBUILD libva-intel-driver-2.4.1-r4.ebuild 1434 BLAKE2B 4a105d08cdd57841ef15297f71bbc0988f9bf4e59008f2d1ccfba7df987a3ce36c4f6909b908dab12e4c4b1668c9f6b15fb6a253cb8651761aa5843135e4f7ec SHA512 f4e4250b7f02535728a3e5e00c99a200b6b30d725469ee2bf2db9f8f6a4b1e1120d73a5dc3db360607343f8ef97e408a6d734882db96d9243de27a45150019f7
+EBUILD libva-intel-driver-9999.ebuild 1315 BLAKE2B 43f74385af30eaa60e053cd4ac6342fb71f4face46c0d019a2cf5d2330ca57b7c5903d113d188622803d30782c5e4d2902b7c3365ae6e3b76e188da1176a3674 SHA512 c9a8eb771580bcb66e65172a23feb6c03bfba03ac505003883479d6efe3a9df92b8595135e0e2db0ee6b6e7326e0613494e57b916f72af5fc76086de40067cf5
+MISC metadata.xml 490 BLAKE2B 1a66bd19f05f0c21849b8fe57ffc8f8e153af9a963e045b0c23050734a4aa506b920b91fb4606306f0850514df4465ef6f448042c0c339b61f75d7d6904e0ce7 SHA512 5bf8d70288c3b63678f6adafbf0a3284385e9122e4acf50455741e0472dd8fe1b8eb6d41ea92056cb2da462c31aa812b061297427dc9de1853539dbf762d7cef
diff --git a/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r3.ebuild b/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r3.ebuild
new file mode 100644
index 000000000000..edb0252633dd
--- /dev/null
+++ b/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="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}]
+	wayland? (
+		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.1.6[egl(+),${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	eapply_user
+	sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	find "${D}" -name "*.la" -delete || die
+}
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-r4.ebuild
new file mode 100644
index 000000000000..a7d5e4df2625
--- /dev/null
+++ b/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+src_prepare() {
+	eapply_user
+	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
+}
diff --git a/media-libs/libva-intel-driver/libva-intel-driver-9999.ebuild b/media-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
new file mode 100644
index 000000000000..2f30270780ef
--- /dev/null
+++ b/media-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="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}]
+	wayland? (
+		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.1.6[egl(+),${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	eapply_user
+	sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/media-libs/libva-intel-driver/metadata.xml b/media-libs/libva-intel-driver/metadata.xml
new file mode 100644
index 000000000000..b5eb6b380053
--- /dev/null
+++ b/media-libs/libva-intel-driver/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vaapi@gentoo.org</email>
+    <name>VA-API Project</name>
+  </maintainer>
+  <use>
+    <flag name="hybrid">Enable support for hybrid vaapi hardware acceleration on Intel Haswell and newer architectures</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">intel/intel-vaapi-driver</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-libs/libva-intel-media-driver/Manifest b/media-libs/libva-intel-media-driver/Manifest
new file mode 100644
index 000000000000..498bae3c9af4
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/Manifest
@@ -0,0 +1,13 @@
+AUX libva-intel-media-driver-20.2.0_x11_optional.patch 458 BLAKE2B 22670f925729ab9e02a4b3ef753911f4e12867da2a0bad90c835ba3291ae139c65327dfdf1e236dd47cd66f943380bb20428d587c9fea57265c1287f31015ca7 SHA512 a235a4c18e388e0564c2ffa1fb4bdd86a05ae8622efdc03bd556b51361478e735330182f4310fd44c275d55759a48fc1ebef8384335daf5160d39b46642c3070
+AUX libva-intel-media-driver-20.4.5_testing_in_src_test.patch 1724 BLAKE2B a4820733470396b42152b8d3863c45946307c3d6e62b16a90a199a29e1564fbb56c044f07c895b2e6d12ecd5ef235db054d87ee49fcf5c2ced2b9242fd11ebe9 SHA512 02edb8803be4dd4608e8ee970c5472c2c6e6c7dfd2ca5c33b2807900cba49f0ef6d65440c7ca7b978abc368b56bfb7a163c3671aead68512b879fbd446475319
+AUX libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch 1473 BLAKE2B d3303d8cf11e99fc08b01cb4a12b1500afba27920e52a47cdf2d3cacc0b2cbea72e417ca4c118793c1149659cf1e51b619c0a81ca5103505a25994d9a0fee00a SHA512 41cd3cefd7a6aa6482c4d06b912cf441879e6fd14cee93380b081021e344d6555791e80d0925f66f59178d1b2d5ee15ff1f2deb4835d72f7fb74673912fc6b9e
+DIST intel-media-22.4.4.tar.gz 27437439 BLAKE2B 63bee317ff12c34e7a2da9f5dce51ebb21708f8b5b3f3a58618f487e72f7826f0d4afa486bac08c2db8582d8a4774de716b5bb9a3dff93ff4fc266e56d434519 SHA512 e6ed669476e42396df7714732c628aa67d90fc8040c006605b754d70bdb7ecf476c5eb5c849a8647646dd3858c5fd469ba05f5c6b02b36d2211dc4f4cc7fa77f
+DIST intel-media-22.5.3.1.tar.gz 27492012 BLAKE2B e300eba764dde8f2d6c07f4768bca253a21ae5f3bcfd829257541fb26c8a997390011a8bfdfab964eafe37fcece5db4826700bccda672ef51b2f62de2ea94d17 SHA512 aab70004aa3bd91ced7b147e4cd4bd662fe0813b2deeaa90e61f4d692d43a302a1e18dad502bbedb5102593f21f9710a56e202f0ba70a58afed139df3bf2bb78
+DIST intel-media-22.5.3.tar.gz 27488655 BLAKE2B 90d79ac8e7ab8cb97941d37fe81ce4524cef45e49e4b64e57931f00927cb2065c0b6f8b4fff5aba58cb9ea64548337261e37df13a53ba07c8ab81db160990e6e SHA512 987ca85ed95272945fd8c23a388ca68481ff5fdf74737a04659304e58c6d131c00db03ee134fc3549225a9fc33b874632335f1182d1e0c6d90fbc5ea290b486d
+DIST intel-media-22.5.4.tar.gz 27493483 BLAKE2B ac6a93e06eec33edd823b1fd4310cd635f20229ce1ba1d52eb36a11b8fcaf484c836261cb5e8437889208e9b268f29f78a241867629eb517fbada28a314bb4dc SHA512 9e7e4d7f33d0248f3d2288239ca121cd8c748a98587384e69c92aeedf4b9ce7ff585cac06b260713f9cd95936d270c36e6981bc500c2a6bee7276d0e238f4b74
+EBUILD libva-intel-media-driver-22.4.4.ebuild 1371 BLAKE2B 4ab9575ec50474e7daf54eec54ff956297b3c3b1bc5d605698037d1347d5fcec84787bab6170a311b096d44cb402cf388068161d2e47d599f461eea4ae97ceea SHA512 51e6c1e24443b4d318ebd3ac23d98ad4cee3fa8fca758492d75f0ebe0677ce9ddff196466c71eb6481ca91421bae6a0ebc1b207cdb42aada43d553043a5848b8
+EBUILD libva-intel-media-driver-22.5.3.1.ebuild 1349 BLAKE2B 0b6c96aebd9fec5ded0db608afda923fd7c09e2ef02da4ae1086bf59f8cc58b497297963db99a2eb79fb4087e74c979d9cc46dbf5f911270521688b1b5d12ff7 SHA512 175a351ac713980f24cabd05d5c4b10846e9cf5f1af10511c58dc51293cf21aeac2831ac5ed4610b07f2faee1bf49decd7146a021fe6a0d76a972955e4474c1b
+EBUILD libva-intel-media-driver-22.5.3.ebuild 1349 BLAKE2B 0b6c96aebd9fec5ded0db608afda923fd7c09e2ef02da4ae1086bf59f8cc58b497297963db99a2eb79fb4087e74c979d9cc46dbf5f911270521688b1b5d12ff7 SHA512 175a351ac713980f24cabd05d5c4b10846e9cf5f1af10511c58dc51293cf21aeac2831ac5ed4610b07f2faee1bf49decd7146a021fe6a0d76a972955e4474c1b
+EBUILD libva-intel-media-driver-22.5.4.ebuild 1349 BLAKE2B 0b6c96aebd9fec5ded0db608afda923fd7c09e2ef02da4ae1086bf59f8cc58b497297963db99a2eb79fb4087e74c979d9cc46dbf5f911270521688b1b5d12ff7 SHA512 175a351ac713980f24cabd05d5c4b10846e9cf5f1af10511c58dc51293cf21aeac2831ac5ed4610b07f2faee1bf49decd7146a021fe6a0d76a972955e4474c1b
+EBUILD libva-intel-media-driver-9999.ebuild 1372 BLAKE2B bb79a9b95c1269ab123d7e50fb0fa3678171ca1685891cf66be9fc210a2a4045db4ac0e9f64eb145225ecff79abb609be3daf5f4f68dde34c511c29b8ee6defd SHA512 ef67e95d0f4541d4fb676a1c746637b363da4d206a546ce9749bbcb94f46bc652aa16c00c0604bcf97e310dbc5c18d85278504f230b839ba37a9d138b8a943f2
+MISC metadata.xml 416 BLAKE2B 749876c200cd1ef9b1ecb850c8fc0c208ec2f51f7ea521621758f6e08851beb536efb8f042057eeb8289ffc46bd5ca2ed3b1117c581be28b7bc5c0b78b23236a SHA512 0acedef15e1a7f39639116b9fa911433ecd024bb404de211fab032c56f105690fbb5ee82bf66afb324760d548230727aa273c4f77396ac3e7029bebc2d0e53f7
diff --git a/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.2.0_x11_optional.patch b/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.2.0_x11_optional.patch
new file mode 100644
index 000000000000..81c80d80f902
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.2.0_x11_optional.patch
@@ -0,0 +1,16 @@
+--- a/media_driver/media_top_cmake.cmake
++++ b/media_driver/media_top_cmake.cmake
+@@ -21,7 +21,12 @@
+ project( media )
+ 
+ find_package(PkgConfig)
++if(NOT DEFINED USE_X11 OR USE_X11)
+ find_package(X11)
++endif(NOT DEFINED USE_X11 OR USE_X11)
++if(USE_X11 AND NOT X11_FOUND)
++    message(FATAL_ERROR "Usage of X11 is required by USE_X11 variable, but X11 package is not found")
++endif(USE_X11 AND NOT X11_FOUND)
+ 
+ bs_set_if_undefined(LIB_NAME iHD_drv_video)
+ 
+
diff --git a/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_testing_in_src_test.patch b/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_testing_in_src_test.patch
new file mode 100644
index 000000000000..3c6d500f2fbf
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_testing_in_src_test.patch
@@ -0,0 +1,46 @@
+Run tests in src_test() instead of src_compile() and src_install()
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -37,6 +37,8 @@ if("${os_name}" STREQUAL "clear-linux-os")
+     set(CMAKE_INSTALL_SYSCONFDIR "usr/share/defaults/etc")
+ endif()
+ 
++include(CTest)
++
+ include(CMakeDependentOption)
+ 
+ option (ENABLE_KERNELS "Build driver with shaders (kernels) support" ON)
+--- a/media_driver/linux/ult/CMakeLists.txt
++++ b/media_driver/linux/ult/CMakeLists.txt
+@@ -52,9 +52,3 @@ endif ()
+ add_subdirectory(libdrm_mock)
+ add_subdirectory(ult_app)
+ 
+-enable_testing()
+-add_test(NAME test_devult COMMAND devult ${UMD_PATH})
+-set_tests_properties(test_devult
+-    PROPERTIES PASS_REGULAR_EXPRESSION "PASS")
+-set_tests_properties(test_devult
+-    PROPERTIES FAIL_REGULAR_EXPRESSION "FAIL")
+--- a/media_driver/linux/ult/ult_app/CMakeLists.txt
++++ b/media_driver/linux/ult/ult_app/CMakeLists.txt
+@@ -68,13 +68,11 @@ if (DEFINED BYPASS_MEDIA_ULT AND "${BYPASS_MEDIA_ULT}" STREQUAL "yes")
+     message("-- media -- BYPASS_MEDIA_ULT = ${BYPASS_MEDIA_ULT}")
+ else ()
+     if (ENABLE_NONFREE_KERNELS)
+-        add_custom_target(RunULT ALL DEPENDS ${LIB_NAME} devult)
+ 
+-        add_custom_command(
+-            TARGET RunULT
+-            POST_BUILD
+-            COMMAND LD_PRELOAD=../libdrm_mock/libdrm_mock.so ./devult ../../../${LIB_NAME}.so
++        add_test(
++            NAME RunULT
++            COMMAND "${CMAKE_COMMAND}" -E env "LD_PRELOAD=${CMAKE_CURRENT_BINARY_DIR}/../libdrm_mock/libdrm_mock.so" "${CMAKE_CURRENT_BINARY_DIR}/devult" "${CMAKE_CURRENT_BINARY_DIR}/../../../${LIB_NAME}.so"
+             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-            COMMENT "Running devult...")
++            )
+         endif ()
+ endif ()
+
diff --git a/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch b/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch
new file mode 100644
index 000000000000..288fe2d7f517
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch
@@ -0,0 +1,43 @@
+From f1c5c12d866783f7a3079be440c06fdb8a931ed2 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Tue, 23 Nov 2021 12:28:05 -0800
+Subject: [PATCH] Remove unwanted CFLAGS
+
+---
+ media_driver/cmake/linux/media_compile_flags_linux.cmake | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/media_driver/cmake/linux/media_compile_flags_linux.cmake b/media_driver/cmake/linux/media_compile_flags_linux.cmake
+index 512ef17b..e8ade76d 100755
+--- a/media_driver/cmake/linux/media_compile_flags_linux.cmake
++++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake
+@@ -52,16 +52,12 @@ set(MEDIA_COMPILER_FLAGS_COMMON
+     -ffunction-sections
+     -Wl,--gc-sections
+ 
+-    # -m32 or -m64
+-    -m${ARCH}
+-
+     # Global defines
+     -DLINUX=1
+     -DLINUX
+     -DNO_RTTI
+     -DNO_EXCEPTION_HANDLING
+     -DINTEL_NOT_PUBLIC
+-    -g
+ )
+ 
+ 
+@@ -189,9 +185,6 @@ include(${MEDIA_EXT_CMAKE}/ext/linux/media_compile_flags_linux_ext.cmake OPTIONA
+ if(${PLATFORM} STREQUAL "linux")
+     #set predefined compiler flags set
+     add_compile_options("${MEDIA_COMPILER_FLAGS_COMMON}")
+-    add_compile_options("$<$<CONFIG:Debug>:${MEDIA_COMPILER_FLAGS_DEBUG}>")
+-    add_compile_options("$<$<CONFIG:Release>:${MEDIA_COMPILER_FLAGS_RELEASE}>")
+-    add_compile_options("$<$<CONFIG:ReleaseInternal>:${MEDIA_COMPILER_FLAGS_RELEASEINTERNAL}>")
+ 
+     foreach (flag ${MEDIA_COMPILER_CXX_FLAGS_COMMON})
+         SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+-- 
+2.32.0
+
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.4.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.4.ebuild
new file mode 100644
index 000000000000..2a5644f6778d
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+else
+	MY_PV="${PV%_pre}"
+	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
+	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="amd64"
+	fi
+fi
+
+DESCRIPTION="Intel Media Driver for VA-API (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD redistributable? ( no-source-code )"
+SLOT="0"
+IUSE="+redistributable test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-22.0.0:=
+	>=media-libs/libva-2.14.0[X?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
+	"${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
+	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
+		-DMEDIA_RUN_TEST_SUITE=$(usex test)
+		-DBUILD_TYPE=Release
+		-DPLATFORM=linux
+		-DUSE_X11=$(usex X)
+		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
+		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+	)
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.5.3.1.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.5.3.1.ebuild
new file mode 100644
index 000000000000..54a280d5f2bf
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.5.3.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+else
+	MY_PV="${PV%_pre}"
+	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
+	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~amd64"
+	fi
+fi
+
+DESCRIPTION="Intel Media Driver for VA-API (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD redistributable? ( no-source-code )"
+SLOT="0"
+IUSE="+redistributable test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-22.0.0:=
+	>=media-libs/libva-2.14.0[X?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
+	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
+		-DMEDIA_RUN_TEST_SUITE=$(usex test)
+		-DBUILD_TYPE=Release
+		-DPLATFORM=linux
+		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
+		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
+		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+	)
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.5.3.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.5.3.ebuild
new file mode 100644
index 000000000000..54a280d5f2bf
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.5.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+else
+	MY_PV="${PV%_pre}"
+	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
+	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~amd64"
+	fi
+fi
+
+DESCRIPTION="Intel Media Driver for VA-API (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD redistributable? ( no-source-code )"
+SLOT="0"
+IUSE="+redistributable test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-22.0.0:=
+	>=media-libs/libva-2.14.0[X?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
+	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
+		-DMEDIA_RUN_TEST_SUITE=$(usex test)
+		-DBUILD_TYPE=Release
+		-DPLATFORM=linux
+		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
+		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
+		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+	)
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.5.4.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.5.4.ebuild
new file mode 100644
index 000000000000..54a280d5f2bf
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.5.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+else
+	MY_PV="${PV%_pre}"
+	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
+	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~amd64"
+	fi
+fi
+
+DESCRIPTION="Intel Media Driver for VA-API (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD redistributable? ( no-source-code )"
+SLOT="0"
+IUSE="+redistributable test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-22.0.0:=
+	>=media-libs/libva-2.14.0[X?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
+	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
+		-DMEDIA_RUN_TEST_SUITE=$(usex test)
+		-DBUILD_TYPE=Release
+		-DPLATFORM=linux
+		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
+		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
+		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+	)
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
new file mode 100644
index 000000000000..a9c6b767ec77
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+else
+	MY_PV="${PV%_pre}"
+	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
+	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~amd64"
+	fi
+fi
+
+DESCRIPTION="Intel Media Driver for VA-API (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD redistributable? ( no-source-code )"
+SLOT="0"
+IUSE="+redistributable test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-22.0.0:=
+	>=media-libs/libva-2.14.0[X?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
+	"${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
+	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
+		-DMEDIA_RUN_TEST_SUITE=$(usex test)
+		-DBUILD_TYPE=Release
+		-DPLATFORM=linux
+		-DUSE_X11=$(usex X)
+		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
+		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+	)
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
diff --git a/media-libs/libva-intel-media-driver/metadata.xml b/media-libs/libva-intel-media-driver/metadata.xml
new file mode 100644
index 000000000000..b1e97d47fc20
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vaapi@gentoo.org</email>
+		<name>VA-API Project</name>
+	</maintainer>
+	<use>
+		<flag name="redistributable">Install redistributable media kernel binaries (no source code) files (primarily needed for video encoding support)</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-libs/libva/Manifest b/media-libs/libva/Manifest
new file mode 100644
index 000000000000..4d61cdebf90f
--- /dev/null
+++ b/media-libs/libva/Manifest
@@ -0,0 +1,8 @@
+DIST libva-2.14.0.tar.gz 266254 BLAKE2B 1ad504dc7f72b15bb35b486a5fcb327c14663b80068791aa983f2d46876b1504b8330888430b85d2fb309bd5aa2a11c4a34589b68fa140e10b27cb952e3eb5c7 SHA512 8d87b49c7242174d05dca709bd79e6e45cea6e6060d12f5cf7636433be587c2b3a6c3183f632fb0ff49b19f31f915a2a62818c26f57c3a8f40741aa1ab8270b4
+DIST libva-2.15.0.tar.gz 264429 BLAKE2B c1bd8c3de25a266b8cc35400db464ea8b0dc81f017951b2814874c93ebf6b1b9e09860749c9eb932fe54b012e6295ff7d9cf0895f5af5fe6963f7dc3cea809b2 SHA512 fd96da76db6e6a80bb83d74a6f736e168d3a27cd200e77553d8ca9a19b9766b101b2e550953ca50445e1874f7ad59bf6c3a166eee6c83fe66c924b5a3494be9d
+DIST libva-2.16.0.tar.gz 267735 BLAKE2B 59c5dc39e1c40c2f24455ec7b0588eb4898b3cab7c49ffbca997882c634ca7be6334fdb820afada8e2ebf39eb2166c95610df190d90c2a98c4fc25d25c733b32 SHA512 08a1481ac693ee9de639f2abd483e1fabfee87f9c04ead066dfce5c24cc7f1d1a29d8664707bb534ce4cc25e52086c5e4a0ecfe704ca59590ce41353fda31c2a
+EBUILD libva-2.14.0.ebuild 1656 BLAKE2B a65bcc2119e25a2a27e9324e83a2c9b11c6a646f09f6f592428d9ec445e08a63dfac192af1d7a4c8dc380c2e2172b1ee1bf0d399bf1384a5946c627efce047ca SHA512 31fba31b1464337f4b3a3f7005a6b3c2a1adee458e30c1e4ef55961c5494117bd084a7b0d71595d5bc07691dbe4a30b8b272c3aeef9fab8944695d410f95c83f
+EBUILD libva-2.15.0.ebuild 1657 BLAKE2B 0ee026d70116dabdb7d25e0872c919e7e78bcbda26673af9748cfaee073c633b28e127163a05fbbace9d47b7c4900b9c9a00c03a1f692697ddc491b6f981bd62 SHA512 7676243761c44684342eaad66a12312dc38394222a7d028a861782ebb5396db4cd47eee4c2fa6270f7f16f6a0184c1441c4ef6d3ae3dfacd9d11a864f90de687
+EBUILD libva-2.16.0.ebuild 1655 BLAKE2B 953f825e9e86522f3a0241667e313940031a7c7818dfc11e89b65d55a20462dd450d248fcab53616f97ffbc87e2c43805e1c5f13b1cd5c9a1dbc0818c56737d1 SHA512 6db97d1c9968b7a543fffc133b40445c212ec191d825de864be29e706553e4d0f6809d5338b188ebafde731bdd542944694f6f6865686dba48f338c2a5b3f014
+EBUILD libva-9999.ebuild 1660 BLAKE2B e5a30d7b64db02bfa6b757adbbd673879ef7d790335459cc59755be541e002ebd827866dfd89a64d7aa7730456bf5516d5d8e1988c7c524b22a7aead81a189f8 SHA512 ec9d7e043fca8b048e4eeea549bec74c295fedd4f0cbda8f5f14674502a4715b89db81c66deb6454d1b4456f4410df7f0e0eb7beae79cc4af6943c47a0fce240
+MISC metadata.xml 405 BLAKE2B 02edd18ab96b6b2b45930e7c623275758bb763f2bd291459a587e020ec34f6a56d0152dcbaf662bff9573fc9e51c69def9ea1caf85f28dbfb6d2fe7be7a80879 SHA512 3ec8eeca943e313e32a5aaf77e5cb3ff277ab976ce2adc7a018d697ba1a45ee19b9555c29f304ade4132c70b2181ab67c04dedb8356d5a93a7a236b9221e3c8b
diff --git a/media-libs/libva/libva-2.14.0.ebuild b/media-libs/libva/libva-2.14.0.ebuild
new file mode 100644
index 000000000000..c156652d5ffb
--- /dev/null
+++ b/media-libs/libva/libva-2.14.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1)"
+IUSE="+drm opengl wayland X"
+REQUIRED_USE="opengl? ( X )"
+
+RDEPEND="
+	>=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}]
+	wayland? (
+		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	wayland? ( dev-util/wayland-scanner )
+	virtual/pkgconfig
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/va/va_backend_glx.h
+	/usr/include/va/va_x11.h
+	/usr/include/va/va_dri2.h
+	/usr/include/va/va_dricommon.h
+	/usr/include/va/va_glx.h
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		-Ddisable_drm=false
+		-Dwith_x11=$(usex X)
+		-Dwith_glx=$(usex X)
+		-Dwith_wayland=$(usex wayland)
+		-Denable_docs=false
+		-Denable_va_messaging=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	optfeature_header
+	optfeature "Older Intel GPU support" media-libs/libva-intel-driver
+	optfeature "Newer Intel GPU support" media-libs/libva-intel-media-driver
+}
diff --git a/media-libs/libva/libva-2.15.0.ebuild b/media-libs/libva/libva-2.15.0.ebuild
new file mode 100644
index 000000000000..12568ff67d7f
--- /dev/null
+++ b/media-libs/libva/libva-2.15.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 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 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1)"
+IUSE="+drm opengl wayland X"
+REQUIRED_USE="opengl? ( X )"
+
+RDEPEND="
+	>=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}]
+	wayland? (
+		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	wayland? ( dev-util/wayland-scanner )
+	virtual/pkgconfig
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/va/va_backend_glx.h
+	/usr/include/va/va_x11.h
+	/usr/include/va/va_dri2.h
+	/usr/include/va/va_dricommon.h
+	/usr/include/va/va_glx.h
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		-Ddisable_drm=false
+		-Dwith_x11=$(usex X)
+		-Dwith_glx=$(usex X)
+		-Dwith_wayland=$(usex wayland)
+		-Denable_docs=false
+		-Denable_va_messaging=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	optfeature_header
+	optfeature "Older Intel GPU support" media-libs/libva-intel-driver
+	optfeature "Newer Intel GPU support" media-libs/libva-intel-media-driver
+}
diff --git a/media-libs/libva/libva-2.16.0.ebuild b/media-libs/libva/libva-2.16.0.ebuild
new file mode 100644
index 000000000000..9955f34cf5a4
--- /dev/null
+++ b/media-libs/libva/libva-2.16.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 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 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1)"
+IUSE="opengl wayland X"
+REQUIRED_USE="opengl? ( X )"
+
+RDEPEND="
+	>=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}]
+	wayland? (
+		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	wayland? ( dev-util/wayland-scanner )
+	virtual/pkgconfig
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/va/va_backend_glx.h
+	/usr/include/va/va_x11.h
+	/usr/include/va/va_dri2.h
+	/usr/include/va/va_dricommon.h
+	/usr/include/va/va_glx.h
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		-Ddisable_drm=false
+		-Dwith_x11=$(usex X)
+		-Dwith_glx=$(usex X)
+		-Dwith_wayland=$(usex wayland)
+		-Denable_docs=false
+		-Denable_va_messaging=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	optfeature_header
+	optfeature "Older Intel GPU support" media-libs/libva-intel-driver
+	optfeature "Newer Intel GPU support" media-libs/libva-intel-media-driver
+}
diff --git a/media-libs/libva/libva-9999.ebuild b/media-libs/libva/libva-9999.ebuild
new file mode 100644
index 000000000000..af519dfd205b
--- /dev/null
+++ b/media-libs/libva/libva-9999.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 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 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1)"
+IUSE="+drm opengl wayland X"
+REQUIRED_USE="opengl? ( X )"
+
+RDEPEND="
+	>=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}]
+	wayland? (
+		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	wayland? ( dev-util/wayland-scanner )
+	virtual/pkgconfig
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/va/va_backend_glx.h
+	/usr/include/va/va_x11.h
+	/usr/include/va/va_dri2.h
+	/usr/include/va/va_dricommon.h
+	/usr/include/va/va_glx.h
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		-Ddisable_drm=false
+		-Dwith_x11=$(usex X)
+		-Dwith_glx=$(usex X)
+		-Dwith_wayland=$(usex wayland)
+		-Denable_docs=false
+		-Denable_va_messaging=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	optfeature_header
+	optfeature "Older Intel GPU support" media-libs/libva-intel-driver
+	optfeature "Newer Intel GPU support" media-libs/libva-intel-media-driver
+}
diff --git a/media-libs/libva/metadata.xml b/media-libs/libva/metadata.xml
new file mode 100644
index 000000000000..7e4a785110b4
--- /dev/null
+++ b/media-libs/libva/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vaapi@gentoo.org</email>
+    <name>VA-API Project</name>
+  </maintainer>
+  <use>
+    <flag name="drm">Enables VA/DRM API support.</flag>
+  </use>
+  <upstream>
+  <remote-id type="github">intel/libva</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 80d4ac14dd2e..a4f672946f66 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,8 @@
 DIST mesa-22.1.7.tar.xz 16109944 BLAKE2B 0d4724068eff0ad242e81808ff94b73e1b5da810d27706b5a594ad77875b54562db6d9f752b61bcfff773b26bbc64b751d4dd13cfa256106d3114377ea668d26 SHA512 447e87359445edce231761d94b316b2aa20e9ab58e4b59d75cbb1696dd0900e7164c32bebc3b75700b4070570b456f7a8cf0914181371754a52427d34e4b9120
 DIST mesa-22.2.0.tar.xz 16298808 BLAKE2B 3f1526626edad49a7d1551283eaab38d905cdd4c70b487538cc2c4de50a4959e396340abe9acb32742ca83fee0a64fcce646c7fcd67d3650eacee8398c289126 SHA512 13a21b9ed6b0a5dfd0293b73df271a929c3155d83e8beb3d958fe18d79277f3611bf5b26a1186d446f4e1479a36bb13d0a13d6ac68937989fe7a0d917e12171e
 DIST mesa-22.2.1.tar.xz 16408240 BLAKE2B 0ea3d42173e2e3a1864724c34aed41298ecaeda220a9338d89bacf5dcf4f5aa88da4867063b027bcc263e69bd17cc45bccfdf5977986a5d848cdf3745d46c41d SHA512 cb69c808453474f77aad68afae7cdb427e6720e1d2259f7b911a5476a03144bbe8adfbe040f9bed3954d92805eea302757b76fd29f03f692f725c0fd2295df7e
-EBUILD mesa-22.1.7.ebuild 12035 BLAKE2B e24591c2f8efa0678fcb47a29b2f126b807d5beff1e4d7b95a8b2ab66d05c6266dc2e648d1d4ef7d34ef6723d78bc40e8ea836bd442c809c66d52d96dad1f787 SHA512 eb06f57c2c628cb1d76fa6aea618936ccd957cc66b845d2b8fc4c14f68b0dea2595cdcc052e659b27618726b4ceba89ba7f6793d0ed01c0a419a6161108ff4b3
-EBUILD mesa-22.2.0.ebuild 12610 BLAKE2B 2e4e3799c9e3c787dee04d2b3010da9778edcab5a8dc87cb47ed5e3f2565ea7617c1f8c5e56fbc29e1432552eba85a0d988385b263efd38c35a9504b5ddd8b15 SHA512 59bcda721079c68692c94e74c59bf36249eb1181a9f5eeba177b795f17e19dc803982cc9dece1c6a17413a718cec8ea02680bd9e8aa4ec1c4389095535d4ebfe
-EBUILD mesa-22.2.1.ebuild 12610 BLAKE2B 2e4e3799c9e3c787dee04d2b3010da9778edcab5a8dc87cb47ed5e3f2565ea7617c1f8c5e56fbc29e1432552eba85a0d988385b263efd38c35a9504b5ddd8b15 SHA512 59bcda721079c68692c94e74c59bf36249eb1181a9f5eeba177b795f17e19dc803982cc9dece1c6a17413a718cec8ea02680bd9e8aa4ec1c4389095535d4ebfe
-EBUILD mesa-9999.ebuild 12245 BLAKE2B 0c07302acf6b612bd82ca3bf7eac7a469e636925c73f9fd278bb0e29dc598f3a7a716f1a51d53d2c715542dd8bc69509d8e728e440dc4b8ef2488c90f1d8c419 SHA512 f83553b5e7c7852d418c9d75fc05279877942226bb33ae78f76bf4ed54c763d1ce9cc16b7c176efb568c088f09c2a44cae36ddbde40cc8da2e68ea656e9393e9
+EBUILD mesa-22.1.7.ebuild 12037 BLAKE2B 36b57a2a4184e6788a4ccee1bab1b1281defbb1a26443266a6ede1d63fcac8f07994045b1dbcc725be4e4b1191603dc4ecf305159861fc3423799fb97652fa2e SHA512 e5b1099fc84179b3feaa4bdd94b01e286ab208cd2207bdbe61d951752b6e7f1ddc3942c260c8e24c5bd6019be2b8e0f7cb69685ef18e7271b065aba859cd5b36
+EBUILD mesa-22.2.0.ebuild 12612 BLAKE2B 94d635a3ad35f3fa18cd8927a6bf89cc99de4e7722c71b211da8fb48dd802e0e5e49f329d7d2f19f1a692764088b35645a7606b09effff1b9f80cfa168ee8b59 SHA512 7077d6c34abc34d616ebc5d9f9551eb5ef6845a80de9c4ab9adca35a16e89f60f23ca75707fb19e0aa63e2609bcebab1873d6fc087cbf75d5b22873c6a9e5b6a
+EBUILD mesa-22.2.1.ebuild 12612 BLAKE2B 94d635a3ad35f3fa18cd8927a6bf89cc99de4e7722c71b211da8fb48dd802e0e5e49f329d7d2f19f1a692764088b35645a7606b09effff1b9f80cfa168ee8b59 SHA512 7077d6c34abc34d616ebc5d9f9551eb5ef6845a80de9c4ab9adca35a16e89f60f23ca75707fb19e0aa63e2609bcebab1873d6fc087cbf75d5b22873c6a9e5b6a
+EBUILD mesa-9999.ebuild 12247 BLAKE2B 3112d47228cad45b3be8f3a86775baebc878ab48f1223b6191105a76953155ce6a8d2dfdb24ea4d93e6c78fab7dfedcfd4e166457445eb558027113710a3e881 SHA512 1f04c0ac687ec099d9d38383156fa2b683178ccd5eb5465200109442ed45568f189c0915fd306d24fd78912c51e2d0db50540e19db121ed3e935c6bcc54aa7a3
 MISC metadata.xml 1649 BLAKE2B dbbaf2c16c29d6b75e272a403f59f943047fc6d19361b289d7a31bffeeed73d7ee6b16acb4a481b8e647b807fd3b4a7354092a52cc55edccb722180eae124370 SHA512 e0f05c43af12b12142eb4fa08b4e5a103bc160554836d614aaa56928b41d5f7160dd1e89e78d54df6ee6e3bb0e4d9d7667402af3dd2e7051e09b17506caf7985
diff --git a/media-libs/mesa/mesa-22.1.7.ebuild b/media-libs/mesa/mesa-22.1.7.ebuild
index cf4769ac91fa..da1e8abbf2e6 100644
--- a/media-libs/mesa/mesa-22.1.7.ebuild
+++ b/media-libs/mesa/mesa-22.1.7.ebuild
@@ -71,7 +71,7 @@ RDEPEND="
 				virtual/libelf:0=[${MULTILIB_USEDEP}]
 			)
 	vaapi? (
-		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
 	)
 	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
 	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/mesa/mesa-22.2.0.ebuild b/media-libs/mesa/mesa-22.2.0.ebuild
index ca85f615d85a..95503664b198 100644
--- a/media-libs/mesa/mesa-22.2.0.ebuild
+++ b/media-libs/mesa/mesa-22.2.0.ebuild
@@ -72,7 +72,7 @@ RDEPEND="
 				virtual/libelf:0=[${MULTILIB_USEDEP}]
 			)
 	vaapi? (
-		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
 	)
 	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
 	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
diff --git a/media-libs/mesa/mesa-22.2.1.ebuild b/media-libs/mesa/mesa-22.2.1.ebuild
index ca85f615d85a..95503664b198 100644
--- a/media-libs/mesa/mesa-22.2.1.ebuild
+++ b/media-libs/mesa/mesa-22.2.1.ebuild
@@ -72,7 +72,7 @@ RDEPEND="
 				virtual/libelf:0=[${MULTILIB_USEDEP}]
 			)
 	vaapi? (
-		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
 	)
 	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
 	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 72724b3f5546..974241738461 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -71,7 +71,7 @@ RDEPEND="
 				virtual/libelf:0=[${MULTILIB_USEDEP}]
 			)
 	vaapi? (
-		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
 	)
 	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
 	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index a14b91eb2eb5..8fb173a47802 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -11,5 +11,5 @@ DIST opencv-4.4.0_extdep.tar.gz 65334871 BLAKE2B 89fa0083da428e986bb4287295bdbff
 DIST opencv-4.6.0.tar.gz 90208971 BLAKE2B f01a907eb4a54fc0795293f1a28bbf3af5a3d237293293f6ef5275646207d48b3d634b2d91e7011407176405b60c7e4383076e520ceb56f92b09c36e97333148 SHA512 93d7807794682990b6a1d1de1851986ae3c5d1afe6605f3f8cace03ba5e3390bee2568bc0f335af34d3fc974df64cbce0ce685261ec2abd693d259b97b15bc46
 DIST opencv-4.6.0_contrib.tar.gz 59667769 BLAKE2B 26b454436d943d7955194fd21ad29efc417d5c873fa19a6a200beb319cd75c6ec5766734c478fcd55745a7c200ffdaa92e7b1821f13810bb9d181d263f8fc6da SHA512 2e9cc9632774babf59cd186cd7b7edbd35a816bdda2acb51339c514a33fc6d8c3f1687eb3b0f6827304e3fcb0f9f3e81d47e8ab08239175750ac1240cc99dc5d
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
-EBUILD opencv-4.6.0-r2.ebuild 21265 BLAKE2B 2efea43929caf99bccaa596dcbfe14a508347c538f17d6b9d8dd004287da5568868f97d84b0ab25208be91a26430694734153c9a4145b90d4da999c08bc612d6 SHA512 64dd47e1061492b48a63a91681eadb8370f2aad0e5dd85b4c44dbfe0a5bc9fd1ec4c82dd794af3f4305ea69ae4ecfe7a60d6d5d3e0e0f8ef462adacbe513c109
+EBUILD opencv-4.6.0-r2.ebuild 21267 BLAKE2B d4c9c586cde1f219342effaa3de5575509efe66aa04b1f711e6b3294bf7d1af3f4290ca25f8af75c3ea7ac600e4e53442abcd412909b7f0d0f3ec17fce85937e SHA512 003fc08b83cb5f070885b451870be07889cae52dafae28c80bfc5232e5a37c36b4c15ae6937c8a522665ee5b6d4f8f9fb956a1bc66009d38c1206f8e8671e666
 MISC metadata.xml 3143 BLAKE2B 014a846a7843b1451b617a80a463342e66b1f204c0f67b84819105d5455968d57574f66d843b6207337e833cb8da161f893579e99fef5c33a4ab0e92c53b0fe6 SHA512 15f6e9fb6ab7ca886f8953dba3cf2b50a9ec9a9bd5b424a2c7af0382fbded7de6dcd3b83b7291a9d09f7a41d922ca7b5d8362786c98b8c6650ab02c1d6f23b1c
diff --git a/media-libs/opencv/opencv-4.6.0-r2.ebuild b/media-libs/opencv/opencv-4.6.0-r2.ebuild
index 4f475dc6f45e..d37405c6f7c1 100644
--- a/media-libs/opencv/opencv-4.6.0-r2.ebuild
+++ b/media-libs/opencv/opencv-4.6.0-r2.ebuild
@@ -144,7 +144,7 @@ RDEPEND="
 	threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] )
 	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
 	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
+	vaapi? ( media-libs/libva[${MULTILIB_USEDEP}] )
 	vtk? ( sci-libs/vtk[rendering] )
 	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
 	xine? ( media-libs/xine-lib )"
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index a8601ee7f166..f8c5e98c60fc 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -2,7 +2,7 @@ AUX xine-lib-1.2.12-dav1d-1.0.0.patch 805 BLAKE2B 83b97835c46ff547636c9a39836ee4
 AUX xine-lib-1.2.12-fix-mmap-crash.patch 535 BLAKE2B 6b6782a7923754c29daf8263bc267f57124de6b80705214537c9d788bafb3f80bcec35915ca50fb50935ffcbc612187dc1f0e0d71e80279d4d9e3fcbe54a4ebd SHA512 f642612419abd03b765f8dbf787aa675a1e5a031878db9b51c7f2a829caa19c153f9cabe733dbd21cbbbe55ce1ce5d5793b75e9b32c229e3fb57b548d39a6aa5
 DIST xine-lib-1.2.11.tar.xz 5282204 BLAKE2B c61bec690f662e01372b1c068b0681ac4435925ca90a767c590d5d3b968163280c11210dc9e3aeb4cc6bb6b3520349ba22e18b17f34bd9139af02280d3a37ee3 SHA512 8208e4699819465ec9e820530f27b6129ee954ea17ab474eb9eda12137af1417ed5260830c1006ce32266a3913d22ba9957689bb5552464908038a1b8a8efbcf
 DIST xine-lib-1.2.12.tar.xz 5341212 BLAKE2B e975be2e7cf013e218001631c6b27a0d5e291605cb236c075e4b7463b30d23f3ee14aa7e18473d52efaf124f6ab0346b93591b613c6d9339f8f28e6a719b1ef8 SHA512 cdc913d0c78a3a34bd6e4060040fd844f22dbc673330e30769c83e9682a46f3369af8f59bd0c759ddc601de979b13d53e7ed10c54f3b78bdc63afceb484826be
-EBUILD xine-lib-1.2.11-r2.ebuild 5279 BLAKE2B b496cf182c84a620588ee425de0a4a31246e8361a3bcaadbc705c1fa21a4fbb62867073593c6d2974553fcb47847381b133ed9d4da9d7388b8ecef0e7be67a89 SHA512 87dffc4f789b73a7dfd40dd125718f4758a59e022a2841bcb053bc04efa0f32e5b68497ca3feed09bd0fd36c9d01e5fa8643b8ab7b73c7e8727abcc2f3a0f062
-EBUILD xine-lib-1.2.12-r4.ebuild 5478 BLAKE2B e8c894e47e1afa400442a3511c329bf70163b6033c754064a1fe281951405fb297bfa55660e2240f4c1d51b16f1e262224e5d3ca582191791bd50df2e643dab6 SHA512 7f7342a5fb11b65f3b8c41d39f91e0eb596c9a132ea57310555a99d69b54a35dd072c987734440a1819a8d58bd9aa2b48ed314de1f8745c1b982cdcd30778098
-EBUILD xine-lib-1.2.9999.ebuild 5375 BLAKE2B df0e592f24da6fc9f693593e26af53d45a0025bdda61bed897a7851b772877ae8bc8877324110852046ed83d06df7d890cd59816d29009304d181dc0c7c9a289 SHA512 bdac51b5520a8f3b90b3c348c05216a22d0b7b3cd269678a510456e8d38714f8c52a424790d877294fc959b1c7b6af28975d148f05f4bfca3c463a8831f68354
+EBUILD xine-lib-1.2.11-r2.ebuild 5281 BLAKE2B afa42f71427c1d9458d1b2b4fabd3ba68d0cf9c82dc69ae4daa17bfcf7ea5ea7699f7fe6956f4ed7885fa857b3c39b63079405f917a03ea9b1f0527595295e5c SHA512 f6fe20473016ff9643e67f67d511bd11f225c59d3f3aeb6bc345bc6d168fc1992010d834f56c3c61cc4e4003e2b4ebed66f6f1beb0548595b991ccbe2623ecb1
+EBUILD xine-lib-1.2.12-r4.ebuild 5480 BLAKE2B f6c38b5b27c33760d5b2b4a777e5e2f2c4a4d0e7d9966ab2228c58375c7e5ca13e98dd3d32ae69ac842ca05e5ca773f632ccf75b6ed667e6c4d1af875ff2815b SHA512 5e598bb89ce097cba3cf14b8c4875c431d5bb5d828005bc401753fa3ec276889a1ec44194245f3880c2751429551d2bfcd89f387e86a96eb6104d547438bab13
+EBUILD xine-lib-1.2.9999.ebuild 5377 BLAKE2B ec30a8d0052e49519fe67f0a200cb0423db0ad12f63af07850ddc0d9b5175acd3b81457b4935ef3ec11a9188cca5962f957e3beb4e7f4b70931a1e9b9eb94969 SHA512 1d1ae4feba2c7e84dbe333bd035f5a61e43a12169b94d2216f4d27483559f5277120e4912a8c0a4ddf296fbafc26ae556bb9ea2a5d0377b257f6c76073cd402f
 MISC metadata.xml 2784 BLAKE2B 636cdb7ad93aa8941a36a23b9bc70cde66878f7628cab7e697582733b8ce85d58c09a5c63fcfbc009f098001399407055c449412dabd52178548c0c41d572c5a SHA512 5b644f501953bbc34020f0955991363d558a23a9610eb37f46499bd2d5415849a10a3306625e50d5cfdf094e67a38da5175bb981387841bae63c33ae74e17757
diff --git a/media-libs/xine-lib/xine-lib-1.2.11-r2.ebuild b/media-libs/xine-lib/xine-lib-1.2.11-r2.ebuild
index 658a811779ee..fac5052b2803 100644
--- a/media-libs/xine-lib/xine-lib-1.2.11-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.11-r2.ebuild
@@ -77,7 +77,7 @@ RDEPEND="${NLS_RDEPEND}
 		media-libs/freetype:2
 	)
 	v4l? ( media-libs/libv4l )
-	vaapi? ( x11-libs/libva:=[X,opengl] )
+	vaapi? ( media-libs/libva:=[X,opengl] )
 	vcd? (
 		>=media-video/vcdimager-0.7.23
 		dev-libs/libcdio:=[-minimal]
diff --git a/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild b/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
index 2d39b5534149..eeef0113e84e 100644
--- a/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
@@ -78,7 +78,7 @@ RDEPEND="
 		media-libs/freetype:2
 	)
 	v4l? ( media-libs/libv4l )
-	vaapi? ( x11-libs/libva:=[X] )
+	vaapi? ( media-libs/libva:=[X] )
 	vcd? (
 		>=media-video/vcdimager-0.7.23
 		dev-libs/libcdio:=[-minimal]
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index 645dce42fdb3..3b2359bfed24 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -78,7 +78,7 @@ RDEPEND="
 		media-libs/freetype:2
 	)
 	v4l? ( media-libs/libv4l )
-	vaapi? ( x11-libs/libva:=[X] )
+	vaapi? ( media-libs/libva:=[X] )
 	vcd? (
 		>=media-video/vcdimager-0.7.23
 		dev-libs/libcdio:=[-minimal]
author	V3n3RiX <venerix@koprulu.sector>	2022-10-16 07:52:23 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-10-16 07:52:23 +0100
commit	c7c046a33897c533b949ee76326d620f5e07f2e9 (patch)
tree	9cefb49f93bb8be42c9129fdf95d7ab846751826 /media-libs
parent	6144cd2e90f8e3623912112050c8d2025de44f0a (diff)