[gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/

[Matt Turner]

commit:     d9d98a2c7367b7c50b885daba705bc674139d8f4
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 31 03:47:37 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Aug 31 03:48:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9d98a2c

media-libs/mesa: Version bump to 23.2.0_rc2

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

 media-libs/mesa/Manifest                                     | 1 +
 media-libs/mesa/{mesa-9999.ebuild => mesa-23.2.0_rc2.ebuild} | 9 +++++++--
 media-libs/mesa/mesa-9999.ebuild                             | 3 ++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 0be7b2cf8698..e0ebe4fe61d5 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1 +1,2 @@
 DIST mesa-23.1.6.tar.xz 18505124 BLAKE2B 
78b71ede0655e538a71d22ecbfb0bed7497c258a16ce5f7d9b627a4c9372f26292a50aec848a4923524e4862b00a6d5d3d2521b05033d9cf39d31f037bdb9254
 SHA512 
24f1c626fa05a82bcdfb24b67b8e5f96f94d5748309631b83e8d7a62142853cd3be90b92c56bac3bc4d223bf40b424d6d6a9977537b899107295b7d45d7e2575
+DIST mesa-23.2.0-rc2.tar.xz 18688072 BLAKE2B 
8e1fad2d69b76f2cbbb67c442c01aebce28f6eb14d61953076a572a74e38379799044722972e18aacf043e9abe0c4820838ad8d2a73fa3fc88e1077db739e9e1
 SHA512 
fc27d23f286aeaf14befa4a48f778ac9e924df12527254cc7e518980c6de0c0ade0547ef3b11e60eaf5cc5491ea6148e0cac4288ed25da7e0bff6b7e5e398873

diff --git a/media-libs/mesa/mesa-9999.ebuild 
b/media-libs/mesa/mesa-23.2.0_rc2.ebuild
similarity index 97%
copy from media-libs/mesa/mesa-9999.ebuild
copy to media-libs/mesa/mesa-23.2.0_rc2.ebuild
index 11458c0cb174..b91c9e4f47da 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-23.2.0_rc2.ebuild
@@ -104,6 +104,7 @@ RDEPEND="
                >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
                >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
                x11-libs/libXfixes[${MULTILIB_USEDEP}]
+               x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
        )
        zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
        zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
@@ -150,7 +151,7 @@ RDEPEND="${RDEPEND}
 unset LLVM_MIN_SLOT {LLVM,PER_SLOT}_DEPSTR
 
 DEPEND="${RDEPEND}
-       video_cards_d3d12? ( dev-util/directx-headers[${MULTILIB_USEDEP}] )
+       video_cards_d3d12? ( 
>=dev-util/directx-headers-1.610.0[${MULTILIB_USEDEP}] )
        valgrind? ( dev-util/valgrind )
        wayland? ( >=dev-libs/wayland-protocols-1.24 )
        X? (
@@ -164,7 +165,6 @@ BDEPEND="
        opencl? (
                >=virtual/rust-1.62.0
                >=dev-util/bindgen-0.58.0
-               >=dev-util/meson-1.2.0
        )
        sys-devel/bison
        sys-devel/flex
@@ -203,6 +203,11 @@ llvm_check_deps() {
        has_version "sys-devel/llvm:${LLVM_SLOT}[${LLVM_USE_DEPS}]"
 }
 
+PATCHES=(
+       # Temporary rusticl workaround: 
https://gitlab.freedesktop.org/mesa/mesa/-/issues/7717#note_1832122
+       "${FILESDIR}/clang_resource_dir.patch"
+)
+
 pkg_pretend() {
        if use vulkan; then
                if ! use video_cards_d3d12 &&

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 11458c0cb174..17968a139f56 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -104,6 +104,7 @@ RDEPEND="
                >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
                >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
                x11-libs/libXfixes[${MULTILIB_USEDEP}]
+               x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
        )
        zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
        zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
@@ -150,7 +151,7 @@ RDEPEND="${RDEPEND}
 unset LLVM_MIN_SLOT {LLVM,PER_SLOT}_DEPSTR
 
 DEPEND="${RDEPEND}
-       video_cards_d3d12? ( dev-util/directx-headers[${MULTILIB_USEDEP}] )
+       video_cards_d3d12? ( 
>=dev-util/directx-headers-1.610.0[${MULTILIB_USEDEP}] )
        valgrind? ( dev-util/valgrind )
        wayland? ( >=dev-libs/wayland-protocols-1.24 )
        X? (