gentoo auto-resync : 24:07:2022 - 14:53:22

2 files changed, 0 insertions, 211 deletions

diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest
index 46eb465be775..9f93fec7517e 100644
--- a/media-gfx/renderdoc/Manifest
+++ b/media-gfx/renderdoc/Manifest
@@ -3,7 +3,6 @@ AUX renderdoc-1.18-conditional-pyside.patch 2178 BLAKE2B b79e3fc960b83248a6991c0
 AUX renderdoc-1.18-env-home.patch 832 BLAKE2B f994893dceded797646b51f7e1a54cbd91c3175278f264c58bc13e67e22b5c2b085251a7b3e91923641e0566888d564145b3f67297fa623cba3a91034ac57208 SHA512 9a176468da8f5c5572349252a59def973ea178e15b7d5e5780cbd776c4ab08a8bf7939d0765f47386b60c582993d14ce5500fc788ce4d5395c6ef90c3f55801c
 AUX renderdoc-1.18-system-compress.patch 4699 BLAKE2B 4f37058deef1773a4a35b64415a8c8133b232374e419e490d81864ab0d1600b84a6f15a4760530078c489c97f7e12baff331cb845cdaced2fad4b2525987876d SHA512 08c38cbadb4cce24036dd22b185a78d4bca074c0d8caa44c1567aca414bc00a60a8adf73a2430930a620b624689be31f690fee92919d9245211f1189493ea091
 AUX renderdoc-1.18-system-flags.patch 845 BLAKE2B 0d4aae31af353b2d199ae66ec999beefa04e2105e6368305bb89359806fa99f4b7048c3d6c30a2787a3125718d3cbd7c97d3381f61f4f98a2e08730b5a22db02 SHA512 bd2692f14729360983f5ca4fb8af87085ab5bd209d82f3cfd99e7753d0dd406905a6280051aa5d1476b863566b385cdc28fbe9120d0d6f5efd78411af15b68ef
-AUX renderdoc-1.18-system-glslang.patch 9100 BLAKE2B a033377083705bbbccaa56657eccf632bcc5093bc86f319d3d30e94eed41bf849fe8e983dd9085b1628ecaed9ab0b358a487b40c8672239d4b32ee83e24ab1df SHA512 a0eea5b3c24092f30b2ec5c9fde327b4683839a34a5f11a64fb85b54d645f50b8e87f8fc59cb87450566caa3ad87aadc6baa7c8843256726cb8bd71fb0444dd0
 AUX renderdoc-1.20-system-glslang.patch 8281 BLAKE2B 3bd15c373de0f37831c2d8a03d9c5c4f14684aea2e1d2e350e6300cce7c2182427014f2607199bbe913d460f113faa352dc882ec40a56403f91d87ce0afe4df4 SHA512 7503a5241aa79c241d300f4a758338d0ae511ee2ce9582b5f3720939f9ee71c149614244a0facc620ba2f2da46ceb7dcf7298440c5cd4b528be96245cafc01fa
 DIST renderdoc-1.20.tar.gz 46744415 BLAKE2B 574933653fa37e8a8a4dac4ec1e4156a9761fe3bf086ecf2a5125b51c368dc885f9c27f47fb9f7ddd4318e627431583be1371b92fbd5a5a8ed9f04ed90cc3498 SHA512 5c395cdd68fcacd7d728f4793301a7c11d11bbc09bc1f168d91b18964756f01bd702c0ffda53f3156ee48c06cc2e8c3b2f7ad8da49146e151d8ff6cb7290ed2e
 DIST renderdoc-1.20.tar.gz.asc 833 BLAKE2B 233875056eff2858054566900a3198e857a6970454e4671f57703c5a8a8e1daff3c5d069cba5293791787e7da7db0a40aab17f26df044ed09ca9113c453f8bf6 SHA512 1ccfe4cb190c1c578abbf5e3f0264a00cb6054333f6829e726c2659c352b3ece585a1f3d55e4602908c737a349020c4fd2edc906cf225519ae049338876e0632
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..000000000000
--- 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 <matt@offtopica.uk>
-Date: Sun, 30 Jan 2022 17:19:47 +0000
-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 <glslang/Public/ShaderLang.h>
- #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}/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 ee1b02c73..ec0db8345 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,6 +129,7 @@ static TBuiltInResource DefaultResources = {
-     /*.maxTaskWorkGroupSizeY_NV =*/1,
-     /*.maxTaskWorkGroupSizeZ_NV =*/1,
-     /*.maxMeshViewCountNV =*/4,
-+    /*.maxDualSourceDrawBuffersEXT =*/1,
- 
-     /*.limits*/
-     {
-diff --git a/renderdoc/driver/shaders/spirv/spirv_compile.cpp b/renderdoc/driver/shaders/spirv/spirv_compile.cpp
-index a2cc2bec4..a494cc69d 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)
--- 
-2.35.1
-