commit:     8bfb20fcdd6c6bd9319015cf95486caaa8e9d6a2
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 19 23:21:34 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Nov 19 23:22:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bfb20fc

media-libs/mesa: Version bump to 21.3.0

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-libs/mesa/Manifest                               |  2 +-
 .../{mesa-21.3.0_rc3.ebuild => mesa-21.3.0.ebuild}     | 18 +++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 23120cbe718b..b70546f80890 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,2 +1,2 @@
 DIST mesa-21.2.5.tar.xz 15829684 BLAKE2B 
a5d00d6c566e699acd1f8cfcf1b52024c92cfa8a4cc9a6fb1d6493526ea0d65790ed97c47c5c174d4369e589caf1a361351df6d43aba89f818970f87f9a81059
 SHA512 
aaa1ebaa1e18eea76c3784c9a65942c3e417c1079d7bf75dcede574999dc459fb4d68d041cf2f767afb9cbfa834a985e0a4edd5a56b0fc90f8fdc506359aa5da
-DIST mesa-21.3.0-rc3.tar.xz 16349156 BLAKE2B 
bc25478b7ee2c6186baf8f8540da7d5a6847146badd37653b65e2d3a47f8a7ae866825058ad54b68563ddb4f8409180ebb7415925409b6f0b401be81a45eca9d
 SHA512 
14c3cdf2085077db3ec6d7e7b66304fccdaf441dfd64cc085d6d83960fcbdaa18a48d8f6bcdc096def06b6d389f51c1a5cb0a6793a236d668e22c592bc8b2e4c
+DIST mesa-21.3.0.tar.xz 16427424 BLAKE2B 
d3feac77b61ea724b841b88882569871eb8ff59561fa47b65a2358a0e912cd27f728a226795b23d63232daab6532b9931dd0d2fc8f001a1902dc6b75d474b44e
 SHA512 
b27c0ccf2fc9b96bbece715612cec4f4e267ab25dc5386c3debd2346c385afa0146317c67a3d2eec198dbf5338fb182b458c5fe5567216b265153c0b7b560de1

diff --git a/media-libs/mesa/mesa-21.3.0_rc3.ebuild 
b/media-libs/mesa/mesa-21.3.0.ebuild
similarity index 97%
rename from media-libs/mesa/mesa-21.3.0_rc3.ebuild
rename to media-libs/mesa/mesa-21.3.0.ebuild
index 5829adce48f2..47b93133f0dc 100644
--- a/media-libs/mesa/mesa-21.3.0_rc3.ebuild
+++ b/media-libs/mesa/mesa-21.3.0.ebuild
@@ -33,18 +33,15 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-       +classic cpu_flags_x86_sse2 d3d9 debug +egl +gallium +gbm gles1 +gles2 
+llvm
+       +classic cpu_flags_x86_sse2 d3d9 debug +gallium gles1 +gles2 +llvm
        lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
        vulkan-overlay wayland +X xa xvmc zink +zstd"
 
 REQUIRED_USE="
        d3d9?   ( || ( 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? ( video_cards_radeonsi? ( llvm ) )
        vulkan-overlay? ( vulkan )
-       wayland? ( egl gbm )
        video_cards_crocus? ( gallium )
        video_cards_freedreno?  ( gallium )
        video_cards_intel?  ( classic )
@@ -64,7 +61,7 @@ REQUIRED_USE="
        video_cards_v3d? ( gallium )
        video_cards_vc4? ( gallium )
        video_cards_virgl? ( gallium )
-       video_cards_vivante? ( gallium gbm )
+       video_cards_vivante? ( gallium )
        video_cards_vmware? ( gallium )
        xa? ( X )
        xvmc? ( X )
@@ -384,12 +381,6 @@ multilib_src_configure() {
        use wayland && platforms+=",wayland"
        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)
@@ -512,8 +503,9 @@ multilib_src_configure() {
                -Dglx=$(usex X dri disabled)
                -Dshared-glapi=enabled
                -Ddri3=enabled
-               $(meson_feature egl)
-               $(meson_feature gbm)
+               -Degl=true
+               -Dgbm=true
+               -Dglvnd=true
                $(meson_feature gles1)
                $(meson_feature gles2)
                $(meson_use osmesa)

Reply via email to