gentoo auto-resync : 03:12:2023 - 16:59:43

5 files changed, 41 insertions, 213 deletions

diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest
index 03895503ace3..c8292d8cc583 100644
--- a/media-gfx/renderdoc/Manifest
+++ b/media-gfx/renderdoc/Manifest
@@ -4,16 +4,13 @@ AUX renderdoc-1.18-system-compress.patch 4699 BLAKE2B 4f37058deef1773a4a35b64415
 AUX renderdoc-1.18-system-flags.patch 845 BLAKE2B 0d4aae31af353b2d199ae66ec999beefa04e2105e6368305bb89359806fa99f4b7048c3d6c30a2787a3125718d3cbd7c97d3381f61f4f98a2e08730b5a22db02 SHA512 bd2692f14729360983f5ca4fb8af87085ab5bd209d82f3cfd99e7753d0dd406905a6280051aa5d1476b863566b385cdc28fbe9120d0d6f5efd78411af15b68ef
 AUX renderdoc-1.22-r1-system-glslang.patch 9341 BLAKE2B df5750dc7a6bf026d3cdbe9791bc270393ef7229b0a314b97350bdeaa5bc26011fdfa671ee8594549c46ae268cbe4563ebbcb1b964da21400cd8852382d3233f SHA512 2dcbc06612533f8266c2b2214a552adc4bca37f4ee9b9c53b2d5245bc7fa75f7e8252d7a35cea04fc418bf55cfa9a239588a062c98f1bc79c4eb6d1a7cf78034
 AUX renderdoc-1.27-env-home.patch 438 BLAKE2B a42c86648314382bba7b93ee544fe6d82b4f1ec122c57d7b989475bd442dd7003de8bfd7f467e88693deac6212846103038f48501ffef9eae7d0c38100669eac SHA512 c0b340582de7c23637afa7a95dcd2f3f4c6f28ad9c244c92235e29e428ba40a991cbcac83197a3b52c1c689f4d07ede2fc0c96d4b1b3c67dc94866137a7ce4b7
-AUX renderdoc-1.29-system-compress.patch 4763 BLAKE2B 22a21fbd9c8a24e95da42329c3a5b467964a0da8e7e9ffcb0257bafa59c7b5331c4aef95f51968e6a5f03bb0aaad0abb57bad520f32ef4f086fce8f0071b52e5 SHA512 6b9f5cabbfa93f85340a8392bcb385f64ed4c304752357e166bf4531b89277a0eec4f991af148eb511545a76302e17aac733c779bbf368cd86cecc6e79788b50
-AUX renderdoc-1.29-system-glslang.patch 10117 BLAKE2B 64f867bbd4fa6c53d193d404d464d83f3a42bdd268a93f3b629a7cbf3bac359f567ac3dff19166bd0b18aa6d7a022a0d76db4ab14645a9d8e030ac1ae6450ebd SHA512 2c099c2ac3ca1e04e94aed7629ff0948951488d6d4b35a81ba4a0465d1720b72ab6fbdd75ac4561e7b5de64e61daa12f03d3b3dcf5d52bb776418d8306024959
+AUX renderdoc-1.29-r2-system-compress.patch 4909 BLAKE2B be9705426995ea29ddd7cc79e2888a66c095b938c7d68c020ec27657c9ebe750a25611d0377c07b9833396e5baa1a3ab69beb7dc3bda4f8a43da5dfd2731fd51 SHA512 07cea44a37a58f4941a47ea5bcb2f2f5d2cb9c567f26ff68c4dfce8dbfe07c2b6e7f7de3a261bd0f3680ae406eea776d59adea5bcb5fb8fe8f6d4b7e082bc586
+AUX renderdoc-1.29-r2-system-glslang.patch 11483 BLAKE2B 383a96c0d4c48fc8f9b63e961c38204a6b73feba5976c457890ab9efb6f27ecfcdb6bc5a9f35c58a08b47eacdc626f8fe31ac5471e0e5aafadad74207ada1253 SHA512 847066b316e07ab4351f2d0cd2d2b5c9fe983afbcc40aed2b43a7f67da536fdeaa3ffd981c3dd96de7e4aa4dd86d9897cbd69066b7b837085c04d7f66622a439
 DIST renderdoc-1.27.tar.gz 47445907 BLAKE2B 58be926cb1282fe5bb2ba195cf71fabd9a5fb5562b5d51a600a98818c8f8bbbd576d8e9c331d3f107cb5db427cd35d242fd3f2f28385a47817fc805f26c47bb4 SHA512 1a6fb0d1942ec403ae1393d6121727aebe6b1eef42e795b03c0e0281bd9ca52fa30b28889a9fe80186a41a1dfbc79f38789b47296bc9b5ba185a19bddd47006f
 DIST renderdoc-1.27.tar.gz.asc 833 BLAKE2B fdfbd1ce367e9757e080e1263651444cd4001fe3d8580672a476923e2cf56b030b568c90566f258b1fd485c15c9d6c5a0b91cfb2c72c831677aa088acb9d4c15 SHA512 a74517747bf19a16d8db241a795e16d1213c745d3ff29236844433937202c91da1e580daac6ec7a54322b215163b0ebf492bef9b77eb603720503e4d3a4849df
