gentoo resync : 18.12.2020

3 files changed, 11 insertions, 6 deletions

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 592f492ad419..595d4269c2d8 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,10 +1,10 @@
 DIST mesa-20.1.10.tar.xz 12918420 BLAKE2B 408f4bc6eb0dc11199cd161d6914b77cb57313bca94f26794cbfd05332922c45dc216a64e33df9fad64cd41e1ad8b2de6c2e5f99cad234870f7a5b970a62dcbd SHA512 0d4016abfcc733c853d7b6c3c997ddc554a44088c0a4d9a7edb51ab5ad7d9e1234728b61ffcb9c82a6c5fee1429091a1c31cbeabcb1b50411337b99ee550d28a
-DIST mesa-20.2.3.tar.xz 13844212 BLAKE2B 53eff6d43d2e05dad051c30de624bd8d872e87d6f1d2f32b631b1c4fea657b8dd9b2d5b9702bdd9138b0d9d6c78b74d737162d3f1c76ca969ce6d9ae4f561eda SHA512 e55b57523f6fdb1199586538c119c3e7c81d1a7af86be14c90d140c514f65e54ac0c56bd341686d04b770b80d3ddd92188ee17b3bc23f243aed10c25de7e19a6
 DIST mesa-20.2.4.tar.xz 13869928 BLAKE2B 078dc88be08d3b41d5144c4d72b0044512dc77c7afcbc6366dc7b9d435886afc65009277b215f6e2898cef98a7c52fb232d8b36bd6e6d1114326302d5acc9216 SHA512 e60decb867a3ca08b99e72aa62db8c5515696bf4a9e2642c1703479167a79b0828192f6dcca688263f5786cd524308a4410e47111fa7b97c091473e4ac4ee799
-DIST mesa-20.3.0.tar.xz 14158932 BLAKE2B 13aa0829691b8cb37eafb913a9fd396637022aafe93c6c40af0c0cd3a179d75fb33c2379420bc94940d82885fb1ea3f26a832ed97b3ae842a334aa8ed1407d31 SHA512 69ee0bc1e7a69a519597dd55f4d601f35fe51ed6687d6f6beff6aef3da8d82de932220305fc187e06a52aaf0073d434a6e3458619c767b9b7932464a2cbb2cf2
+DIST mesa-20.2.6.tar.xz 13886924 BLAKE2B 2bc5d680979b58a77105a8058da5dfea81afe05166a44d08cf243e5760b8c66e418fd78046a2c88243f56aa85a610d052f3aaf259938668cd0f4a184e9edca46 SHA512 347b275d88c0d14cacef570ed736cac07f2e607bc4c89a16b915ec01ac57dbbe698ddf9a0ad70f034e00318403351e3c728e74c72c653acf1fc99720887fa888
+DIST mesa-20.3.1.tar.xz 14176916 BLAKE2B a557949f5cddedee1ee157d982ff74330984c8e1f3a60731397234a2154ee908d1fd38b6f436ea139ba28ba7b45b597bfcd99d1cebd1a0a84bce4c071e591fd6 SHA512 06638b8d2d866b5e27024c58a2ca03a73869221a7d536f7a8f1679d73708e5c1713446c8fedc594844b95596ae817bfceb88ace6b42423328189778e5036edf6
 EBUILD mesa-20.1.10.ebuild 14439 BLAKE2B 44180101e4e4c6692661cae16822ed29e292e86821df1361e733839bceeb8353883e5aff3893a91f5e09936aa8e5c0d2d14f8871f558c24590e61b78c6e8716a SHA512 d4474ce10d3cab18cc75ff5c0b9cfe2d05e0987e9c20a2a01ce2cf9873fac0b8e259fad1196327cf3426406e0a338ed326ff9309439af93403f458b104f0fde7
-EBUILD mesa-20.2.3.ebuild 14709 BLAKE2B f32b8f3f99197ad5e7a16393929ddccb1b6fb650dcf413587a74a497531b94ea7c3ba2f0490a32b37729e33271d100e52fa480c8b6422742a16e9ddb9d756911 SHA512 5223621eaf05a7f2b7500b8f31c1b0cf0a68b729c00a57527e741eb353aa57c65e1abffeb552bedf70012338beb7d49efdadd4847626cfbabbc89f59938dc5f2
 EBUILD mesa-20.2.4.ebuild 14790 BLAKE2B 9ca2d00b39d3bb307ac2cc68ac3b531c2413e44dd902a6510c2b8dacbf8da09765129519e2d36e8e5972315b4b2c740402a5558775d8d22b7af63710fc54b0ac SHA512 f0852f53d8810d89ad2f84d4f6d49a749305a8ae120c9d06fa4cf7258dbf0630d74fd60074f53ec871bb658ba5d78ebcd90006c72be5706a7c156a2a1a13555b
