From nobody Wed May 31 15:52:31 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QWYgM3fzfz4YtVP; Wed, 31 May 2023 15:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QWYgM372bz4Qsq; Wed, 31 May 2023 15:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685548351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RlAFCusAvKMcjsiwBnElpwcGPj+yYgicksh4aLiTkzk=; b=NaUq39BSh714W0M7IDXOYLSoI6NILaW6JNfNJwtn224awW1fy5UZKe/Q2+hSM6ednu8EzL xbfKQHqTZEkaOKNgHwNOKSou2KKjaJu2kRefG/2M2ZgqGHZJ4ugjEORojddrmyKLG0Mjck X1EPhVBvSszldeL3Syj7b+IyRa6wzZ3gECNJQPWxUXo1g/g1cPUVClZ4ChnjXBpMXbHh33 WtJA6tOS2vcX5sRjc5GLjISlfmYKA/bSZESsk8sXX/30WWX2ZkQ09d/VWiyJ7KCjjm+SyG ViWlImDElgrm5XAudT1xXcWSBFKPRYGvHJOwGg/tBQgH3e2jDoxzU4jqHHI6rQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685548351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RlAFCusAvKMcjsiwBnElpwcGPj+yYgicksh4aLiTkzk=; b=vkj5kaQyDm/YUKGjXq7KoNAP567uAMKLc1paeUwmpqIb8WsewTjnGy8hQ/Kthb2dRrXnHy YVWaFAXkzw1Hxqq/9/CiMrgf83KEtw64m7Y2u+LRuqwLX/P2QbCs77J+Hc33XtJWE4+KH4 FSfyhyOu7l7AcvPd2BvluLZFvk3MCtTlkeLt8IHeevvKTGpgGh/UgvRvcSocD2Rz1s3VEv rtr9MF2vkCCmc5Bya/wIAAXAKOUORtchP2CKTQKxQN1a9XMyqg6kwM8d6mZpFQU7zyeLUi sxiVKiEwud/IGVXu9EHge5m1s7kQGltFFATxmmxYpdOKe4M9qjIb0xk3Oca2CQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685548351; a=rsa-sha256; cv=none; b=kaZxTZlQULMt4voOyxJflTWfPT2X3LEkIQvnqZynru9mY55qX5fRdEBCcyFbd+lOpzu4nL kMIekLllGyyrMQDfGks3ccD6R6nP+Z523H9CFR9SkuD1zoRrg/ajsa1ywHvoz+e1sHur3d xLqrNBarHkGQX5pAO3/x1iAbvrn+ECFMCY9zcVUv6Xg4btdh8LpRlQ7zfapecFPwsXLElh onTreFnT0RAyMn9wj3h8mJ604qR2kFIMOAXjVkX9sbIBQp8UVvqUbt6jShEdh3WMa+PsDZ 5hIBOluU/baJow7WhIiSVTWQ8OLNs95wEdsSAE+yduQJ0W/31W5Ku3pbnxjZAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QWYgM2BCqzgyY; Wed, 31 May 2023 15:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34VFqVKN074232; Wed, 31 May 2023 15:52:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34VFqVFX074231; Wed, 31 May 2023 15:52:31 GMT (envelope-from git) Date: Wed, 31 May 2023 15:52:31 GMT Message-Id: <202305311552.34VFqVFX074231@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 5250ef3adeca - main - =?utf-8?Q?graphics/msl:=20Update=201.7.2=20=E2=86=92=201.7.3?= List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5250ef3adecacc4e33c26d8f4957328bd41d7124 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=5250ef3adecacc4e33c26d8f4957328bd41d7124 commit 5250ef3adecacc4e33c26d8f4957328bd41d7124 Author: Yuri Victorovich AuthorDate: 2023-05-31 15:17:16 +0000 Commit: Yuri Victorovich 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 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