gentoo auto-resync : 03:12:2023 - 16:59:43

2 files changed, 35 insertions, 2 deletions

diff --git a/media-gfx/renderdoc/files/renderdoc-1.29-system-compress.patch b/media-gfx/renderdoc/files/renderdoc-1.29-r2-system-compress.patch
index 967d300b29d5..8f793562bcc7 100644
--- a/media-gfx/renderdoc/files/renderdoc-1.29-system-compress.patch
+++ b/media-gfx/renderdoc/files/renderdoc-1.29-r2-system-compress.patch
@@ -89,12 +89,14 @@ index 927e95fb9..5908be6de 100644
      3rdparty/stb/stb_image.h
      3rdparty/stb/stb_image_write.h
      3rdparty/stb/stb_image_resize.h
-@@ -580,7 +534,7 @@ endif()
+@@ -580,9 +534,9 @@ 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 glslang-default-resource-limits SPIRV)
 +target_link_libraries(renderdoc ${RDOC_LIBRARIES} glslang glslang-default-resource-limits miniz::miniz PkgConfig::lz4 PkgConfig::zstd SPIRV)
+ # Newer versions of glslang require C++17 for std::variant
+ set_target_properties(renderdoc PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED ON)
  
  add_dependencies(renderdoc renderdoc_libentry)
  
diff --git a/media-gfx/renderdoc/files/renderdoc-1.29-system-glslang.patch b/media-gfx/renderdoc/files/renderdoc-1.29-r2-system-glslang.patch
index 4e7934928ef7..287917feb549 100644
--- a/media-gfx/renderdoc/files/renderdoc-1.29-system-glslang.patch
+++ b/media-gfx/renderdoc/files/renderdoc-1.29-r2-system-glslang.patch
@@ -5,6 +5,15 @@ Subject: [PATCH] system glslang
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
+@@ -383,7 +383,7 @@
+ endif()
+
+ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
+     if(ENABLE_GGP)
+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -gline-tables-only -fno-omit-frame-pointer")
 @@ -469,6 +469,17 @@ elseif(UNIX)
      endif()
  endif()
@@ -25,12 +34,14 @@ Subject: [PATCH] system glslang
  # these variables are handled within the CMakeLists.txt in qrenderdoc,
 --- a/renderdoc/CMakeLists.txt
 +++ b/renderdoc/CMakeLists.txt
-@@ -604,7 +604,7 @@ endif()
+@@ -604,7 +604,9 @@ 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 glslang-default-resource-limits SPIRV)
++# Newer versions of glslang require C++17 for std::variant
++set_target_properties(renderdoc PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED ON)
  
  add_dependencies(renderdoc renderdoc_libentry)
  
@@ -232,6 +243,26 @@ Subject: [PATCH] system glslang
  
  rdcstr rdcspv::Compile(const rdcspv::CompilationSettings &settings, const rdcarray<rdcstr> &sources,
                         rdcarray<uint32_t> &spirv)
+--- a/qrenderdoc/Code/pyrenderdoc/CMakeLists.txt
++++ b/qrenderdoc/Code/pyrenderdoc/CMakeLists.txt
+@@ -1,11 +1,3 @@
+-# Build as C++14 for the python bindings template-fu
+-if (CMAKE_VERSION VERSION_LESS "3.1")
+-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+-else ()
+-    set (CMAKE_CXX_STANDARD 14)
+-    set (CMAKE_CXX_STANDARD_REQUIRED ON)
+-endif ()
+-
+ # include paths for qrenderdoc, the internal renderdoc API, and Python
+ set(MODULE_INCLUDES
+     PRIVATE ${CMAKE_SOURCE_DIR}/qrenderdoc
+@@ -82,3 +74,5 @@
+ # Make sure we build after the wrappers are generated
+ add_dependencies(_renderdoc swig-bindings)
+ add_dependencies(_qrenderdoc swig-bindings)
++
++set_target_properties(_renderdoc _qrenderdoc PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED ON)
 -- 
 2.42.0