diff options
| -rw-r--r-- | media-gfx/renderdoc/Manifest | 3 | ||||
| -rw-r--r-- | media-gfx/renderdoc/files/renderdoc-1.18-analytics-off.patch | 52 | ||||
| -rw-r--r-- | media-gfx/renderdoc/files/renderdoc-1.18-conditional-pyside.patch | 54 | ||||
| -rw-r--r-- | media-gfx/renderdoc/files/renderdoc-1.18-system-compress.patch | 142 | ||||
| -rw-r--r-- | media-gfx/renderdoc/files/renderdoc-1.18-system-flags.patch | 26 | ||||
| -rw-r--r-- | media-gfx/renderdoc/files/renderdoc-1.22-r1-system-glslang.patch | 215 | ||||
| -rw-r--r-- | media-gfx/renderdoc/files/renderdoc-1.24-env-home.patch | 15 | ||||
| -rw-r--r-- | media-gfx/renderdoc/metadata.xml | 19 | ||||
| -rw-r--r-- | media-gfx/renderdoc/renderdoc-1.25.ebuild | 203 |
9 files changed, 0 insertions, 729 deletions
diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest deleted file mode 100644 index bff3d61..0000000 --- a/media-gfx/renderdoc/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST renderdoc-1.25.tar.gz 47285123 BLAKE2B f279d2ebad384556a399a4f50ad2f11e9863b82978640ef1a69713fb00286ded21f561bcff2904d902c1044c25990d75166a17a11c2601256cace517b875ec09 SHA512 0f7a672c4b44276c157b3d09b3bc487be0ab214cb62452fecf284fc5d3a075df1bb13ce801f47d16ebcbbe23ca1fe4e47238e7bd64544356d8c7ac1e4398968a -DIST renderdoc-1.25.tar.gz.asc 833 BLAKE2B 8c6750b15bdb9871ce1fe6b126d5239aaef2aad34da5fed98483c9f0051547519e3a8f52a8630a1c2a5db6ecb993ab147ccb36cb7a38086ad02087ef16b087b8 SHA512 52f77ebf6d61eb5d7bf9568da5310323b2f18d3a87c6862b08e1b63c271a78e0ab8d555fca1ef1feb336f9a85f60c8cfb255619b3d16e257096859b52a7a070c -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 deleted file mode 100644 index 4fd98c8..0000000 --- a/media-gfx/renderdoc/files/renderdoc-1.18-analytics-off.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 03d5a1f515bee326933e163eb3bd300deb4a5753 Mon Sep 17 00:00:00 2001 -From: Matthew Smith <matt@offtopica.uk> -Date: Sun, 6 Feb 2022 09:54:17 +0000 -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 @@ - <property name="text"> - <string>Gather anonymous low-detail statistics and submit automatically.</string> - </property> -- <property name="checked"> -- <bool>true</bool> -- </property> - </widget> - </item> - <item> -@@ -55,6 +52,9 @@ - <property name="text"> - <string>Do not gather or submit any statistics.</string> - </property> -+ <property name="checked"> -+ <bool>true</bool> -+ </property> - </widget> - </item> - </layout> --- -2.35.1 - diff --git a/media-gfx/renderdoc/files/renderdoc-1.18-conditional-pyside.patch b/media-gfx/renderdoc/files/renderdoc-1.18-conditional-pyside.patch deleted file mode 100644 index f09ff05..0000000 --- a/media-gfx/renderdoc/files/renderdoc-1.18-conditional-pyside.patch +++ /dev/null @@ -1,54 +0,0 @@ -From e6c0ee16967d3aa79f645a5a0aad0d50c20987f4 Mon Sep 17 00:00:00 2001 -From: Matthew Smith <matt@offtopica.uk> -Date: Sun, 20 Feb 2022 09:19:03 +0000 -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/files/renderdoc-1.18-system-compress.patch b/media-gfx/renderdoc/files/renderdoc-1.18-system-compress.patch deleted file mode 100644 index 5b9a747..0000000 --- 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 <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 -@@ -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 <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/files/renderdoc-1.18-system-flags.patch b/media-gfx/renderdoc/files/renderdoc-1.18-system-flags.patch deleted file mode 100644 index 6478187..0000000 --- a/media-gfx/renderdoc/files/renderdoc-1.18-system-flags.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f83fea90e09d368cd3d8e119a2b3a6d7352d6de6 Mon Sep 17 00:00:00 2001 -From: Matthew Smith <matt@offtopica.uk> -Date: Tue, 8 Feb 2022 18:42:02 +0000 -Subject: [PATCH] build: qrenderdoc: Respect CXX and LDFLAGS - ---- - qrenderdoc/CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt -index 486832594..05ad8ba89 100644 ---- a/qrenderdoc/CMakeLists.txt -+++ b/qrenderdoc/CMakeLists.txt -@@ -177,7 +177,9 @@ file(WRITE - "QMAKE_LINK=${CMAKE_CXX_COMPILER}\n" - "QMAKE_CXXFLAGS+=${warning_flags}\n" - "QMAKE_CXXFLAGS+=${QMAKE_CXXFLAGS}\n" -+ "QMAKE_CXXFLAGS+=${CMAKE_CXX_FLAGS}\n" - "QMAKE_LFLAGS+=${QMAKE_LDFLAGS}\n" -+ "QMAKE_LFLAGS+=${CMAKE_EXE_LINKER_FLAGS}\n" - "QMAKE_RPATHDIR+=${QMAKE_RPATHDIR}\n" - "\n" - "LIB_SUFFIX=${LIB_SUFFIX}\n" --- -2.35.1 - diff --git a/media-gfx/renderdoc/files/renderdoc-1.22-r1-system-glslang.patch b/media-gfx/renderdoc/files/renderdoc-1.22-r1-system-glslang.patch deleted file mode 100644 index 7b5b88a..0000000 --- a/media-gfx/renderdoc/files/renderdoc-1.22-r1-system-glslang.patch +++ /dev/null @@ -1,215 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 857c848b9..0423b3e3c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -448,6 +448,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 a26438d76..9ee043959 100644 ---- a/renderdoc/CMakeLists.txt -+++ b/renderdoc/CMakeLists.txt -@@ -601,7 +601,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 dd79c1f89..5295fb05e 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 <glslang/Public/ShaderLang.h> - #include "os/os_specific.h" - - #define GLSL_HEADERS(HEADER) \ -diff --git a/renderdoc/driver/gl/gl_shader_refl.cpp b/renderdoc/driver/gl/gl_shader_refl.cpp -index dfd871f32..57b5aeca6 100644 ---- a/renderdoc/driver/gl/gl_shader_refl.cpp -+++ b/renderdoc/driver/gl/gl_shader_refl.cpp -@@ -26,7 +26,7 @@ - #include <algorithm> - #include <functional> - #include "driver/shaders/spirv/glslang_compile.h" --#include "glslang/glslang/Public/ShaderLang.h" -+#include <glslang/Public/ShaderLang.h> - #include "gl_driver.h" - - template <> -diff --git a/renderdoc/driver/shaders/spirv/CMakeLists.txt b/renderdoc/driver/shaders/spirv/CMakeLists.txt -index e5f2f4113..79525b5f6 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}/glslang/Include/intermediate.h -- ${glslang_dir}/glslang/Include/PoolAlloc.h -- ${glslang_dir}/glslang/Include/ResourceLimits.h -- ${glslang_dir}/glslang/Include/revision.h -- ${glslang_dir}/glslang/Include/ShHandle.h -- ${glslang_dir}/glslang/Include/Types.h -- ${glslang_dir}/glslang/MachineIndependent/Constant.cpp -- ${glslang_dir}/glslang/MachineIndependent/glslang_tab.cpp -- ${glslang_dir}/glslang/MachineIndependent/glslang_tab.cpp.h -- ${glslang_dir}/glslang/MachineIndependent/gl_types.h -- ${glslang_dir}/glslang/MachineIndependent/iomapper.cpp -- ${glslang_dir}/glslang/MachineIndependent/iomapper.h -- ${glslang_dir}/glslang/MachineIndependent/gl_types.h -- ${glslang_dir}/glslang/MachineIndependent/InfoSink.cpp -- ${glslang_dir}/glslang/MachineIndependent/Initialize.cpp -- ${glslang_dir}/glslang/MachineIndependent/Initialize.h -- ${glslang_dir}/glslang/MachineIndependent/Intermediate.cpp -- ${glslang_dir}/glslang/MachineIndependent/intermOut.cpp -- ${glslang_dir}/glslang/MachineIndependent/IntermTraverse.cpp -- ${glslang_dir}/glslang/MachineIndependent/limits.cpp -- ${glslang_dir}/glslang/MachineIndependent/linkValidate.cpp -- ${glslang_dir}/glslang/MachineIndependent/LiveTraverser.h -- ${glslang_dir}/glslang/MachineIndependent/localintermediate.h -- ${glslang_dir}/glslang/MachineIndependent/parseConst.cpp -- ${glslang_dir}/glslang/MachineIndependent/ParseContextBase.cpp -- ${glslang_dir}/glslang/MachineIndependent/ParseHelper.cpp -- ${glslang_dir}/glslang/MachineIndependent/ParseHelper.h -- ${glslang_dir}/glslang/MachineIndependent/PoolAlloc.cpp -- ${glslang_dir}/glslang/MachineIndependent/propagateNoContraction.cpp -- ${glslang_dir}/glslang/MachineIndependent/propagateNoContraction.h -- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpAtom.cpp -- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpContext.cpp -- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpContext.h -- ${glslang_dir}/glslang/MachineIndependent/preprocessor/Pp.cpp -- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpScanner.cpp -- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpTokens.cpp -- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpTokens.h -- ${glslang_dir}/glslang/MachineIndependent/reflection.cpp -- ${glslang_dir}/glslang/MachineIndependent/reflection.h -- ${glslang_dir}/glslang/MachineIndependent/RemoveTree.cpp -- ${glslang_dir}/glslang/MachineIndependent/RemoveTree.h -- ${glslang_dir}/glslang/MachineIndependent/ScanContext.h -- ${glslang_dir}/glslang/MachineIndependent/Scan.cpp -- ${glslang_dir}/glslang/MachineIndependent/Scan.h -- ${glslang_dir}/glslang/MachineIndependent/ShaderLang.cpp -- ${glslang_dir}/glslang/MachineIndependent/SymbolTable.cpp -- ${glslang_dir}/glslang/MachineIndependent/SymbolTable.h -- ${glslang_dir}/glslang/MachineIndependent/Versions.cpp -- ${glslang_dir}/glslang/MachineIndependent/Versions.h -- ${glslang_dir}/glslang/MachineIndependent/attribute.cpp -- ${glslang_dir}/glslang/MachineIndependent/attribute.h -- ${glslang_dir}/glslang/OSDependent/osinclude.h -- ${glslang_dir}/glslang/Public/ShaderLang.h) -- --if(UNIX) -- list(APPEND glslang_sources -- ${glslang_dir}/glslang/OSDependent/Unix/ossource.cpp) --endif() -- - set(sources - glslang_compile.cpp - glslang_compile.h -@@ -108,8 +20,7 @@ set(sources - spirv_processor.h - spirv_disassemble.cpp - spirv_stringise.cpp -- var_dispatch_helpers.h -- ${glslang_sources}) -+ var_dispatch_helpers.h) - - add_definitions(-DAMD_EXTENSIONS) - add_definitions(-DNV_EXTENSIONS) -diff --git a/renderdoc/driver/shaders/spirv/glslang_compile.cpp b/renderdoc/driver/shaders/spirv/glslang_compile.cpp -index e2f1f2df8..fc0adab99 100644 ---- a/renderdoc/driver/shaders/spirv/glslang_compile.cpp -+++ b/renderdoc/driver/shaders/spirv/glslang_compile.cpp -@@ -29,8 +29,8 @@ - #undef min - #undef max - --#include "glslang/glslang/Include/Types.h" --#include "glslang/glslang/Public/ShaderLang.h" -+#include <glslang/Include/Types.h> -+#include <glslang/Public/ShaderLang.h> - - static bool glslang_inited = false; - rdcarray<glslang::TShader *> *allocatedShaders = NULL; -@@ -129,7 +129,16 @@ static TBuiltInResource DefaultResources = { - /*.maxTaskWorkGroupSizeY_NV =*/1, - /*.maxTaskWorkGroupSizeZ_NV =*/1, - /*.maxMeshViewCountNV =*/4, -- -+ /*.maxMeshOutputVerticesEXT = */ 256, -+ /*.maxMeshOutputPrimitivesEXT = */ 256, -+ /*.maxMeshWorkGroupSizeX_EXT = */ 128, -+ /*.maxMeshWorkGroupSizeY_EXT = */ 128, -+ /*.maxMeshWorkGroupSizeZ_EXT = */ 128, -+ /*.maxTaskWorkGroupSizeX_EXT = */ 128, -+ /*.maxTaskWorkGroupSizeY_EXT = */ 128, -+ /*.maxTaskWorkGroupSizeZ_EXT = */ 128, -+ /*.maxMeshViewCountEXT = */ 4, -+ /*.maxDualSourceDrawBuffersEXT =*/1, - /*.limits*/ - { - /*.limits.nonInductiveForLoops =*/1, -diff --git a/renderdoc/driver/shaders/spirv/spirv_compile.cpp b/renderdoc/driver/shaders/spirv/spirv_compile.cpp -index 8fbf2f16a..49bd322f4 100644 ---- a/renderdoc/driver/shaders/spirv/spirv_compile.cpp -+++ b/renderdoc/driver/shaders/spirv/spirv_compile.cpp -@@ -31,8 +31,8 @@ - #undef min - #undef max - --#include "glslang/SPIRV/GlslangToSpv.h" --#include "glslang/glslang/Public/ShaderLang.h" -+#include <glslang/SPIRV/GlslangToSpv.h> -+#include <glslang/Public/ShaderLang.h> - - rdcstr rdcspv::Compile(const rdcspv::CompilationSettings &settings, const rdcarray<rdcstr> &sources, - rdcarray<uint32_t> &spirv) 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 b4a2230..0000000 --- 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/metadata.xml b/media-gfx/renderdoc/metadata.xml deleted file mode 100644 index 81616f8..0000000 --- a/media-gfx/renderdoc/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>matthew@gentoo.org</email> - <name>Matthew Smith</name> - </maintainer> - <use> - <flag name="pyside2"> - Expose the QRenderdoc UI to Python scripting to allow for customisation - </flag> - <flag name="qt5"> - Build and install the qrenderdoc GUI - </flag> - </use> - <upstream> - <remote-id type="github">baldurk/renderdoc</remote-id> - </upstream> -</pkgmetadata> diff --git a/media-gfx/renderdoc/renderdoc-1.25.ebuild b/media-gfx/renderdoc/renderdoc-1.25.ebuild deleted file mode 100644 index f524df4..0000000 --- a/media-gfx/renderdoc/renderdoc-1.25.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 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:= - 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.24-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="${BROOT}"/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 -} |