-EBUILD mesa-20.3.0.ebuild 14877 BLAKE2B daf969be2dc77ab4d88c1656d01ce244b326aa4462836e3b8ab1402febb677100850ddec1b89c0e025cf3b0af582bf220b4f5f3cc7212fbf38677e2a79440435 SHA512 45e9652f9c8965f35bab368d2332a5aae72b93d5ceb44425bbc0b6781bc1f622f5f8bc79914170869490f896746dabf079a099feade2343928abfd6a6104bfe0
+EBUILD mesa-20.2.6.ebuild 14794 BLAKE2B ab5f4a04e055c761db7bd0757b62d5e75d87288972780d5d24fed1d6da6cd17ae79f1427c2190a629b8c6b78471991f5d43dfe88a159416a6788b97ea33db11e SHA512 02e10dbb2a6e0e4542771ef543fd04cbca5d0bb6394382db6aced502e34955556ae00df2b62a8a0bc437f64668ab1f099fd71243c26f965a7e734d5b49ad1b95
+EBUILD mesa-20.3.1.ebuild 14877 BLAKE2B daf969be2dc77ab4d88c1656d01ce244b326aa4462836e3b8ab1402febb677100850ddec1b89c0e025cf3b0af582bf220b4f5f3cc7212fbf38677e2a79440435 SHA512 45e9652f9c8965f35bab368d2332a5aae72b93d5ceb44425bbc0b6781bc1f622f5f8bc79914170869490f896746dabf079a099feade2343928abfd6a6104bfe0
 EBUILD mesa-9999.ebuild 14818 BLAKE2B d196d517ea52bc878e43e96efb814f8a03a3b69746b4a6b134933c0efb5dc047909975f7bfc90882ba3b0148d09526e0992d56b8fde1dfbbab551c883dda730a SHA512 6008aac202f6b54914b637be9f6c4d25203579beb5f947b63fbd96c5b216eec58d9bd69343f913368dbe19193f2a7d0a99a4fd7d68e511f1cf096f89eeb08396
 MISC metadata.xml 1895 BLAKE2B abf62dda9b9eba657e310c68fdd86aaa49c550dc34ef624e8feb038e0412f0da786e1120dc16631399cb2c83961b88e78571347c3e6d464c2cf3a343bc0f1483 SHA512 7758641386100e07c1112afe04a8613de8ae1e35a8e940f0eefcfc7daa829789c42b903320339b04b44c2400f0857c180740407abd171e9773a9f51e3dd9468a
diff --git a/media-libs/mesa/mesa-20.2.3.ebuild b/media-libs/mesa/mesa-20.2.6.ebuild
index e1622cc2b02e..87cd61434798 100644
--- a/media-libs/mesa/mesa-20.2.3.ebuild
+++ b/media-libs/mesa/mesa-20.2.6.ebuild
@@ -371,6 +371,12 @@ multilib_src_configure() {
 	use wayland && platforms+=",wayland"
 	[[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,})
 
+	if use X || use egl; then
+		emesonargs+=(-Dglvnd=true)
+	else
+		emesonargs+=(-Dglvnd=false)
+	fi
+
 	if use gallium; then
 		emesonargs+=(
 			$(meson_feature llvm)
@@ -490,8 +496,7 @@ multilib_src_configure() {
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
-		-Dglvnd=true
-		-Dshared-glapi=true
+		-Dshared-glapi=enabled
 		$(meson_feature dri3)
 		$(meson_feature egl)
 		$(meson_feature gbm)
diff --git a/media-libs/mesa/mesa-20.3.0.ebuild b/media-libs/mesa/mesa-20.3.1.ebuild
index 4a9d566b07cd..4a9d566b07cd 100644
--- a/media-libs/mesa/mesa-20.3.0.ebuild
+++ b/media-libs/mesa/mesa-20.3.1.ebuild