<pre style='margin:0'>
Vadym-Valdis Yudaiev (judaew) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ccbaab41920d2cfed5a4f3b61399c93d50cd88cc">https://github.com/macports/macports-ports/commit/ccbaab41920d2cfed5a4f3b61399c93d50cd88cc</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ccbaab41920d2cfed5a4f3b61399c93d50cd88cc
</span>Author: christophecvr <stefansat@proximus.be>
AuthorDate: Fri Oct 18 20:24:08 2024 +0200
<span style='display:block; white-space:pre;color:#404040;'> glslang: update to 1.3.296.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/71081
</span><span style='display:block; white-space:pre;color:#404040;'> Set python to version 3.12
</span><span style='display:block; white-space:pre;color:#404040;'> Added the lates remark on:
</span><span style='display:block; white-space:pre;color:#404040;'> https://github.com/KhronosGroup/glslang/pull/3371
</span><span style='display:block; white-space:pre;color:#404040;'> to patchfile.
</span>---
graphics/glslang/Portfile | 25 +++++++++++++++--------
graphics/glslang/files/create-pkgconfig-file.diff | 21 ++++++++++++++-----
2 files changed, 32 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/glslang/Portfile b/graphics/glslang/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ef0056f5cba..1aea837d12f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/glslang/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/glslang/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,8 @@ PortGroup github 1.0
</span> PortGroup cmake 1.1
PortGroup legacysupport 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup KhronosGroup glslang 13.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup KhronosGroup glslang 1.3.296.0 vulkan-sdk-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories graphics devel
license {BSD Permissive}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,11 +17,11 @@ long_description Glslang is the official reference compiler for \
</span> the OpenGL and OpenGL ES shading languages.
homepage https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 d4eece144c4930b4793779396665bd415dd641c8f33115b4de4c83d42a39d9f1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a187c2d1c75a05eb5aba4afadf9ba689b15c63f9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3712855
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 4d455a9a9a0d23231b22c7595ee343989a5f6ee50b5eb05aa663b92352bb51e8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 c0e219aee3a62a8d0fd25c2f96a5a5851437963d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3867163
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set py_ver 3.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver 3.12
</span> set py_ver_nodot [string map {. {}} ${py_ver}]
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ compiler.cxx_standard 2017
</span> # Need to use MacPorts libc++ on macOS 10.14 Mojave and older, because
# Apple Clang only added support for the C++17 <filesystem> library
# starting in Xcode 11 (clang-1100) for macOS 10.15+.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span> # References:
# * https://stackoverflow.com/a/55353263
# * https://developer.apple.com/documentation/xcode-release-notes/xcode-11-release-notes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,9 +45,16 @@ legacysupport.use_mp_libcxx yes
</span> # https://github.com/KhronosGroup/glslang/pull/3371
patchfiles-append create-pkgconfig-file.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:spirv-tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:python${py_ver_nodot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append port:python${py_ver_nodot}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.python ${prefix}/bin/python${py_ver}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DPYTHON_EXECUTABLE:FILEPATH=${configure.python}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# there is no such option in CMakeLists.txt, cmake discovers and uses right python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#configure.args-append -DPYTHON_EXECUTABLE:FILEPATH=${configure.python}
</span>
configure.args-append -DBUILD_SHARED_LIBS=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_GLSLANG_INSTALL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGLSLANG_ENABLE_INSTALL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DALLOW_EXTERNAL_SPIRV_TOOLS=ON
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/glslang/files/create-pkgconfig-file.diff b/graphics/glslang/files/create-pkgconfig-file.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1979079a910..4b97cb26c76 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/glslang/files/create-pkgconfig-file.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/glslang/files/create-pkgconfig-file.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2023-08-23 19:24:25.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2023-10-13 18:07:29.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -361,4 +361,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2024-09-26 01:10:44.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2024-10-17 09:21:40.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -300,6 +300,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(WARNING "ENABLE_OPT set but SPIR-V tools not found! Disabling SPIR-V optimization.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(ENABLE_OPT OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(STATUS "XDEBUG Using external SPIRV-Tools")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(STATUS "XDEBUG\n ENABLE_OPT=${ENABLE_OPT}\n ENABLE_HLSL=${ENABLE_HLSL}\n ENABLE_SPIRV=${ENABLE_SPIRV}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ENABLE_GLSLANG_BINARIES=${ENABLE_GLSLANG_BINARIES}\n GLSLANG_TESTS=${GLSLANG_TESTS}\n PROJECT_IS_TOP_LEVEL=${PROJECT_IS_TOP_LEVEL}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(ENABLE_OPT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -397,4 +401,34 @@
</span> DESTINATION
"${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +27,7 @@
</span> +prefix="@CMAKE_INSTALL_PREFIX@"
+exec_prefix="${prefix}"
+libdir="${prefix}/lib"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+includedir="${prefix}/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++includedir="${prefix}/@CMAKE_INSTALL_INCLUDEDIR@"
</span> +
+Name: @PROJECT_NAME@
+Description: official reference compiler front end for the OpenGL ES and OpenGL shading languages
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,4 +45,4 @@
</span> + DESTINATION
+ "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+ )
<span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(GLSLANG_ENABLE_INSTALL)
</span></pre><pre style='margin:0'>
</pre>