-DIST renderdoc-1.28.tar.gz 47456620 BLAKE2B 62572e3c2ca4423c3c220f946a419c74951858027a5369ae59e0a026ddaa35c96b44be7d06ce1ff4e8105f3e5edf0bb0227d11f1dd7d8a747cf75ad97e4f354e SHA512 46f0fbde1ba8df1257e426489a425af1e4fa8393f27a6bf17d18e2a8881c5afac5af95e729ce4cc3bb4ef89b58b1db738cce721c1283edfceac48cfcea776a18
-DIST renderdoc-1.28.tar.gz.asc 833 BLAKE2B d7df63a111dd5747bf3ac0c34f6c6f77c91d6cfe91a09552fead8cda4197962bdf89da44e13344ebc0916ce2d20ba98d42e0670a825cd1bf7900eaa858658dcf SHA512 3fa45af60ae8500bc0d05a13bc0b3f6aaed812bc4015e664ff8cd430e4ff9dc497bcceb81769d5037e869ed1096e1c03c4183f00d6ddf9b4932b3f917e6c2697
 DIST renderdoc-1.29.tar.gz 50717466 BLAKE2B 492b32140c8ad1ab3e753158cfede64ea0b580a2df03094aeeff2d4eac659fbedc62971f65d3fe024e0282de39d5f122b512be2fc6a28ac7abf794b58f116322 SHA512 cbb6a2bd4a7d0c4347296f0e6f49d90b40ba11949e1bc5d777104f067c70999c5b124c44eb180a37363331832afb890f7a83fac521d306dd99cdab92b0d09106
 DIST renderdoc-1.29.tar.gz.asc 833 BLAKE2B b8fe64653153ed09b9e03eb255747d8476f6a6badea0bd834808d4e982750b627dc736b71ddacb96ac82e0136500cdb6c54dc4e7ab49529b2044b8e6512a1822 SHA512 ed7b12376e189df421ba69e6b1c14790045491195bdf1197c7c7a6fdc20d72046ae441d057a01e283a7e2ff85b4b341ec6bf45a28e8b04a9f48b441b42699cfd
 DIST swig-renderdoc-7.tar.gz 4006241 BLAKE2B 619f41239f4aef496264d61f44ae042cf80d3ff28491d452cf11ad07e898554c4a32df6119ee0e8e3de36e6bee61855358cd968ad01c9281976e24e9a6cac839 SHA512 5285a65924c069cfb9f73104ad8a95251badac4001293a1757b97ebead5953730c03289159741f82da4c5afe4f61f7c826b105eaf82df044ed2fa21810242c86
 EBUILD renderdoc-1.27-r1.ebuild 5473 BLAKE2B 71d99643258588a2206b51cc439be2683cfe840d558735cf8d64340296f2ee06b4e7939ed13373dd75fdd5bb88c2aaf14e2e13fe64aa087473bb772ece485fc8 SHA512 6dabafa3e9351ed9cd43f43275db9cad8c31878bdbfddc1044f1682f06f9836a47f1b03aaf6cfdefc9f5b838dc5c3d4732df4de8cadab438e42bf4c120def8d9
