CVS commit: pkgsrc/parallel

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/parallel
From: "Tobias Nygren" <tnn%netbsd.org@localhost>
Date: Mon, 15 Aug 2022 20:39:21 +0000

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Aug 15 20:39:21 UTC 2022

Modified Files:
        pkgsrc/parallel/spirv-headers: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/parallel/spirv-llvm-translator: Makefile PLIST buildlink3.mk
            distinfo
Removed Files:
        pkgsrc/parallel/spirv-llvm-translator/patches:
            patch-lib_SPIRV_SPIRVReader.cpp patch-lib_SPIRV_SPIRVWriter.cpp
            patch-lib_SPIRV_SPIRVWriter.h
            patch-lib_SPIRV_libSPIRV_SPIRVFunction.h
            patch-lib_SPIRV_libSPIRV_SPIRVModule.cpp
            patch-lib_SPIRV_libSPIRV_SPIRVModule.h
            patch-lib_SPIRV_libSPIRV_SPIRVOpCode.h
            patch-lib_SPIRV_libSPIRV_SPIRVOpCodeEnum.h
            patch-spirv-headers-tag.conf patch-test_constexpr__vector.ll
            patch-test_transcoding_SPV__INTEL__function__pointers_bitcast.ll
            patch-test_transcoding_SPV__INTEL__function__pointers_const-function-pointer.ll
            patch-test_transcoding_SPV__INTEL__function__pointers_function-pointer.ll
            patch-test_transcoding_SPV__INTEL__function__pointers_global__ctor__dtor.ll
            patch-test_transcoding_SPV__INTEL__function__pointers_non-uniform-function-pointer.ll
            patch-test_transcoding_SPV__INTEL__function__pointers_select.ll
            patch-test_transcoding_SPV__INTEL__function__pointers_vector__elem.ll

Log Message:
spirv-llvm-translator: update to 14.0.0 fix the build

Changes unknown.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/parallel/spirv-headers/Makefile \
    pkgsrc/parallel/spirv-headers/PLIST \
    pkgsrc/parallel/spirv-headers/buildlink3.mk \
    pkgsrc/parallel/spirv-headers/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/parallel/spirv-llvm-translator/Makefile \
    pkgsrc/parallel/spirv-llvm-translator/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/parallel/spirv-llvm-translator/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/parallel/spirv-llvm-translator/buildlink3.mk
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_SPIRVReader.cpp \
    pkgsrc/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_SPIRVWriter.cpp \
    pkgsrc/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_SPIRVWriter.h \
    pkgsrc/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_libSPIRV_SPIRVFunction.h \
    pkgsrc/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_libSPIRV_SPIRVModule.cpp \
    pkgsrc/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_libSPIRV_SPIRVModule.h \
    pkgsrc/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_libSPIRV_SPIRVOpCode.h \
    pkgsrc/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_libSPIRV_SPIRVOpCodeEnum.h \
    pkgsrc/parallel/spirv-llvm-translator/patches/patch-spirv-headers-tag.conf \
    pkgsrc/parallel/spirv-llvm-translator/patches/patch-test_constexpr__vector.ll \
    pkgsrc/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_bitcast.ll \
    pkgsrc/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_const-function-pointer.ll \
    pkgsrc/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_function-pointer.ll \
    pkgsrc/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_global__ctor__dtor.ll \
    pkgsrc/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_non-uniform-function-pointer.ll \
    pkgsrc/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_select.ll \
    pkgsrc/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_vector__elem.ll

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.1 pkgsrc/parallel/spirv-headers/Makefile:1.2
--- pkgsrc/parallel/spirv-headers/Makefile:1.1  Sat Nov 20 20:06:55 2021
+++ pkgsrc/parallel/spirv-headers/Makefile      Mon Aug 15 20:39:21 2022
@@ -1,13 +1,17 @@
-# $NetBSD: Makefile,v 1.1 2021/11/20 20:06:55 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2022/08/15 20:39:21 tnn Exp $
 
-DISTNAME=      SPIRV-Headers-1.2.198.0
+# This version should be kept in sync with what
+# parallel/spirv-llvm-translator's ${WRKSRC}/spirv-headers-tag.conf
+# contains.
+DISTNAME=      SPIRV-Headers-1.3.216.0
 CATEGORIES=    parallel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=KhronosGroup/}
