spirv-tools: update to 2025.1.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: spirv-tools: update to 2025.1.
From: Robert Swindells (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Fri, 9 May 2025 14:37:42 +0000
Module Name:	pkgsrc-wip
Committed By:	Robert Swindells <rjs%NetBSD.org@localhost>
Pushed By:	rjs
Date:		Fri May 9 15:36:20 2025 +0100
Changeset:	72a5daa7d0b798d2a2bc89be5c570ee73a1b6563

Modified Files:
	spirv-tools/Makefile
	spirv-tools/PLIST
	spirv-tools/distinfo
Removed Files:
	spirv-tools/patches/patch-CMakeLists.txt
	spirv-tools/patches/patch-include_spirv-tools_libspirv.h
	spirv-tools/patches/patch-source_binary.cpp
	spirv-tools/patches/patch-source_operand.cpp
	spirv-tools/patches/patch-source_print.cpp

Log Message:
spirv-tools: update to 2025.1.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=72a5daa7d0b798d2a2bc89be5c570ee73a1b6563

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 spirv-tools/Makefile                               |  2 +-
 spirv-tools/PLIST                                  |  1 -
 spirv-tools/distinfo                               | 11 ++-----
 spirv-tools/patches/patch-CMakeLists.txt           | 15 ----------
 .../patches/patch-include_spirv-tools_libspirv.h   | 25 ----------------
 spirv-tools/patches/patch-source_binary.cpp        | 26 -----------------
 spirv-tools/patches/patch-source_operand.cpp       | 34 ----------------------
 spirv-tools/patches/patch-source_print.cpp         | 18 ------------
 8 files changed, 4 insertions(+), 128 deletions(-)

diffs:
diff --git a/spirv-tools/Makefile b/spirv-tools/Makefile
index e6994023ff..3e54c3fb71 100644
--- a/spirv-tools/Makefile
+++ b/spirv-tools/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	SPIRV-Tools-2024.2
+DISTNAME=	SPIRV-Tools-2025.1
 PKGNAME=	${DISTNAME:tl}
 CATEGORIES=	parallel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=KhronosGroup/}
diff --git a/spirv-tools/PLIST b/spirv-tools/PLIST
index 90254ff346..38c805ef5d 100644
--- a/spirv-tools/PLIST
+++ b/spirv-tools/PLIST
@@ -9,7 +9,6 @@ bin/spirv-objdump
 bin/spirv-opt
 bin/spirv-reduce
 bin/spirv-val
-include/spirv-tools/instrument.hpp
 include/spirv-tools/libspirv.h
 include/spirv-tools/libspirv.hpp
 include/spirv-tools/linker.hpp
diff --git a/spirv-tools/distinfo b/spirv-tools/distinfo
index 85333b404d..2d1bf39f89 100644
--- a/spirv-tools/distinfo
+++ b/spirv-tools/distinfo
@@ -1,10 +1,5 @@
 $NetBSD$
 