-EBUILD renderdoc-1.28-r1.ebuild 5474 BLAKE2B ecadb29237714f15eb6a89c1f09b913e6012fb4c90dc0e198585daf6eb8b5e9233408309b0deb760d6edf28e7534a5ec6043b36bafdb3c632abe026ac42c1208 SHA512 e3014a54070d9f724c930c764bed7ca55fba1ec634b926d9ee47c7dc7a06eaca069c0c4ef670c693cd39ed9387e79cdbc5763879285b37230e3e22cc371f848e
-EBUILD renderdoc-1.29-r1.ebuild 5471 BLAKE2B f48522605f1b24490ced95702c5f8dbd76b49803d63357e44c9cae50c0e9d0a0daf3a20a2aa5d3ffe43ae04e7c6afc8f6475602f1eb0034afb4e690dd6b98588 SHA512 fe11c69c17bbbf697601f647a089b59c2bb4ba935977f521ba26bf1efa27cb993467ad8cc23a6c197f285b80d523b9ce1b81744758d7704228bf65cdc4c18ae4
+EBUILD renderdoc-1.29-r2.ebuild 5451 BLAKE2B 23939278ef92ea953e2ffb56bbf4c60e3f4f9c0058545318c8634649a8355f032f08bab291b3db68531f44d1b2ae5fc6cb7daa494d3fb9b779e045b1a7a17124 SHA512 980a17357f1b431ab246a35b83631c83847c1e10a1f7fbd673bf26b89611a7d98fc6f517b1912e25f9473a0235a3cff9d8f400c2e2612ad8b785de5ad919e2c9
 MISC metadata.xml 551 BLAKE2B 6b04ab731ce0f9c836b958914e25fcd4a4b76032fd97ba41f6bda742e99a4b7404de51acac99fe4736ba87e488300e94dc1ef7621a780d0a8e453d0fde0430f2 SHA512 a1c2b5260d0265efe2e1294cb88aa1c43618654c7d989cd8f4bd6e919082ea1d37fed4df8a601a702b5b120d5fb5f6658d3e155c5346dacb17249fed629c04d0
diff --git a/media-gfx/renderdoc/files/renderdoc-1.29-system-compress.patch b/media-gfx/renderdoc/files/renderdoc-1.29-r2-system-compress.patch
index 967d300b29d5..8f793562bcc7 100644
--- a/media-gfx/renderdoc/files/renderdoc-1.29-system-compress.patch
+++ b/media-gfx/renderdoc/files/renderdoc-1.29-r2-system-compress.patch
@@ -89,12 +89,14 @@ index 927e95fb9..5908be6de 100644
      3rdparty/stb/stb_image.h
      3rdparty/stb/stb_image_write.h
      3rdparty/stb/stb_image_resize.h
-@@ -580,7 +534,7 @@ endif()
+@@ -580,9 +534,9 @@ endif()
  add_library(renderdoc SHARED ${renderdoc_objects})
  target_compile_definitions(renderdoc ${RDOC_DEFINITIONS})
  target_include_directories(renderdoc ${RDOC_INCLUDES})
 -target_link_libraries(renderdoc ${RDOC_LIBRARIES} glslang glslang-default-resource-limits SPIRV)
 +target_link_libraries(renderdoc ${RDOC_LIBRARIES} glslang glslang-default-resource-limits miniz::miniz PkgConfig::lz4 PkgConfig::zstd SPIRV)
+ # Newer versions of glslang require C++17 for std::variant
+ set_target_properties(renderdoc PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED ON)
  
  add_dependencies(renderdoc renderdoc_libentry)
  
diff --git a/media-gfx/renderdoc/files/renderdoc-1.29-system-glslang.patch b/media-gfx/renderdoc/files/renderdoc-1.29-r2-system-glslang.patch
index 4e7934928ef7..287917feb549 100644
--- a/media-gfx/renderdoc/files/renderdoc-1.29-system-glslang.patch
+++ b/media-gfx/renderdoc/files/renderdoc-1.29-r2-system-glslang.patch
@@ -5,6 +5,15 @@ Subject: [PATCH] system glslang
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
+@@ -383,7 +383,7 @@
+ endif()
+
+ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
+     if(ENABLE_GGP)
+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -gline-tables-only -fno-omit-frame-pointer")
 @@ -469,6 +469,17 @@ elseif(UNIX)
      endif()
  endif()
@@ -25,12 +34,14 @@ Subject: [PATCH] system glslang
  # these variables are handled within the CMakeLists.txt in qrenderdoc,
 --- a/renderdoc/CMakeLists.txt
 +++ b/renderdoc/CMakeLists.txt
-@@ -604,7 +604,7 @@ endif()
+@@ -604,7 +604,9 @@ endif()
  add_library(renderdoc SHARED ${renderdoc_objects})
  target_compile_definitions(renderdoc ${RDOC_DEFINITIONS})
  target_include_directories(renderdoc ${RDOC_INCLUDES})
 -target_link_libraries(renderdoc ${RDOC_LIBRARIES})
 +target_link_libraries(renderdoc ${RDOC_LIBRARIES} glslang glslang-default-resource-limits SPIRV)
++# Newer versions of glslang require C++17 for std::variant
++set_target_properties(renderdoc PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED ON)
  
  add_dependencies(renderdoc renderdoc_libentry)
  
@@ -232,6 +243,26 @@ Subject: [PATCH] system glslang
  
  rdcstr rdcspv::Compile(const rdcspv::CompilationSettings &settings, const rdcarray<rdcstr> &sources,
                         rdcarray<uint32_t> &spirv)