-GITHUB_TAG=    sdk-1.2.198.0
+GITHUB_TAG=    sdk-${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/KhronosGroup/SPIRV-Headers
 COMMENT=       Headers for translation between SPIR-V and LLVM IR
+LICENSE=       mit
 
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++
Index: pkgsrc/parallel/spirv-headers/PLIST
diff -u pkgsrc/parallel/spirv-headers/PLIST:1.1 pkgsrc/parallel/spirv-headers/PLIST:1.2
--- pkgsrc/parallel/spirv-headers/PLIST:1.1     Sat Nov 20 20:06:55 2021
+++ pkgsrc/parallel/spirv-headers/PLIST Mon Aug 15 20:39:21 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/11/20 20:06:55 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/08/15 20:39:21 tnn Exp $
 include/spirv/1.0/GLSL.std.450.h
 include/spirv/1.0/OpenCL.std.h
 include/spirv/1.0/extinst.glsl.std.450.grammar.json
@@ -58,6 +58,7 @@ include/spirv/unified1/extinst.spv-amd-g
 include/spirv/unified1/extinst.spv-amd-shader-ballot.grammar.json
 include/spirv/unified1/extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json
 include/spirv/unified1/extinst.spv-amd-shader-trinary-minmax.grammar.json
+include/spirv/unified1/spirv.bf
 include/spirv/unified1/spirv.core.grammar.json
 include/spirv/unified1/spirv.cs
 include/spirv/unified1/spirv.h
Index: pkgsrc/parallel/spirv-headers/buildlink3.mk
diff -u pkgsrc/parallel/spirv-headers/buildlink3.mk:1.1 pkgsrc/parallel/spirv-headers/buildlink3.mk:1.2
--- pkgsrc/parallel/spirv-headers/buildlink3.mk:1.1     Sat Nov 20 20:06:55 2021
+++ pkgsrc/parallel/spirv-headers/buildlink3.mk Mon Aug 15 20:39:21 2022
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2021/11/20 20:06:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2022/08/15 20:39:21 tnn Exp $
 
 BUILDLINK_TREE+=       SPIRV-Headers
 
 .if !defined(SPIRV_HEADERS_BUILDLINK3_MK)
 SPIRV_HEADERS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.SPIRV-Headers+=  SPIRV-Headers>=1.2.198.0
+BUILDLINK_API_DEPENDS.SPIRV-Headers+=  SPIRV-Headers>=1.3.216.0
 BUILDLINK_PKGSRCDIR.SPIRV-Headers?=    ../../parallel/spirv-headers
 BUILDLINK_DEPMETHOD.SPIRV-Headers?=    build
 .endif # SPIRV_HEADERS_BUILDLINK3_MK
Index: pkgsrc/parallel/spirv-headers/distinfo
diff -u pkgsrc/parallel/spirv-headers/distinfo:1.1 pkgsrc/parallel/spirv-headers/distinfo:1.2
--- pkgsrc/parallel/spirv-headers/distinfo:1.1  Sat Nov 20 20:06:55 2021
+++ pkgsrc/parallel/spirv-headers/distinfo      Mon Aug 15 20:39:21 2022
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2021/11/20 20:06:55 wiz Exp $
+$NetBSD: distinfo,v 1.2 2022/08/15 20:39:21 tnn Exp $
 
-BLAKE2s (SPIRV-Headers-1.2.198.0.tar.gz) = 9c797196b2fdc42dfbf34eed28acfe78037cbba614cfffdfd925ba882e9bbbb8
-SHA512 (SPIRV-Headers-1.2.198.0.tar.gz) = a35167f8de66f2e16c6d2dccdd69f95c58b08abcdef5dac5a705e8e52af049ec9b0e2d0ef6fb732454a0671cd331b69bea75b24911599c0a2ce3972d40addfef
-Size (SPIRV-Headers-1.2.198.0.tar.gz) = 416113 bytes
+BLAKE2s (SPIRV-Headers-1.3.216.0.tar.gz) = d8f2122fc7c99084f5526066093ea412b29d3674b3e65cfc4b6f76b5b544b5a9
+SHA512 (SPIRV-Headers-1.3.216.0.tar.gz) = 951715cf62a643bfce6a3854f2206b95dd65e60b27355a2f290e829da0f06e19877e9dfcbf53f455b8a0524fb851a851742f3e16bb29be2f470cd62d3a8fc8f0
+Size (SPIRV-Headers-1.3.216.0.tar.gz) = 437011 bytes

Index: pkgsrc/parallel/spirv-llvm-translator/Makefile
diff -u pkgsrc/parallel/spirv-llvm-translator/Makefile:1.5 pkgsrc/parallel/spirv-llvm-translator/Makefile:1.6
--- pkgsrc/parallel/spirv-llvm-translator/Makefile:1.5  Mon Aug 15 19:22:52 2022
+++ pkgsrc/parallel/spirv-llvm-translator/Makefile      Mon Aug 15 20:39:21 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2022/08/15 19:22:52 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/08/15 20:39:21 tnn Exp $
 
-DISTNAME=      SPIRV-LLVM-Translator-13.0.0
+DISTNAME=      SPIRV-LLVM-Translator-14.0.0
 PKGNAME=       ${DISTNAME:tl}
 CATEGORIES=    parallel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=KhronosGroup/}
