commit: 3679d1f346ac7d37f44d2c9d695aecc401f30ac8 Author: stefson <herrtimson <AT> yahoo <DOT> de> AuthorDate: Sun Oct 20 14:17:21 2019 +0000 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> CommitDate: Sun Oct 20 22:10:28 2019 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3679d1f3
media-libs/mesa: add stable v19.1.7, remove old Closes: https://github.com/gentoo/musl/pull/270 Signed-off-by: Steffen Kuhn <nielson2 <AT> yandex.com> Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> media-libs/mesa/Manifest | 3 +- .../mesa/files/mesa-19.1.4-musl-upstream-fix.patch | 227 --------- media-libs/mesa/mesa-19.0.8.ebuild | 535 --------------------- .../{mesa-19.1.4.ebuild => mesa-19.1.7.ebuild} | 3 +- 4 files changed, 2 insertions(+), 766 deletions(-) diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index d5e1046..4bd3cb8 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,3 +1,2 @@ -DIST mesa-19.0.8.tar.xz 11967592 BLAKE2B 91a46b67bdb8cb3ab4c7337be7c2b0dc6ab5ec8cc126afc2d8af8d056bff0392a5b443c26304bf4c68472eb6ba16d29ca248c1fc0c0f2dd6af03d3e10d3ec1b3 SHA512 fbddc3a74f223564343027380af776b3fa5d63fe1af4e34121273235d1c6eced96439f601eb19bf658eb927aff3965b520f0329fcbd4650f3112167303e1746d -DIST mesa-19.1.4.tar.xz 10938008 BLAKE2B 4745fc7e844397378fe1adf61bcd5b54aad11ec0b375ced85fd80ced01227432b491ad8b7ba7d9013190cfbb451bc11cdb7c8af0e1f298dd5d793d3ce43aa92b SHA512 234032d917c9b378c3f6ceb921677b64e549344c3957331810b50fd73e0dccd2f4f62e2bd39e619590f389bc58fdab10fab4b88f7c117557cbeb1dda049b9fc5 +DIST mesa-19.1.7.tar.xz 10941152 BLAKE2B 6be14ddac404668bdd8b7b8756388019c3610ac41b65a7723a419b97b7eccbca666ad6d904f4cde186c4b171e056636a8a6a5727e30963c8fa177d7861bd6cfb SHA512 0865b5f91e5daa00e1da2b3d8b65fe5d2ff6332372bf8fec7d671d05d8d64ec5a7abea1858cdfc506c76b7226d2bea0af3426565f156b796d8e0f949ea33dc15 DIST mesa-19.2.1.tar.xz 11468492 BLAKE2B 9f6a1a5426343213a19dccb07917326b887ddc6ec02426b0604bea35a529f33c18ca46e2db09eb44c5b4a3b6e70da5f8fc7e049b1a0febd35d0de8f2ec4d2641 SHA512 decd74976fe866bf67fac4ae55a62d8e33ad24278dd58effe533e7d258b249f0ead848360e7e71444265184c6d9d9b04361caf0c6df99504e33599e7a0cd6c5d diff --git a/media-libs/mesa/files/mesa-19.1.4-musl-upstream-fix.patch b/media-libs/mesa/files/mesa-19.1.4-musl-upstream-fix.patch deleted file mode 100644 index 5c02abd..0000000 --- a/media-libs/mesa/files/mesa-19.1.4-musl-upstream-fix.patch +++ /dev/null @@ -1,227 +0,0 @@ -From 9c411e020d164563fb6fcd92a28a435277bf0745 Mon Sep 17 00:00:00 2001 -From: Matt Turner <[email protected]> -Date: Wed, 24 Jul 2019 18:26:49 -0700 -Subject: [PATCH 1/5] util: Drop preprocessor guards for glibc-2.12 - -glibc-2.12 was released in 2010. No one is building new Mesa against 9 -year old glibc, and removing these checks allows the code to work on -other C libraries like musl. - -Acked-by: Eric Engestrom <[email protected]> ---- - src/util/u_thread.h | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/src/util/u_thread.h b/src/util/u_thread.h -index a46c18d3db2..8c8cc803199 100644 ---- a/src/util/u_thread.h -+++ b/src/util/u_thread.h -@@ -61,11 +61,7 @@ static inline thrd_t u_thread_create(int (*routine)(void *), void *param) - static inline void u_thread_setname( const char *name ) - { - #if defined(HAVE_PTHREAD) --# if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \ -- (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12)) && \ -- defined(__linux__) - pthread_setname_np(pthread_self(), name); --# endif - #endif - (void)name; - } -@@ -150,10 +146,7 @@ u_thread_get_time_nano(thrd_t thread) - static inline bool u_thread_is_self(thrd_t thread) - { - #if defined(HAVE_PTHREAD) --# if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \ -- (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12)) - return pthread_equal(pthread_self(), thread); --# endif - #endif - return false; - } --- -2.21.0 - - -From 9cc4311d86a797bba26448bcaf24db4887c6ec8d Mon Sep 17 00:00:00 2001 -From: Matt Turner <[email protected]> -Date: Wed, 24 Jul 2019 18:28:38 -0700 -Subject: [PATCH 2/5] st/nine: Drop preprocessor guards for glibc-2.12 - -Same rationale as the previous patch, but additionally these checks just -seem entirely unnecessary. pthread_self() has been used in Mesa since at -least 1999. - -Acked-by: Eric Engestrom <[email protected]> ---- - src/gallium/state_trackers/nine/nine_debug.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/gallium/state_trackers/nine/nine_debug.c b/src/gallium/state_trackers/nine/nine_debug.c -index 904a40fde83..784d535d213 100644 ---- a/src/gallium/state_trackers/nine/nine_debug.c -+++ b/src/gallium/state_trackers/nine/nine_debug.c -@@ -73,11 +73,8 @@ _nine_debug_printf( unsigned long flag, - } - - #if defined(HAVE_PTHREAD) --# if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \ -- (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12)) - if (dbg_flags & DBG_TID) - tid = pthread_self(); --# endif - #endif - - if (dbg_flags & flag) { --- -2.21.0 - - -From c96407f37ef8325db11ae5fdb16e372cbc663bf4 Mon Sep 17 00:00:00 2001 -From: Matt Turner <[email protected]> -Date: Wed, 24 Jul 2019 18:44:35 -0700 -Subject: [PATCH 3/5] meson: Test for random_r() - -It's better to test for needed functions instead of using external -knowledge about presence in this or that C library. - -Reviewed-by: Eric Engestrom <[email protected]> ---- - meson.build | 2 +- - src/glx/glxhash.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 542c35d525b..8dc431cfc5b 100644 ---- a/meson.build -+++ b/meson.build -@@ -1029,7 +1029,7 @@ foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h', 'endian.h', 'dlfcn.h' - endif - endforeach - --foreach f : ['strtof', 'mkostemp', 'posix_memalign', 'timespec_get', 'memfd_create'] -+foreach f : ['strtof', 'mkostemp', 'posix_memalign', 'timespec_get', 'memfd_create', 'random_r'] - if cc.has_function(f) - pre_args += '-DHAVE_@0@'.format(f.to_upper()) - endif -diff --git a/src/glx/glxhash.c b/src/glx/glxhash.c -index b76ec323459..5a89bf99b1c 100644 ---- a/src/glx/glxhash.c -+++ b/src/glx/glxhash.c -@@ -88,7 +88,7 @@ - - #define HASH_ALLOC malloc - #define HASH_FREE free --#ifndef __GLIBC__ -+#ifndef HAVE_RANDOM_R - #define HASH_RANDOM_DECL char *ps, rs[256] - #define HASH_RANDOM_INIT(seed) ps = initstate(seed, rs, sizeof(rs)) - #define HASH_RANDOM random() --- -2.21.0 - - -From 597bddad47e831474a33cde054c40bbd2cbc0600 Mon Sep 17 00:00:00 2001 -From: Matt Turner <[email protected]> -Date: Mon, 29 Jul 2019 15:31:34 -0700 -Subject: [PATCH 4/5] scons: Test for random_r() - -Suggested-by: Eric Engestrom <[email protected]> ---- - scons/gallium.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/scons/gallium.py b/scons/gallium.py -index 27727612d14..6d5b2fccc17 100755 ---- a/scons/gallium.py -+++ b/scons/gallium.py -@@ -368,6 +368,9 @@ def generate(env): - if check_functions(env, ['strtod_l', 'strtof_l']): - cppdefines += ['HAVE_STRTOD_L'] - -+ if check_functions(env, 'random_r'): -+ cppdefines += ['HAVE_RANDOM_R'] -+ - if check_functions(env, ['timespec_get']): - cppdefines += ['HAVE_TIMESPEC_GET'] - --- -2.21.0 - - -From c9b86cf52692f1d76314dce345080af8ce786792 Mon Sep 17 00:00:00 2001 -From: Matt Turner <[email protected]> -Date: Mon, 29 Jul 2019 13:51:55 -0700 -Subject: [PATCH 5/5] meson: Test for program_invocation_name - -program_invocation_name and program_invocation_short_name are both GNU -extensions. I don't believe one can exist without the other, so only -check for program_invocation_name. - -Reviewed-by: Eric Engestrom <[email protected]> ---- - meson.build | 7 +++++++ - src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c | 2 +- - src/util/u_process.c | 8 ++------ - 3 files changed, 10 insertions(+), 7 deletions(-) - -diff --git a/meson.build b/meson.build -index 8dc431cfc5b..c9f96e7135d 100644 ---- a/meson.build -+++ b/meson.build -@@ -1035,6 +1035,13 @@ foreach f : ['strtof', 'mkostemp', 'posix_memalign', 'timespec_get', 'memfd_crea - endif - endforeach - -+if cc.has_header_symbol('errno.h', 'program_invocation_name', -+ args : '-D_GNU_SOURCE') -+ pre_args += '-DHAVE_PROGRAM_INVOCATION_NAME' -+elif with_tools.contains('intel') -+ error('Intel tools require the program_invocation_name variable') -+endif -+ - # strtod locale support - if cc.links(''' - #define _GNU_SOURCE -diff --git a/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c b/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c -index 58005df5595..42a58a6dcc1 100644 ---- a/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c -+++ b/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c -@@ -125,7 +125,7 @@ static int virgl_vtest_send_init(struct virgl_vtest_winsys *vws) - ret = os_get_process_name(cmdline, 63); - if (ret == FALSE) - strcpy(cmdline, nstr); --#if defined(__GLIBC__) || defined(__CYGWIN__) -+#if defined(HAVE_PROGRAM_INVOCATION_NAME) - if (!strcmp(cmdline, "shader_runner")) { - const char *name; - /* hack to get better testname */ -diff --git a/src/util/u_process.c b/src/util/u_process.c -index 94c975df396..cbccf48ed01 100644 ---- a/src/util/u_process.c -+++ b/src/util/u_process.c -@@ -32,11 +32,7 @@ - - #undef GET_PROGRAM_NAME - --#if (defined(__GNU_LIBRARY__) || defined(__GLIBC__)) && !defined(__UCLIBC__) --# if !defined(__GLIBC__) || (__GLIBC__ < 2) --/* These aren't declared in any libc5 header */ --extern char *program_invocation_name, *program_invocation_short_name; --# endif -+#if defined(__linux__) && defined(HAVE_PROGRAM_INVOCATION_NAME) - static const char * - __getProgramName() - { -@@ -79,7 +75,7 @@ __getProgramName() - return program_invocation_name; - } - # define GET_PROGRAM_NAME() __getProgramName() --#elif defined(__CYGWIN__) -+#elif defined(HAVE_PROGRAM_INVOCATION_NAME) - # define GET_PROGRAM_NAME() program_invocation_short_name - #elif defined(__FreeBSD__) && (__FreeBSD__ >= 2) - # include <osreldate.h> --- -2.21.0 - diff --git a/media-libs/mesa/mesa-19.0.8.ebuild b/media-libs/mesa/mesa-19.0.8.ebuild deleted file mode 100644 index 8be5b50..0000000 --- a/media-libs/mesa/mesa-19.0.8.ebuild +++ /dev/null @@ -1,535 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_5 python3_6 python3_7 ) - -inherit llvm meson multilib-minimal pax-utils python-any-r1 - -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 - EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"; - EXPERIMENTAL="true" - inherit git-r3 -else - SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"; - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="MIT" -SLOT="0" -RESTRICT=" - !test? ( test ) -" - -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} - +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 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) - gles1? ( egl ) - gles2? ( egl ) - vulkan? ( dri3 - || ( video_cards_i965 video_cards_radeonsi ) - video_cards_radeonsi? ( llvm ) ) - wayland? ( egl gbm ) - 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.97" -RDEPEND=" - >=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}] - 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? ( - 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? ( - dev-libs/ocl-icd[khronos-headers,${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}] ) - ) - wayland? ( - >=dev-libs/wayland-1.15.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] ) -" -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. < 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-9:=[${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/bison - sys-devel/flex - sys-devel/gettext - virtual/pkgconfig - valgrind? ( dev-util/valgrind ) - x11-base/xorg-proto - x11-libs/libXrandr[${MULTILIB_USEDEP}] - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${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.0.0 - usr/lib*/libGLESv2.so.2.0.0 - usr/lib*/libGL.so.1.2.0 - usr/lib*/libOSMesa.so.8.0.0 - ) -)" - -PATCHES=( - "${FILESDIR}"/${PN}-19.0.8-execinfo.patch - "${FILESDIR}"/${PN}-19.0.8-heap-allocation.patch - "${FILESDIR}"/${PN}-19.1.4-musl-upstream-fix.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 - 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 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 -} - -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 - 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 -} - -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 - - emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") ) - - if use gallium; then - emesonargs+=( - $(meson_use llvm) - $(meson_use lm-sensors lmsensors) - $(meson_use unwind libunwind) - ) - - if 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_use vaapi gallium-va)) - use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) - else - emesonargs+=(-Dgallium-va=false) - fi - - if use video_cards_r300 || - use video_cards_r600 || - use video_cards_radeonsi || - use video_cards_nouveau; then - emesonargs+=($(meson_use vdpau gallium-vdpau)) - else - emesonargs+=(-Dgallium-vdpau=false) - fi - - if use video_cards_freedreno || - use video_cards_nouveau || - use video_cards_vmware; then - emesonargs+=($(meson_use xa gallium-xa)) - else - emesonargs+=(-Dgallium-xa=false) - fi - - if use video_cards_r600 || - use video_cards_nouveau; then - emesonargs+=($(meson_use xvmc gallium-xvmc)) - else - emesonargs+=(-Dgallium-xvmc=false) - fi - - 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_imx imx - - # 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_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_i965 intel - vulkan_enable video_cards_radeonsi amd - fi - - # x86 hardened pax_kernel needs glx-rts, bug 240956 - if [[ ${ABI} == x86 ]]; then - 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 ) - fi - - if use gallium; then - gallium_enable -- swrast - emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) - else - dri_driver_enable -- swrast - emesonargs+=( -Dosmesa=$(usex osmesa classic none) ) - fi - - driver_list() { - local drivers="$(sort -u <<< "${1// /$'\n'}")" - echo "${drivers//$'\n'/,}" - } - - emesonargs+=( - $(meson_use test build-tests) - -Dglx=dri - -Dshared-glapi=true - $(meson_use dri3) - $(meson_use egl) - $(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[*]}") - -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_compile() { - meson_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() { - einstalldocs -} - -multilib_src_test() { - meson test -v -C "${BUILD_DIR}" -t 100 -} - -pkg_postinst() { - # Switch to the xorg implementation. - echo - eselect opengl set --use-old ${OPENGL_DIR} -} - -# $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/mesa-19.1.4.ebuild b/media-libs/mesa/mesa-19.1.7.ebuild similarity index 98% rename from media-libs/mesa/mesa-19.1.4.ebuild rename to media-libs/mesa/mesa-19.1.7.ebuild index db12dee..f5f56c6 100644 --- a/media-libs/mesa/mesa-19.1.4.ebuild +++ b/media-libs/mesa/mesa-19.1.7.ebuild @@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" fi LICENSE="MIT" @@ -238,7 +238,6 @@ x86? ( )" PATCHES=( - "${FILESDIR}"/${PN}-19.1.4-musl-upstream-fix.patch "${FILESDIR}"/${PN}-18.2.4-add-disable-tls-support.patch )
