CVS commit: pkgsrc/parallel/spirv-headers

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Oct  4 12:07:45 UTC 2025

Modified Files:
        pkgsrc/parallel/spirv-headers: Makefile buildlink3.mk distinfo

Log Message:
spirv-headers: apply some upstream commits to fix the build of spirv-tools


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/parallel/spirv-headers/Makefile \
    pkgsrc/parallel/spirv-headers/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/parallel/spirv-headers/buildlink3.mk

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

Modified files:

Index: pkgsrc/parallel/spirv-headers/Makefile
diff -u pkgsrc/parallel/spirv-headers/Makefile:1.9 pkgsrc/parallel/spirv-headers/Makefile:1.10
--- pkgsrc/parallel/spirv-headers/Makefile:1.9  Tue Sep 23 09:30:31 2025
+++ pkgsrc/parallel/spirv-headers/Makefile      Sat Oct  4 12:07:45 2025
@@ -1,14 +1,23 @@
-# $NetBSD: Makefile,v 1.9 2025/09/23 09:30:31 tnn Exp $
+# $NetBSD: Makefile,v 1.10 2025/10/04 12:07:45 tnn Exp $
 
 # This version should be kept in sync with what
 # parallel/spirv-llvm-translator's ${WRKSRC}/spirv-headers-tag.conf
 # contains.
 DISTNAME=      SPIRV-Headers-1.4.321.0
 PKGNAME=       ${DISTNAME:tl}
+PKGREVISION=   1
 CATEGORIES=    parallel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=KhronosGroup/}
 GITHUB_TAG=    vulkan-sdk-${PKGVERSION_NOREV}
 
+PATCHFILES=            9e3836d7d6023843a72ecd3fbf3f09b1b6747a9e.patch
+PATCHFILES+=           1de2e410ae8b5f7276afcfd9f3401a1c4e2cb2d7.patch
+PATCH_DIST_STRIP=      -p1
+SITES.9e3836d7d6023843a72ecd3fbf3f09b1b6747a9e.patch=  \
+       https://github.com/KhronosGroup/SPIRV-Headers/commit/
+SITES.1de2e410ae8b5f7276afcfd9f3401a1c4e2cb2d7.patch=  \
+       https://github.com/KhronosGroup/SPIRV-Headers/commit/
+
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/KhronosGroup/SPIRV-Headers
 COMMENT=       Headers for translation between SPIR-V and LLVM IR
@@ -20,5 +29,8 @@ WRKSRC=               ${WRKDIR}/SPIRV-Headers-${GITHU
 
 PKGCONFIG_OVERRIDE+=   SPIRV-Headers.pc.in
 
+pre-configure:
+       ${RM} -rf ${WRKSRC}/include/spirv/unified1/*.orig*
+
 .include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/parallel/spirv-headers/distinfo
diff -u pkgsrc/parallel/spirv-headers/distinfo:1.9 pkgsrc/parallel/spirv-headers/distinfo:1.10
--- pkgsrc/parallel/spirv-headers/distinfo:1.9  Tue Sep 23 09:30:31 2025
+++ pkgsrc/parallel/spirv-headers/distinfo      Sat Oct  4 12:07:45 2025
@@ -1,5 +1,11 @@
-$NetBSD: distinfo,v 1.9 2025/09/23 09:30:31 tnn Exp $
+$NetBSD: distinfo,v 1.10 2025/10/04 12:07:45 tnn Exp $
 
+BLAKE2s (1de2e410ae8b5f7276afcfd9f3401a1c4e2cb2d7.patch) = 97d30fa10ee81fba0ade7a73f201de51e3f8cb0b101745391b697210236eeaed
+SHA512 (1de2e410ae8b5f7276afcfd9f3401a1c4e2cb2d7.patch) = e0355aaff7c29231e3775f7708f5f06d3b01cbf1c041c8ecb6823985087a74c50a2ff9ad6c23f6b3f4ca59fc8fa11e8573612062e8b0138bb790da17d533d91e
+Size (1de2e410ae8b5f7276afcfd9f3401a1c4e2cb2d7.patch) = 23473 bytes
+BLAKE2s (9e3836d7d6023843a72ecd3fbf3f09b1b6747a9e.patch) = 1f3813c99a488e54ad5b2e2728bdadea87f55bdb7a17fd9e8da77374ca69508c
+SHA512 (9e3836d7d6023843a72ecd3fbf3f09b1b6747a9e.patch) = 76f0e5618adf6c1a26b1e62a6b783ca8ce86b1049f86b278bad4128b79b012a5e1bbf659d40b1ad487587a6663821baf2de0a04e29ca5a7feecc585e3d5bbd81
+Size (9e3836d7d6023843a72ecd3fbf3f09b1b6747a9e.patch) = 31163 bytes
 BLAKE2s (SPIRV-Headers-1.4.321.0.tar.gz) = 931796c2f71eab9ea8f6e77ec87360cbebf9d19cb34ff4776a3ae700d4d1aa05
 SHA512 (SPIRV-Headers-1.4.321.0.tar.gz) = ea28714ba07d98e8a2baca482f9c483ae525f40d03aa7987b56c1561e1f0a2c66782b620b41fc8782c7cbb4979d5125c28a20f706a25909aacca6ebee184d467
 Size (SPIRV-Headers-1.4.321.0.tar.gz) = 538412 bytes

Index: pkgsrc/parallel/spirv-headers/buildlink3.mk
diff -u pkgsrc/parallel/spirv-headers/buildlink3.mk:1.3 pkgsrc/parallel/spirv-headers/buildlink3.mk:1.4
--- pkgsrc/parallel/spirv-headers/buildlink3.mk:1.3     Fri Nov 29 16:25:48 2024
+++ pkgsrc/parallel/spirv-headers/buildlink3.mk Sat Oct  4 12:07:45 2025
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.3 2024/11/29 16:25:48 triaxx Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2025/10/04 12:07:45 tnn Exp $
 
 BUILDLINK_TREE+=       spirv-headers
 
 .if !defined(SPIRV_HEADERS_BUILDLINK3_MK)
 SPIRV_HEADERS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.spirv-headers+=  spirv-headers>=1.3.216.0
+BUILDLINK_API_DEPENDS.spirv-headers+=  spirv-headers>=1.4.321.0nb1
 BUILDLINK_PKGSRCDIR.spirv-headers?=    ../../parallel/spirv-headers
 BUILDLINK_DEPMETHOD.spirv-headers?=    build
 .endif # SPIRV_HEADERS_BUILDLINK3_MK