-BLAKE2s (SPIRV-Tools-2024.2.tar.gz) = 5f10b569568842fec5ffff65dc5b551c6ed80d2dca0c470b7ac3567639cb3ecb
-SHA512 (SPIRV-Tools-2024.2.tar.gz) = 1ac7195fb0a1d94f81702f4fe0e33da4b024a5c822d840fb3960665483fbbb163cb28f346d174856c7499422323bf891c334b0d9a8352ff3e0bc5aef8a5b037c
-Size (SPIRV-Tools-2024.2.tar.gz) = 3175743 bytes
-SHA1 (patch-CMakeLists.txt) = 766518783611a5bb65634b82eadea2592f9c602c
-SHA1 (patch-include_spirv-tools_libspirv.h) = fb9ef4384543943877f59a0d89400562fc347f67
-SHA1 (patch-source_binary.cpp) = deeee25f74fa45f68ce34c045f83cd9cd679f2e2
-SHA1 (patch-source_operand.cpp) = 675f4a5717f87107020b7c0eee43662c556abd32
-SHA1 (patch-source_print.cpp) = ee1dcd3f5695a2457826f6044428b2c0e026db37
+BLAKE2s (SPIRV-Tools-2025.1.tar.gz) = 279995a17c65ab3ab8a11ecdce73d08a5402d715a23a01e7394e1b58924aee15
+SHA512 (SPIRV-Tools-2025.1.tar.gz) = 8b2da6d38324a9cbb1a3471f30025a000f3ec77f351b2e3bf779ce99b8e03e1e8425b12f5318df1487dc3d27631f0e71b251adf9835252e1283cf472f96840c7
+Size (SPIRV-Tools-2025.1.tar.gz) = 3242384 bytes
diff --git a/spirv-tools/patches/patch-CMakeLists.txt b/spirv-tools/patches/patch-CMakeLists.txt
deleted file mode 100644
index 95b1cda143..0000000000
--- a/spirv-tools/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Add support of NetBSD platform.
-
---- CMakeLists.txt.orig	2024-04-22 19:29:56.000000000 +0000
-+++ CMakeLists.txt
-@@ -70,6 +70,8 @@ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "
-   set(SPIRV_TIMER_ENABLED ${SPIRV_ALLOW_TIMERS})
- elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
-   add_definitions(-DSPIRV_FREEBSD)
-+elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "NetBSD")
-+  add_definitions(-DSPIRV_NETBSD)
- elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD")
-   add_definitions(-DSPIRV_OPENBSD)
- elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia")
diff --git a/spirv-tools/patches/patch-include_spirv-tools_libspirv.h b/spirv-tools/patches/patch-include_spirv-tools_libspirv.h
deleted file mode 100644
index 631de76ca6..0000000000
--- a/spirv-tools/patches/patch-include_spirv-tools_libspirv.h
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-The symbol for FPEncoding is provided by the grammar of spirv-headers in
-version 1.3.296. But it is not handle in the latest stable version of
-spirv-tools.
-
---- include/spirv-tools/libspirv.h.orig	2024-11-30 21:16:16.095487983 +0000
-+++ include/spirv-tools/libspirv.h
-@@ -175,6 +175,7 @@ typedef enum spv_operand_type_t {
-   SPV_OPERAND_TYPE_KERNEL_ENQ_FLAGS,              // SPIR-V Sec 3.29
-   SPV_OPERAND_TYPE_KERNEL_PROFILING_INFO,         // SPIR-V Sec 3.30
-   SPV_OPERAND_TYPE_CAPABILITY,                    // SPIR-V Sec 3.31
-+  SPV_OPERAND_TYPE_FPENCODING,                    // SPIR-V Sec 3.51
- 
-   // NOTE: New concrete enum values should be added at the end.
- 
-@@ -236,6 +237,8 @@ typedef enum spv_operand_type_t {
-   // assemble regardless of where they occur -- literals, IDs, immediate
-   // integers, etc.
-   SPV_OPERAND_TYPE_OPTIONAL_CIV,
-+  // An optional floating point encoding enum
-+  SPV_OPERAND_TYPE_OPTIONAL_FPENCODING,
- 
-   // A variable operand represents zero or more logical operands.
-   // In an instruction definition, this may only appear at the end of the
diff --git a/spirv-tools/patches/patch-source_binary.cpp b/spirv-tools/patches/patch-source_binary.cpp
deleted file mode 100644
index e6cbae8631..0000000000
--- a/spirv-tools/patches/patch-source_binary.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-The symbol for FPEncoding is provided by the grammar of spirv-headers in
-version 1.3.296. But it is not handle in the latest stable version of
-spirv-tools.
-
---- source/binary.cpp.orig	2024-11-30 21:08:50.580118424 +0000
-+++ source/binary.cpp
-@@ -671,6 +671,8 @@ spv_result_t Parser::parseOperand(size_t
-     case SPV_OPERAND_TYPE_OVERFLOW_MODES:
-     case SPV_OPERAND_TYPE_PACKED_VECTOR_FORMAT:
-     case SPV_OPERAND_TYPE_OPTIONAL_PACKED_VECTOR_FORMAT:
-+    case SPV_OPERAND_TYPE_FPENCODING:
-+    case SPV_OPERAND_TYPE_OPTIONAL_FPENCODING:
-     case SPV_OPERAND_TYPE_NAMED_MAXIMUM_NUMBER_OF_REGISTERS: {
-       // A single word that is a plain enum value.
- 
-@@ -679,6 +681,8 @@ spv_result_t Parser::parseOperand(size_t
-         parsed_operand.type = SPV_OPERAND_TYPE_ACCESS_QUALIFIER;
-       if (type == SPV_OPERAND_TYPE_OPTIONAL_PACKED_VECTOR_FORMAT)
-         parsed_operand.type = SPV_OPERAND_TYPE_PACKED_VECTOR_FORMAT;
-+      if (type == SPV_OPERAND_TYPE_OPTIONAL_FPENCODING)
-+        parsed_operand.type = SPV_OPERAND_TYPE_FPENCODING;
- 
-       spv_operand_desc entry;
-       if (grammar_.lookupOperand(type, word, &entry)) {
diff --git a/spirv-tools/patches/patch-source_operand.cpp b/spirv-tools/patches/patch-source_operand.cpp
deleted file mode 100644
index 77a5501bab..0000000000
--- a/spirv-tools/patches/patch-source_operand.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD$
-
-The symbol for FPEncoding is provided by the grammar of spirv-headers in
-version 1.3.296. But it is not handle in the latest stable version of
-spirv-tools.
-
---- source/operand.cpp.orig	2024-11-30 21:05:43.754585540 +0000
-+++ source/operand.cpp
-@@ -252,6 +252,9 @@ const char* spvOperandTypeStr(spv_operan
-       return "OpenCL.DebugInfo.100 debug operation";
-     case SPV_OPERAND_TYPE_CLDEBUG100_DEBUG_IMPORTED_ENTITY:
-       return "OpenCL.DebugInfo.100 debug imported entity";
-+    case SPV_OPERAND_TYPE_FPENCODING:
-+    case SPV_OPERAND_TYPE_OPTIONAL_FPENCODING:
-+      return "FP encoding";
- 
-     // The next values are for values returned from an instruction, not actually
-     // an operand.  So the specific strings don't matter.  But let's add them
-@@ -366,6 +369,7 @@ bool spvOperandIsConcrete(spv_operand_ty
-     case SPV_OPERAND_TYPE_LOAD_CACHE_CONTROL:
-     case SPV_OPERAND_TYPE_STORE_CACHE_CONTROL:
-     case SPV_OPERAND_TYPE_NAMED_MAXIMUM_NUMBER_OF_REGISTERS:
-+    case SPV_OPERAND_TYPE_FPENCODING:
-       return true;
-     default:
-       break;
-@@ -407,6 +411,7 @@ bool spvOperandIsOptional(spv_operand_ty
-     case SPV_OPERAND_TYPE_OPTIONAL_COOPERATIVE_MATRIX_OPERANDS:
-     case SPV_OPERAND_TYPE_OPTIONAL_CIV:
-     case SPV_OPERAND_TYPE_OPTIONAL_RAW_ACCESS_CHAIN_OPERANDS:
-+    case SPV_OPERAND_TYPE_OPTIONAL_FPENCODING:
-       return true;
-     default:
-       break;
diff --git a/spirv-tools/patches/patch-source_print.cpp b/spirv-tools/patches/patch-source_print.cpp
deleted file mode 100644
index c4fe45da4b..0000000000
--- a/spirv-tools/patches/patch-source_print.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Add support of NetBSD platform.
-
---- source/print.cpp.orig	2024-04-22 19:29:56.000000000 +0000
-+++ source/print.cpp
-@@ -16,8 +16,9 @@
- 
- #if defined(SPIRV_ANDROID) || defined(SPIRV_LINUX) || defined(SPIRV_MAC) || \
-     defined(SPIRV_IOS) || defined(SPIRV_TVOS) || defined(SPIRV_FREEBSD) ||  \
--    defined(SPIRV_OPENBSD) || defined(SPIRV_EMSCRIPTEN) ||                  \
--    defined(SPIRV_FUCHSIA) || defined(SPIRV_GNU) || defined(SPIRV_QNX)
-+    defined(SPIRV_NETBSD) || defined(SPIRV_OPENBSD) ||                      \
-+    defined(SPIRV_EMSCRIPTEN) || defined(SPIRV_FUCHSIA) ||                  \
-+    defined(SPIRV_GNU) || defined(SPIRV_QNX)
- namespace spvtools {
- 
- clr::reset::operator const char*() { return "\x1b[0m"; }
Prev by Date: gcc15-gnat*: pkglinting
Next by Date: libclc: initial import.
Previous by Thread: gcc15-gnat*: pkglinting
Next by Thread: libclc: initial import.
Indexes:
Home | Main Index | Thread Index | Old Index