@@ -13,15 +13,13 @@ LICENSE=    modified-bsd
 
 WRKSRC=                ${WRKDIR}/${DISTNAME}
 
-BROKEN=                "This version does not support llvm 14, please update this to 14.0.0."
-
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 
-GCC_REQD+=     5 # C++14
+GCC_REQD+=     7 # sync with llvm
 
 CMAKE_ARGS+=   -DBUILD_SHARED_LIBS=ON
-CMAKE_ARGS+=   -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${PREFIX}/include
+CMAKE_ARGS+=   -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${PREFIX}/include/libLLVM
 
 PKGCONFIG_OVERRIDE+=   LLVMSPIRVLib.pc.in
 
Index: pkgsrc/parallel/spirv-llvm-translator/distinfo
diff -u pkgsrc/parallel/spirv-llvm-translator/distinfo:1.5 pkgsrc/parallel/spirv-llvm-translator/distinfo:1.6
--- pkgsrc/parallel/spirv-llvm-translator/distinfo:1.5  Tue Nov 23 20:55:44 2021
+++ pkgsrc/parallel/spirv-llvm-translator/distinfo      Mon Aug 15 20:39:21 2022
@@ -1,23 +1,6 @@
-$NetBSD: distinfo,v 1.5 2021/11/23 20:55:44 wiz Exp $
+$NetBSD: distinfo,v 1.6 2022/08/15 20:39:21 tnn Exp $
 
-BLAKE2s (SPIRV-LLVM-Translator-13.0.0.tar.gz) = 1d544e845cb4adfc4c9a5056ab48c4347bf5cc0848bcf21f5ab098a583e6d272
-SHA512 (SPIRV-LLVM-Translator-13.0.0.tar.gz) = 1ce7a38c2c3447249e19d50063a7a2acf32699905572950e4f102d8ce1680785433035154b7b55782d5a56211a50e042aef775836f37c33fe847b347a02b5a04
-Size (SPIRV-LLVM-Translator-13.0.0.tar.gz) = 1436324 bytes
+BLAKE2s (SPIRV-LLVM-Translator-14.0.0.tar.gz) = c3aa2584d427b33aacd85cb3406a222505a56ae32a7f3d674822bf34e8417ea2
+SHA512 (SPIRV-LLVM-Translator-14.0.0.tar.gz) = 5659149a380ceef7acdcb274bcad9b23e4817bf88e795e0a8464dfe14fbd102dbf7199cbe67eb611a16d3a411c7a1b8afc6f0eef61fec5a2b8f9fba06748bcb1
+Size (SPIRV-LLVM-Translator-14.0.0.tar.gz) = 1482704 bytes
 SHA1 (patch-CMakeLists.txt) = db9173e06fb702c3fa88844fc87380262024cbe1
