diff options
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/Manifest.gz | bin | 37698 -> 37699 bytes | |||
-rw-r--r-- | media-gfx/renderdoc/Manifest | 2 | ||||
-rw-r--r-- | media-gfx/renderdoc/files/renderdoc-1.30-r1-system-compress.patch | 142 | ||||
-rw-r--r-- | media-gfx/renderdoc/renderdoc-1.30-r1.ebuild | 194 |
4 files changed, 338 insertions, 0 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 1167b48cbcd5..a8eba65ee5c0 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest index 6418f16b6aa3..0e5cf150794b 100644 --- a/media-gfx/renderdoc/Manifest +++ b/media-gfx/renderdoc/Manifest @@ -6,6 +6,7 @@ AUX renderdoc-1.22-r1-system-glslang.patch 9341 BLAKE2B df5750dc7a6bf026d3cdbe97 AUX renderdoc-1.27-env-home.patch 438 BLAKE2B a42c86648314382bba7b93ee544fe6d82b4f1ec122c57d7b989475bd442dd7003de8bfd7f467e88693deac6212846103038f48501ffef9eae7d0c38100669eac SHA512 c0b340582de7c23637afa7a95dcd2f3f4c6f28ad9c244c92235e29e428ba40a991cbcac83197a3b52c1c689f4d07ede2fc0c96d4b1b3c67dc94866137a7ce4b7 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 +AUX renderdoc-1.30-r1-system-compress.patch 4565 BLAKE2B 62ac93b27e7b2fd1962075241cab49acc3971f76b9046a53b0ccdb7707f849aca1c6b4306e07455bdb5e4c9df7f72bba5665a2b3927dfc782722486e2fc152c7 SHA512 7815ea6170583899ee6f48c1aec8a175082208c6b4d1f6c651f3274317c9b9575548f8bb900abc5137309df5448c4643b4fc4e74b367aa18c3dc7dacabba842a 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.29.tar.gz 50717466 BLAKE2B 492b32140c8ad1ab3e753158cfede64ea0b580a2df03094aeeff2d4eac659fbedc62971f65d3fe024e0282de39d5f122b512be2fc6a28ac7abf794b58f116322 SHA512 cbb6a2bd4a7d0c4347296f0e6f49d90b40ba11949e1bc5d777104f067c70999c5b124c44eb180a37363331832afb890f7a83fac521d306dd99cdab92b0d09106 @@ -15,5 +16,6 @@ DIST renderdoc-1.30.tar.gz.asc 833 BLAKE2B c829329806de5cfc672c2cc976596a5c126cd DIST swig-renderdoc-7.tar.gz 4006241 BLAKE2B 619f41239f4aef496264d61f44ae042cf80d3ff28491d452cf11ad07e898554c4a32df6119ee0e8e3de36e6bee61855358cd968ad01c9281976e24e9a6cac839 SHA512 5285a65924c069cfb9f73104ad8a95251badac4001293a1757b97ebead5953730c03289159741f82da4c5afe4f61f7c826b105eaf82df044ed2fa21810242c86 EBUILD renderdoc-1.27-r1.ebuild 5479 BLAKE2B a34c8c8f7c6a1d5bb6e287059a6fd2a5ec8299f5ef0d84da76d1478978a25211848fd296d8223283c5cf684f5d355e783e9d8053c5cb305bd92ac20f17deddac SHA512 73f36946b49b8b527081fc74ded00d8a70dc11dde6b818f8a0164cb03ebab9aee98f734f4a74f0febd0ceb6dec0e95bac14284f481cd205a28b1154b60e01f2a EBUILD renderdoc-1.29-r2.ebuild 5457 BLAKE2B 860dbb13a59b2cdc4c148b1be46998e820cb2fc4811446d755746843ce0252539f82ee9bc82681c54b1de3a9ae01a6dc82368deb3efd8c4cb46a50cc905187de SHA512 789212fd01036635b9cf4f82389016b710b01056c55d2e0154631e514bd1b603f8b2f5ef9fbc53d09a905021cc258fffd927c8ddf33d926d3612e72ceb9b365d +EBUILD renderdoc-1.30-r1.ebuild 5194 BLAKE2B 21874cc362f0f90ccfa0082b3783b31b39213aa52fce770f75ccaaebf4fed49d25387beed7bce33b1207e70eb15badb51d343df0ad3101e270ce44058f26dd1c SHA512 80b426dd5bc10efe11008723187175dea6f81217e571e5c4bd2b831addf7c31eb06b9f8f4c657aa11068a1dd1d2e56a24189c957e2d6887ce3f7b35d4bf3653b EBUILD renderdoc-1.30.ebuild 5498 BLAKE2B 1d32afbc6a0f1e85a1cd9aba8cd2bd43ef926b3015605c259ea660832f2e530431aef2ad68069184b4bebfd3603e5aaa8f659c3352f44e1b6dd28d1d198c65d4 SHA512 3b9cc5b0d61f8a6d832b76b812e3d8242344b5d76fd8a0e566dac39ca04040bc89866d7ed150bc8bd992bd83c5f34ad5670416ab85ac25c610d2fd4fe2d751bc MISC metadata.xml 551 BLAKE2B 6b04ab731ce0f9c836b958914e25fcd4a4b76032fd97ba41f6bda742e99a4b7404de51acac99fe4736ba87e488300e94dc1ef7621a780d0a8e453d0fde0430f2 SHA512 a1c2b5260d0265efe2e1294cb88aa1c43618654c7d989cd8f4bd6e919082ea1d37fed4df8a601a702b5b120d5fb5f6658d3e155c5346dacb17249fed629c04d0 diff --git a/media-gfx/renderdoc/files/renderdoc-1.30-r1-system-compress.patch b/media-gfx/renderdoc/files/renderdoc-1.30-r1-system-compress.patch new file mode 100644 index 000000000000..5b754395cf36 --- /dev/null +++ b/media-gfx/renderdoc/files/renderdoc-1.30-r1-system-compress.patch @@ -0,0 +1,142 @@ +From 8f16c974fc8ec0b286d803490baa6e00a83615cf Mon Sep 17 00:00:00 2001 +From: Matthew Smith <matt@offtopica.uk> +Date: Sun, 30 Jan 2022 18:07:51 +0000 +Subject: [PATCH 2/3] build: Use system compression libs + +--- + CMakeLists.txt | 6 +++ + renderdoc/CMakeLists.txt | 48 +------------------ + renderdoc/core/replay_proxy.cpp | 2 +- + .../driver/shaders/dxbc/dxbc_container.cpp | 2 +- + renderdoc/serialise/lz4io.h | 2 +- + 5 files changed, 10 insertions(+), 50 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cb0a2c7f6..0ee4fc629 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -473,6 +473,12 @@ + endif() + endif() + ++find_package(PkgConfig REQUIRED) ++find_package(miniz REQUIRED CONFIG) ++ ++pkg_check_modules(lz4 REQUIRED IMPORTED_TARGET liblz4) ++pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd) ++ + add_subdirectory(renderdoc) + + # these variables are handled within the CMakeLists.txt in qrenderdoc, +diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt +index 927e95fb9..5908be6de 100644 +--- a/renderdoc/CMakeLists.txt ++++ b/renderdoc/CMakeLists.txt +@@ -218,56 +218,10 @@ set(sources + 3rdparty/pugixml/pugixml.cpp + 3rdparty/pugixml/pugixml.hpp + 3rdparty/pugixml/pugiconfig.hpp +- 3rdparty/lz4/lz4.c +- 3rdparty/lz4/lz4.h + 3rdparty/md5/md5.c + 3rdparty/md5/md5.h +- 3rdparty/miniz/miniz.c +- 3rdparty/miniz/miniz.h + 3rdparty/superluminal/superluminal.cpp + 3rdparty/superluminal/superluminal.h +- 3rdparty/zstd/bitstream.h +- 3rdparty/zstd/compiler.h +- 3rdparty/zstd/cpu.h +- 3rdparty/zstd/debug.c +- 3rdparty/zstd/debug.h +- 3rdparty/zstd/entropy_common.c +- 3rdparty/zstd/error_private.c +- 3rdparty/zstd/error_private.h +- 3rdparty/zstd/fse.h +- 3rdparty/zstd/fse_compress.c +- 3rdparty/zstd/fse_decompress.c +- 3rdparty/zstd/hist.c +- 3rdparty/zstd/hist.h +- 3rdparty/zstd/huf.h +- 3rdparty/zstd/huf_compress.c +- 3rdparty/zstd/huf_decompress.c +- 3rdparty/zstd/mem.h +- 3rdparty/zstd/pool.c +- 3rdparty/zstd/pool.h +- 3rdparty/zstd/threading.c +- 3rdparty/zstd/threading.h +- 3rdparty/zstd/xxhash.c +- 3rdparty/zstd/xxhash.h +- 3rdparty/zstd/zstd.h +- 3rdparty/zstd/zstd_common.c +- 3rdparty/zstd/zstd_compress.c +- 3rdparty/zstd/zstd_compress_internal.h +- 3rdparty/zstd/zstd_decompress.c +- 3rdparty/zstd/zstd_double_fast.c +- 3rdparty/zstd/zstd_double_fast.h +- 3rdparty/zstd/zstd_errors.h +- 3rdparty/zstd/zstd_fast.c +- 3rdparty/zstd/zstd_fast.h +- 3rdparty/zstd/zstd_internal.h +- 3rdparty/zstd/zstd_lazy.c +- 3rdparty/zstd/zstd_lazy.h +- 3rdparty/zstd/zstd_ldm.c +- 3rdparty/zstd/zstd_ldm.h +- 3rdparty/zstd/zstd_opt.c +- 3rdparty/zstd/zstd_opt.h +- 3rdparty/zstd/zstdmt_compress.c +- 3rdparty/zstd/zstdmt_compress.h + 3rdparty/stb/stb_image.h + 3rdparty/stb/stb_image_write.h + 3rdparty/stb/stb_image_resize.h +@@ -580,7 +534,7 @@ 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} miniz::miniz PkgConfig::lz4 PkgConfig::zstd) + + add_dependencies(renderdoc renderdoc_libentry) + +diff --git a/renderdoc/core/replay_proxy.cpp b/renderdoc/core/replay_proxy.cpp +index dea1e86cf..c9362e797 100644 +--- a/renderdoc/core/replay_proxy.cpp ++++ b/renderdoc/core/replay_proxy.cpp +@@ -25,7 +25,7 @@ + + #include "replay_proxy.h" + #include <list> +-#include "lz4/lz4.h" ++#include <lz4.h> + #include "replay/dummy_driver.h" + #include "serialise/lz4io.h" + +diff --git a/renderdoc/driver/shaders/dxbc/dxbc_container.cpp b/renderdoc/driver/shaders/dxbc/dxbc_container.cpp +index ede1fdeb7..0c8fd4dfe 100644 +--- a/renderdoc/driver/shaders/dxbc/dxbc_container.cpp ++++ b/renderdoc/driver/shaders/dxbc/dxbc_container.cpp +@@ -29,7 +29,7 @@ + #include "common/common.h" + #include "core/settings.h" + #include "driver/shaders/dxil/dxil_bytecode.h" +-#include "lz4/lz4.h" ++#include <lz4.h> + #include "md5/md5.h" + #include "serialise/serialiser.h" + #include "strings/string_utils.h" +diff --git a/renderdoc/serialise/lz4io.h b/renderdoc/serialise/lz4io.h +index 199fbbbc1..80fdf94f2 100644 +--- a/renderdoc/serialise/lz4io.h ++++ b/renderdoc/serialise/lz4io.h +@@ -24,7 +24,7 @@ + + #pragma once + +-#include "lz4/lz4.h" ++#include <lz4.h> + #include "streamio.h" + + class LZ4Compressor : public Compressor +-- +2.35.1 + diff --git a/media-gfx/renderdoc/renderdoc-1.30-r1.ebuild b/media-gfx/renderdoc/renderdoc-1.30-r1.ebuild new file mode 100644 index 000000000000..4fcb8c509c33 --- /dev/null +++ b/media-gfx/renderdoc/renderdoc-1.30-r1.ebuild @@ -0,0 +1,194 @@ +# Copyright 1999-2024 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 +# + glslang: BSD +# + 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:= + 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 + app-alternatives/yacc + ) + 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.30-r1-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 + + # 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_UNSUPPORTED_EXPERIMENTAL_POSSIBLY_BROKEN_WAYLAND=OFF + + -DENABLE_XCB=ON + -DENABLE_XLIB=ON + + # 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 +} |