[gentoo-commits] repo/gentoo:master commit in: media-gfx/renderdoc/files/, media-gfx/renderdoc/
commit: 005b4f99bb3495483514c179811f253ea7132c71 Author: Matthew Smith gentoo org> AuthorDate: Fri Apr 5 07:32:07 2024 + Commit: Matthew Smith gentoo org> CommitDate: Fri Apr 5 08:21:29 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=005b4f99 media-gfx/renderdoc: add 1.31 Closes: https://bugs.gentoo.org/925578 Signed-off-by: Matthew Smith gentoo.org> media-gfx/renderdoc/Manifest | 2 + media-gfx/renderdoc/files/renderdoc-1.31-lld.patch | 23 +++ media-gfx/renderdoc/renderdoc-1.31.ebuild | 191 + 3 files changed, 216 insertions(+) diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest index 17f8392c0cce..c72dab197a3d 100644 --- a/media-gfx/renderdoc/Manifest +++ b/media-gfx/renderdoc/Manifest @@ -1,3 +1,5 @@ DIST renderdoc-1.30.tar.gz 50938458 BLAKE2B 2e9364a8eabca64384e066709c98be8df0ed3c970c173074f9d38eea21d4dc31a50b862818879ccb9f32be8b839643c2d01ddda70d9da8c338c2fc305549eaa9 SHA512 33437f7420d6a79f2b02536ae63bc31537cfab83cdac2d44efdef377e93db7c0c15f2e46ecc67a6ea780f36b162f04d7a00ac3fe5d382fe761fa986664aceb60 DIST renderdoc-1.30.tar.gz.asc 833 BLAKE2B c829329806de5cfc672c2cc976596a5c126cd5f24bef189f6832de8f8f3721461e56688823d562e82eae89792c5fc4a500037cc97c2cce2b762b211a951c1d19 SHA512 f68a04aec4e304df0eba3dcba2876f99182fecff82b6b600d621e48c15bce42c07f20aebc811fd36aff5c04f550a51483af2b499051700a2c5bc936311a534de +DIST renderdoc-1.31.tar.gz 51193992 BLAKE2B a51e2d380b61f462e29b97679b0c2014e26cf108e3d9bc70874fedfbee5a9f391e8693f54c76fae51b9459b70d2197c362b95054a54c5e2e889c8ce85ba74305 SHA512 c119fdd7f27ef4f617b5b5aad94267326f403802648d6ed0970651e48b2467729ce5768ea64c77cab337ff0bdde4c17eaa01028dfebb15568bb4500693cf6d6e +DIST renderdoc-1.31.tar.gz.asc 833 BLAKE2B 82d360070eea9cf037b3ec7de899c58372e64540d2346cc209edb8cc3c321fd628954fbb1275b27366a2d91dd8604e9ebdd961cfd4dcab0abea1fb3bc793817b SHA512 878dd0a042aa8af97b7ba158fd88776cb2ea3ca662cfc95752d477727686342153db217302d9325f0f6bbd76628eb608820350981bf0d819812e57cea773f499 DIST swig-renderdoc-7.tar.gz 4006241 BLAKE2B 619f41239f4aef496264d61f44ae042cf80d3ff28491d452cf11ad07e898554c4a32df6119ee0e8e3de36e6bee61855358cd968ad01c9281976e24e9a6cac839 SHA512 5285a65924c069cfb9f73104ad8a95251badac4001293a1757b97ebead5953730c03289159741f82da4c5afe4f61f7c826b105eaf82df044ed2fa21810242c86 diff --git a/media-gfx/renderdoc/files/renderdoc-1.31-lld.patch b/media-gfx/renderdoc/files/renderdoc-1.31-lld.patch new file mode 100644 index ..4c19c97bf28e --- /dev/null +++ b/media-gfx/renderdoc/files/renderdoc-1.31-lld.patch @@ -0,0 +1,23 @@ +Remove undefined symbols from version script. + +Bug: https://bugs.gentoo.org/925578 +--- a/renderdoc/renderdoc.version b/renderdoc/renderdoc.version +@@ -6,17 +6,14 @@ + egl[A-Z]*; + vk_icd*; + dlopen; +-dlsym; + fork; + execl; + execlp; + execle; +-execlpe; + execv; + execvp; + execve; + execvpe; +-_exit; + RENDERDOC_*; + VK_LAYER_RENDERDOC_*; + local: diff --git a/media-gfx/renderdoc/renderdoc-1.31.ebuild b/media-gfx/renderdoc/renderdoc-1.31.ebuild new file mode 100644 index ..c8d27b42b52d --- /dev/null +++ b/media-gfx/renderdoc/renderdoc-1.31.ebuild @@ -0,0 +1,191 @@ +# 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..12} ) +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 +#
[gentoo-commits] repo/gentoo:master commit in: media-gfx/renderdoc/files/
commit: e7ee9b5616fab3ceafee09422c6ff1b8fe1eaf82 Author: Matthew Smith gentoo org> AuthorDate: Sun Mar 3 19:23:12 2024 + Commit: Matthew Smith gentoo org> CommitDate: Sun Mar 3 19:23:12 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7ee9b56 media-gfx/renderdoc: remove unused patches Signed-off-by: Matthew Smith gentoo.org> .../files/renderdoc-1.18-system-compress.patch | 142 --- .../files/renderdoc-1.22-r1-system-glslang.patch | 215 - .../files/renderdoc-1.29-r2-system-compress.patch | 144 --- .../files/renderdoc-1.29-r2-system-glslang.patch | 268 - 4 files changed, 769 deletions(-) diff --git a/media-gfx/renderdoc/files/renderdoc-1.18-system-compress.patch b/media-gfx/renderdoc/files/renderdoc-1.18-system-compress.patch deleted file mode 100644 index 5b9a7472349b.. --- a/media-gfx/renderdoc/files/renderdoc-1.18-system-compress.patch +++ /dev/null @@ -1,142 +0,0 @@ -From 8f16c974fc8ec0b286d803490baa6e00a83615cf Mon Sep 17 00:00:00 2001 -From: Matthew Smith -Date: Sun, 30 Jan 2022 18:07:51 + -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 -@@ -419,6 +419,12 @@ elseif(UNIX) - 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) -+ - # glslang package does not export a -config.cmake file. - option(GLSLANG_TARGET_DIR "Absolute path to glslangTargets.cmake directory") - include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") -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} glslang SPIRV) -+target_link_libraries(renderdoc ${RDOC_LIBRARIES} glslang miniz::miniz PkgConfig::lz4 PkgConfig::zstd SPIRV) - - 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 --#include "lz4/lz4.h" -+#include - #include "replay/dummy_driver.h" - #include "serialise/lz4io.h" - -diff --git a/renderdoc/driver/shaders/dxb
[gentoo-commits] repo/gentoo:master commit in: media-gfx/renderdoc/files/, media-gfx/renderdoc/
commit: dbab74604fc6fea1f0ddc167ca889e567ca6f25a Author: Matthew Smith gentoo org> AuthorDate: Sat Jan 27 17:37:12 2024 + Commit: Matthew Smith gentoo org> CommitDate: Sat Jan 27 17:37:31 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbab7460 media-gfx/renderdoc: use vendored glslang Closes: https://bugs.gentoo.org/922436 Signed-off-by: Matthew Smith gentoo.org> .../files/renderdoc-1.30-r1-system-compress.patch | 142 +++ media-gfx/renderdoc/renderdoc-1.30-r1.ebuild | 194 + 2 files changed, 336 insertions(+) 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 ..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 +Date: Sun, 30 Jan 2022 18:07:51 + +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 +-#include "lz4/lz4.h" ++#include + #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 +2
[gentoo-commits] repo/gentoo:master commit in: media-gfx/renderdoc/files/, media-gfx/renderdoc/
commit: f3e1fe0f5dcf61ffaeb41b3e923f92befdbb95a4 Author: Matthew Smith gentoo org> AuthorDate: Sun Dec 3 13:23:00 2023 + Commit: Matthew Smith gentoo org> CommitDate: Sun Dec 3 13:23:00 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3e1fe0f media-gfx/renderdoc: drop 1.28-r1, 1.29-r1 Signed-off-by: Matthew Smith gentoo.org> media-gfx/renderdoc/Manifest | 2 - .../files/renderdoc-1.29-system-compress.patch | 142 .../files/renderdoc-1.29-system-glslang.patch | 237 - media-gfx/renderdoc/renderdoc-1.28-r1.ebuild | 202 -- media-gfx/renderdoc/renderdoc-1.29-r1.ebuild | 202 -- 5 files changed, 785 deletions(-) diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest index 429c6056e92f..1b633938f478 100644 --- a/media-gfx/renderdoc/Manifest +++ b/media-gfx/renderdoc/Manifest @@ -1,7 +1,5 @@ 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 diff --git a/media-gfx/renderdoc/files/renderdoc-1.29-system-compress.patch b/media-gfx/renderdoc/files/renderdoc-1.29-system-compress.patch deleted file mode 100644 index 967d300b29d5.. --- a/media-gfx/renderdoc/files/renderdoc-1.29-system-compress.patch +++ /dev/null @@ -1,142 +0,0 @@ -From 8f16c974fc8ec0b286d803490baa6e00a83615cf Mon Sep 17 00:00:00 2001 -From: Matthew Smith -Date: Sun, 30 Jan 2022 18:07:51 + -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 -@@ -419,6 +419,12 @@ elseif(UNIX) - 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) -+ - # glslang package does not export a -config.cmake file. - option(GLSLANG_TARGET_DIR "Absolute path to glslangTargets.cmake directory") - include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") -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/
[gentoo-commits] repo/gentoo:master commit in: media-gfx/renderdoc/files/, media-gfx/renderdoc/
commit: d523e2ed9e0302c57fb425341ceec2995a6daa4c Author: Matthew Smith gentoo org> AuthorDate: Fri Jun 23 08:58:09 2023 + Commit: Matthew Smith gentoo org> CommitDate: Fri Jun 23 08:58:09 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d523e2ed media-gfx/renderdoc: drop 1.24, security cleanup Bug: https://bugs.gentoo.org/908031 Signed-off-by: Matthew Smith gentoo.org> media-gfx/renderdoc/Manifest | 2 - .../renderdoc/files/renderdoc-1.24-env-home.patch | 15 -- media-gfx/renderdoc/renderdoc-1.24.ebuild | 203 - 3 files changed, 220 deletions(-) diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest index 4da598b1b2ec..0bea9d1c10ae 100644 --- a/media-gfx/renderdoc/Manifest +++ b/media-gfx/renderdoc/Manifest @@ -1,5 +1,3 @@ -DIST renderdoc-1.24.tar.gz 46998687 BLAKE2B 34316e81da94eeeb0aff2291563e9bf5c46089746f7dc53f8def2b047d0d377e5c26edd8fee23ff97d77037bcfc8468b7f27f2c82c7f6e80f20cd5278b026d75 SHA512 07cc35800c13893bf1b8f8635d5a819f546e458be6a8111d1b40d54e25977c0b88d7c7bc6a89a813dfa353e0fe0a84a334d3796e04c327bf2f42c65a172f9027 -DIST renderdoc-1.24.tar.gz.asc 833 BLAKE2B 0649f4437c57fee9cd69946cff3be0b2b156656fe648b56504ff241dbd43d37d4f3d6a89ea17bd006a7d4778f3d901e25756c069baeb3d55283d9046d19b3cb0 SHA512 fad7ffd3a9538d26b38a9a32a22021063cf9b457cedecb1e40cb7cf7a55e86c290ed1776877612af02205b0f8d35f5331f05e7b2fcdfc00469be21831b62939f DIST renderdoc-1.27.tar.gz 47445907 BLAKE2B 58be926cb1282fe5bb2ba195cf71fabd9a5fb5562b5d51a600a98818c8f8bbbd576d8e9c331d3f107cb5db427cd35d242fd3f2f28385a47817fc805f26c47bb4 SHA512 1a6fb0d1942ec403ae1393d6121727aebe6b1eef42e795b03c0e0281bd9ca52fa30b28889a9fe80186a41a1dfbc79f38789b47296bc9b5ba185a19bddd47006f DIST renderdoc-1.27.tar.gz.asc 833 BLAKE2B fdfbd1ce367e9757e080e1263651444cd4001fe3d8580672a476923e2cf56b030b568c90566f258b1fd485c15c9d6c5a0b91cfb2c72c831677aa088acb9d4c15 SHA512 a74517747bf19a16d8db241a795e16d1213c745d3ff29236844433937202c91da1e580daac6ec7a54322b215163b0ebf492bef9b77eb603720503e4d3a4849df DIST swig-renderdoc-7.tar.gz 4006241 BLAKE2B 619f41239f4aef496264d61f44ae042cf80d3ff28491d452cf11ad07e898554c4a32df6119ee0e8e3de36e6bee61855358cd968ad01c9281976e24e9a6cac839 SHA512 5285a65924c069cfb9f73104ad8a95251badac4001293a1757b97ebead5953730c03289159741f82da4c5afe4f61f7c826b105eaf82df044ed2fa21810242c86 diff --git a/media-gfx/renderdoc/files/renderdoc-1.24-env-home.patch b/media-gfx/renderdoc/files/renderdoc-1.24-env-home.patch deleted file mode 100644 index b4a2230cbfd4.. --- a/media-gfx/renderdoc/files/renderdoc-1.24-env-home.patch +++ /dev/null @@ -1,15 +0,0 @@ a/renderdoc/os/posix/linux/linux_stringio.cpp -+++ b/renderdoc/os/posix/linux/linux_stringio.cpp -@@ -595,11 +595,7 @@ - - rdcstr GetAppFolderFilename(const rdcstr &filename) - { -- passwd *pw = getpwuid(getuid()); -- const char *homedir = pw ? pw->pw_dir : NULL; -- -- if(!homedir) --homedir = getenv("HOME"); -+ const char *homedir = getenv("HOME"); - - if(!homedir) - { diff --git a/media-gfx/renderdoc/renderdoc-1.24.ebuild b/media-gfx/renderdoc/renderdoc-1.24.ebuild deleted file mode 100644 index f524df42b3ef.. --- a/media-gfx/renderdoc/renderdoc-1.24.ebuild +++ /dev/null @@ -1,203 +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" -# For Python 3.11, see https://github.com/baldurk/renderdoc/issues/2730 -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
[gentoo-commits] repo/gentoo:master commit in: media-gfx/renderdoc/files/, media-gfx/renderdoc/
commit: 43f654a060813a88209ab9998291b3701eacf86e Author: Matthew Smith gentoo org> AuthorDate: Fri Jun 9 16:49:18 2023 + Commit: Matthew Smith gentoo org> CommitDate: Fri Jun 9 16:49:36 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43f654a0 media-gfx/renderdoc: add 1.27 Bug: https://bugs.gentoo.org/908031 Signed-off-by: Matthew Smith gentoo.org> media-gfx/renderdoc/Manifest | 2 + .../renderdoc/files/renderdoc-1.27-env-home.patch | 15 ++ media-gfx/renderdoc/renderdoc-1.27.ebuild | 202 + 3 files changed, 219 insertions(+) diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest index 5978148372fd..4da598b1b2ec 100644 --- a/media-gfx/renderdoc/Manifest +++ b/media-gfx/renderdoc/Manifest @@ -1,3 +1,5 @@ DIST renderdoc-1.24.tar.gz 46998687 BLAKE2B 34316e81da94eeeb0aff2291563e9bf5c46089746f7dc53f8def2b047d0d377e5c26edd8fee23ff97d77037bcfc8468b7f27f2c82c7f6e80f20cd5278b026d75 SHA512 07cc35800c13893bf1b8f8635d5a819f546e458be6a8111d1b40d54e25977c0b88d7c7bc6a89a813dfa353e0fe0a84a334d3796e04c327bf2f42c65a172f9027 DIST renderdoc-1.24.tar.gz.asc 833 BLAKE2B 0649f4437c57fee9cd69946cff3be0b2b156656fe648b56504ff241dbd43d37d4f3d6a89ea17bd006a7d4778f3d901e25756c069baeb3d55283d9046d19b3cb0 SHA512 fad7ffd3a9538d26b38a9a32a22021063cf9b457cedecb1e40cb7cf7a55e86c290ed1776877612af02205b0f8d35f5331f05e7b2fcdfc00469be21831b62939f +DIST renderdoc-1.27.tar.gz 47445907 BLAKE2B 58be926cb1282fe5bb2ba195cf71fabd9a5fb5562b5d51a600a98818c8f8bbbd576d8e9c331d3f107cb5db427cd35d242fd3f2f28385a47817fc805f26c47bb4 SHA512 1a6fb0d1942ec403ae1393d6121727aebe6b1eef42e795b03c0e0281bd9ca52fa30b28889a9fe80186a41a1dfbc79f38789b47296bc9b5ba185a19bddd47006f +DIST renderdoc-1.27.tar.gz.asc 833 BLAKE2B fdfbd1ce367e9757e080e1263651444cd4001fe3d8580672a476923e2cf56b030b568c90566f258b1fd485c15c9d6c5a0b91cfb2c72c831677aa088acb9d4c15 SHA512 a74517747bf19a16d8db241a795e16d1213c745d3ff29236844433937202c91da1e580daac6ec7a54322b215163b0ebf492bef9b77eb603720503e4d3a4849df DIST swig-renderdoc-7.tar.gz 4006241 BLAKE2B 619f41239f4aef496264d61f44ae042cf80d3ff28491d452cf11ad07e898554c4a32df6119ee0e8e3de36e6bee61855358cd968ad01c9281976e24e9a6cac839 SHA512 5285a65924c069cfb9f73104ad8a95251badac4001293a1757b97ebead5953730c03289159741f82da4c5afe4f61f7c826b105eaf82df044ed2fa21810242c86 diff --git a/media-gfx/renderdoc/files/renderdoc-1.27-env-home.patch b/media-gfx/renderdoc/files/renderdoc-1.27-env-home.patch new file mode 100644 index ..09510318c5a5 --- /dev/null +++ b/media-gfx/renderdoc/files/renderdoc-1.27-env-home.patch @@ -0,0 +1,15 @@ +--- a/renderdoc/os/posix/linux/linux_stringio.cpp b/renderdoc/os/posix/linux/linux_stringio.cpp +@@ -595,11 +595,7 @@ rdcstr GetTempRootPath() + + rdcstr GetAppFolderFilename(const rdcstr &filename) + { +- passwd *pw = getpwuid(getuid()); +- rdcstr homedir = pw ? pw->pw_dir : ""; +- +- if(homedir.empty()) +-homedir = Process::GetEnvVariable("HOME"); ++ rdcstr homedir = Process::GetEnvVariable("HOME"); + + if(homedir.empty()) + { diff --git a/media-gfx/renderdoc/renderdoc-1.27.ebuild b/media-gfx/renderdoc/renderdoc-1.27.ebuild new file mode 100644 index ..ffd0e8f0e5c4 --- /dev/null +++ b/media-gfx/renderdoc/renderdoc-1.27.ebuild @@ -0,0 +1,202 @@ +# 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" +I
[gentoo-commits] repo/gentoo:master commit in: media-gfx/renderdoc/files/
commit: 313b8a15f5cffbbc421f1649aadde45f49576c93 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Mon Feb 27 19:26:14 2023 + Commit: Matthew Smith gentoo org> CommitDate: Wed Mar 1 11:20:25 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=313b8a15 media-gfx/renderdoc: remove unused patches Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/29841 Signed-off-by: Matthew Smith gentoo.org> .../renderdoc/files/renderdoc-1.18-env-home.patch | 26 --- .../files/renderdoc-1.20-system-glslang.patch | 197 - 2 files changed, 223 deletions(-) diff --git a/media-gfx/renderdoc/files/renderdoc-1.18-env-home.patch b/media-gfx/renderdoc/files/renderdoc-1.18-env-home.patch deleted file mode 100644 index 94ec9a9bbf14.. --- a/media-gfx/renderdoc/files/renderdoc-1.18-env-home.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1a9c1bc02d2ed1b8e1723750d8e9eb9fa92fddef Mon Sep 17 00:00:00 2001 -From: Matthew Smith -Date: Thu, 10 Feb 2022 18:02:37 + -Subject: [PATCH] Use getenv("HOME") instead of getpwuid - - renderdoc/os/posix/linux/linux_stringio.cpp | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/renderdoc/os/posix/linux/linux_stringio.cpp b/renderdoc/os/posix/linux/linux_stringio.cpp -index c704fc7fc..9a556ec16 100644 a/renderdoc/os/posix/linux/linux_stringio.cpp -+++ b/renderdoc/os/posix/linux/linux_stringio.cpp -@@ -595,8 +595,7 @@ rdcstr GetTempRootPath() - - rdcstr GetAppFolderFilename(const rdcstr &filename) - { -- passwd *pw = getpwuid(getuid()); -- const char *homedir = pw->pw_dir; -+ const char *homedir = getenv("HOME"); - - rdcstr ret = rdcstr(homedir) + "/.renderdoc/"; - --- -2.35.1 - diff --git a/media-gfx/renderdoc/files/renderdoc-1.20-system-glslang.patch b/media-gfx/renderdoc/files/renderdoc-1.20-system-glslang.patch deleted file mode 100644 index be808131c362.. --- a/media-gfx/renderdoc/files/renderdoc-1.20-system-glslang.patch +++ /dev/null @@ -1,197 +0,0 @@ -From 70442b7a3952350429872e95d843374f0aaa6a2f Mon Sep 17 00:00:00 2001 -From: Matthew Smith -Date: Sun, 30 Jan 2022 17:19:47 + -Subject: [PATCH] build: Use system glslang - -Requires -DGLSLANG_TARGET_DIR option. a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -437,6 +437,17 @@ elseif(UNIX) - endif() - endif() - -+# glslang package does not export a -config.cmake file. -+option(GLSLANG_TARGET_DIR "Absolute path to glslangTargets.cmake directory") -+include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") -+include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake") -+include("${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") -+include("${GLSLANG_TARGET_DIR}/glslangTargets.cmake") -+include("${GLSLANG_TARGET_DIR}/SPIRVTargets.cmake") -+if(NOT TARGET glslang OR NOT TARGET SPIRV) -+ message(FATAL_ERROR "glslang or SPIRV target not found") -+endif() -+ - add_subdirectory(renderdoc) - - # these variables are handled within the CMakeLists.txt in qrenderdoc, a/renderdoc/CMakeLists.txt -+++ b/renderdoc/CMakeLists.txt -@@ -595,7 +595,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} glslang SPIRV) - - add_dependencies(renderdoc renderdoc_libentry) - a/renderdoc/data/glsl_shaders.cpp -+++ b/renderdoc/data/glsl_shaders.cpp -@@ -26,7 +26,7 @@ - #include "common/common.h" - #include "common/formatting.h" - #include "driver/shaders/spirv/glslang_compile.h" --#include "glslang/glslang/Public/ShaderLang.h" -+#include - #include "os/os_specific.h" - - #define GLSL_HEADERS(HEADER) \ a/renderdoc/driver/gl/gl_shader_refl.cpp -+++ b/renderdoc/driver/gl/gl_shader_refl.cpp -@@ -26,7 +26,7 @@ - #include - #include - #include "driver/shaders/spirv/glslang_compile.h" --#include "glslang/glslang/Public/ShaderLang.h" -+#include - #include "gl_driver.h" - - template <> a/renderdoc/driver/shaders/spirv/CMakeLists.txt -+++ b/renderdoc/driver/shaders/spirv/CMakeLists.txt -@@ -1,91 +1,3 @@ --set(glslang_dir ${RDOC_SOURCE_DIR}/3rdparty/glslang) --set(glslang_sources --${glslang_dir}/OGLCompilersDLL/InitializeDll.cpp --${glslang_dir}/OGLCompilersDLL/InitializeDll.h --${glslang_dir}/SPIRV/GlslangToSpv.cpp --${glslang_dir}/SPIRV/GlslangToSpv.h --${glslang_dir}/SPIRV/GLSL.std.450.h --${glslang_dir}/SPIRV/GLSL.ext.AMD.h --${glslang_dir}/SPIRV/GLSL.ext.EXT.h --${glslang_dir}/SPIRV/GLSL.ext.KHR.h --${glslang_dir}/SPIRV/GLSL.ext.NV.h --${glslang_dir}/SPIRV/hex_float.h --${glslang_dir}/SPIRV/InReadableOrder.cpp --${glslang_dir}/SPIRV/Logger.cpp --${glslang_dir}/SPIRV/Logger.h --${glslang_dir}/SPIRV/SpvBuilder.cpp --${glslang_dir}/SPIRV/SpvBuilder.h --${glslang_dir}/SP
[gentoo-commits] repo/gentoo:master commit in: media-gfx/renderdoc/files/
commit: b30c37c149c6123c40ee5bdc3a0d77a48b632605 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sat Jul 23 17:50:48 2022 + Commit: Matthew Smith gentoo org> CommitDate: Sun Jul 24 10:40:52 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b30c37c1 media-gfx/renderdoc: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Portage 3.0.34 / pkgdev 0.2.1 / pkgcheck 0.10.11 Closes: https://github.com/gentoo/gentoo/pull/26541 Signed-off-by: Matthew Smith gentoo.org> .../files/renderdoc-1.18-system-glslang.patch | 210 - 1 file changed, 210 deletions(-) diff --git a/media-gfx/renderdoc/files/renderdoc-1.18-system-glslang.patch b/media-gfx/renderdoc/files/renderdoc-1.18-system-glslang.patch deleted file mode 100644 index 12f6913002a0.. --- a/media-gfx/renderdoc/files/renderdoc-1.18-system-glslang.patch +++ /dev/null @@ -1,210 +0,0 @@ -From 76052a739491c194e2d4aa3bace501083fb6c2a9 Mon Sep 17 00:00:00 2001 -From: Matthew Smith -Date: Sun, 30 Jan 2022 17:19:47 + -Subject: [PATCH 1/3] build: Use system glslang - -Requires -DGLSLANG_TARGET_DIR option. - CMakeLists.txt| 11 +++ - renderdoc/CMakeLists.txt | 2 +- - renderdoc/data/glsl_shaders.cpp | 2 +- - renderdoc/driver/shaders/spirv/CMakeLists.txt | 91 +-- - .../driver/shaders/spirv/glslang_compile.cpp | 5 +- - .../driver/shaders/spirv/spirv_compile.cpp| 4 +- - 6 files changed, 19 insertions(+), 96 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 127cee3fd..cb0a2c7f6 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -419,6 +419,17 @@ elseif(UNIX) - endif() - endif() - -+# glslang package does not export a -config.cmake file. -+option(GLSLANG_TARGET_DIR "Absolute path to glslangTargets.cmake directory") -+include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") -+include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake") -+include("${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") -+include("${GLSLANG_TARGET_DIR}/glslangTargets.cmake") -+include("${GLSLANG_TARGET_DIR}/SPIRVTargets.cmake") -+if(NOT TARGET glslang OR NOT TARGET SPIRV) -+ message(FATAL_ERROR "glslang or SPIRV target not found") -+endif() -+ - add_subdirectory(renderdoc) - - # these variables are handled within the CMakeLists.txt in qrenderdoc, -diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt -index 9174afb2a..927e95fb9 100644 a/renderdoc/CMakeLists.txt -+++ b/renderdoc/CMakeLists.txt -@@ -580,7 +580,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} glslang SPIRV) - - add_dependencies(renderdoc renderdoc_libentry) - -diff --git a/renderdoc/data/glsl_shaders.cpp b/renderdoc/data/glsl_shaders.cpp -index d11cd0b88..d33f18099 100644 a/renderdoc/data/glsl_shaders.cpp -+++ b/renderdoc/data/glsl_shaders.cpp -@@ -26,7 +26,7 @@ - #include "common/common.h" - #include "common/formatting.h" - #include "driver/shaders/spirv/glslang_compile.h" --#include "glslang/glslang/Public/ShaderLang.h" -+#include - #include "os/os_specific.h" - - #define GLSL_HEADERS(HEADER) \ -diff --git a/renderdoc/driver/shaders/spirv/CMakeLists.txt b/renderdoc/driver/shaders/spirv/CMakeLists.txt -index 68229cd36..088645fbe 100644 a/renderdoc/driver/shaders/spirv/CMakeLists.txt -+++ b/renderdoc/driver/shaders/spirv/CMakeLists.txt -@@ -1,91 +1,3 @@ --set(glslang_dir ${RDOC_SOURCE_DIR}/3rdparty/glslang) --set(glslang_sources --${glslang_dir}/OGLCompilersDLL/InitializeDll.cpp --${glslang_dir}/OGLCompilersDLL/InitializeDll.h --${glslang_dir}/SPIRV/GlslangToSpv.cpp --${glslang_dir}/SPIRV/GlslangToSpv.h --${glslang_dir}/SPIRV/GLSL.std.450.h --${glslang_dir}/SPIRV/GLSL.ext.AMD.h --${glslang_dir}/SPIRV/GLSL.ext.EXT.h --${glslang_dir}/SPIRV/GLSL.ext.KHR.h --${glslang_dir}/SPIRV/GLSL.ext.NV.h --${glslang_dir}/SPIRV/hex_float.h --${glslang_dir}/SPIRV/InReadableOrder.cpp --${glslang_dir}/SPIRV/Logger.cpp --${glslang_dir}/SPIRV/Logger.h --${glslang_dir}/SPIRV/SpvBuilder.cpp --${glslang_dir}/SPIRV/SpvBuilder.h --${glslang_dir}/SPIRV/SpvTools.cpp --${glslang_dir}/SPIRV/SpvTools.h --${glslang_dir}/SPIRV/SpvPostProcess.cpp --${glslang_dir}/SPIRV/spvIR.h --${glslang_dir}/glslang/GenericCodeGen/CodeGen.cpp --${glslang_dir}/glslang/GenericCodeGen/Link.cpp --${glslang_dir}/glslang/Include/arrays.h --${glslang_dir}/glslang/Include/BaseTypes.h --${glslang_dir}/glslang/Include/Common.h --${glslang_dir}/glslang/Include/ConstantUnion.h --${glslang_dir}/glslang/Include/InfoSink.h --${glslang_dir}/glslang/Include/InitializeGlobals.h --${glslang_dir}/gl
[gentoo-commits] repo/gentoo:master commit in: media-gfx/renderdoc/files/
commit: 36841780c9d66e2351366cb39d2196ece2fd53bc Author: Michael Mair-Keimberger levelnine at> AuthorDate: Fri Jul 15 18:31:24 2022 + Commit: Matthew Smith gentoo org> CommitDate: Fri Jul 15 20:44:34 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36841780 media-gfx/renderdoc: remove unused patch Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/26426 Signed-off-by: Matthew Smith gentoo.org> .../files/renderdoc-1.18-check-api-ver.patch | 50 -- 1 file changed, 50 deletions(-) diff --git a/media-gfx/renderdoc/files/renderdoc-1.18-check-api-ver.patch b/media-gfx/renderdoc/files/renderdoc-1.18-check-api-ver.patch deleted file mode 100644 index a6af5645d14b.. --- a/media-gfx/renderdoc/files/renderdoc-1.18-check-api-ver.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 3d49524da4a28ecc1ee1a9b3f9ec455fc0263c81 Mon Sep 17 00:00:00 2001 -From: baldurk -Date: Mon, 31 Jan 2022 19:28:08 + -Subject: [PATCH] Don't enable functionality not supported by the current - physical device - - .../driver/vulkan/wrappers/vk_device_funcs.cpp | 14 -- - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp -index 4d342e0123..a40c52d6ef 100644 a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp -+++ b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp -@@ -3171,7 +3171,7 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_KHR, - }; - --if(physProps.apiVersion >= VK_MAKE_VERSION(1, 2, 0)) -+if(RDCMIN(m_EnabledExtensions.vulkanVersion, physProps.apiVersion) >= VK_MAKE_VERSION(1, 2, 0)) - { - VkPhysicalDeviceVulkan12Features avail12Features = { - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES, -@@ -3376,11 +3376,13 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi - - CheckDeviceExts(); - -+uint32_t effectiveApiVersion = RDCMIN(m_EnabledExtensions.vulkanVersion, physProps.apiVersion); -+ - #undef CheckExt --#define CheckExt(name, ver) \ -- if(!strcmp(createInfo.ppEnabledExtensionNames[i], "VK_" #name) || physProps.apiVersion >= ver) \ -- { \ --m_EnabledExtensions.ext_##name = true; \ -+#define CheckExt(name, ver) \ -+ if(!strcmp(createInfo.ppEnabledExtensionNames[i], "VK_" #name) || effectiveApiVersion >= ver) \ -+ { \ -+m_EnabledExtensions.ext_##name = true; \ - } - - for(uint32_t i = 0; i < createInfo.enabledExtensionCount; i++) -@@ -3391,7 +3393,7 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi - // for cases where a promoted extension isn't supported as the extension itself, manually - // disable them when the feature bit is false. - --if(physProps.apiVersion >= VK_MAKE_VERSION(1, 2, 0)) -+if(effectiveApiVersion >= VK_MAKE_VERSION(1, 2, 0)) - { - if(supportedExtensions.find(VK_KHR_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME) == - supportedExtensions.end() &&
[gentoo-commits] repo/gentoo:master commit in: media-gfx/renderdoc/files/, media-gfx/renderdoc/
commit: 9a639cbe2577e5981eba961e802f02a237745baa Author: Matthew Smith gentoo org> AuthorDate: Sun Feb 20 09:29:18 2022 + Commit: Matthew Smith gentoo org> CommitDate: Sun Feb 20 09:33:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a639cbe media-gfx/renderdoc: Conditionally set PYTHON_CONFIG_SUFFIX The Shiboken2 CMake config needs PYTHON_CONFIG_SUFFIX setting so that it doesn't always default to using its most recent PYTHON_TARGET. Patch the Renderdoc CMakeLists so that it only tries to find the Shiboken2 library if required. The installed files don't change, this just fixes a QA warning. Closes: https://bugs.gentoo.org/833627 Signed-off-by: Matthew Smith gentoo.org> .../files/renderdoc-1.18-conditional-pyside.patch | 54 ++ media-gfx/renderdoc/renderdoc-1.18.ebuild | 7 ++- 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/media-gfx/renderdoc/files/renderdoc-1.18-conditional-pyside.patch b/media-gfx/renderdoc/files/renderdoc-1.18-conditional-pyside.patch new file mode 100644 index ..f09ff059528b --- /dev/null +++ b/media-gfx/renderdoc/files/renderdoc-1.18-conditional-pyside.patch @@ -0,0 +1,54 @@ +From e6c0ee16967d3aa79f645a5a0aad0d50c20987f4 Mon Sep 17 00:00:00 2001 +From: Matthew Smith +Date: Sun, 20 Feb 2022 09:19:03 + +Subject: [PATCH] build: Only search for PySide2 if required + +--- + qrenderdoc/CMakeLists.txt | 17 +++-- + 1 file changed, 7 insertions(+), 10 deletions(-) + +diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt +index 05ad8ba89..e4470715e 100644 +--- a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt +@@ -154,9 +154,6 @@ ExternalProject_Add(custom_swig + BUILD_COMMAND ${GENERATOR_MAKE} ${GENERATOR_MAKE_PARAMS} > /dev/null 2>&1 + INSTALL_COMMAND ${GENERATOR_MAKE} install > /dev/null 2>&1) + +-find_package(Shiboken2 QUIET) +-find_package(PySide2 QUIET) +- + set(PYTHON_LINK "${PYTHON_LIBRARY}") + + # ensure we link the whole python library so that modules have all the exports they need +@@ -251,7 +248,13 @@ option(QRENDERDOC_ENABLE_PYSIDE2 "Enable PySide2 if found" ON) + + if(NOT QRENDERDOC_ENABLE_PYSIDE2) + message(STATUS "PySide2 integration disabled") +-elseif(PySide2_FOUND AND Shiboken2_FOUND AND TARGET Shiboken2::libshiboken AND TARGET PySide2::pyside2) ++file(APPEND ++ ${CMAKE_BINARY_DIR}/qrenderdoc/qrenderdoc_cmake.pri ++ "DEFINES+=PYSIDE2_ENABLED=0\n") ++else() ++find_package(Shiboken2 QUIET REQUIRED) ++find_package(PySide2 QUIET REQUIRED) ++ + message(STATUS "Building with PySide2 ${PySide2_VERSION} from ${PySide2_DIR}") + + if(NOT PYTHONLIBS_VERSION_STRING MATCHES "${SHIBOKEN_PYTHON_VERSION_MAJOR}.${SHIBOKEN_PYTHON_VERSION_MINOR}") +@@ -280,12 +283,6 @@ elseif(PySide2_FOUND AND Shiboken2_FOUND AND TARGET Shiboken2::libshiboken AND T + "DEFINES+=PYSIDE2_ENABLED=1\n" + "DEFINES+=PYSIDE2_SYS_PATH=${PYSIDE_PYTHONPATH}\n" + "LIBS+=-lshiboken2${SHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX}\n") +-else() +-message(STATUS "PySide2 not found - Qt will not be accessible in python scripting. See https://github.com/baldurk/renderdoc/wiki/PySide2";) +- +-file(APPEND +- ${CMAKE_BINARY_DIR}/qrenderdoc/qrenderdoc_cmake.pri +- "DEFINES+=PYSIDE2_ENABLED=0\n") + endif() + + # generate the SWIG interface files +-- +2.35.1 + diff --git a/media-gfx/renderdoc/renderdoc-1.18.ebuild b/media-gfx/renderdoc/renderdoc-1.18.ebuild index fae8b079434c..38a71320c453 100644 --- a/media-gfx/renderdoc/renderdoc-1.18.ebuild +++ b/media-gfx/renderdoc/renderdoc-1.18.ebuild @@ -86,6 +86,10 @@ 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 + "${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 @@ -153,11 +157,12 @@ src_configure() { use qt5 && mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" - -DPYTHON_CONFIG_SUFFIX=-${EPYTHON} -DRENDERDOC_SWIG_PACKAGE="${DISTDIR}"/${MY_SWIG}.tar.gz -DQRENDERDOC_ENABLE_PYSIDE2=$(usex pyside2) ) + use pyside2 && mycmakeargs+=( -DPYTHON_CONFIG_SUFFIX=-${EPYTHON} ) + cmake_src_configure }
[gentoo-commits] repo/gentoo:master commit in: media-gfx/renderdoc/files/, media-gfx/renderdoc/
commit: 53504f9dfb82ee5ce72b1c42c0f44d7a0d792662 Author: Matthew Smith gentoo org> AuthorDate: Sat Feb 12 18:26:09 2022 + Commit: Matthew Smith gentoo org> CommitDate: Sat Feb 12 19:08:13 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53504f9d media-gfx/renderdoc: initial import Signed-off-by: Matthew Smith gentoo.org> media-gfx/renderdoc/Manifest | 2 + .../files/renderdoc-1.18-analytics-off.patch | 52 + .../renderdoc/files/renderdoc-1.18-env-home.patch | 26 +++ .../files/renderdoc-1.18-system-compress.patch | 142 ++ .../files/renderdoc-1.18-system-flags.patch| 26 +++ .../files/renderdoc-1.18-system-glslang.patch | 210 + media-gfx/renderdoc/metadata.xml | 19 ++ media-gfx/renderdoc/renderdoc-1.18.ebuild | 181 ++ 8 files changed, 658 insertions(+) diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest new file mode 100644 index ..21433d25e443 --- /dev/null +++ b/media-gfx/renderdoc/Manifest @@ -0,0 +1,2 @@ +DIST renderdoc-1.18.tar.gz 46372788 BLAKE2B 3f07e29770e033d96f202fa143c7dd2e422750b28f33d14736c43f667fd45ec1b899e66136e415a2b947fbba7cdf0f822fe1dc6978c5146ae5432b44ed497a75 SHA512 4f7baba39ee8e346d00c2d80b5bf7370adebe0200ea2a95a339b3d207fc58f42bff109ffe922604ad49bcd3b5ff8d1ef2a282dd4aa16f09fd6b57aba06aa493d +DIST swig-renderdoc-7.tar.gz 4006241 BLAKE2B 619f41239f4aef496264d61f44ae042cf80d3ff28491d452cf11ad07e898554c4a32df6119ee0e8e3de36e6bee61855358cd968ad01c9281976e24e9a6cac839 SHA512 5285a65924c069cfb9f73104ad8a95251badac4001293a1757b97ebead5953730c03289159741f82da4c5afe4f61f7c826b105eaf82df044ed2fa21810242c86 diff --git a/media-gfx/renderdoc/files/renderdoc-1.18-analytics-off.patch b/media-gfx/renderdoc/files/renderdoc-1.18-analytics-off.patch new file mode 100644 index ..4fd98c890bf4 --- /dev/null +++ b/media-gfx/renderdoc/files/renderdoc-1.18-analytics-off.patch @@ -0,0 +1,52 @@ +From 03d5a1f515bee326933e163eb3bd300deb4a5753 Mon Sep 17 00:00:00 2001 +From: Matthew Smith +Date: Sun, 6 Feb 2022 09:54:17 + +Subject: [PATCH 3/5] analytics: Default selection to off + +--- + qrenderdoc/Code/Interface/PersistantConfig.h| 4 ++-- + qrenderdoc/Windows/Dialogs/AnalyticsPromptDialog.ui | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/qrenderdoc/Code/Interface/PersistantConfig.h b/qrenderdoc/Code/Interface/PersistantConfig.h +index 5c074d27d..e37ecb3ce 100644 +--- a/qrenderdoc/Code/Interface/PersistantConfig.h b/qrenderdoc/Code/Interface/PersistantConfig.h +@@ -588,8 +588,8 @@ DECLARE_REFLECTION_STRUCT(BugReport); + "``True`` if the user has selected to completely opt-out from and disable all analytics "\ + "collection and reporting.\n" \ + "\n" \ +- "Defaults to ``False``."); \ +- CONFIG_SETTING_VAL(public, bool, bool, Analytics_TotalOptOut, false) \ ++ "Defaults to ``True``."); \ ++ CONFIG_SETTING_VAL(public, bool, bool, Analytics_TotalOptOut, true) \ + \ + DOCUMENT( \ + "``True`` if the user has remained with analytics turned on, but has chosen to manually "\ +diff --git a/qrenderdoc/Windows/Dialogs/AnalyticsPromptDialog.ui b/qrenderdoc/Windows/Dialogs/AnalyticsPromptDialog.ui +index 5ec558161..e43574165 100644 +--- a/qrenderdoc/Windows/Dialogs/AnalyticsPromptDialog.ui b/qrenderdoc/Windows/Dialogs/AnalyticsPromptDialog.ui +@@ -38,9 +38,6 @@ + + Gather anonymous low-detail statistics and submit automatically. + +- +- true +- + + + +@@ -55,6 +52,9 @@ + + Do not gather or submit any statistics. + ++ ++ true ++ + + + +-- +2.35.1 + diff --git a/media-gfx/renderdoc/files/renderdoc-1.18-env-home.patch b/media-gfx/renderdoc/files/renderdoc-1.18-env-home.patch new file mode 100644 index ..94ec9a9bbf14 --- /dev/null +++ b/media-gfx/renderdoc/files/renderdoc-1.18-env-home.patch @@ -0,0 +1,26 @@ +From 1a9c1bc02d2ed1b8e1723750d8e9eb9fa92fddef Mon Sep 17 00:00:00 2001 +From: Matthew Smith +Date: Thu, 10 Feb 2022 18:02:37 + +Subject: [PATCH] Use getenv("HOME") instead of getpwuid + +--- + renderdoc/os/posix/linux/linux_stringio.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --