| 1 |
commit: 013c996a9408c6c74ea5b0aa5cdf95f9ec20d695 |
| 2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 1 19:54:26 2021 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 1 19:54:26 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=013c996a |
| 7 |
|
| 8 |
media-libs/mesa: sync with current stable in ::gentoo |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
| 11 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
| 12 |
|
| 13 |
media-libs/mesa/Manifest | 2 +- |
| 14 |
.../mesa/{mesa-20.2.4.ebuild => mesa-20.2.6.ebuild} | 18 +++++++++--------- |
| 15 |
2 files changed, 10 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest |
| 18 |
index 7fdc752..e691156 100644 |
| 19 |
--- a/media-libs/mesa/Manifest |
| 20 |
+++ b/media-libs/mesa/Manifest |
| 21 |
@@ -1,2 +1,2 @@ |
| 22 |
DIST mesa-20.1.10.tar.xz 12918420 BLAKE2B 408f4bc6eb0dc11199cd161d6914b77cb57313bca94f26794cbfd05332922c45dc216a64e33df9fad64cd41e1ad8b2de6c2e5f99cad234870f7a5b970a62dcbd SHA512 0d4016abfcc733c853d7b6c3c997ddc554a44088c0a4d9a7edb51ab5ad7d9e1234728b61ffcb9c82a6c5fee1429091a1c31cbeabcb1b50411337b99ee550d28a |
| 23 |
-DIST mesa-20.2.4.tar.xz 13869928 BLAKE2B 078dc88be08d3b41d5144c4d72b0044512dc77c7afcbc6366dc7b9d435886afc65009277b215f6e2898cef98a7c52fb232d8b36bd6e6d1114326302d5acc9216 SHA512 e60decb867a3ca08b99e72aa62db8c5515696bf4a9e2642c1703479167a79b0828192f6dcca688263f5786cd524308a4410e47111fa7b97c091473e4ac4ee799 |
| 24 |
+DIST mesa-20.2.6.tar.xz 13886924 BLAKE2B 2bc5d680979b58a77105a8058da5dfea81afe05166a44d08cf243e5760b8c66e418fd78046a2c88243f56aa85a610d052f3aaf259938668cd0f4a184e9edca46 SHA512 347b275d88c0d14cacef570ed736cac07f2e607bc4c89a16b915ec01ac57dbbe698ddf9a0ad70f034e00318403351e3c728e74c72c653acf1fc99720887fa888 |
| 25 |
|
| 26 |
diff --git a/media-libs/mesa/mesa-20.2.4.ebuild b/media-libs/mesa/mesa-20.2.6.ebuild |
| 27 |
similarity index 98% |
| 28 |
rename from media-libs/mesa/mesa-20.2.4.ebuild |
| 29 |
rename to media-libs/mesa/mesa-20.2.6.ebuild |
| 30 |
index 0f0e31f..ad23331 100644 |
| 31 |
--- a/media-libs/mesa/mesa-20.2.4.ebuild |
| 32 |
+++ b/media-libs/mesa/mesa-20.2.6.ebuild |
| 33 |
@@ -1,9 +1,9 @@ |
| 34 |
-# Copyright 1999-2020 Gentoo Authors |
| 35 |
+# Copyright 1999-2021 Gentoo Authors |
| 36 |
# Distributed under the terms of the GNU General Public License v2 |
| 37 |
|
| 38 |
EAPI=7 |
| 39 |
|
| 40 |
-PYTHON_COMPAT=( python3_{6,7,8,9} ) |
| 41 |
+PYTHON_COMPAT=( python3_{7,8,9} ) |
| 42 |
|
| 43 |
inherit llvm meson multilib-minimal python-any-r1 linux-info |
| 44 |
|
| 45 |
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then |
| 46 |
inherit git-r3 |
| 47 |
else |
| 48 |
SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz" |
| 49 |
- KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~x86" |
| 50 |
+ KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86" |
| 51 |
fi |
| 52 |
|
| 53 |
LICENSE="MIT" |
| 54 |
@@ -373,7 +373,7 @@ multilib_src_configure() { |
| 55 |
local platforms |
| 56 |
use X && platforms+="x11" |
| 57 |
use wayland && platforms+=",wayland" |
| 58 |
- [[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,}) |
| 59 |
+ emesonargs+=(-Dplatforms=${platforms#,}) |
| 60 |
|
| 61 |
if use X || use egl; then |
| 62 |
emesonargs+=(-Dglvnd=true) |
| 63 |
@@ -381,6 +381,11 @@ multilib_src_configure() { |
| 64 |
emesonargs+=(-Dglvnd=false) |
| 65 |
fi |
| 66 |
|
| 67 |
+ # Disable glx tls support on musl |
| 68 |
+ if use elibc_musl; then |
| 69 |
+ emesonargs+=( -Delf-tls=false ) |
| 70 |
+ fi |
| 71 |
+ |
| 72 |
if use gallium; then |
| 73 |
emesonargs+=( |
| 74 |
$(meson_feature llvm) |
| 75 |
@@ -484,11 +489,6 @@ multilib_src_configure() { |
| 76 |
vulkan_enable video_cards_radeonsi amd |
| 77 |
fi |
| 78 |
|
| 79 |
- # Disable glx tls support on musl |
| 80 |
- if use elibc_musl; then |
| 81 |
- emesonargs+=( -Delf-tls=false ) |
| 82 |
- fi |
| 83 |
- |
| 84 |
if use gallium; then |
| 85 |
gallium_enable -- swrast |
| 86 |
emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) |
Archives