From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 439751382C5 for ; Mon, 7 Jun 2021 13:22:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84F08E0877; Mon, 7 Jun 2021 13:22:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 59F98E0877 for ; Mon, 7 Jun 2021 13:22:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6EBE933FD3F for ; Mon, 7 Jun 2021 13:22:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C06A79D for ; Mon, 7 Jun 2021 13:22:31 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1623072138.13adabf0033a58c9b1a9d0587c5fee5ffffc4962.anarchy@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: media-libs/mesa/, media-libs/mesa/files/ X-VCS-Repository: proj/musl X-VCS-Files: media-libs/mesa/Manifest media-libs/mesa/files/mesa-20.1.7-add-disable-tls-support.patch media-libs/mesa/files/mesa-20.2.0-add-disable-tls-support.patch media-libs/mesa/files/mesa-20.3.4-missing-git_sha1.patch media-libs/mesa/files/mesa-21.0.3-add-disable-tls-support.patch media-libs/mesa/mesa-20.1.10.ebuild media-libs/mesa/mesa-20.3.5.ebuild media-libs/mesa/mesa-21.0.3.ebuild X-VCS-Directories: media-libs/mesa/ media-libs/mesa/files/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 13adabf0033a58c9b1a9d0587c5fee5ffffc4962 X-VCS-Branch: master Date: Mon, 7 Jun 2021 13:22:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3ba5227d-5170-48bf-8968-0d5199d250e0 X-Archives-Hash: a702c93efd8b6537839deffa8590b622 commit: 13adabf0033a58c9b1a9d0587c5fee5ffffc4962 Author: Jory Pratt gentoo org> AuthorDate: Mon Jun 7 13:22:18 2021 +0000 Commit: Jory Pratt gentoo org> CommitDate: Mon Jun 7 13:22:18 2021 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=13adabf0 media-libs/mesa: sync with ::gentoo Package-Manager: Portage-3.0.19, Repoman-3.0.2 Signed-off-by: Jory Pratt gentoo.org> media-libs/mesa/Manifest | 3 +- .../mesa-20.1.7-add-disable-tls-support.patch | 45 -- .../mesa-20.2.0-add-disable-tls-support.patch | 44 -- .../mesa/files/mesa-20.3.4-missing-git_sha1.patch | 57 --- .../mesa-21.0.3-add-disable-tls-support.patch | 41 ++ media-libs/mesa/mesa-20.1.10.ebuild | 552 --------------------- .../{mesa-20.3.5.ebuild => mesa-21.0.3.ebuild} | 22 +- 7 files changed, 52 insertions(+), 712 deletions(-) diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 36782df..0583fc1 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,2 +1 @@ -DIST mesa-20.1.10.tar.xz 12918420 BLAKE2B 408f4bc6eb0dc11199cd161d6914b77cb57313bca94f26794cbfd05332922c45dc216a64e33df9fad64cd41e1ad8b2de6c2e5f99cad234870f7a5b970a62dcbd SHA512 0d4016abfcc733c853d7b6c3c997ddc554a44088c0a4d9a7edb51ab5ad7d9e1234728b61ffcb9c82a6c5fee1429091a1c31cbeabcb1b50411337b99ee550d28a -DIST mesa-20.3.5.tar.xz 14367412 BLAKE2B 7bad876ce702158e727a752eda6722e7165b497fd3a485dae4e989f22b13288a93f51bcd5e6a69b979f0bbe41599fa237c08f3bbb81cb9c6dc4c06827f8ad5f4 SHA512 481e710ed80d8f215a8d541cfe51b960862c2403c2b9e7e6932c8236b8decb5d478871d6c73559d6d795ada143803764f3a93b2329588c80f62e2e5ec98c78a9 +DIST mesa-21.0.3.tar.xz 14710004 BLAKE2B f2165da4487824931d8ff90e4f13624546a297b0d3577d69b7cfd6078a965282b4a732cb720cbb08ea83a3a987603cfe67876fb18022fa444b011fcc9b7df352 SHA512 4a8aee48a8ea7f32e8aa3bbbd91db26c6053b9a43e62ff88256929e6bc147884f0fef988726b5a3d59d7008663f017c746a0352fd3fcc1c476b8190af4a2531f diff --git a/media-libs/mesa/files/mesa-20.1.7-add-disable-tls-support.patch b/media-libs/mesa/files/mesa-20.1.7-add-disable-tls-support.patch deleted file mode 100644 index b64b429..0000000 --- a/media-libs/mesa/files/mesa-20.1.7-add-disable-tls-support.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 6be4bac8f5a7c8c0ae0f95582e9905f485095988 Mon Sep 17 00:00:00 2001 -From: Jory Pratt -Date: Wed, 6 Nov 2019 13:26:34 -0600 -Subject: [PATCH] Add option to control elf-tls - -Signed-off-by: Jory Pratt ---- - meson.build | 2 +- - meson_options.txt | 6 ++++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 4eda551..87fe071 100644 ---- a/meson.build -+++ b/meson.build -@@ -427,7 +427,7 @@ else - endif - - # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. --if not ['windows', 'freebsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) -+if get_option('elf-tls') - pre_args += '-DUSE_ELF_TLS' - endif - -diff --git a/meson_options.txt b/meson_options.txt -index 626baf3..d30a238 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -293,6 +293,12 @@ option( - value : false, - description : 'Build an SELinux-aware Mesa' - ) -+option( -+ 'elf-tls', -+ type : 'boolean', -+ value : true, -+ description : 'Enable thread-local storage in GLX and EGL' -+) - option( - 'osmesa', - type : 'combo', --- -2.24.0 - - diff --git a/media-libs/mesa/files/mesa-20.2.0-add-disable-tls-support.patch b/media-libs/mesa/files/mesa-20.2.0-add-disable-tls-support.patch deleted file mode 100644 index bc4f5e9..0000000 --- a/media-libs/mesa/files/mesa-20.2.0-add-disable-tls-support.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 97365c36582ad77db40e957931f29f958074edec Mon Sep 17 00:00:00 2001 -From: Jory Pratt -Date: Tue, 1 Sep 2020 18:04:56 -0500 -Subject: [PATCH] Allow to disable glx_tls for musl users - -Signed-off-by: Jory Pratt ---- - meson.build | 2 +- - meson_options.txt | 6 ++++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 4f9c589..2c388e7 100644 ---- a/meson.build -+++ b/meson.build -@@ -424,7 +424,7 @@ endif - - # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. - use_elf_tls = false --if not ['windows', 'freebsd', 'openbsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) -+if get_option('elf-tls') - pre_args += '-DUSE_ELF_TLS' - use_elf_tls = true - endif -diff --git a/meson_options.txt b/meson_options.txt -index 2d39d13..a3d1de5 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -313,6 +313,12 @@ option( - value : false, - description : 'Build an SELinux-aware Mesa' - ) -+option( -+ 'elf-tls', -+ type : 'boolean', -+ value : true, -+ description : 'Enable thread-local storage in GLX and EGL' -+) - option( - 'osmesa', - type : 'combo', --- -2.28.0 - diff --git a/media-libs/mesa/files/mesa-20.3.4-missing-git_sha1.patch b/media-libs/mesa/files/mesa-20.3.4-missing-git_sha1.patch deleted file mode 100644 index c994a7a..0000000 --- a/media-libs/mesa/files/mesa-20.3.4-missing-git_sha1.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 434da21a7c81acbe03f0e1621e80904313c0b05c Mon Sep 17 00:00:00 2001 -From: Michael Forney -Date: Wed, 16 Dec 2020 00:48:25 -0800 -Subject: [PATCH] meson: add missing dependency on generated git_sha1.h - -Reviewed-by: Lionel Landwerlin -Reviewed-by: Eric Anholt -Part-of: ---- - src/freedreno/common/meson.build | 1 + - src/gallium/frontends/lavapipe/meson.build | 2 +- - src/intel/common/meson.build | 4 ++-- - 3 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/freedreno/common/meson.build b/src/freedreno/common/meson.build -index 2da6c1eacf8..30ef23043a7 100644 ---- a/src/freedreno/common/meson.build -+++ b/src/freedreno/common/meson.build -@@ -27,6 +27,7 @@ libfreedreno_common = static_library( - 'freedreno_uuid.c', - 'freedreno_uuid.h', - 'freedreno_guardband.h', -+ sha1_h, - ], - include_directories : [inc_freedreno, inc_include, inc_src, inc_gallium], - c_args : [no_override_init_args], -diff --git a/src/gallium/frontends/lavapipe/meson.build b/src/gallium/frontends/lavapipe/meson.build -index 972735fcff9..94c68d14d23 100644 ---- a/src/gallium/frontends/lavapipe/meson.build -+++ b/src/gallium/frontends/lavapipe/meson.build -@@ -57,7 +57,7 @@ endif - - liblavapipe_st = static_library( - 'lavapipe_st', -- [liblvp_files, lvp_entrypoints, lvp_extensions_c ], -+ [liblvp_files, lvp_entrypoints, lvp_extensions_c, sha1_h], - link_with : [ libvulkan_wsi ], - c_args : [ lvp_flags ], - gnu_symbol_visibility : 'hidden', -diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build -index 2586b4cf956..53c458f447d 100644 ---- a/src/intel/common/meson.build -+++ b/src/intel/common/meson.build -@@ -42,8 +42,8 @@ files_libintel_common = files( - ) - - libintel_common = static_library( -- ['intel_common', genX_xml_h], -- files_libintel_common, -+ 'intel_common', -+ [files_libintel_common, genX_xml_h, sha1_h], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel], - c_args : [no_override_init_args], - gnu_symbol_visibility : 'hidden', --- -GitLab - diff --git a/media-libs/mesa/files/mesa-21.0.3-add-disable-tls-support.patch b/media-libs/mesa/files/mesa-21.0.3-add-disable-tls-support.patch new file mode 100644 index 0000000..e6f9e18 --- /dev/null +++ b/media-libs/mesa/files/mesa-21.0.3-add-disable-tls-support.patch @@ -0,0 +1,41 @@ +From 7af845bca9eafb67b32c2f5e2de7bc2a56772aa4 Mon Sep 17 00:00:00 2001 +From: +Date: Fri, 28 May 2021 11:48:26 -0500 +Subject: [PATCH] Allow to disable glx_tls for musl users + +--- + meson.build | 3 ++- + meson_options.txt | 6 ++++++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 26cfd01..38d4802 100644 +--- a/meson.build ++++ b/meson.build +@@ -448,7 +448,8 @@ endif + + # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. + use_elf_tls = false +-if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) ++with_use_elf_tls = get_option('use-elf-tls') ++if with_use_elf_tls and not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) + pre_args += '-DUSE_ELF_TLS' + use_elf_tls = true + endif +diff --git a/meson_options.txt b/meson_options.txt +index fc73f6e..edd3886 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -464,3 +464,9 @@ option( + value : true, + description : 'use msse2 flag for mingw x86. Default: true', + ) ++option( ++ 'use-elf-tls', ++ type : 'boolean', ++ value : false, ++ description : 'Build support for initial-exec TLS model' ++) +-- +2.31.1 + diff --git a/media-libs/mesa/mesa-20.1.10.ebuild b/media-libs/mesa/mesa-20.1.10.ebuild deleted file mode 100644 index a0615fe..0000000 --- a/media-libs/mesa/mesa-20.1.10.ebuild +++ /dev/null @@ -1,552 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit llvm meson multilib-minimal python-any-r1 linux-info - -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" - inherit git-r3 -else - SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz" - KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86" -fi - -LICENSE="MIT" -SLOT="0" -RESTRICT=" - !test? ( test ) -" - -RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" -VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost 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 +llvm - lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan - vulkan-overlay wayland +X xa xvmc +zstd" - -REQUIRED_USE=" - d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) - gles1? ( egl ) - gles2? ( egl ) - vulkan? ( dri3 - video_cards_radeonsi? ( llvm ) ) - vulkan-overlay? ( vulkan ) - wayland? ( egl gbm ) - video_cards_freedreno? ( gallium ) - video_cards_intel? ( classic ) - video_cards_i915? ( || ( classic gallium ) ) - video_cards_i965? ( classic ) - video_cards_iris? ( gallium ) - video_cards_lima? ( gallium ) - video_cards_nouveau? ( || ( classic gallium ) ) - video_cards_panfrost? ( gallium ) - video_cards_radeon? ( || ( classic gallium ) - gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) - video_cards_r100? ( classic ) - video_cards_r200? ( classic ) - video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) - video_cards_r600? ( gallium ) - video_cards_radeonsi? ( gallium llvm ) - video_cards_vc4? ( gallium ) - video_cards_virgl? ( gallium ) - video_cards_vivante? ( gallium gbm ) - video_cards_vmware? ( gallium ) - xa? ( X ) - xvmc? ( X ) -" - -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100" -RDEPEND=" - !app-eselect/eselect-mesa - >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] - >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] - gallium? ( - unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) - llvm? ( - video_cards_radeonsi? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - video_cards_r600? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - video_cards_radeon? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - ) - lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) - opencl? ( - >=virtual/opencl-3[${MULTILIB_USEDEP}] - dev-libs/libclc - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - vaapi? ( - >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] - ) - vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) - xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) - ) - selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] ) - wayland? ( - >=dev-libs/wayland-1.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] ) - vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] ) - X? ( - >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] - >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] - >=x11-libs/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}] - ) - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) -" -for card in ${RADEON_CARDS}; do - RDEPEND="${RDEPEND} - video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) - " -done -RDEPEND="${RDEPEND} - video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) -" - -# Please keep the LLVM dependency block separate. Since LLVM is slotted, -# we need to *really* make sure we're not pulling one than more slot -# simultaneously. -# -# How to use it: -# 1. List all the working slots (with min versions) in ||, newest first. -# 2. Update the := to specify *max* version, e.g. < 10. -# 3. Specify LLVM_MAX_SLOT, e.g. 9. -LLVM_MAX_SLOT="10" -LLVM_DEPSTR=" - || ( - sys-devel/llvm:10[${MULTILIB_USEDEP}] - sys-devel/llvm:9[${MULTILIB_USEDEP}] - ) - =dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") -" - -S="${WORKDIR}/${MY_P}" -EGIT_CHECKOUT_DIR=${S} - -QA_WX_LOAD=" -x86? ( - usr/lib*/libglapi.so.0.0.0 - usr/lib*/libGLESv1_CM.so.1.1.0 - usr/lib*/libGLESv2.so.2.0.0 - usr/lib*/libGL.so.1.2.0 - usr/lib*/libOSMesa.so.8.0.0 - usr/lib/libGLX_mesa.so.0.0.0 -)" - -PATCHES=( - "${FILESDIR}"/${PN}-20.1.7-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 vulkan; then - if ! use video_cards_i965 && - ! use video_cards_iris && - ! use video_cards_radeonsi; then - ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, or radeonsi" - fi - fi - - if use opencl; then - if ! use video_cards_r600 && - ! use video_cards_radeonsi; then - ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi" - fi - fi - - if use vaapi; then - if ! use video_cards_r600 && - ! use video_cards_radeonsi && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau" - fi - fi - - if use vdpau; then - if ! use video_cards_r300 && - ! use video_cards_r600 && - ! use video_cards_radeonsi && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau" - fi - fi - - if use xa; then - if ! use video_cards_freedreno && - ! use video_cards_nouveau && - ! use video_cards_vmware; then - ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware" - fi - fi - - if use xvmc; then - if ! use video_cards_r600 && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau" - fi - fi - - if ! use gallium; then - use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium" - use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium" - use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium" - use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium" - use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium" - use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium" - use xa && ewarn "Ignoring USE=xa since USE does not contain gallium" - use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium" - fi - - if ! use llvm; then - use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" - fi -} - -python_check_deps() { - has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" -} - -pkg_setup() { - # warning message for bug 459306 - if use llvm && has_version sys-devel/llvm[!debug=]; then - ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" - ewarn "detected! This can cause problems. For details, see bug 459306." - fi - - if use video_cards_i965 || - use video_cards_iris || - use video_cards_radeonsi; then - CONFIG_CHECK="~CHECKPOINT_RESTORE" - linux-info_pkg_setup - fi - - if use gallium && use llvm; then - llvm_pkg_setup - fi - python-any-r1_pkg_setup -} - -multilib_src_configure() { - local emesonargs=() - - if use classic; then - # Intel code - dri_driver_enable video_cards_i915 i915 - dri_driver_enable video_cards_i965 i965 - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - dri_driver_enable video_cards_intel i915 i965 - fi - - # Nouveau code - dri_driver_enable video_cards_nouveau nouveau - - # ATI code - dri_driver_enable video_cards_r100 r100 - dri_driver_enable video_cards_r200 r200 - if ! use video_cards_r100 && \ - ! use video_cards_r200; then - dri_driver_enable video_cards_radeon r100 r200 - fi - fi - - emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless ) - - if use gallium; then - emesonargs+=( - $(meson_use llvm) - $(meson_use lm-sensors lmsensors) - $(meson_use unwind libunwind) - ) - - if use video_cards_iris || - use video_cards_r300 || - use video_cards_r600 || - use video_cards_radeonsi || - use video_cards_nouveau || - use video_cards_vmware; then - emesonargs+=($(meson_use d3d9 gallium-nine)) - else - emesonargs+=(-Dgallium-nine=false) - fi - - if use video_cards_r600 || - use video_cards_radeonsi || - use video_cards_nouveau; then - emesonargs+=($(meson_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 - - if use video_cards_freedreno || - use video_cards_lima || - use video_cards_panfrost || - use video_cards_vc4 || - use video_cards_vivante; then - gallium_enable -- kmsro - fi - - gallium_enable video_cards_lima lima - gallium_enable video_cards_panfrost panfrost - gallium_enable video_cards_vc4 vc4 - gallium_enable video_cards_vivante etnaviv - gallium_enable video_cards_vmware svga - gallium_enable video_cards_nouveau nouveau - - # 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_iris iris - - gallium_enable video_cards_r300 r300 - gallium_enable video_cards_r600 r600 - gallium_enable video_cards_radeonsi radeonsi - if ! use video_cards_r300 && \ - ! use video_cards_r600; then - gallium_enable video_cards_radeon r300 r600 - fi - - gallium_enable video_cards_freedreno freedreno - gallium_enable video_cards_virgl virgl - - # opencl stuff - emesonargs+=( - -Dgallium-opencl="$(usex opencl icd disabled)" - ) - fi - - if use vulkan; then - vulkan_enable video_cards_i965 intel - vulkan_enable video_cards_iris intel - vulkan_enable video_cards_radeonsi amd - fi - - # Disable glx tls support on musl - if use elibc_musl; then - emesonargs+=( -Delf-tls=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=$(usex X dri disabled) - -Dglvnd=true - -Dshared-glapi=true - $(meson_use dri3) - $(meson_use egl) - $(meson_use gbm) - $(meson_use gles1) - $(meson_use gles2) - $(meson_use selinux) - $(meson_use zstd) - -Dvalgrind=$(usex valgrind auto false) - -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") - -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") - -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") - $(meson_use vulkan vulkan-device-select-layer) - $(meson_use vulkan-overlay vulkan-overlay-layer) - --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 -} - -multilib_src_install_all() { - einstalldocs -} - -multilib_src_test() { - meson test -v -C "${BUILD_DIR}" -t 100 || die "tests failed" -} - -# $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-20.3.5.ebuild b/media-libs/mesa/mesa-21.0.3.ebuild similarity index 97% rename from media-libs/mesa/mesa-20.3.5.ebuild rename to media-libs/mesa/mesa-21.0.3.ebuild index 469b19e..fdca704 100644 --- a/media-libs/mesa/mesa-20.3.5.ebuild +++ b/media-libs/mesa/mesa-21.0.3.ebuild @@ -43,6 +43,7 @@ REQUIRED_USE=" d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) + osmesa? ( gallium ) vulkan? ( dri3 video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) @@ -104,7 +105,7 @@ RDEPEND=" ) selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] ) wayland? ( - >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}] + >=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}] >=dev-libs/wayland-protocols-1.8 ) ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] @@ -116,7 +117,6 @@ RDEPEND=" X? ( >=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}] @@ -225,6 +225,7 @@ BDEPEND=" sys-devel/flex virtual/pkgconfig $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") + wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] ) " S="${WORKDIR}/${MY_P}" @@ -241,8 +242,7 @@ x86? ( )" PATCHES=( - "${FILESDIR}"/${PN}-20.2.0-add-disable-tls-support.patch - "${FILESDIR}"/${PN}-20.3.4-missing-git_sha1.patch + "${FILESDIR}"/${PN}-21.0.3-add-disable-tls-support.patch ) llvm_check_deps() { @@ -321,6 +321,10 @@ pkg_pretend() { if ! use llvm; then use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" fi + + if use osmesa && ! use llvm; then + ewarn "OSMesa will be slow without enabling USE=llvm" + fi } python_check_deps() { @@ -455,6 +459,7 @@ multilib_src_configure() { gallium_enable -- kmsro fi + gallium_enable -- swrast gallium_enable video_cards_lima lima gallium_enable video_cards_panfrost panfrost gallium_enable video_cards_v3d v3d @@ -499,14 +504,6 @@ multilib_src_configure() { vulkan_enable video_cards_v3d broadcom 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'/,}" @@ -521,6 +518,7 @@ multilib_src_configure() { $(meson_feature gbm) $(meson_feature gles1) $(meson_feature gles2) + $(meson_use osmesa) $(meson_use selinux) $(meson_feature zstd) -Dvalgrind=$(usex valgrind auto false)