git: 5250ef3adeca - main - graphics/msl: Update 1.7.2 → 1.7.3

From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Wed, 31 May 2023 15:52:31 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5250ef3adecacc4e33c26d8f4957328bd41d7124

commit 5250ef3adecacc4e33c26d8f4957328bd41d7124
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-05-31 15:17:16 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-05-31 15:52:27 +0000

    graphics/msl: Update 1.7.2 → 1.7.3
    
    Reported by:    portscout
---
 graphics/msl/Makefile                                  | 12 ++++++------
 graphics/msl/distinfo                                  | 18 +++++++++---------
 .../msl/files/patch-Compile_SPIRV-Cross_CMakeLists.txt | 11 +++++++++++
 graphics/msl/pkg-plist                                 |  4 ++--
 4 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/graphics/msl/Makefile b/graphics/msl/Makefile
index 787f45ba2069..06515554df08 100644
--- a/graphics/msl/Makefile
+++ b/graphics/msl/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	msl
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.7.2
-PORTREVISION=	3
+DISTVERSION=	1.7.3
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -19,15 +18,16 @@ USES=		cmake:testing compiler:c++14-lang python:3.6+,build
 CMAKE_ON=	BUILD_SHARED_LIBS MSL_SHARED
 CMAKE_OFF=	SPIRV_TOOLS_BUILD_STATIC
 CMAKE_OFF=	MSL_BUILD_TESTS MSL_BUILD_DOCS
+CMAKE_ARGS=	-DFREEBSD_PYTHON_VER=${PYTHON_VER}
 CMAKE_TESTING_ON=	MSL_BUILD_TESTS
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	akb825
 GH_PROJECT=	ModularShaderLanguage
 
-GH_TUPLE=	akb825:glslang:b429a06:akb825_glslang/Compile/glslang \
-		KhronosGroup:SPIRV-Cross:eb9b273:KhronosGroup_SPIRV_Cross/Compile/SPIRV-Cross \
-		akb825:SPIRV-Tools:289e050:akb825_SPIRV_Tools/Compile/SPIRV-Tools \
-			KhronosGroup:SPIRV-Headers:aa331ab:KhronosGroup_SPIRV_Headers/Compile/SPIRV-Tools/external/SPIRV-Headers
+GH_TUPLE=	akb825:glslang:45234bb:akb825_glslang/Compile/glslang \
+		KhronosGroup:SPIRV-Cross:12542fc:KhronosGroup_SPIRV_Cross/Compile/SPIRV-Cross \
+		akb825:SPIRV-Tools:0783a8d:akb825_SPIRV_Tools/Compile/SPIRV-Tools \
+			KhronosGroup:SPIRV-Headers:aa331ab:KhronosGroup_SPIRV_Headers/Compile/SPIRV-Tools/external/spirv-headers
 
 .include <bsd.port.mk>