+--- a/qrenderdoc/Code/pyrenderdoc/CMakeLists.txt
++++ b/qrenderdoc/Code/pyrenderdoc/CMakeLists.txt
+@@ -1,11 +1,3 @@
+-# Build as C++14 for the python bindings template-fu
+-if (CMAKE_VERSION VERSION_LESS "3.1")
+-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+-else ()
+-    set (CMAKE_CXX_STANDARD 14)
+-    set (CMAKE_CXX_STANDARD_REQUIRED ON)
+-endif ()
+-
+ # include paths for qrenderdoc, the internal renderdoc API, and Python
+ set(MODULE_INCLUDES
+     PRIVATE ${CMAKE_SOURCE_DIR}/qrenderdoc
+@@ -82,3 +74,5 @@
+ # Make sure we build after the wrappers are generated
+ add_dependencies(_renderdoc swig-bindings)
+ add_dependencies(_qrenderdoc swig-bindings)
++
++set_target_properties(_renderdoc _qrenderdoc PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED ON)
 -- 
 2.42.0
 
diff --git a/media-gfx/renderdoc/renderdoc-1.28-r1.ebuild b/media-gfx/renderdoc/renderdoc-1.28-r1.ebuild
deleted file mode 100644
index 8be34dedc295..000000000000
--- a/media-gfx/renderdoc/renderdoc-1.28-r1.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# The swig fork is required for compatibility with both provided and
-# 3rd-party Python scripts.  Required patch was sent to upstream in
-# 2014: https://github.com/swig/swig/pull/251
-MY_SWIG_VER=7
-MY_SWIG=swig-${PN}-${MY_SWIG_VER}
-
-AUTOTOOLS_AUTO_DEPEND="no"
-DOCS_BUILDER="sphinx"
-DOCS_DIR="docs"
-PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools cmake flag-o-matic optfeature python-single-r1 docs qmake-utils verify-sig xdg
-
-DESCRIPTION="A stand-alone graphics debugging tool"
-HOMEPAGE="https://renderdoc.org https://github.com/baldurk/renderdoc"
-SRC_URI="
-	https://github.com/baldurk/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	qt5? ( https://github.com/baldurk/swig/archive/${PN}-modified-${MY_SWIG_VER}.tar.gz -> ${MY_SWIG}.tar.gz )
-	verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v${PV}/v${PV}.tar.gz.asc -> ${P}.tar.gz.asc )
-"
-
-# renderdoc: MIT
-#   + cmdline: BSD (not compatible with upstream lib)
-#   + farm fresh icons: CC-BY-3.0
-#   + half: MIT (not compatible with system dev-libs/half)
-#   + include-bin ZLIB (upstream doesn't exist anymore, maintained in tree)
-#   + md5: public-domain
-#   + plthook: BSD-2
-#   + pugixml: MIT
-#   + radeon gpu analyzer: MIT
-#   + source code pro: OFL-1.1
-#   + stb: public-domain
-#   + tinyfiledialogs: ZLIB
-#   + docs? ( sphinx.paramlinks: MIT )
-# swig: GPL-3+ BSD BSD-2
-LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="pyside2 qt5"
-REQUIRED_USE="doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	app-arch/lz4:=
-	app-arch/zstd:=
-	dev-libs/miniz:=
-	>=dev-util/glslang-1.3.231:= <dev-util/glslang-1.3.268
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	x11-libs/xcb-util-keysyms
-	virtual/opengl
-	pyside2? (
-		$(python_gen_cond_dep '
-			dev-python/pyside2[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		${PYTHON_DEPS}
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-	)
-"
-DEPEND="${RDEPEND}"
-# qtcore provides qmake, which is required to build the qrenderdoc gui.
-BDEPEND="
-	x11-base/xorg-proto
-	virtual/pkgconfig
-	qt5? (
-		${AUTOTOOLS_DEPEND}
-		${PYTHON_DEPS}
-		dev-libs/libpcre
-		dev-qt/qtcore:5
-		sys-devel/bison
-	)
-	verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson )
-"
-
-PATCHES=(
-	# The analytics seem very reasonable, and even without this patch
-	# they are NOT sent before the user accepts.  But default the
-	# selection to off, just in case.
-	"${FILESDIR}"/${PN}-1.18-analytics-off.patch
-
-	# Only search for PySide2 if pyside2 USE flag is set.
-	# Bug #833627
-	"${FILESDIR}"/${PN}-1.18-conditional-pyside.patch
-
-	# Pass CXXFLAGS and LDFLAGS through to qmake when qrenderdoc is
-	# built.
-	"${FILESDIR}"/${PN}-1.18-system-flags.patch
-
-	# Needed to prevent sandbox violations during build.
-	"${FILESDIR}"/${PN}-1.27-env-home.patch
-
-	"${FILESDIR}"/${PN}-1.22-r1-system-glslang.patch
-	"${FILESDIR}"/${PN}-1.18-system-compress.patch
-)
-
-DOCS=( util/LINUX_DIST_README )
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/baldurkarlsson.gpg
-
-pkg_setup() {
-	use qt5 && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-	   verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-
-	# Do not unpack the swig sources here.  CMake will do that if
-	# required.
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Ensure that we use the system glslang headers instead of the
-	# vendored copy.
-	rm -r renderdoc/3rdparty/glslang || die 'rm vendored glslang failed'
-
-	# Remove the calls to install the documentation files.  Instead,
-	# install them with einstalldocs.
-	sed -i '/share\/doc\/renderdoc/d' \
-		"${S}"/CMakeLists.txt "${S}"/qrenderdoc/CMakeLists.txt \
-		|| die 'sed remove doc install failed'
-
-	# Assumes that the build directory is "${S}"/build, which it is not.
-	sed -i "s|../build/lib|${BUILD_DIR}/lib|" \
-		"${S}"/docs/conf.py \
-		|| die 'sed patch doc sys.path failed'
-
-	# Bug #836235
-	sed -i '/#include <stdarg/i #include <time.h>' \
-		"${S}"/renderdoc/os/os_specific.h \
-		|| die 'sed include time.h failed'
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# Build system does not know that this is a tagged release, as
-		# we just have the tarball and not the git repository.
-		-DBUILD_VERSION_STABLE=ON
-
-		-DENABLE_EGL=ON
-		-DENABLE_GL=ON
-		-DENABLE_GLES=ON
-		-DENABLE_PYRENDERDOC=$(usex qt5)
-		-DENABLE_QRENDERDOC=$(usex qt5)
-		-DENABLE_VULKAN=ON
-
-		# Upstream says that this option is unsupported and should not
-		# be used yet.
-		-DENABLE_WAYLAND=OFF
-
-		-DENABLE_XCB=ON
-		-DENABLE_XLIB=ON
-
-		# Path to glslang*.cmake.
-		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
-
-		# renderdoc_capture.json is installed here
-		-DVULKAN_LAYER_FOLDER="${EPREFIX}"/etc/vulkan/implicit_layer.d
-	)
-
-	use qt5 && mycmakeargs+=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DRENDERDOC_SWIG_PACKAGE="${DISTDIR}"/${MY_SWIG}.tar.gz
-
-		# Needed after qtchooser removal, bug #836474.
-		-DQMAKE_QT5_COMMAND="$(qt5_get_bindir)"/qmake
-
-		-DQRENDERDOC_ENABLE_PYSIDE2=$(usex pyside2)
-	)
-
-	use pyside2 && mycmakeargs+=( -DPYTHON_CONFIG_SUFFIX=-${EPYTHON} )
-
-	# Lots of type mismatch issues.
-	filter-lto
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	docs_compile
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "android remote contexts" dev-util/android-tools
-	optfeature "vulkan contexts" media-libs/vulkan-loader
-}
diff --git a/media-gfx/renderdoc/renderdoc-1.29-r1.ebuild b/media-gfx/renderdoc/renderdoc-1.29-r2.ebuild
index 74350a137472..1ec49d4c1e88 100644
--- a/media-gfx/renderdoc/renderdoc-1.29-r1.ebuild
+++ b/media-gfx/renderdoc/renderdoc-1.29-r2.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 	app-arch/lz4:=
 	app-arch/zstd:=
 	dev-libs/miniz:=
-	>=dev-util/glslang-1.3.231:= <dev-util/glslang-1.3.268
+	>=dev-util/glslang-1.3.231:=
 	x11-libs/libX11
 	x11-libs/libxcb:=
 	x11-libs/xcb-util-keysyms
@@ -99,8 +99,8 @@ PATCHES=(
 	# Needed to prevent sandbox violations during build.
 	"${FILESDIR}"/${PN}-1.27-env-home.patch
 
-	"${FILESDIR}"/${PN}-1.29-system-glslang.patch
-	"${FILESDIR}"/${PN}-1.29-system-compress.patch
+	"${FILESDIR}"/${PN}-1.29-r2-system-glslang.patch
+	"${FILESDIR}"/${PN}-1.29-r2-system-compress.patch
 )
 
 DOCS=( util/LINUX_DIST_README )