-SHA1 (patch-lib_SPIRV_SPIRVReader.cpp) = 25dc02f63e6b32f69afa0388ceb945131c2fb48e
-SHA1 (patch-lib_SPIRV_SPIRVWriter.cpp) = cd9030f5ab63b0c7ba9492e101578b7431fdc903
-SHA1 (patch-lib_SPIRV_SPIRVWriter.h) = db22ff84b6cd8494898ea5cd35f53bde8e6c35a0
-SHA1 (patch-lib_SPIRV_libSPIRV_SPIRVFunction.h) = 8290d8246db59c3beb27866a7c555a08468e8d05
-SHA1 (patch-lib_SPIRV_libSPIRV_SPIRVModule.cpp) = 683a2d76e4faaed82179f6f995e1c272e706fcf5
-SHA1 (patch-lib_SPIRV_libSPIRV_SPIRVModule.h) = 83ddc00be71ce79d1fe1b63564857053da9fd1f3
-SHA1 (patch-lib_SPIRV_libSPIRV_SPIRVOpCode.h) = bc0e6685c80e82190f7b327e5ebb5ccf19b3e810
-SHA1 (patch-lib_SPIRV_libSPIRV_SPIRVOpCodeEnum.h) = e2a7329fbdcdadbae07334b0c735056837a88121
-SHA1 (patch-spirv-headers-tag.conf) = ecfb5efbaceb94672f8cc8e9d6242315c44818bd
-SHA1 (patch-test_constexpr__vector.ll) = b4527f06912fa18dc824fc43f5fed433cca84354
-SHA1 (patch-test_transcoding_SPV__INTEL__function__pointers_bitcast.ll) = 373852e3963a06e991e231f0c5ab2ae766404410
-SHA1 (patch-test_transcoding_SPV__INTEL__function__pointers_const-function-pointer.ll) = f6067833cdcb1620aba9394f9535bde76056c191
-SHA1 (patch-test_transcoding_SPV__INTEL__function__pointers_function-pointer.ll) = 4e0ac321159280936fb38b7f16b417cf060cafbd
-SHA1 (patch-test_transcoding_SPV__INTEL__function__pointers_global__ctor__dtor.ll) = f11189c9f6df87402dc0cd44015206cbbf0591af
-SHA1 (patch-test_transcoding_SPV__INTEL__function__pointers_non-uniform-function-pointer.ll) = 25a6766ee57116d3b8296bfea8c8b8983016a9cd
-SHA1 (patch-test_transcoding_SPV__INTEL__function__pointers_select.ll) = 17fc3d504c94a9f88eda183e07e8ec8a2a9e8624
-SHA1 (patch-test_transcoding_SPV__INTEL__function__pointers_vector__elem.ll) = c019121148a8d95269ca7b41a0c1c162ae46eed9

Index: pkgsrc/parallel/spirv-llvm-translator/PLIST
diff -u pkgsrc/parallel/spirv-llvm-translator/PLIST:1.3 pkgsrc/parallel/spirv-llvm-translator/PLIST:1.4
--- pkgsrc/parallel/spirv-llvm-translator/PLIST:1.3     Tue Nov 23 20:55:44 2021
+++ pkgsrc/parallel/spirv-llvm-translator/PLIST Mon Aug 15 20:39:21 2022
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2021/11/23 20:55:44 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2022/08/15 20:39:21 tnn Exp $
 include/LLVMSPIRVLib/LLVMSPIRVExtensions.inc
 include/LLVMSPIRVLib/LLVMSPIRVLib.h
 include/LLVMSPIRVLib/LLVMSPIRVOpts.h
 lib/libLLVMSPIRVLib.so
-lib/libLLVMSPIRVLib.so.13
+lib/libLLVMSPIRVLib.so.14
 lib/pkgconfig/LLVMSPIRVLib.pc

Index: pkgsrc/parallel/spirv-llvm-translator/buildlink3.mk
diff -u pkgsrc/parallel/spirv-llvm-translator/buildlink3.mk:1.2 pkgsrc/parallel/spirv-llvm-translator/buildlink3.mk:1.3
--- pkgsrc/parallel/spirv-llvm-translator/buildlink3.mk:1.2     Wed Jun  9 14:56:51 2021
+++ pkgsrc/parallel/spirv-llvm-translator/buildlink3.mk Mon Aug 15 20:39:21 2022
@@ -1,13 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.2 2021/06/09 14:56:51 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2022/08/15 20:39:21 tnn Exp $
 
 BUILDLINK_TREE+=       spirv-llvm-translator
 
 .if !defined(SPIRV_LLVM_TRANSLATOR_BUILDLINK3_MK)
 SPIRV_LLVM_TRANSLATOR_BUILDLINK3_MK:=
 
-GCC_REQD+=     5 # C++14
+GCC_REQD+=     7 # sync with llvm
 
-BUILDLINK_API_DEPENDS.spirv-llvm-translator+=  spirv-llvm-translator>=10.0.0
+BUILDLINK_API_DEPENDS.spirv-llvm-translator+=  spirv-llvm-translator>=14.0.0
 BUILDLINK_PKGSRCDIR.spirv-llvm-translator?=    ../../parallel/spirv-llvm-translator
 
 .include "../../lang/llvm/buildlink3.mk"

Prev by Date: CVS commit: pkgsrc/net/freerdp2
Next by Date: CVS commit: pkgsrc/editors/codeblocks
Previous by Thread: CVS commit: pkgsrc/net/freerdp2
Next by Thread: CVS commit: pkgsrc/editors/codeblocks
Indexes:

Home | Main Index | Thread Index | Old Index