Re: [ITP] SPIRV-Tools

[Takashi Yano via Cygwin-apps]

On Sat, 15 Mar 2025 17:37:37 +0900
Takashi Yano vwrote:

> Needed by mpv.
> 
> SUMMARY="API and commands for processing SPIR-V modules"

-- 
Takashi Yano <takashi.y...@nifty.ne.jp>

NAME="SPIRV-Tools"
VERSION=1.4.309.0
RELEASE=1
LICENSE="Apache-2.0"
CATEGORY="Graphics"
SUMMARY="API and commands for processing SPIR-V modules"
HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools";
GIT_URI="https://github.com/KhronosGroup/SPIRV-Tools.git";
GIT_TAG="vulkan-sdk-${VERSION}"
inherit git cmake
PKG_NAMES="SPIRV-Tools SPIRV-Tools-devel"
SPIRV_Tools_CONTENTS="usr/bin usr/share"
SPIRV_Tools_devel_CONTENTS="usr/lib usr/include"
BUILD_REQUIRES="SPIRV-Headers"

--- origsrc/SPIRV-Tools/CMakeLists.txt  2025-02-14 02:18:51.000000000 +0900
+++ src/SPIRV-Tools/CMakeLists.txt      2025-02-21 14:51:40.774022000 +0900
@@ -53,7 +53,7 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linu
 elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Windows")
   add_definitions(-DSPIRV_WINDOWS)
 elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN")
-  add_definitions(-DSPIRV_WINDOWS)
+  # Nothing to do
 elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Android")
   set(SPIRV_TIMER_ENABLED ${SPIRV_ALLOW_TIMERS})
 endif()
@@ -317,7 +317,8 @@ macro(spvtools_pch SRCS PCHPREFIX)
   endif()
 endmacro(spvtools_pch)
 
-add_subdirectory(external)
+#add_subdirectory(external)
+set(SPIRV_HEADER_INCLUDE_DIR "/usr/include")
 
 # Warning about extra semi-colons.
 #
--- origsrc/SPIRV-Tools/source/val/function.cpp 2025-02-14 02:18:52.000000000 
+0900
+++ src/SPIRV-Tools/source/val/function.cpp     2025-02-21 15:16:15.473395000 
+0900
@@ -88,7 +88,8 @@ spv_result_t Function::RegisterLoopMerge
   merge_block_header_[&merge_block] = current_block_;
   if (continue_target_headers_.find(&continue_target_block) ==
       continue_target_headers_.end()) {
-    continue_target_headers_[&continue_target_block] = {current_block_};
+    continue_target_headers_[&continue_target_block] =
+      std::vector<BasicBlock *> {current_block_};
   } else {
     continue_target_headers_[&continue_target_block].push_back(current_block_);
   }