[gentoo-commits] proj/musl:master commit in: media-libs/mesa/files/, media-libs/mesa/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     1af02d54f2f2b0d41b8e176a8156d7e1d37acdf9
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 01:07:57 2022 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 01:07:57 2022 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=1af02d54

media-libs/mesa: in tree version 22.0.5 works

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 media-libs/mesa/Manifest                           |   1 -
 media-libs/mesa/files/mesa-tls-2.patch             |  60 ---
 .../files/mesa-tls-3-fix-non-initial-exec.patch    | 122 -----
 media-libs/mesa/files/mesa-tls.patch               | 134 -----
 media-libs/mesa/mesa-21.3.7.ebuild                 | 566 ---------------------
 media-libs/mesa/metadata.xml                       |  33 --
 6 files changed, 916 deletions(-)

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
deleted file mode 100644
index 1e36ad7d..00000000
--- a/media-libs/mesa/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mesa-21.3.7.tar.xz 16569592 BLAKE2B 7c5a3f144b1ce9e8bbb3560ae2bf46afda9d5c4a3e7b825d406f9a5090dfd51e2b3cc6ee2c10df09c817f5836ffbd09bfc86fbaf63bcc907caef290fd44baee6 SHA512 0991543e9435457fa4d077517408b3f197be32ed61a6c7ca34ddb3906eed208791f1a57227f74115f99df18e612efab1d2c6809b7cf426d273633b53d4aefc88

diff --git a/media-libs/mesa/files/mesa-tls-2.patch b/media-libs/mesa/files/mesa-tls-2.patch
deleted file mode 100644
index c849e27d..00000000
--- a/media-libs/mesa/files/mesa-tls-2.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 60d95c5d0feef4e4b2820a26c4708aff10f5730d Mon Sep 17 00:00:00 2001
-From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
-Date: Thu, 2 Sep 2021 12:19:53 -0400
-Subject: [PATCH] Auto-enable TLSDESC support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-TLSDESC speeds up access to dynamic TLS. This is especially important
-for non-glibc targets, but is also helpful for non-initial-exec TLS
-variables.
-
-The entry asm does not support TLSDESC, but it only accesses
-initial-exec symbols, so it is not necessary to handle that separately.
-
-Acked-by: Tapani Pälli <tapani.palli@intel.com>
-Acked-by: Jesse Natalie <jenatali@microsoft.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12722>
----
- meson.build | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index a7ace23677c..29f0c3f3912 100644
---- a/meson.build
-+++ b/meson.build
-@@ -520,6 +520,30 @@ if not with_platform_windows or not with_shared_glapi
-     c_args += '-fno-emulated-tls'
-     cpp_args += '-fno-emulated-tls'
-   endif
-+
-+  # -mtls-dialect=gnu2 speeds up non-initial-exec TLS significantly but requires
-+  # full toolchain (including libc) support.
-+  have_mtls_dialect = false
-+  foreach c_arg : get_option('c_args')
-+    if c_arg.startswith('-mtls-dialect=')
-+      have_mtls_dialect = true
-+      break
-+    endif
-+  endforeach
-+  if not have_mtls_dialect
-+    # need .run to check libc support. meson aborts when calling .run when
-+    # cross-compiling, but because this is just an optimization we can skip it
-+    if meson.is_cross_build()
-+      warning('cannot auto-detect -mtls-dialect when cross-compiling, using compiler default')
-+    else
-+      # -fpic to force dynamic tls, otherwise TLS relaxation defeats check
-+      gnu2_test = cc.run('int __thread x; int main() { return x; }', args: ['-mtls-dialect=gnu2', '-fpic'], name: '-mtls-dialect=gnu2')
-+      if gnu2_test.returncode() == 0
-+        c_args += '-mtls-dialect=gnu2'
-+        cpp_args += '-mtls-dialect=gnu2'
-+      endif
-+    endif
-+  endif
- endif
- 
- if with_glx != 'disabled'
--- 
-GitLab
-

