commit: 2c66a0eef4f242b580aace2c61c07a2cacbb1b26 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Nov 29 18:10:32 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Nov 29 22:32:04 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c66a0ee
media-gfx/renderdoc: Rip out IUSE qt5, doc, also gets rid of autotools+py Without replacements. Until upstream decides to port to Qt6, which then may better be packaged as split if possible. Bug: https://bugs.gentoo.org/961634 Closes: https://bugs.gentoo.org/954832 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-gfx/renderdoc/Manifest | 1 - media-gfx/renderdoc/metadata.xml | 5 -- ...derdoc-1.36.ebuild => renderdoc-1.36-r1.ebuild} | 80 ++++------------------ 3 files changed, 12 insertions(+), 74 deletions(-) diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest index be432d5a7688..c5de96ad30dc 100644 --- a/media-gfx/renderdoc/Manifest +++ b/media-gfx/renderdoc/Manifest @@ -1,3 +1,2 @@ DIST renderdoc-1.36.tar.gz 51867409 BLAKE2B b1e8f0b1991f9ec131e88967725354fa63fbb2b13a06908af9c16c332570290433e43b146b352088fedc40326f2886399ea288bcb8eb0c709dc05b6717d72c49 SHA512 b908b97f9b2c59f762f8a909ac3c0e76d8acffb569dc43ce0899407984ce94999b43351f11101e49ef1f1e2365da2e86641b95b0b9774bdf6c6ea7e502551324 DIST renderdoc-1.36.tar.gz.asc 833 BLAKE2B af97dd33aab87325172ab88a1161456a070a72d1a8e286d9dece7292248a74eb5b8b8da6052ebc4b5a98bad62f697e0fac2c69d9a3173bc942ebde2dc22649a5 SHA512 d325cdef3c85ed839b68f896cd327811e5eb58958daaee674b78614530a8f896eb471386beb2ea4e143d39bf511e7df07a548978dbd32b9ca85e4d2d36a9548d -DIST swig-renderdoc-7.tar.gz 4006241 BLAKE2B 619f41239f4aef496264d61f44ae042cf80d3ff28491d452cf11ad07e898554c4a32df6119ee0e8e3de36e6bee61855358cd968ad01c9281976e24e9a6cac839 SHA512 5285a65924c069cfb9f73104ad8a95251badac4001293a1757b97ebead5953730c03289159741f82da4c5afe4f61f7c826b105eaf82df044ed2fa21810242c86 diff --git a/media-gfx/renderdoc/metadata.xml b/media-gfx/renderdoc/metadata.xml index 4dab889d943d..f217ead6ef7f 100644 --- a/media-gfx/renderdoc/metadata.xml +++ b/media-gfx/renderdoc/metadata.xml @@ -2,11 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <!-- maintainer-needed --> - <use> - <flag name="qt5"> - Build and install the qrenderdoc GUI - </flag> - </use> <upstream> <remote-id type="github">baldurk/renderdoc</remote-id> </upstream> diff --git a/media-gfx/renderdoc/renderdoc-1.36.ebuild b/media-gfx/renderdoc/renderdoc-1.36-r1.ebuild similarity index 64% rename from media-gfx/renderdoc/renderdoc-1.36.ebuild rename to media-gfx/renderdoc/renderdoc-1.36-r1.ebuild index cba1640bb9ee..803ec846b5da 100644 --- a/media-gfx/renderdoc/renderdoc-1.36.ebuild +++ b/media-gfx/renderdoc/renderdoc-1.36-r1.ebuild @@ -3,23 +3,12 @@ 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_{11..13} ) -inherit autotools cmake flag-o-matic optfeature python-single-r1 docs qmake-utils verify-sig xdg - -DESCRIPTION="Stand-alone graphics debugging tool" +inherit cmake flag-o-matic optfeature verify-sig xdg + +DESCRIPTION="Standalone 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 ) " @@ -41,8 +30,6 @@ SRC_URI=" LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB" SLOT="0" KEYWORDS="amd64" -IUSE="qt5" -REQUIRED_USE="doc? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" app-arch/lz4:= @@ -52,28 +39,11 @@ RDEPEND=" x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl - 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 - app-alternatives/yacc - ) verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson ) " @@ -83,15 +53,13 @@ PATCHES=( # 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 + # 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. + # 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. + # Needed to prevent sandbox violations during build "${FILESDIR}"/${PN}-1.27-env-home.patch "${FILESDIR}"/${PN}-1.30-r1-system-compress.patch @@ -107,10 +75,6 @@ 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} @@ -129,18 +93,14 @@ src_prepare() { # 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' + CMakeLists.txt qrenderdoc/CMakeLists.txt || die - # 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' + # Assumes that the build directory is "${S}"/build, which it is not + sed -i "s|../build/lib|${BUILD_DIR}/lib|" docs/conf.py || die # Bug #836235 sed -i '/#include <stdarg/i #include <time.h>' \ - "${S}"/renderdoc/os/os_specific.h \ - || die 'sed include time.h failed' + renderdoc/os/os_specific.h || die } src_configure() { @@ -152,8 +112,8 @@ src_configure() { -DENABLE_EGL=ON -DENABLE_GL=ON -DENABLE_GLES=ON - -DENABLE_PYRENDERDOC=$(usex qt5) - -DENABLE_QRENDERDOC=$(usex qt5) + -DENABLE_PYRENDERDOC=OFF # disable Qt5 + -DENABLE_QRENDERDOC=OFF # disable Qt5 -DENABLE_VULKAN=ON # Upstream says that this option is unsupported and should not @@ -167,28 +127,12 @@ src_configure() { -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 - - # Bug #926549 - -DQRENDERDOC_ENABLE_PYSIDE2=OFF - ) - # 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