diff --git a/graphics/msl/distinfo b/graphics/msl/distinfo
index 244beff43ce4..aa8f5dbf699d 100644
--- a/graphics/msl/distinfo
+++ b/graphics/msl/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1677740443
-SHA256 (akb825-ModularShaderLanguage-v1.7.2_GH0.tar.gz) = 7a9e14017647c99153202ad4a9ebcc603f8f07bedab4ecdfe3783437cc633973
-SIZE (akb825-ModularShaderLanguage-v1.7.2_GH0.tar.gz) = 257328
-SHA256 (akb825-glslang-b429a06_GH0.tar.gz) = e36b0155fb5c85a9cda68ced78d605644f272e4126661f1a00c06816b5a599f6
-SIZE (akb825-glslang-b429a06_GH0.tar.gz) = 3682573
-SHA256 (KhronosGroup-SPIRV-Cross-eb9b273_GH0.tar.gz) = afb0a2f146bcd145d5dc8353d0bb45e2028d372cef78d4ce7b35f484e14bcae3
-SIZE (KhronosGroup-SPIRV-Cross-eb9b273_GH0.tar.gz) = 1706705
-SHA256 (akb825-SPIRV-Tools-289e050_GH0.tar.gz) = 4133b514391faaec05477c1fbb8c42373f3a5fe533694d53cf750e7e38cc700c
-SIZE (akb825-SPIRV-Tools-289e050_GH0.tar.gz) = 3087956
+TIMESTAMP = 1685544713
+SHA256 (akb825-ModularShaderLanguage-v1.7.3_GH0.tar.gz) = c547ea3b335439fcc5bdfd68b950e3dc2e6cde46ab968ca237274d1b32982c95
+SIZE (akb825-ModularShaderLanguage-v1.7.3_GH0.tar.gz) = 260853
+SHA256 (akb825-glslang-45234bb_GH0.tar.gz) = eeebe05d7f6f2987cfa53e2fcf11e1d3ebeeca598d197caf426897be5458c6fb
+SIZE (akb825-glslang-45234bb_GH0.tar.gz) = 3706176
+SHA256 (KhronosGroup-SPIRV-Cross-12542fc_GH0.tar.gz) = 16d31d9ff0c46fe89c77ac10277805fe964d7e48efd9dd294332581b548d7b25
+SIZE (KhronosGroup-SPIRV-Cross-12542fc_GH0.tar.gz) = 1740554
+SHA256 (akb825-SPIRV-Tools-0783a8d_GH0.tar.gz) = efc05548fb4fbe3dd1c8449daa247a46b9f88141af41f547cdf9774857168ddb
+SIZE (akb825-SPIRV-Tools-0783a8d_GH0.tar.gz) = 3099902
 SHA256 (KhronosGroup-SPIRV-Headers-aa331ab_GH0.tar.gz) = 5df789020e7f38f1c950cfd39eb212493cfff01c7e17206c966b05c6b1918b80
 SIZE (KhronosGroup-SPIRV-Headers-aa331ab_GH0.tar.gz) = 447531
diff --git a/graphics/msl/files/patch-Compile_SPIRV-Cross_CMakeLists.txt b/graphics/msl/files/patch-Compile_SPIRV-Cross_CMakeLists.txt
new file mode 100644
index 000000000000..c7c427fa1236
--- /dev/null
+++ b/graphics/msl/files/patch-Compile_SPIRV-Cross_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- Compile/SPIRV-Cross/CMakeLists.txt.orig	2023-05-31 14:55:36 UTC
++++ Compile/SPIRV-Cross/CMakeLists.txt
+@@ -459,7 +459,7 @@ if (SPIRV_CROSS_CLI)
+ 		#  - Update the reference files
+ 		#  - Get cycle counts from malisc
+ 		#  - Keep failing outputs
+-		find_package(PythonInterp)
++		find_package(PythonInterp ${FREEBSD_PYTHON_VER} EXACT REQUIRED)
+ 		find_program(spirv-cross-glslang NAMES glslangValidator
+ 				PATHS ${CMAKE_CURRENT_SOURCE_DIR}/external/glslang-build/output/bin
+ 				NO_DEFAULT_PATH)
diff --git a/graphics/msl/pkg-plist b/graphics/msl/pkg-plist
index a5584a07cc54..5cbbe81861aa 100644
--- a/graphics/msl/pkg-plist
+++ b/graphics/msl/pkg-plist
@@ -29,6 +29,6 @@ lib/cmake/MSLCompile/MSLCompileConfigVersion.cmake
 lib/cmake/MSLCompile/MSLCompileTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/MSLCompile/MSLCompileTargets.cmake
 lib/libmsl_client.so
-lib/libmsl_client.so.1.7.2
+lib/libmsl_client.so.1.7.3
 lib/libmsl_compile.so
-lib/libmsl_compile.so.1.7.2
+lib/libmsl_compile.so.1.7.3