diff --git a/media-libs/mesa/files/mesa-tls-3-fix-non-initial-exec.patch b/media-libs/mesa/files/mesa-tls-3-fix-non-initial-exec.patch
deleted file mode 100644
index 4ae45ca0..00000000
--- a/media-libs/mesa/files/mesa-tls-3-fix-non-initial-exec.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 3aab34171d464f907ed4488ab87c48270381ecde Mon Sep 17 00:00:00 2001
-From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
-Date: Tue, 23 Nov 2021 15:24:38 -0500
-Subject: [PATCH] Fix TSD stubs for non-initial-exec case (fixes #5667).
-
-ppc64le TSD disabled for now since I am insufficiently familiar with ppc
-asm. x86 pthread stubs deleted because adding USE_ELF_TLS to the #if is
-isn't worth the effort since it only saves a single function call on
-initial entry (TSD stubs are not used for read-only text now). also
-potentially fix non-pthread TSD builds (_glapi_Dispatch was undefined),
-but untested (could still be broken).
-
-Tested-by: Jesse Natalie <jenatali@microsoft.com>
-Tested-by: Jan Beich <jbeich@freebsd.org>
-Signed-off-by: Alex Xu (Hello71) <alex_y_xu@yahoo.ca>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13935>
----
- src/mapi/entry.c                 |  5 ++---
- src/mapi/entry_x86_tsd.h         |  2 +-
- src/mapi/glapi/gen/gl_x86_asm.py | 28 +++-------------------------
- 3 files changed, 6 insertions(+), 29 deletions(-)
-
-diff --git a/src/mapi/entry.c b/src/mapi/entry.c
-index b120eae31a1..5ebd85011c6 100644
---- a/src/mapi/entry.c
-+++ b/src/mapi/entry.c
-@@ -47,8 +47,6 @@
- #endif
- 
- /* REALLY_INITIAL_EXEC implies USE_ELF_TLS and __GNUC__ */
--/* Use TSD stubs for non-IE ELF TLS even though first access is slower because
-- * future accesses will be patched */
- #if defined(USE_X86_ASM) && defined(REALLY_INITIAL_EXEC)
- #include "entry_x86_tls.h"
- #elif defined(USE_X86_ASM) && !defined(GLX_X86_READONLY_TEXT) && defined(__GNUC__)
-@@ -57,7 +55,8 @@
- #include "entry_x86-64_tls.h"
- #elif defined(USE_PPC64LE_ASM) && UTIL_ARCH_LITTLE_ENDIAN && defined(REALLY_INITIAL_EXEC)
- #include "entry_ppc64le_tls.h"
--#elif defined(USE_PPC64LE_ASM) && UTIL_ARCH_LITTLE_ENDIAN && defined(__GNUC__)
-+/* ppc64le non-IE TSD stubs are possible but not currently implemented */
-+#elif defined(USE_PPC64LE_ASM) && UTIL_ARCH_LITTLE_ENDIAN && !defined(USE_ELF_TLS) && defined(__GNUC__)
- #include "entry_ppc64le_tsd.h"
- #else
- 
-diff --git a/src/mapi/entry_x86_tsd.h b/src/mapi/entry_x86_tsd.h
-index f5d9c41253f..2aa724a70f3 100644
---- a/src/mapi/entry_x86_tsd.h
-+++ b/src/mapi/entry_x86_tsd.h
-@@ -69,7 +69,7 @@ __asm__(".balign 32\n"
-    "popl %ecx\n\t"                  \
-    "addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %ecx\n\t" \
-    LOC_END_SET_ECX                                \
--   "movl " ENTRY_CURRENT_TABLE "@GOT(%ecx), %eax\n\t" \
-+   "movl _glapi_Dispatch@GOT(%ecx), %eax\n\t" \
-    "mov (%eax), %eax\n\t"           \
-    "testl %eax, %eax\n\t"           \
-    "jne 1f\n\t"                     \
-diff --git a/src/mapi/glapi/gen/gl_x86_asm.py b/src/mapi/glapi/gen/gl_x86_asm.py
-index 4b10db37d7f..057aa54ba3f 100644
---- a/src/mapi/glapi/gen/gl_x86_asm.py
-+++ b/src/mapi/glapi/gen/gl_x86_asm.py
-@@ -70,7 +70,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
-         print('#endif')
-         print('')
-         print('')
--        print('#ifdef USE_ELF_TLS')
-+        print('#ifdef REALLY_INITIAL_EXEC')
-         print('')
-         print('#ifdef GLX_X86_READONLY_TEXT')
-         print('# define CTX_INSNS MOV_L(GS:(EAX), EAX)')
-@@ -86,17 +86,6 @@ class PrintGenericStubs(gl_XML.gl_print_base):
-         print('\tCTX_INSNS ;					\\')
-         print('\tJMP(GL_OFFSET(off))')
-         print('')
--        print('#elif defined(HAVE_PTHREAD)')
--        print('#  define GL_STUB(fn,off,fn_alt)\t\t\t\\')
--        print('ALIGNTEXT16;\t\t\t\t\t\t\\')
--        print('GLOBL_FN(GL_PREFIX(fn, fn_alt));\t\t\t\\')
--        print('GL_PREFIX(fn, fn_alt):\t\t\t\t\t\\')
--        print('\tMOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX) ;\t\\')
--        print('\tTEST_L(EAX, EAX) ;\t\t\t\t\\')
--        print('\tJE(1f) ;\t\t\t\t\t\\')
--        print('\tJMP(GL_OFFSET(off)) ;\t\t\t\t\\')
--        print('1:\tCALL(_x86_get_dispatch) ;\t\t\t\\')
--        print('\tJMP(GL_OFFSET(off))')
-         print('#else')
-         print('#  define GL_STUB(fn,off,fn_alt)\t\t\t\\')
-         print('ALIGNTEXT16;\t\t\t\t\t\t\\')
-@@ -121,7 +110,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
-         print('')
-         print('SEG_TEXT')
-         print('')
--        print('#ifdef USE_ELF_TLS')
-+        print('#ifdef REALLY_INITIAL_EXEC')
-         print('')
-         print('\tGLOBL\tGLNAME(_x86_get_dispatch)')
-         print('\tHIDDEN(GLNAME(_x86_get_dispatch))')
-@@ -133,19 +122,8 @@ class PrintGenericStubs(gl_XML.gl_print_base):
-         print('\tmovl	_glapi_tls_Dispatch@GOTNTPOFF(%eax), %eax')
-         print('\tret')
-         print('')
--        print('#elif defined(HAVE_PTHREAD)')
--        print('EXTERN GLNAME(_glapi_Dispatch)')
--        print('EXTERN GLNAME(_gl_DispatchTSD)')
--        print('EXTERN GLNAME(pthread_getspecific)')
--        print('')
--        print('ALIGNTEXT16')
--        print('GLNAME(_x86_get_dispatch):')
--        print('\tSUB_L(CONST(24), ESP)')
--        print('\tPUSH_L(GLNAME(_gl_DispatchTSD))')
--        print('\tCALL(GLNAME(pthread_getspecific))')
--        print('\tADD_L(CONST(28), ESP)')
--        print('\tRET')
-         print('#else')
-+        print('EXTERN GLNAME(_glapi_Dispatch)')
-         print('EXTERN GLNAME(_glapi_get_dispatch)')
-         print('#endif')
-         print('')
--- 
-GitLab
-

diff --git a/media-libs/mesa/files/mesa-tls.patch b/media-libs/mesa/files/mesa-tls.patch
deleted file mode 100644
index f445c934..00000000
--- a/media-libs/mesa/files/mesa-tls.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From 8570a2a280587a1e43ac11ad46ad62dfdd6c7b39 Mon Sep 17 00:00:00 2001
-From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
-Date: Thu, 2 Sep 2021 11:58:32 -0400
-Subject: [PATCH] Use initial-exec TLS for glibc only, enable TLS elsewhere
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It is not portable to use initial-exec TLS in dlopened libraries. glibc
-and FreeBSD allocate extra memory for extra initial-exec variables
-specifically for libGL, but other libcs including musl do not.
-
-Keep initial-exec disabled on FreeBSD since it is apparently broken for
-some reason:
-
-https://gitlab.freedesktop.org/mesa/mesa/-/issues/966#note_394512
-https://github.com/jbeich/mesa/commit/81dbdb15d55054242eded0eb2f32621d583c1aaf
-
-Enable TLS on OpenBSD and Haiku based on the u_thread.h comment that
-emutls is better than pthread_getspecific, which seems plausible given
-that emutls has strictly more information to work with.
-
-Fixes #966.
-
-Acked-by: Tapani Pälli <tapani.palli@intel.com>
-Acked-by: Jesse Natalie <jenatali@microsoft.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12722>
----
- meson.build         |  7 ++-----
- src/mapi/entry.c    | 28 ++++++++++++++--------------
- src/util/u_thread.h | 16 ++++++----------
- 3 files changed, 22 insertions(+), 29 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index cf2b5f4b939..a7ace23677c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -508,15 +508,12 @@ foreach platform : _platforms
-   pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
- endforeach
- 
--# Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
- use_elf_tls = false
--if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and
--    (not with_platform_android or get_option('platform-sdk-version') >= 29) and
--    (not with_platform_windows or not with_shared_glapi))
-+if not with_platform_windows or not with_shared_glapi
-   pre_args += '-DUSE_ELF_TLS'
-   use_elf_tls = true
- 
--  if with_platform_android
-+  if with_platform_android and get_option('platform-sdk-version') >= 29
-     # By default the NDK compiler, at least, emits emutls references instead of
-     # ELF TLS, even when building targeting newer API levels.  Make it actually do
-     # ELF TLS instead.
-diff --git a/src/mapi/entry.c b/src/mapi/entry.c
-index 7ff3c8f8c8c..b120eae31a1 100644
---- a/src/mapi/entry.c
-+++ b/src/mapi/entry.c
-@@ -31,6 +31,7 @@
- #include "entry.h"
- #include "u_current.h"
- #include "util/u_endian.h"
-+#include "util/u_thread.h"
- 
- #define _U_STRINGIFY(x) #x
- #define U_STRINGIFY(x) _U_STRINGIFY(x)
-@@ -45,20 +46,19 @@
- #define ENTRY_CURRENT_TABLE_GET U_STRINGIFY(u_current_get_table_internal)
- #endif
- 
--#if defined(USE_X86_ASM) && defined(__GNUC__)
--#   ifdef USE_ELF_TLS
--#      include "entry_x86_tls.h"
--#   else                 
--#      include "entry_x86_tsd.h"
--#   endif
--#elif defined(USE_X86_64_ASM) && defined(__GNUC__) && defined(USE_ELF_TLS)
--#   include "entry_x86-64_tls.h"
--#elif defined(USE_PPC64LE_ASM) && defined(__GNUC__) && UTIL_ARCH_LITTLE_ENDIAN
--#   ifdef USE_ELF_TLS
--#      include "entry_ppc64le_tls.h"
--#   else
--#      include "entry_ppc64le_tsd.h"
--#   endif
-+/* REALLY_INITIAL_EXEC implies USE_ELF_TLS and __GNUC__ */
-+/* Use TSD stubs for non-IE ELF TLS even though first access is slower because
-+ * future accesses will be patched */
-+#if defined(USE_X86_ASM) && defined(REALLY_INITIAL_EXEC)
-+#include "entry_x86_tls.h"
-+#elif defined(USE_X86_ASM) && !defined(GLX_X86_READONLY_TEXT) && defined(__GNUC__)
-+#include "entry_x86_tsd.h"
-+#elif defined(USE_X86_64_ASM) && defined(REALLY_INITIAL_EXEC)
-+#include "entry_x86-64_tls.h"
-+#elif defined(USE_PPC64LE_ASM) && UTIL_ARCH_LITTLE_ENDIAN && defined(REALLY_INITIAL_EXEC)
-+#include "entry_ppc64le_tls.h"
-+#elif defined(USE_PPC64LE_ASM) && UTIL_ARCH_LITTLE_ENDIAN && defined(__GNUC__)
-+#include "entry_ppc64le_tsd.h"
- #else
- 
- static inline const struct _glapi_table *
-diff --git a/src/util/u_thread.h b/src/util/u_thread.h
-index 0fb474f32ba..a4215452d35 100644
---- a/src/util/u_thread.h
-+++ b/src/util/u_thread.h
-@@ -75,19 +75,15 @@
-  * still want to use normal TLS (which involves a function call, but not the
-  * expensive pthread_getspecific() or its equivalent).
-  */
-+#ifdef USE_ELF_TLS
- #ifdef _MSC_VER
- #define __THREAD_INITIAL_EXEC __declspec(thread)
--#elif defined(ANDROID)
--/* Android 29 gained ELF TLS support, but it doesn't support initial-exec and
-- * it will throw:
-- *
-- *     dlopen failed: TLS symbol "(null)" in dlopened
-- *     "/vendor/lib64/egl/libEGL_mesa.so" referenced from
-- *     "/vendor/lib64/egl/libEGL_mesa.so" using IE access model.
-- */
--#define __THREAD_INITIAL_EXEC __thread
--#else
-+#elif defined(__GLIBC__)
- #define __THREAD_INITIAL_EXEC __thread __attribute__((tls_model("initial-exec")))
-+#define REALLY_INITIAL_EXEC
-+#else
-+#define __THREAD_INITIAL_EXEC __thread
-+#endif
- #endif
- 
- static inline int
--- 
-GitLab
-

diff --git a/media-libs/mesa/mesa-21.3.7.ebuild b/media-libs/mesa/mesa-21.3.7.ebuild
deleted file mode 100644
index 9412c3c5..00000000
--- a/media-libs/mesa/mesa-21.3.7.ebuild
+++ /dev/null
@@ -1,566 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} crocus freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic cpu_flags_x86_sse2 d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm
-	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	osmesa? ( gallium )
-	vulkan? ( video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	wayland? ( egl gbm )
-	video_cards_crocus? ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_iris?   ( gallium )
-	video_cards_lima?   ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_panfrost? ( gallium )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_v3d? ( gallium )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-	xa? ( X )
-	xvmc? ( X )
-	zink? ( gallium vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					>=virtual/opencl-3[${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="13"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:13[${MULTILIB_USEDEP}]
-		sys-devel/llvm:12[${MULTILIB_USEDEP}]
-		sys-devel/llvm:11[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	gallium? (
-		llvm? (
-			opencl? (
-				video_cards_r600? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${CLANG_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${CLANG_DEPSTR}
-						)
-					)
-				)
-			)
-			!opencl? (
-				video_cards_r600? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${LLVM_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${LLVM_DEPSTR}
-						)
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-PATCHES=(
-	"${FILESDIR}"/mesa-tls.patch
-	"${FILESDIR}"/mesa-tls-2.patch
-	"${FILESDIR}"/mesa-tls-3-fix-non-initial-exec.patch
-)
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_i965 &&
-		   ! use video_cards_iris &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain freedreno, i965, iris, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_i965 ||
-	   use video_cards_iris ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use gallium && use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use X || use egl; then
-		emesonargs+=(-Dglvnd=true)
-	else
-		emesonargs+=(-Dglvnd=false)
-	fi
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_feature llvm)
-			$(meson_feature lm-sensors lmsensors)
-			$(meson_feature unwind libunwind)
-		)
-
-		if use video_cards_iris ||
-		   use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=disabled)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_feature xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=disabled)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_lima ||
-		   use video_cards_panfrost ||
-		   use video_cards_v3d ||
-		   use video_cards_vc4 ||
-		   use video_cards_vivante; then
-			gallium_enable -- kmsro
-		fi
-
-		gallium_enable -- swrast
-		gallium_enable video_cards_lima lima
-		gallium_enable video_cards_panfrost panfrost
-		gallium_enable video_cards_v3d v3d
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable zink zink
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		fi
-
-		gallium_enable video_cards_crocus crocus
-		gallium_enable video_cards_iris iris
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-			! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_iris intel
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	local vulkan_layers
-	use vulkan && vulkan_layers+="device-select"
-	use vulkan-overlay && vulkan_layers+=",overlay"
-	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		$(meson_feature egl)
-		$(meson_feature gbm)
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature zstd)
-		$(meson_use video_cards_crocus prefer-crocus)
-		$(meson_use video_cards_iris prefer-iris)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
deleted file mode 100644
index 2b18aba1..00000000
--- a/media-libs/mesa/metadata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<use>
-		<flag name="classic">Build drivers based on the classic architecture.</flag>
-		<flag name="d3d9">Enable Direct 3D9 API through Nine state tracker. Can be used together with patched wine.</flag>
-		<flag name="egl">Enable EGL support.</flag>
-		<flag name="gallium">Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag>
-		<flag name="gbm">Enable the Graphics Buffer Manager for EGL on KMS.</flag>
-		<flag name="gles1">Enable GLESv1 support.</flag>
-		<flag name="gles2">Enable GLESv2 support.</flag>
-		<flag name="llvm">Enable LLVM backend for Gallium3D.</flag>
-		<flag name="lm-sensors">Enable Gallium HUD lm-sensors support.</flag>
-		<flag name="opencl">Enable the Clover Gallium OpenCL state tracker.</flag>
-		<flag name="osmesa">Build the Mesa library for off-screen rendering.</flag>
-		<flag name="valgrind">Compile in valgrind memory hints</flag>
-		<flag name="vdpau">Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
-		<flag name="vulkan">Enable Vulkan drivers</flag>
-		<flag name="vulkan-overlay">Build vulkan-overlay-layer which displays Frames Per Second and other statistics</flag>
-		<flag name="wayland">Enable support for dev-libs/wayland</flag>
-		<flag name="xa">Enable the XA (X Acceleration) API for Gallium3D.</flag>
-		<flag name="xvmc">Enable the XvMC acceleration interface for the Gallium3D Video Layer.</flag>
-		<flag name="zink">Enable the Zink OpenGL-over-Vulkan Gallium driver</flag>
-	</use>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:mesa3d:mesa</remote-id>
-		<remote-id type="sourceforge">mesa3d</remote-id>
-	</upstream>
-</pkgmetadata>