commit: 7c5001885455f64a6fecf3b8343e6225828b2ee0
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 01:29:41 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 01:29:41 2019 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7c500188
media-libs/mesa: sync with upstream and forward port patches
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
media-libs/mesa/Manifest | 7 +-
media-libs/mesa/files/mesa-11-execinfo.patch | 68 ---
media-libs/mesa/files/mesa-13-musl_endian.patch | 12 -
media-libs/mesa/files/mesa-17-musl_endian.patch | 12 -
.../mesa/files/mesa-18-missing-includes.patch | 53 ---
.../mesa/files/mesa-18-musl-larger-stacksize.patch | 52 ---
...2.4-meson-link-gallium-nine-with-pthreads.patch | 34 --
media-libs/mesa/mesa-18.1.6-r1.ebuild | 520 ---------------------
media-libs/mesa/mesa-18.1.6.ebuild | 519 --------------------
media-libs/mesa/mesa-18.1.9-r1.ebuild | 520 ---------------------
.../{mesa-18.2.4.ebuild => mesa-18.2.8.ebuild} | 27 +-
.../{mesa-18.2.1.ebuild => mesa-18.3.4.ebuild} | 90 ++--
.../{mesa-18.2.4.ebuild => mesa-18.3.5.ebuild} | 37 +-
.../{mesa-18.2.4.ebuild => mesa-19.0.0.ebuild} | 58 ++-
media-libs/mesa/metadata.xml | 2 +-
15 files changed, 86 insertions(+), 1925 deletions(-)
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 2e5ff61..7c11ac6 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,4 +1,5 @@
-DIST mesa-18.1.6.tar.xz 11142884 BLAKE2B
fdd156fe7debf5223285dfa238070a2bd7d8ec684dec168afab78b9d2d38d53c10d939aaa64f34c2910e542dce3869adfca6383fca6a854c6dd03287a044b0e3
SHA512
2966210800215f5ced2720691063a8519b51ebeab9fb1e99bde4b1bd7ccc719d6395a1c29f25c88efe62d1592cf14ceafc163aca349490b1f8cee81070d46fcc
DIST mesa-18.1.9.tar.xz 11146188 BLAKE2B
753f0fa3780502d56927f9b0e6124b4728cb5aa3600de78585487fb8e178c6987a72b79fb56e6c310757d157f9f85f12b73a6889bd361b51b62fb1dc1c20eecd
SHA512
22db2950d25a3d9393e7c622c783bd177c21695569c8a95683bf77e92318e1db85672a134d4bea30c1f49a24e52bc3a2c1a0ac15deafb3a8fcbfb6de6a18adc2
-DIST mesa-18.2.1.tar.xz 11374476 BLAKE2B
f0f3b766d68550f8c395a1b1d1ffc7a9e532c22ee6b91d698db33a270c152e03ab656d4219301bc2e0e95ba6f0583017c4361add928ad8ab26378a1ec6958f36
SHA512
d249bdf79aad36db9a8d291b3a1a100d283893ac741f58f85ae7e5c90ca25c37f80a5fa6fc57945ffeb0b67b788e7ea146543ec790b22f144578fc4c1525b84d
-DIST mesa-18.2.4.tar.xz 11377556 BLAKE2B
b11c33ade744fb976862fecccbcc4c97196a005e40a00ef02bd8d409b66b3aa11f97baee13f2aa92f2d7c5461b2ef44beae3103687dea9ee29e92439a068f08a
SHA512
088d43b087f4005752e4db75eaa6897e0fcb6de7b9a1f2d2b2ce3b5557d1dff829022e0092e8b1038ff01182c863ca0f26c97b9adde34bca462d3fa24502bfde
+DIST mesa-18.2.8.tar.xz 11385224 BLAKE2B
c6fbf71e2ab6837f91dfa996cf7e89e9cae22e219cac56bd4201f7a62c787ddd2f65e7d162a329971018f0b1a796ee1a5b252ee6b43bb3b27a233d67b6cdf615
SHA512
04d5ada9ba3acea853def3ebcbb53ee76936a4cd4229ae753d2ce1b5cf543bea1e5764f2ef2b19735d47d041ba6b0582841bc89e2c9331fdfbd89386f599a1f7
+DIST mesa-18.3.4.tar.xz 11875224 BLAKE2B
81d34349c644cc93b3ca525046cdd63a5aa2a16d8f6b841830a138c8e9e375fb0f75a17bd80b4c48ed573f4976dd6612b0773305a3bec982540914365c9925ff
SHA512
e4ead944ba053aa05425e9e199d633f576dfa424976253fc32438e8db6da5e8d381122e4c4b7fb18f94177421f208bab5567cfec8d2692d104e266483ca02a99
+DIST mesa-18.3.5.tar.xz 11882012 BLAKE2B
88279fe2f24c2a47c8857ad34382b7c8b64119632f1ec7ce8d0fe2afe669e01d2e071726f01e28b001be353d8d9ec1f0ef46d3ba1e64239d63221b100745e8ee
SHA512
f229ac122eafee98d1a40c54adeb019eb4458cb67063db9ba760b265da0634fe77247c3c8cb5c5de5fd40f8545e35d45000a74af9257ebf4e2028156add8644c
+DIST mesa-19.0.0.tar.xz 11959360 BLAKE2B
e58144bb22f296175d7feb59d2c7940ca795dd417b0b014735d8842a29292cf07a6197184942febfdc85ad062267a55059e0ebd1532a886610dabf888cc68b8f
SHA512
5759b85275bcd145513cf14a9ef7505595766fb33b82c53738f74ede462e5850580d48ab4af326b41209e7f4b05aab75539f2bfebf67c3098a4680ea95c37591
diff --git a/media-libs/mesa/files/mesa-11-execinfo.patch
b/media-libs/mesa/files/mesa-11-execinfo.patch
deleted file mode 100644
index 0eefba8..0000000
--- a/media-libs/mesa/files/mesa-11-execinfo.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -Naur mesa-11.1.2.orig/configure.ac mesa-11.1.2/configure.ac
---- mesa-11.1.2.orig/configure.ac 2016-02-10 15:57:54.000000000 -0800
-+++ mesa-11.1.2/configure.ac 2016-03-09 13:27:47.979302937 -0800
-@@ -681,6 +681,7 @@
- AC_CHECK_HEADER([sys/sysctl.h], [DEFINES="$DEFINES -DHAVE_SYS_SYSCTL_H"])
- AC_CHECK_FUNC([strtof], [DEFINES="$DEFINES -DHAVE_STRTOF"])
- AC_CHECK_FUNC([mkostemp], [DEFINES="$DEFINES -DHAVE_MKOSTEMP"])
-+AC_CHECK_HEADER([execinfo.h], [DEFINES="$DEFINES -DHAVE_EXECINFO_H"])
-
- dnl Check to see if dlopen is in default libraries (like Solaris, which
- dnl has it in libc), or if libdl is needed to get it.
-diff -Naur mesa-11.1.2.orig/src/gallium/auxiliary/util/u_debug_symbol.c
mesa-11.1.2/src/gallium/auxiliary/util/u_debug_symbol.c
---- mesa-11.1.2.orig/src/gallium/auxiliary/util/u_debug_symbol.c
2016-01-17 23:39:26.000000000 -0800
-+++ mesa-11.1.2/src/gallium/auxiliary/util/u_debug_symbol.c 2016-03-09
13:29:27.255060988 -0800
-@@ -219,7 +219,7 @@
- #endif /* PIPE_OS_WINDOWS */
-
-
--#if defined(__GLIBC__) && !defined(__UCLIBC__)
-+#if defined(HAVE_EXECINFO_H)
-
- #include <execinfo.h>
-
-@@ -240,7 +240,7 @@
- return TRUE;
- }
-
--#endif /* defined(__GLIBC__) && !defined(__UCLIBC__) */
-+#endif /* defined(HAVE_EXECINFO_H) */
-
-
- void
-diff -Naur mesa-11.1.2.orig/src/mapi/glapi/gen/gl_gentable.py
mesa-11.1.2/src/mapi/glapi/gen/gl_gentable.py
---- mesa-11.1.2.orig/src/mapi/glapi/gen/gl_gentable.py 2016-02-10
15:57:54.000000000 -0800
-+++ mesa-11.1.2/src/mapi/glapi/gen/gl_gentable.py 2016-03-09
13:28:14.624506395 -0800
-@@ -44,7 +44,7 @@
- #endif
-
- #if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \\
-- || (!defined(GLXEXT) && defined(DEBUG) && !defined(__CYGWIN__) &&
!defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) &&
!defined(__DragonFly__))
-+ || (!defined(GLXEXT) && defined(DEBUG) && defined(HAVE_EXECINFO_H))
- #define USE_BACKTRACE
- #endif
-
-diff -Naur mesa-11.1.2.orig/src/mapi/glapi/glapi_gentable.c
mesa-11.1.2/src/mapi/glapi/glapi_gentable.c
---- mesa-11.1.2.orig/src/mapi/glapi/glapi_gentable.c 2016-02-10
16:24:49.000000000 -0800
-+++ mesa-11.1.2/src/mapi/glapi/glapi_gentable.c 2016-03-09
13:28:38.411688029 -0800
-@@ -36,7 +36,7 @@
- #endif
-
- #if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \
-- || (!defined(GLXEXT) && defined(DEBUG) && !defined(__CYGWIN__) &&
!defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) &&
!defined(__DragonFly__))
-+ || (!defined(GLXEXT) && defined(DEBUG) && defined(HAVE_EXECINFO_H))
- #define USE_BACKTRACE
- #endif
-
-diff -Naur mesa-11.1.2.orig/src/mesa/drivers/dri/i915/intel_regions.c
mesa-11.1.2/src/mesa/drivers/dri/i915/intel_regions.c
---- mesa-11.1.2.orig/src/mesa/drivers/dri/i915/intel_regions.c 2016-01-17
23:39:26.000000000 -0800
-+++ mesa-11.1.2/src/mesa/drivers/dri/i915/intel_regions.c 2016-03-09
13:30:18.483460168 -0800
-@@ -57,7 +57,7 @@
- */
- #define DEBUG_BACKTRACE_SIZE 0
-
--#if DEBUG_BACKTRACE_SIZE == 0
-+#if DEBUG_BACKTRACE_SIZE == 0 || !defined(HAVE_EXECINFO_H)
- /* Use the standard debug output */
- #define _DBG(...) DBG(__VA_ARGS__)
- #else
diff --git a/media-libs/mesa/files/mesa-13-musl_endian.patch
b/media-libs/mesa/files/mesa-13-musl_endian.patch
deleted file mode 100644
index 1276605..0000000
--- a/media-libs/mesa/files/mesa-13-musl_endian.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur mesa-13.0.5.orig/src/util/u_endian.h mesa-13.0.5/src/util/u_endian.h
---- mesa-13.0.5.orig/src/util/u_endian.h 2017-03-19 12:40:43.808781967
-0700
-+++ mesa-13.0.5/src/util/u_endian.h 2017-03-19 12:49:01.731158551 -0700
-@@ -27,7 +27,7 @@
- #ifndef U_ENDIAN_H
- #define U_ENDIAN_H
-
--#if defined(__GLIBC__) || defined(ANDROID)
-+#if defined(__linux__)
- #include <endian.h>
-
- #if __BYTE_ORDER == __LITTLE_ENDIAN
diff --git a/media-libs/mesa/files/mesa-17-musl_endian.patch
b/media-libs/mesa/files/mesa-17-musl_endian.patch
deleted file mode 100644
index 74e3d1d..0000000
--- a/media-libs/mesa/files/mesa-17-musl_endian.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur mesa-17.3.1.orig/src/util/u_endian.h mesa-17.3.1/src/util/u_endian.h
---- mesa-17.3.1.orig/src/util/u_endian.h 2017-12-29 14:19:33.532915798
-0800
-+++ mesa-17.3.1/src/util/u_endian.h 2017-12-29 14:21:55.547913255 -0800
-@@ -27,7 +27,7 @@
- #ifndef U_ENDIAN_H
- #define U_ENDIAN_H
-
--#if defined(__GLIBC__) || defined(ANDROID) || defined(__CYGWIN__)
-+#if defined(__linux__) || defined(__CYGWIN__)
- #include <endian.h>
-
- #if __BYTE_ORDER == __LITTLE_ENDIAN
diff --git a/media-libs/mesa/files/mesa-18-missing-includes.patch
b/media-libs/mesa/files/mesa-18-missing-includes.patch
deleted file mode 100644
index 3f7bd62..0000000
--- a/media-libs/mesa/files/mesa-18-missing-includes.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 456b660306e475a30f170a3bcecc0445124d7e2b Mon Sep 17 00:00:00 2001
-From:
-Date: Sun, 8 Jul 2018 03:57:11 -0500
-Subject: [PATCH] Fix all missing includes for mesa
-
-Signed-off-by:
----
- src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h | 1 +
- src/gallium/winsys/svga/drm/vmw_screen.h | 2 +-
- src/util/rand_xor.c | 2 ++
- 3 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-index d6af605..6eee83f 100644
---- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
-@@ -32,6 +32,7 @@
- #include "ac_gpu_info.h"
- #include "addrlib/addrinterface.h"
- #include <amdgpu.h>
-+#include <pthread.h>
- #include "util/list.h"
-
- struct radv_amdgpu_winsys {
-diff --git a/src/gallium/winsys/svga/drm/vmw_screen.h
b/src/gallium/winsys/svga/drm/vmw_screen.h
-index f21cabb..20d03f8 100644
---- a/src/gallium/winsys/svga/drm/vmw_screen.h
-+++ b/src/gallium/winsys/svga/drm/vmw_screen.h
-@@ -34,7 +34,7 @@
- #ifndef VMW_SCREEN_H_
- #define VMW_SCREEN_H_
-
--
-+#include <sys/stat.h>
- #include "pipe/p_compiler.h"
- #include "pipe/p_state.h"
-
-diff --git a/src/util/rand_xor.c b/src/util/rand_xor.c
-index de04bbc..08d507f 100644
---- a/src/util/rand_xor.c
-+++ b/src/util/rand_xor.c
-@@ -24,6 +24,8 @@
-
- #if defined(__linux__)
- #include <sys/file.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>
- #else
---
-2.18.0
-
diff --git a/media-libs/mesa/files/mesa-18-musl-larger-stacksize.patch
b/media-libs/mesa/files/mesa-18-musl-larger-stacksize.patch
deleted file mode 100644
index cfc3bc5..0000000
--- a/media-libs/mesa/files/mesa-18-musl-larger-stacksize.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-# [main/mesa: use larger stack size for new threads
#4847](https://github.com/alpinelinux/aports/pull/4847)
-
-[prspkt (prspkt) · GitHub](https://github.com/prspkt) commented
-2018-07-25T12:34:00Z
-
-Since the introduction of the mesa 18.1.* series, applications that use OpenGL
-have been consistently segfaulting. I can locally reproduce using
-`community/mpv` for video playback. This has also been discovered
-[here](https://github.com/gentoo/musl/issues/136) and the
-[patch](https://github.com/void-linux/void-packages/blob/18838a6cd6b00b1d309d6cc712b7d54660597221/srcpkgs/libGL/patches/musl-stacksize.patch)
-was imported after following a discussion
-[here](https://github.com/void-linux/void-packages/issues/933).
-
-Increasing the stacksise consistently fixes the issue.
-
-## References
-
-[Segfaults with mesa-18.1.0_rc* · Issue #136 · gentoo/musl ·
GitHub](https://github.com/gentoo/musl/issues/136)
-[RetroArch segfaults after recent update of various gfx libraries:
mesa-ati-dri, libGL, etc. · Issue #933 · void-linux/void-packages ·
GitHub](https://github.com/void-linux/void-packages/issues/933)
-
---- a/include/c11/threads_posix.h
-+++ b/include/c11/threads_posix.h
-@@ -281,15 +281,29 @@ static inline int
- thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
- {
- struct impl_thrd_param *pack;
-+#ifdef __GLIBC__
-+ pthread_attr_t *attrp = NULL;
-+#else
-+ pthread_attr_t attr = { 0 };
-+ pthread_attr_init(&attr);
-+ pthread_attr_setstacksize(&attr, 8388608);
-+ pthread_attr_t *attrp = &attr;
-+#endif
- assert(thr != NULL);
- pack = (struct impl_thrd_param *)malloc(sizeof(struct impl_thrd_param));
- if (!pack) return thrd_nomem;
- pack->func = func;
- pack->arg = arg;
-- if (pthread_create(thr, NULL, impl_thrd_routine, pack) != 0) {
-+ if (pthread_create(thr, attrp, impl_thrd_routine, pack) != 0) {
-+#ifndef __GLIBC__
-+ pthread_attr_destroy(&attr);
-+#endif
- free(pack);
- return thrd_error;
- }
-+#ifndef __GLIBC__
-+ pthread_attr_destroy(&attr);
-+#endif
- return thrd_success;
- }
diff --git
a/media-libs/mesa/files/mesa-18.2.4-meson-link-gallium-nine-with-pthreads.patch
b/media-libs/mesa/files/mesa-18.2.4-meson-link-gallium-nine-with-pthreads.patch
deleted file mode 100644
index 11d4f9c..0000000
---
a/media-libs/mesa/files/mesa-18.2.4-meson-link-gallium-nine-with-pthreads.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7652931d33b36c93b2e84713baa8c283d568402e Mon Sep 17 00:00:00 2001
-From: Dylan Baker <[email protected]>
-Date: Thu, 1 Nov 2018 14:12:57 -0700
-Subject: [PATCH] meson: link gallium nine with pthreads
-
-In some cases (not building with llvm, which automatically pulls in
-pthreads) nine needs to be directly linked with pthreads. Fixes building
-on x86 (32 bit) without llvm.
-
-Distro bug: https://bugs.gentoo.org/670094
-Fixes: 6b4c7047d57178d3362a710ad503057c6a582ca3
- ("meson: build gallium nine state_tracker")
-Tested-by: Rafal Lalik <[email protected]>
-Reviewed-by: Matt Turner <[email protected]>
----
- src/gallium/targets/d3dadapter9/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gallium/targets/d3dadapter9/meson.build
b/src/gallium/targets/d3dadapter9/meson.build
-index bd05b4f9692..bc72b1110a0 100644
---- a/src/gallium/targets/d3dadapter9/meson.build
-+++ b/src/gallium/targets/d3dadapter9/meson.build
-@@ -53,7 +53,7 @@ libgallium_nine = shared_library(
- libswkmsdri,
- ],
- dependencies : [
-- dep_selinux, dep_expat, dep_libdrm, dep_llvm,
-+ dep_selinux, dep_expat, dep_libdrm, dep_llvm, dep_thread,
- driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
- driver_i915, driver_svga,
- ],
---
-2.16.4
-
diff --git a/media-libs/mesa/mesa-18.1.6-r1.ebuild
b/media-libs/mesa/mesa-18.1.6-r1.ebuild
deleted file mode 100644
index 8e43662..0000000
--- a/media-libs/mesa/mesa-18.1.6-r1.ebuild
+++ /dev/null
@@ -1,520 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git";
-
-if [[ ${PV} = 9999 ]]; then
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/";
-
-if [[ $PV == 9999 ]]; then
- SRC_URI=""
-else
- SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz";
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl
vivante vmware"
-for card in ${VIDEO_CARDS}; do
- IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
- bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
- +llvm +nptl opencl osmesa pax_kernel pic selinux vaapi valgrind
- vdpau vulkan wayland xvmc xa"
-
-REQUIRED_USE="
- d3d9? ( dri3 gallium )
- llvm? ( gallium )
- opencl? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi ) )
- gles1? ( egl )
- gles2? ( egl )
- vaapi? ( gallium )
- vdpau? ( gallium )
- vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
- video_cards_radeonsi? ( llvm ) )
- wayland? ( egl gbm )
- xa? ( gallium )
- video_cards_freedreno? ( gallium )
- video_cards_intel? ( classic )
- video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( classic )
- video_cards_imx? ( gallium video_cards_vivante )
- video_cards_nouveau? ( || ( classic 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_vc4? ( gallium )
- video_cards_virgl? ( gallium )
- video_cards_vivante? ( gallium gbm )
- video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.91"
-RDEPEND="
- !app-eselect/eselect-mesa
- >=app-eselect/eselect-opengl-1.3.0
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1:=[${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}]
- 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}]
- )
- )
- opencl? (
- app-eselect/eselect-opencl
- dev-libs/libclc
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- vaapi? (
- >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
- video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
- )
- vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
- wayland? (
- >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
- >=dev-libs/wayland-protocols-1.8
- )
- xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-
${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] )
-"
-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. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_MAX_SLOT="6"
-LLVM_DEPSTR="
- || (
- sys-devel/llvm:7[${MULTILIB_USEDEP}]
- sys-devel/llvm:6[${MULTILIB_USEDEP}]
- sys-devel/llvm:5[${MULTILIB_USEDEP}]
- sys-devel/llvm:4[${MULTILIB_USEDEP}]
- >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
- )
- sys-devel/llvm:=[${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}
- 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}
- ${PYTHON_DEPS}
- opencl? (
- >=sys-devel/gcc-4.6
- )
- sys-devel/gettext
- virtual/pkgconfig
- valgrind? ( dev-util/valgrind )
- x11-base/xorg-proto
- vulkan? (
- $(python_gen_any_dep
">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
- )
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
- sys-devel/bison
- sys-devel/flex
- $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
- !pic? (
- 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
- )
-)"
-
-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[${flags}]" || return 1
- fi
- has_version "sys-devel/llvm[${flags}]"
-}
-
-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 llvm; then
- llvm_pkg_setup
- fi
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-17-execinfo.patch
- eapply "${FILESDIR}"/${PN}-17-musl-string_h.patch
- eapply "${FILESDIR}"/${PN}-17-musl-invocation_name.patch
- eapply "${FILESDIR}"/${PN}-18-musl-pthread.patch
- eapply "${FILESDIR}"/${PN}-18-intel-missing-time_t.patch
- eapply "${FILESDIR}"/${PN}-18-musl-amdgpu-include-pthread.patch
- eapply "${FILESDIR}"/${PN}-18-musl-larger-stacksize.patch
- eapply_user
- eautoreconf
-}
-
-multilib_src_configure() {
- local myconf
-
- if use classic; then
- # Configurable DRI drivers
- driver_enable swrast
-
- # Intel code
- driver_enable video_cards_i915 i915
- driver_enable video_cards_i965 i965
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- driver_enable video_cards_intel i915 i965
- fi
-
- # Nouveau code
- driver_enable video_cards_nouveau nouveau
-
- # ATI code
- driver_enable video_cards_r100 radeon
- driver_enable video_cards_r200 r200
- if ! use video_cards_r100 && \
- ! use video_cards_r200; then
- driver_enable video_cards_radeon radeon r200
- fi
- fi
-
- if use egl; then
- myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo
",wayland")$(use gbm && echo ",drm")"
- fi
-
- if use gallium; then
- myconf+="
- $(use_enable d3d9 nine)
- $(use_enable llvm)
- $(use_enable vaapi va)
- $(use_enable vdpau)
- $(use_enable xa)
- $(use_enable xvmc)
- "
- use vaapi && myconf+="
--with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
- gallium_enable swrast
- 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 video_cards_i915 i915
- gallium_enable video_cards_imx imx
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- gallium_enable video_cards_intel i915
- fi
-
- 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
- # opencl stuff
- if use opencl; then
- myconf+="
- $(use_enable opencl)
- --with-clang-libdir="${EPREFIX}/usr/lib"
- "
- fi
-
- gallium_enable video_cards_virgl virgl
- fi
-
- if use vulkan; then
- vulkan_enable video_cards_i965 intel
- vulkan_enable video_cards_radeonsi radeon
- fi
-
- # x86 hardened pax_kernel needs glx-rts, bug 240956
- if [[ ${ABI} == x86 ]]; then
- myconf+=" $(use_enable pax_kernel glx-read-only-text)"
- fi
-
- # on abi_x86_32 hardened we need to have asm disable
- if [[ ${ABI} == x86* ]] && use pic; then
- myconf+=" --disable-asm"
- fi
-
- if use gallium; then
- myconf+=" $(use_enable osmesa gallium-osmesa)"
- else
- myconf+=" $(use_enable osmesa)"
- fi
-
- # build fails with BSD indent, bug #428112
- use userland_GNU || export INDENT=cat
-
- ECONF_SOURCE="${S}" \
- econf \
- --enable-dri \
- --enable-glx \
- --enable-shared-glapi \
- $(use_enable !bindist texture-float) \
- $(use_enable d3d9 nine) \
- $(use_enable debug) \
- $(use_enable dri3) \
- $(use_enable egl) \
- $(use_enable gbm) \
- $(use_enable gles1) \
- $(use_enable gles2) \
- $(use_enable nptl glx-tls) \
- $(use_enable unwind libunwind) \
- --enable-valgrind=$(usex valgrind auto no) \
- --enable-llvm-shared-libs \
- --disable-opencl-icd \
- --with-dri-drivers=${DRI_DRIVERS} \
- --with-gallium-drivers=${GALLIUM_DRIVERS} \
- --with-vulkan-drivers=${VULKAN_DRIVERS} \
- PYTHON2="${PYTHON}" \
- ${myconf}
-}
-
-multilib_src_install() {
- emake install DESTDIR="${D}"
-
- if use wayland; then
- # These files are now provided by >=dev-libs/wayland-1.15.0
- rm "${ED}/usr/$(get_libdir)/libwayland-egl.so" || die
- rm "${ED}/usr/$(get_libdir)/libwayland-egl.so.1" || die
- rm "${ED}/usr/$(get_libdir)/libwayland-egl.so.1.0.0" || die
- rm "${ED}/usr/$(get_libdir)/pkgconfig/wayland-egl.pc" || die
- fi
-
- if use opencl; then
- ebegin "Moving Gallium/Clover OpenCL implementation for dynamic
switching"
- local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
- dodir ${cl_dir}/{lib,include}
- if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
- mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
- "${ED}"${cl_dir}
- fi
- if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
- mv -f "${ED}"/usr/include/CL \
- "${ED}"${cl_dir}/include
- fi
- eend $?
- fi
-}
-
-multilib_src_install_all() {
- find "${ED}" -name '*.la' -delete
- einstalldocs
-
- if use !bindist; then
- dodoc docs/patents.txt
- fi
-}
-
-multilib_src_test() {
- if use llvm; then
- local llvm_tests='lp_test_arit lp_test_arit lp_test_blend
lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format
lp_test_printf lp_test_printf'
- pushd src/gallium/drivers/llvmpipe >/dev/null || die
- emake ${llvm_tests}
- pax-mark m ${llvm_tests}
- popd >/dev/null || die
- fi
- emake check
-}
-
-pkg_postinst() {
- # Switch to the xorg implementation.
- echo
- eselect opengl set --use-old ${OPENGL_DIR}
-
- # Switch to mesa opencl
- if use opencl; then
- eselect opencl set --use-old ${PN}
- fi
-
- # warn about patent encumbered texture-float
- if use !bindist; then
- elog "USE=\"bindist\" was not set. Potentially patent
encumbered code was"
- elog "enabled. Please see /usr/share/doc/${P}/patents.txt.bz2
for an"
- elog "explanation."
- fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- DRI_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- DRI_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
-
-gallium_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- GALLIUM_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- GALLIUM_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
-
-vulkan_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- VULKAN_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- VULKAN_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
diff --git a/media-libs/mesa/mesa-18.1.6.ebuild
b/media-libs/mesa/mesa-18.1.6.ebuild
deleted file mode 100644
index 3145d0d..0000000
--- a/media-libs/mesa/mesa-18.1.6.ebuild
+++ /dev/null
@@ -1,519 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git";
-
-if [[ ${PV} = 9999 ]]; then
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/";
-
-if [[ $PV == 9999 ]]; then
- SRC_URI=""
-else
- SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz";
- KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl
vivante vmware"
-for card in ${VIDEO_CARDS}; do
- IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
- bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
- +llvm +nptl opencl osmesa pax_kernel pic selinux vaapi valgrind
- vdpau vulkan wayland xvmc xa"
-
-REQUIRED_USE="
- d3d9? ( dri3 gallium )
- llvm? ( gallium )
- opencl? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi ) )
- gles1? ( egl )
- gles2? ( egl )
- vaapi? ( gallium )
- vdpau? ( gallium )
- vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
- video_cards_radeonsi? ( llvm ) )
- wayland? ( egl gbm )
- xa? ( gallium )
- video_cards_freedreno? ( gallium )
- video_cards_intel? ( classic )
- video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( classic )
- video_cards_imx? ( gallium video_cards_vivante )
- video_cards_nouveau? ( || ( classic 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_vc4? ( gallium )
- video_cards_virgl? ( gallium )
- video_cards_vivante? ( gallium gbm )
- video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.91"
-RDEPEND="
- !app-eselect/eselect-mesa
- >=app-eselect/eselect-opengl-1.3.0
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1:=[${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}]
- 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}]
- )
- )
- opencl? (
- app-eselect/eselect-opencl
- dev-libs/libclc
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- vaapi? (
- >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
- video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
- )
- vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
- wayland? (
- >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
- >=dev-libs/wayland-protocols-1.8
- )
- xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-
${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] )
-"
-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. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_MAX_SLOT="6"
-LLVM_DEPSTR="
- || (
- sys-devel/llvm:7[${MULTILIB_USEDEP}]
- sys-devel/llvm:6[${MULTILIB_USEDEP}]
- sys-devel/llvm:5[${MULTILIB_USEDEP}]
- sys-devel/llvm:4[${MULTILIB_USEDEP}]
- >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
- )
- sys-devel/llvm:=[${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}
- 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}
- ${PYTHON_DEPS}
- opencl? (
- >=sys-devel/gcc-4.6
- )
- sys-devel/gettext
- virtual/pkgconfig
- valgrind? ( dev-util/valgrind )
- x11-base/xorg-proto
- vulkan? (
- $(python_gen_any_dep
">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
- )
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
- sys-devel/bison
- sys-devel/flex
- $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
- !pic? (
- 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
- )
-)"
-
-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[${flags}]" || return 1
- fi
- has_version "sys-devel/llvm[${flags}]"
-}
-
-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 llvm; then
- llvm_pkg_setup
- fi
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-17-execinfo.patch
- eapply "${FILESDIR}"/${PN}-17-musl-string_h.patch
- eapply "${FILESDIR}"/${PN}-17-musl-invocation_name.patch
- eapply "${FILESDIR}"/${PN}-18-musl-pthread.patch
- eapply "${FILESDIR}"/${PN}-18-intel-missing-time_t.patch
- eapply "${FILESDIR}"/${PN}-18-musl-amdgpu-include-pthread.patch
- eapply_user
- eautoreconf
-}
-
-multilib_src_configure() {
- local myconf
-
- if use classic; then
- # Configurable DRI drivers
- driver_enable swrast
-
- # Intel code
- driver_enable video_cards_i915 i915
- driver_enable video_cards_i965 i965
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- driver_enable video_cards_intel i915 i965
- fi
-
- # Nouveau code
- driver_enable video_cards_nouveau nouveau
-
- # ATI code
- driver_enable video_cards_r100 radeon
- driver_enable video_cards_r200 r200
- if ! use video_cards_r100 && \
- ! use video_cards_r200; then
- driver_enable video_cards_radeon radeon r200
- fi
- fi
-
- if use egl; then
- myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo
",wayland")$(use gbm && echo ",drm")"
- fi
-
- if use gallium; then
- myconf+="
- $(use_enable d3d9 nine)
- $(use_enable llvm)
- $(use_enable vaapi va)
- $(use_enable vdpau)
- $(use_enable xa)
- $(use_enable xvmc)
- "
- use vaapi && myconf+="
--with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
- gallium_enable swrast
- 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 video_cards_i915 i915
- gallium_enable video_cards_imx imx
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- gallium_enable video_cards_intel i915
- fi
-
- 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
- # opencl stuff
- if use opencl; then
- myconf+="
- $(use_enable opencl)
- --with-clang-libdir="${EPREFIX}/usr/lib"
- "
- fi
-
- gallium_enable video_cards_virgl virgl
- fi
-
- if use vulkan; then
- vulkan_enable video_cards_i965 intel
- vulkan_enable video_cards_radeonsi radeon
- fi
-
- # x86 hardened pax_kernel needs glx-rts, bug 240956
- if [[ ${ABI} == x86 ]]; then
- myconf+=" $(use_enable pax_kernel glx-read-only-text)"
- fi
-
- # on abi_x86_32 hardened we need to have asm disable
- if [[ ${ABI} == x86* ]] && use pic; then
- myconf+=" --disable-asm"
- fi
-
- if use gallium; then
- myconf+=" $(use_enable osmesa gallium-osmesa)"
- else
- myconf+=" $(use_enable osmesa)"
- fi
-
- # build fails with BSD indent, bug #428112
- use userland_GNU || export INDENT=cat
-
- ECONF_SOURCE="${S}" \
- econf \
- --enable-dri \
- --enable-glx \
- --enable-shared-glapi \
- $(use_enable !bindist texture-float) \
- $(use_enable d3d9 nine) \
- $(use_enable debug) \
- $(use_enable dri3) \
- $(use_enable egl) \
- $(use_enable gbm) \
- $(use_enable gles1) \
- $(use_enable gles2) \
- $(use_enable nptl glx-tls) \
- $(use_enable unwind libunwind) \
- --enable-valgrind=$(usex valgrind auto no) \
- --enable-llvm-shared-libs \
- --disable-opencl-icd \
- --with-dri-drivers=${DRI_DRIVERS} \
- --with-gallium-drivers=${GALLIUM_DRIVERS} \
- --with-vulkan-drivers=${VULKAN_DRIVERS} \
- PYTHON2="${PYTHON}" \
- ${myconf}
-}
-
-multilib_src_install() {
- emake install DESTDIR="${D}"
-
- if use wayland; then
- # These files are now provided by >=dev-libs/wayland-1.15.0
- rm "${ED}/usr/$(get_libdir)/libwayland-egl.so" || die
- rm "${ED}/usr/$(get_libdir)/libwayland-egl.so.1" || die
- rm "${ED}/usr/$(get_libdir)/libwayland-egl.so.1.0.0" || die
- rm "${ED}/usr/$(get_libdir)/pkgconfig/wayland-egl.pc" || die
- fi
-
- if use opencl; then
- ebegin "Moving Gallium/Clover OpenCL implementation for dynamic
switching"
- local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
- dodir ${cl_dir}/{lib,include}
- if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
- mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
- "${ED}"${cl_dir}
- fi
- if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
- mv -f "${ED}"/usr/include/CL \
- "${ED}"${cl_dir}/include
- fi
- eend $?
- fi
-}
-
-multilib_src_install_all() {
- find "${ED}" -name '*.la' -delete
- einstalldocs
-
- if use !bindist; then
- dodoc docs/patents.txt
- fi
-}
-
-multilib_src_test() {
- if use llvm; then
- local llvm_tests='lp_test_arit lp_test_arit lp_test_blend
lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format
lp_test_printf lp_test_printf'
- pushd src/gallium/drivers/llvmpipe >/dev/null || die
- emake ${llvm_tests}
- pax-mark m ${llvm_tests}
- popd >/dev/null || die
- fi
- emake check
-}
-
-pkg_postinst() {
- # Switch to the xorg implementation.
- echo
- eselect opengl set --use-old ${OPENGL_DIR}
-
- # Switch to mesa opencl
- if use opencl; then
- eselect opencl set --use-old ${PN}
- fi
-
- # warn about patent encumbered texture-float
- if use !bindist; then
- elog "USE=\"bindist\" was not set. Potentially patent
encumbered code was"
- elog "enabled. Please see /usr/share/doc/${P}/patents.txt.bz2
for an"
- elog "explanation."
- fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- DRI_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- DRI_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
-
-gallium_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- GALLIUM_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- GALLIUM_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
-
-vulkan_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- VULKAN_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- VULKAN_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
diff --git a/media-libs/mesa/mesa-18.1.9-r1.ebuild
b/media-libs/mesa/mesa-18.1.9-r1.ebuild
deleted file mode 100644
index ca6486f..0000000
--- a/media-libs/mesa/mesa-18.1.9-r1.ebuild
+++ /dev/null
@@ -1,520 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git";
-
-if [[ ${PV} = 9999 ]]; then
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/";
-
-if [[ $PV == 9999 ]]; then
- SRC_URI=""
-else
- SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz";
- KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl
vivante vmware"
-for card in ${VIDEO_CARDS}; do
- IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
- bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
- +llvm +nptl opencl osmesa pax_kernel pic selinux vaapi valgrind
- vdpau vulkan wayland xvmc xa"
-
-REQUIRED_USE="
- d3d9? ( dri3 gallium )
- llvm? ( gallium )
- opencl? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi ) )
- gles1? ( egl )
- gles2? ( egl )
- vaapi? ( gallium )
- vdpau? ( gallium )
- vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
- video_cards_radeonsi? ( llvm ) )
- wayland? ( egl gbm )
- xa? ( gallium )
- video_cards_freedreno? ( gallium )
- video_cards_intel? ( classic )
- video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( classic )
- video_cards_imx? ( gallium video_cards_vivante )
- video_cards_nouveau? ( || ( classic 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_vc4? ( gallium )
- video_cards_virgl? ( gallium )
- video_cards_vivante? ( gallium gbm )
- video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.91"
-RDEPEND="
- !app-eselect/eselect-mesa
- >=app-eselect/eselect-opengl-1.3.0
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1:=[${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}]
- 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}]
- )
- )
- opencl? (
- app-eselect/eselect-opencl
- dev-libs/libclc
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- vaapi? (
- >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
- video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
- )
- vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
- wayland? (
- >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
- >=dev-libs/wayland-protocols-1.8
- )
- xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-
${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] )
-"
-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. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_MAX_SLOT="6"
-LLVM_DEPSTR="
- || (
- sys-devel/llvm:7[${MULTILIB_USEDEP}]
- sys-devel/llvm:6[${MULTILIB_USEDEP}]
- sys-devel/llvm:5[${MULTILIB_USEDEP}]
- sys-devel/llvm:4[${MULTILIB_USEDEP}]
- >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
- )
- sys-devel/llvm:=[${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}
- 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}
- ${PYTHON_DEPS}
- opencl? (
- >=sys-devel/gcc-4.6
- )
- sys-devel/gettext
- virtual/pkgconfig
- valgrind? ( dev-util/valgrind )
- x11-base/xorg-proto
- vulkan? (
- $(python_gen_any_dep
">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
- )
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
- sys-devel/bison
- sys-devel/flex
- $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
- !pic? (
- 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
- )
-)"
-
-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[${flags}]" || return 1
- fi
- has_version "sys-devel/llvm[${flags}]"
-}
-
-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 llvm; then
- llvm_pkg_setup
- fi
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-17-execinfo.patch
- eapply "${FILESDIR}"/${PN}-17-musl-string_h.patch
- eapply "${FILESDIR}"/${PN}-17-musl-invocation_name.patch
- eapply "${FILESDIR}"/${PN}-18-musl-pthread.patch
- eapply "${FILESDIR}"/${PN}-18-intel-missing-time_t.patch
- eapply "${FILESDIR}"/${PN}-18-musl-amdgpu-include-pthread.patch
- eapply "${FILESDIR}"/${PN}-18-musl-larger-stacksize.patch
- eapply_user
- eautoreconf
-}
-
-multilib_src_configure() {
- local myconf
-
- if use classic; then
- # Configurable DRI drivers
- driver_enable swrast
-
- # Intel code
- driver_enable video_cards_i915 i915
- driver_enable video_cards_i965 i965
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- driver_enable video_cards_intel i915 i965
- fi
-
- # Nouveau code
- driver_enable video_cards_nouveau nouveau
-
- # ATI code
- driver_enable video_cards_r100 radeon
- driver_enable video_cards_r200 r200
- if ! use video_cards_r100 && \
- ! use video_cards_r200; then
- driver_enable video_cards_radeon radeon r200
- fi
- fi
-
- if use egl; then
- myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo
",wayland")$(use gbm && echo ",drm")"
- fi
-
- if use gallium; then
- myconf+="
- $(use_enable d3d9 nine)
- $(use_enable llvm)
- $(use_enable vaapi va)
- $(use_enable vdpau)
- $(use_enable xa)
- $(use_enable xvmc)
- "
- use vaapi && myconf+="
--with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
- gallium_enable swrast
- 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 video_cards_i915 i915
- gallium_enable video_cards_imx imx
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- gallium_enable video_cards_intel i915
- fi
-
- 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
- # opencl stuff
- if use opencl; then
- myconf+="
- $(use_enable opencl)
- --with-clang-libdir="${EPREFIX}/usr/lib"
- "
- fi
-
- gallium_enable video_cards_virgl virgl
- fi
-
- if use vulkan; then
- vulkan_enable video_cards_i965 intel
- vulkan_enable video_cards_radeonsi radeon
- fi
-
- # x86 hardened pax_kernel needs glx-rts, bug 240956
- if [[ ${ABI} == x86 ]]; then
- myconf+=" $(use_enable pax_kernel glx-read-only-text)"
- fi
-
- # on abi_x86_32 hardened we need to have asm disable
- if [[ ${ABI} == x86* ]] && use pic; then
- myconf+=" --disable-asm"
- fi
-
- if use gallium; then
- myconf+=" $(use_enable osmesa gallium-osmesa)"
- else
- myconf+=" $(use_enable osmesa)"
- fi
-
- # build fails with BSD indent, bug #428112
- use userland_GNU || export INDENT=cat
-
- ECONF_SOURCE="${S}" \
- econf \
- --enable-dri \
- --enable-glx \
- --enable-shared-glapi \
- $(use_enable !bindist texture-float) \
- $(use_enable d3d9 nine) \
- $(use_enable debug) \
- $(use_enable dri3) \
- $(use_enable egl) \
- $(use_enable gbm) \
- $(use_enable gles1) \
- $(use_enable gles2) \
- $(use_enable nptl glx-tls) \
- $(use_enable unwind libunwind) \
- --enable-valgrind=$(usex valgrind auto no) \
- --enable-llvm-shared-libs \
- --disable-opencl-icd \
- --with-dri-drivers=${DRI_DRIVERS} \
- --with-gallium-drivers=${GALLIUM_DRIVERS} \
- --with-vulkan-drivers=${VULKAN_DRIVERS} \
- PYTHON2="${PYTHON}" \
- ${myconf}
-}
-
-multilib_src_install() {
- emake install DESTDIR="${D}"
-
- if use wayland; then
- # These files are now provided by >=dev-libs/wayland-1.15.0
- rm "${ED}/usr/$(get_libdir)/libwayland-egl.so" || die
- rm "${ED}/usr/$(get_libdir)/libwayland-egl.so.1" || die
- rm "${ED}/usr/$(get_libdir)/libwayland-egl.so.1.0.0" || die
- rm "${ED}/usr/$(get_libdir)/pkgconfig/wayland-egl.pc" || die
- fi
-
- if use opencl; then
- ebegin "Moving Gallium/Clover OpenCL implementation for dynamic
switching"
- local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
- dodir ${cl_dir}/{lib,include}
- if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
- mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
- "${ED}"${cl_dir}
- fi
- if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
- mv -f "${ED}"/usr/include/CL \
- "${ED}"${cl_dir}/include
- fi
- eend $?
- fi
-}
-
-multilib_src_install_all() {
- find "${ED}" -name '*.la' -delete
- einstalldocs
-
- if use !bindist; then
- dodoc docs/patents.txt
- fi
-}
-
-multilib_src_test() {
- if use llvm; then
- local llvm_tests='lp_test_arit lp_test_arit lp_test_blend
lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format
lp_test_printf lp_test_printf'
- pushd src/gallium/drivers/llvmpipe >/dev/null || die
- emake ${llvm_tests}
- pax-mark m ${llvm_tests}
- popd >/dev/null || die
- fi
- emake check
-}
-
-pkg_postinst() {
- # Switch to the xorg implementation.
- echo
- eselect opengl set --use-old ${OPENGL_DIR}
-
- # Switch to mesa opencl
- if use opencl; then
- eselect opencl set --use-old ${PN}
- fi
-
- # warn about patent encumbered texture-float
- if use !bindist; then
- elog "USE=\"bindist\" was not set. Potentially patent
encumbered code was"
- elog "enabled. Please see /usr/share/doc/${P}/patents.txt.bz2
for an"
- elog "explanation."
- fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- DRI_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- DRI_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
-
-gallium_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- GALLIUM_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- GALLIUM_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
-
-vulkan_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- VULKAN_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- VULKAN_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
diff --git a/media-libs/mesa/mesa-18.2.4.ebuild
b/media-libs/mesa/mesa-18.2.8.ebuild
similarity index 94%
copy from media-libs/mesa/mesa-18.2.4.ebuild
copy to media-libs/mesa/mesa-18.2.8.ebuild
index 09f49a9..68f8024 100644
--- a/media-libs/mesa/mesa-18.2.4.ebuild
+++ b/media-libs/mesa/mesa-18.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -41,7 +41,7 @@ IUSE="${IUSE_VIDEO_CARDS}
vulkan wayland xa xvmc"
REQUIRED_USE="
- d3d9? ( dri3 )
+ d3d9? ( dri3 || ( video_cards_r300 video_cards_r600
video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
gles1? ( egl )
gles2? ( egl )
vulkan? ( dri3
@@ -132,8 +132,8 @@ RDEPEND="${RDEPEND}
#
# 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. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+# 2. Update the := to specify *max* version, e.g. < 8.
+# 3. Specify LLVM_MAX_SLOT, e.g. 7.
LLVM_MAX_SLOT="7"
LLVM_DEPSTR="
|| (
@@ -141,9 +141,8 @@ LLVM_DEPSTR="
sys-devel/llvm:6[${MULTILIB_USEDEP}]
sys-devel/llvm:5[${MULTILIB_USEDEP}]
sys-devel/llvm:4[${MULTILIB_USEDEP}]
- >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
)
- sys-devel/llvm:=[${MULTILIB_USEDEP}]
+ <sys-devel/llvm-8:=[${MULTILIB_USEDEP}]
"
LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
@@ -232,13 +231,12 @@ x86? (
)"
PATCHES=(
- "${FILESDIR}"/${P}-meson-link-gallium-nine-with-pthreads.patch
"${FILESDIR}"/${PN}-17-execinfo.patch
"${FILESDIR}"/${PN}-17-musl-string_h.patch
"${FILESDIR}"/${PN}-18-musl-invocation_name.patch
"${FILESDIR}"/${PN}-18-musl-pthread.patch
"${FILESDIR}"/${PN}-18-musl-amdgpu-include-pthread.patch
- "${FILESDIR}"/${P}-add-disable-tls-support.patch
+ "${FILESDIR}"/${PN}-18.2.4-add-disable-tls-support.patch
)
llvm_check_deps() {
@@ -255,16 +253,6 @@ llvm_check_deps() {
}
pkg_pretend() {
- if use d3d9; then
- if ! use video_cards_r300 &&
- ! use video_cards_r600 &&
- ! use video_cards_radeonsi &&
- ! use video_cards_nouveau &&
- ! use video_cards_vmware; then
- ewarn "Ignoring USE=d3d9 since VIDEO_CARDS does
not contain r300, r600, radeonsi, nouveau, or vmware"
- fi
- fi
-
if use opencl; then
if ! use video_cards_r600 &&
! use video_cards_radeonsi; then
@@ -305,7 +293,6 @@ pkg_pretend() {
fi
if ! use gallium; then
- use d3d9 && ewarn "Ignoring USE=d3d9 since USE does
not contain gallium"
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"
@@ -381,7 +368,7 @@ multilib_src_configure() {
use video_cards_radeonsi ||
use video_cards_nouveau; then
emesonargs+=($(meson_use vaapi gallium-va))
- use vaapi && emesonargs+=(
-Dva-libs-path=/usr/$(get_libdir)/va/drivers )
+ use vaapi && emesonargs+=(
-Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
else
emesonargs+=(-Dgallium-va=false)
fi
diff --git a/media-libs/mesa/mesa-18.2.1.ebuild
b/media-libs/mesa/mesa-18.3.4.ebuild
similarity index 87%
rename from media-libs/mesa/mesa-18.2.1.ebuild
rename to media-libs/mesa/mesa-18.3.4.ebuild
index e128919..0b02534 100644
--- a/media-libs/mesa/mesa-18.2.1.ebuild
+++ b/media-libs/mesa/mesa-18.3.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_4 python3_5 python3_6 python3_7 )
inherit llvm meson multilib-minimal pax-utils python-any-r1
@@ -41,7 +41,7 @@ IUSE="${IUSE_VIDEO_CARDS}
vulkan wayland xa xvmc"
REQUIRED_USE="
- d3d9? ( dri3 )
+ d3d9? ( dri3 || ( video_cards_r300 video_cards_r600
video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
gles1? ( egl )
gles2? ( egl )
vulkan? ( dri3
@@ -67,7 +67,7 @@ REQUIRED_USE="
video_cards_vmware? ( gallium )
"
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.93"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.96"
RDEPEND="
!app-eselect/eselect-mesa
>=app-eselect/eselect-opengl-1.3.0
@@ -95,7 +95,7 @@ RDEPEND="
)
lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
opencl? (
- app-eselect/eselect-opencl
+
dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
dev-libs/libclc
virtual/libelf:0=[${MULTILIB_USEDEP}]
)
@@ -132,8 +132,8 @@ RDEPEND="${RDEPEND}
#
# 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. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+# 2. Update the := to specify *max* version, e.g. < 8.
+# 3. Specify LLVM_MAX_SLOT, e.g. 7.
LLVM_MAX_SLOT="7"
LLVM_DEPSTR="
|| (
@@ -141,9 +141,8 @@ LLVM_DEPSTR="
sys-devel/llvm:6[${MULTILIB_USEDEP}]
sys-devel/llvm:5[${MULTILIB_USEDEP}]
sys-devel/llvm:4[${MULTILIB_USEDEP}]
- >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
)
- sys-devel/llvm:=[${MULTILIB_USEDEP}]
+ <sys-devel/llvm-8:=[${MULTILIB_USEDEP}]
"
LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
@@ -231,6 +230,15 @@ x86? (
)
)"
+PATCHES=(
+ "${FILESDIR}"/${PN}-17-execinfo.patch
+ "${FILESDIR}"/${PN}-17-musl-string_h.patch
+ "${FILESDIR}"/${PN}-18-musl-invocation_name.patch
+ "${FILESDIR}"/${PN}-18-musl-pthread.patch
+ "${FILESDIR}"/${PN}-18-musl-amdgpu-include-pthread.patch
+ "${FILESDIR}"/${PN}-18.2.4-add-disable-tls-support.patch
+)
+
llvm_check_deps() {
local flags=${MULTILIB_USEDEP}
if use video_cards_r600 || use video_cards_radeon || use
video_cards_radeonsi
@@ -245,16 +253,6 @@ llvm_check_deps() {
}
pkg_pretend() {
- if use d3d9; then
- if ! use video_cards_r300 &&
- ! use video_cards_r600 &&
- ! use video_cards_radeonsi &&
- ! use video_cards_nouveau &&
- ! use video_cards_vmware; then
- ewarn "Ignoring USE=d3d9 since VIDEO_CARDS does
not contain r300, r600, radeonsi, nouveau, or vmware"
- fi
- fi
-
if use opencl; then
if ! use video_cards_r600 &&
! use video_cards_radeonsi; then
@@ -295,7 +293,6 @@ pkg_pretend() {
fi
if ! use gallium; then
- use d3d9 && ewarn "Ignoring USE=d3d9 since USE does
not contain gallium"
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"
@@ -311,6 +308,10 @@ pkg_pretend() {
fi
}
+python_check_deps() {
+ has_version --host-root ">=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
@@ -324,16 +325,6 @@ pkg_setup() {
python-any-r1_pkg_setup
}
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-17-execinfo.patch
- eapply "${FILESDIR}"/${PN}-17-musl-string_h.patch
- eapply "${FILESDIR}"/${PN}-18-musl-invocation_name.patch
- eapply "${FILESDIR}"/${PN}-18-musl-pthread.patch
- #eapply "${FILESDIR}"/${PN}-18-intel-missing-time_t.patch
- eapply "${FILESDIR}"/${PN}-18-musl-amdgpu-include-pthread.patch
- eapply_user
-}
-
multilib_src_configure() {
local emesonargs=()
@@ -381,7 +372,7 @@ multilib_src_configure() {
use video_cards_radeonsi ||
use video_cards_nouveau; then
emesonargs+=($(meson_use vaapi gallium-va))
- use vaapi && emesonargs+=(
-Dva-libs-path=/usr/$(get_libdir)/va/drivers )
+ use vaapi && emesonargs+=(
-Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
else
emesonargs+=(-Dgallium-va=false)
fi
@@ -434,14 +425,12 @@ multilib_src_configure() {
fi
gallium_enable video_cards_freedreno freedreno
- # opencl stuff
- if use opencl; then
- emesonargs+=(
- -Dgallium-opencl="$(usex opencl standalone
disabled)"
- )
- fi
-
gallium_enable video_cards_virgl virgl
+
+ # opencl stuff
+ emesonargs+=(
+ -Dgallium-opencl="$(usex opencl icd disabled)"
+ )
fi
if use vulkan; then
@@ -454,6 +443,11 @@ multilib_src_configure() {
emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
fi
+ # Disable glx tls support on musl
+ if use elibc_musl; then
+ emesonargs+=( -Dglx-tls=false )
+ fi
+
# on abi_x86_32 hardened we need to have asm disable
if [[ ${ABI} == x86* ]] && use pic; then
emesonargs+=( -Dasm=false )
@@ -498,21 +492,6 @@ multilib_src_compile() {
multilib_src_install() {
meson_src_install
-
- if use opencl; then
- ebegin "Moving Gallium/Clover OpenCL implementation for dynamic
switching"
- local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
- dodir ${cl_dir}/{lib,include}
- if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
- mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
- "${ED}"${cl_dir}
- fi
- if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
- mv -f "${ED}"/usr/include/CL \
- "${ED}"${cl_dir}/include
- fi
- eend $?
- fi
}
multilib_src_install_all() {
@@ -527,11 +506,6 @@ pkg_postinst() {
# Switch to the xorg implementation.
echo
eselect opengl set --use-old ${OPENGL_DIR}
-
- # Switch to mesa opencl
- if use opencl; then
- eselect opencl set --use-old ${PN}
- fi
}
# $1 - VIDEO_CARDS flag (check skipped for "--")
diff --git a/media-libs/mesa/mesa-18.2.4.ebuild
b/media-libs/mesa/mesa-18.3.5.ebuild
similarity index 93%
copy from media-libs/mesa/mesa-18.2.4.ebuild
copy to media-libs/mesa/mesa-18.3.5.ebuild
index 09f49a9..f49d518 100644
--- a/media-libs/mesa/mesa-18.2.4.ebuild
+++ b/media-libs/mesa/mesa-18.3.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_4 python3_5 python3_6 python3_7 )
inherit llvm meson multilib-minimal pax-utils python-any-r1
@@ -36,12 +36,12 @@ for card in ${VIDEO_CARDS}; do
done
IUSE="${IUSE_VIDEO_CARDS}
- +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
lm_sensors
+ +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm
lm_sensors
opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
vulkan wayland xa xvmc"
REQUIRED_USE="
- d3d9? ( dri3 )
+ d3d9? ( dri3 || ( video_cards_r300 video_cards_r600
video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
gles1? ( egl )
gles2? ( egl )
vulkan? ( dri3
@@ -67,7 +67,7 @@ REQUIRED_USE="
video_cards_vmware? ( gallium )
"
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.93"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.96"
RDEPEND="
!app-eselect/eselect-mesa
>=app-eselect/eselect-opengl-1.3.0
@@ -132,8 +132,8 @@ RDEPEND="${RDEPEND}
#
# 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. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+# 2. Update the := to specify *max* version, e.g. < 8.
+# 3. Specify LLVM_MAX_SLOT, e.g. 7.
LLVM_MAX_SLOT="7"
LLVM_DEPSTR="
|| (
@@ -141,9 +141,8 @@ LLVM_DEPSTR="
sys-devel/llvm:6[${MULTILIB_USEDEP}]
sys-devel/llvm:5[${MULTILIB_USEDEP}]
sys-devel/llvm:4[${MULTILIB_USEDEP}]
- >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
)
- sys-devel/llvm:=[${MULTILIB_USEDEP}]
+ <sys-devel/llvm-8:=[${MULTILIB_USEDEP}]
"
LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
@@ -232,13 +231,12 @@ x86? (
)"
PATCHES=(
- "${FILESDIR}"/${P}-meson-link-gallium-nine-with-pthreads.patch
"${FILESDIR}"/${PN}-17-execinfo.patch
"${FILESDIR}"/${PN}-17-musl-string_h.patch
"${FILESDIR}"/${PN}-18-musl-invocation_name.patch
"${FILESDIR}"/${PN}-18-musl-pthread.patch
"${FILESDIR}"/${PN}-18-musl-amdgpu-include-pthread.patch
- "${FILESDIR}"/${P}-add-disable-tls-support.patch
+ "${FILESDIR}"/${PN}-18.2.4-add-disable-tls-support.patch
)
llvm_check_deps() {
@@ -255,16 +253,6 @@ llvm_check_deps() {
}
pkg_pretend() {
- if use d3d9; then
- if ! use video_cards_r300 &&
- ! use video_cards_r600 &&
- ! use video_cards_radeonsi &&
- ! use video_cards_nouveau &&
- ! use video_cards_vmware; then
- ewarn "Ignoring USE=d3d9 since VIDEO_CARDS does
not contain r300, r600, radeonsi, nouveau, or vmware"
- fi
- fi
-
if use opencl; then
if ! use video_cards_r600 &&
! use video_cards_radeonsi; then
@@ -305,7 +293,6 @@ pkg_pretend() {
fi
if ! use gallium; then
- use d3d9 && ewarn "Ignoring USE=d3d9 since USE does
not contain gallium"
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"
@@ -321,6 +308,10 @@ pkg_pretend() {
fi
}
+python_check_deps() {
+ has_version --host-root ">=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
@@ -381,7 +372,7 @@ multilib_src_configure() {
use video_cards_radeonsi ||
use video_cards_nouveau; then
emesonargs+=($(meson_use vaapi gallium-va))
- use vaapi && emesonargs+=(
-Dva-libs-path=/usr/$(get_libdir)/va/drivers )
+ use vaapi && emesonargs+=(
-Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
else
emesonargs+=(-Dgallium-va=false)
fi
diff --git a/media-libs/mesa/mesa-18.2.4.ebuild
b/media-libs/mesa/mesa-19.0.0.ebuild
similarity index 91%
rename from media-libs/mesa/mesa-18.2.4.ebuild
rename to media-libs/mesa/mesa-19.0.0.ebuild
index 09f49a9..16fe459 100644
--- a/media-libs/mesa/mesa-18.2.4.ebuild
+++ b/media-libs/mesa/mesa-19.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_4 python3_5 python3_6 python3_7 )
inherit llvm meson multilib-minimal pax-utils python-any-r1
@@ -36,12 +36,12 @@ for card in ${VIDEO_CARDS}; do
done
IUSE="${IUSE_VIDEO_CARDS}
- +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
lm_sensors
- opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
- vulkan wayland xa xvmc"
+ +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd
+llvm
+ lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi
valgrind
+ vdpau vulkan wayland xa xvmc"
REQUIRED_USE="
- d3d9? ( dri3 )
+ d3d9? ( dri3 || ( video_cards_r300 video_cards_r600
video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
gles1? ( egl )
gles2? ( egl )
vulkan? ( dri3
@@ -67,10 +67,9 @@ REQUIRED_USE="
video_cards_vmware? ( gallium )
"
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.93"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
RDEPEND="
!app-eselect/eselect-mesa
- >=app-eselect/eselect-opengl-1.3.0
>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
@@ -80,6 +79,13 @@ RDEPEND="
>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+ libglvnd? (
+ media-libs/libglvnd[${MULTILIB_USEDEP}]
+ !app-eselect/eselect-opengl
+ )
+ !libglvnd? (
+ >=app-eselect/eselect-opengl-1.3.0
+ )
gallium? (
unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
llvm? (
@@ -132,18 +138,15 @@ RDEPEND="${RDEPEND}
#
# 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. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_MAX_SLOT="7"
+# 2. Update the := to specify *max* version, e.g. < 9.
+# 3. Specify LLVM_MAX_SLOT, e.g. 8.
+LLVM_MAX_SLOT="8"
LLVM_DEPSTR="
|| (
+ sys-devel/llvm:8[${MULTILIB_USEDEP}]
sys-devel/llvm:7[${MULTILIB_USEDEP}]
- sys-devel/llvm:6[${MULTILIB_USEDEP}]
- sys-devel/llvm:5[${MULTILIB_USEDEP}]
- sys-devel/llvm:4[${MULTILIB_USEDEP}]
- >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
)
- sys-devel/llvm:=[${MULTILIB_USEDEP}]
+ <sys-devel/llvm-9:=[${MULTILIB_USEDEP}]
"
LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
@@ -232,13 +235,12 @@ x86? (
)"
PATCHES=(
- "${FILESDIR}"/${P}-meson-link-gallium-nine-with-pthreads.patch
"${FILESDIR}"/${PN}-17-execinfo.patch
"${FILESDIR}"/${PN}-17-musl-string_h.patch
"${FILESDIR}"/${PN}-18-musl-invocation_name.patch
"${FILESDIR}"/${PN}-18-musl-pthread.patch
"${FILESDIR}"/${PN}-18-musl-amdgpu-include-pthread.patch
- "${FILESDIR}"/${P}-add-disable-tls-support.patch
+ "${FILESDIR}"/${PN}-18.2.4-add-disable-tls-support.patch
)
llvm_check_deps() {
@@ -255,16 +257,6 @@ llvm_check_deps() {
}
pkg_pretend() {
- if use d3d9; then
- if ! use video_cards_r300 &&
- ! use video_cards_r600 &&
- ! use video_cards_radeonsi &&
- ! use video_cards_nouveau &&
- ! use video_cards_vmware; then
- ewarn "Ignoring USE=d3d9 since VIDEO_CARDS does
not contain r300, r600, radeonsi, nouveau, or vmware"
- fi
- fi
-
if use opencl; then
if ! use video_cards_r600 &&
! use video_cards_radeonsi; then
@@ -305,7 +297,6 @@ pkg_pretend() {
fi
if ! use gallium; then
- use d3d9 && ewarn "Ignoring USE=d3d9 since USE does
not contain gallium"
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"
@@ -321,6 +312,10 @@ pkg_pretend() {
fi
}
+python_check_deps() {
+ has_version --host-root ">=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
@@ -381,7 +376,7 @@ multilib_src_configure() {
use video_cards_radeonsi ||
use video_cards_nouveau; then
emesonargs+=($(meson_use vaapi gallium-va))
- use vaapi && emesonargs+=(
-Dva-libs-path=/usr/$(get_libdir)/va/drivers )
+ use vaapi && emesonargs+=(
-Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
else
emesonargs+=(-Dgallium-va=false)
fi
@@ -484,6 +479,7 @@ multilib_src_configure() {
$(meson_use gbm)
$(meson_use gles1)
$(meson_use gles2)
+ $(meson_use libglvnd glvnd)
$(meson_use selinux)
-Dvalgrind=$(usex valgrind auto false)
-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
@@ -501,6 +497,8 @@ multilib_src_compile() {
multilib_src_install() {
meson_src_install
+
+ use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
}
multilib_src_install_all() {
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index f978f99..23679a7 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -6,7 +6,6 @@
<name>X11</name>
</maintainer>
<use>
- <flag name="bindist">Disable patent-encumbered
ARB_texture_float, EXT_texture_shared_exponent, and EXT_packed_float
extensions.</flag>
<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="dri3">Enable DRI3 support.</flag>
@@ -15,6 +14,7 @@
<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="libglvnd">Use libglvnd for dispatch.</flag>
<flag name="llvm">Enable LLVM backend for Gallium3D.</flag>
<flag name="opencl">Enable the Clover Gallium OpenCL state
tracker.</flag>
<flag name="osmesa">Build the Mesa library for off-screen
rendering.</flag>
