git: d35ea7b74f4a - main - graphics/glslang: update to 14.0.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 04 Jan 2024 13:02:09 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=d35ea7b74f4abc3f936245a1f217467075c79757
commit d35ea7b74f4abc3f936245a1f217467075c79757
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-12-22 17:11:28 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-01-04 13:01:14 +0000
graphics/glslang: update to 14.0.0
Changes: https://github.com/KhronosGroup/glslang/releases/tag/13.0.0
Reported by: GitHub (watch releases)
---
graphics/glslang/Makefile | 5 +-
graphics/glslang/distinfo | 8 ++--
graphics/glslang/pkg-plist | 54 ----------------------
.../libplacebo/files/patch-src_glsl_meson.build | 12 +++++
multimedia/ffmpeg/files/patch-configure | 13 ++++++
multimedia/ffmpeg4/files/patch-configure | 9 ++++
6 files changed, 38 insertions(+), 63 deletions(-)
diff --git a/graphics/glslang/Makefile b/graphics/glslang/Makefile
index b77520a5cc65..e3adef433c77 100644
--- a/graphics/glslang/Makefile
+++ b/graphics/glslang/Makefile
@@ -1,10 +1,7 @@
PORTNAME= glslang
-DISTVERSION= 13.1.0
+DISTVERSION= 14.0.0
CATEGORIES= graphics
-PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+= eac012fff3a7.patch:-p1 # https://github.com/KhronosGroup/glslang/pull/3406
-
MAINTAINER= jbeich@FreeBSD.org
COMMENT= OpenGL and OpenGL ES shader front end and validator
WWW= https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/
diff --git a/graphics/glslang/distinfo b/graphics/glslang/distinfo
index bfea1d3dc201..e84a1da427e8 100644
--- a/graphics/glslang/distinfo
+++ b/graphics/glslang/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1697321367
-SHA256 (KhronosGroup-glslang-13.1.0_GH0.tar.gz) = 926808f4bf129264a1b7d969978881ec041bb902ad49a180ba74270df7178494
-SIZE (KhronosGroup-glslang-13.1.0_GH0.tar.gz) = 3763153
-SHA256 (eac012fff3a7.patch) = 143ef7a612da3a380fc689eb72813f34bdda0235f706c0a592daf55044eb46d2
-SIZE (eac012fff3a7.patch) = 2240
+TIMESTAMP = 1703265088
+SHA256 (KhronosGroup-glslang-14.0.0_GH0.tar.gz) = 80bbb916a23e94ea9cbfb1acb5d1a44a7e0c9613bcf5b5947c03f2273bdc92b0
+SIZE (KhronosGroup-glslang-14.0.0_GH0.tar.gz) = 3770344
diff --git a/graphics/glslang/pkg-plist b/graphics/glslang/pkg-plist
index 9121ca68067a..c4837a7a8abb 100644
--- a/graphics/glslang/pkg-plist
+++ b/graphics/glslang/pkg-plist
@@ -1,71 +1,19 @@
bin/glslang
bin/glslangValidator
bin/spirv-remap
-include/glslang/HLSL/hlslAttributes.h
-include/glslang/HLSL/hlslGrammar.h
-include/glslang/HLSL/hlslOpMap.h
-include/glslang/HLSL/hlslParseHelper.h
-include/glslang/HLSL/hlslParseables.h
-include/glslang/HLSL/hlslScanContext.h
-include/glslang/HLSL/hlslTokenStream.h
-include/glslang/HLSL/hlslTokens.h
-include/glslang/Include/BaseTypes.h
-include/glslang/Include/Common.h
-include/glslang/Include/ConstantUnion.h
-include/glslang/Include/InfoSink.h
-include/glslang/Include/InitializeGlobals.h
-include/glslang/Include/PoolAlloc.h
include/glslang/Include/ResourceLimits.h
-include/glslang/Include/ShHandle.h
-include/glslang/Include/SpirvIntrinsics.h
-include/glslang/Include/Types.h
-include/glslang/Include/arrays.h
include/glslang/Include/glslang_c_interface.h
include/glslang/Include/glslang_c_shader_types.h
-include/glslang/Include/intermediate.h
-include/glslang/MachineIndependent/Initialize.h
-include/glslang/MachineIndependent/LiveTraverser.h
-include/glslang/MachineIndependent/ParseHelper.h
-include/glslang/MachineIndependent/RemoveTree.h
-include/glslang/MachineIndependent/Scan.h
-include/glslang/MachineIndependent/ScanContext.h
-include/glslang/MachineIndependent/SymbolTable.h
include/glslang/MachineIndependent/Versions.h
-include/glslang/MachineIndependent/attribute.h
-include/glslang/MachineIndependent/gl_types.h
-include/glslang/MachineIndependent/glslang_tab.cpp.h
-include/glslang/MachineIndependent/iomapper.h
-include/glslang/MachineIndependent/localintermediate.h
-include/glslang/MachineIndependent/parseVersions.h
-include/glslang/MachineIndependent/preprocessor/PpContext.h
-include/glslang/MachineIndependent/preprocessor/PpTokens.h
-include/glslang/MachineIndependent/propagateNoContraction.h
-include/glslang/MachineIndependent/reflection.h
include/glslang/Public/ResourceLimits.h
include/glslang/Public/ShaderLang.h
include/glslang/Public/resource_limits_c.h
-include/glslang/SPIRV/GLSL.ext.AMD.h
-include/glslang/SPIRV/GLSL.ext.ARM.h
-include/glslang/SPIRV/GLSL.ext.EXT.h
-include/glslang/SPIRV/GLSL.ext.KHR.h
-include/glslang/SPIRV/GLSL.ext.NV.h
-include/glslang/SPIRV/GLSL.std.450.h
include/glslang/SPIRV/GlslangToSpv.h
include/glslang/SPIRV/Logger.h
-include/glslang/SPIRV/NonSemanticDebugPrintf.h
-include/glslang/SPIRV/NonSemanticShaderDebugInfo100.h
include/glslang/SPIRV/SPVRemapper.h
-include/glslang/SPIRV/SpvBuilder.h
-include/glslang/SPIRV/SpvTools.h
-include/glslang/SPIRV/bitutils.h
include/glslang/SPIRV/disassemble.h
-include/glslang/SPIRV/doc.h
-include/glslang/SPIRV/hex_float.h
include/glslang/SPIRV/spirv.hpp
-include/glslang/SPIRV/spvIR.h
include/glslang/build_info.h
-lib/cmake/HLSLTargets.cmake
-lib/cmake/OGLCompilerTargets.cmake
lib/cmake/OSDependentTargets.cmake
lib/cmake/SPIRVTargets.cmake
lib/cmake/SPVRemapperTargets.cmake
@@ -78,9 +26,7 @@ lib/cmake/glslang/glslang-targets.cmake
lib/cmake/glslangTargets.cmake
lib/cmake/spirv-remapTargets.cmake
lib/libGenericCodeGen.a
-lib/libHLSL.a
lib/libMachineIndependent.a
-lib/libOGLCompiler.a
lib/libOSDependent.a
lib/libSPIRV.a
lib/libSPVRemapper.a
diff --git a/graphics/libplacebo/files/patch-src_glsl_meson.build b/graphics/libplacebo/files/patch-src_glsl_meson.build
new file mode 100644
index 000000000000..9ab49e40f678
--- /dev/null
+++ b/graphics/libplacebo/files/patch-src_glsl_meson.build
@@ -0,0 +1,12 @@
+src/glsl/meson.build:47:12: ERROR: C++ static library 'OGLCompiler' not found
+
+--- src/glsl/meson.build.orig 2023-10-17 12:24:39 UTC
++++ src/glsl/meson.build
+@@ -44,7 +44,6 @@ elif not glslang_req.disabled()
+ # Always required for static linking
+ cxx.find_library('MachineIndependent', required: true, static: true),
+ cxx.find_library('OSDependent', required: true, static: true),
+- cxx.find_library('OGLCompiler', required: true, static: true),
+ cxx.find_library('GenericCodeGen', required: true, static: true),
+ # SPIRV-Tools are required only if optimizer is enabled in glslang build
+ cxx.find_library('SPIRV-Tools', required: false, static: true),
diff --git a/multimedia/ffmpeg/files/patch-configure b/multimedia/ffmpeg/files/patch-configure
index 78fa743c4630..fbdb10a698ee 100644
--- a/multimedia/ffmpeg/files/patch-configure
+++ b/multimedia/ffmpeg/files/patch-configure
@@ -15,6 +15,19 @@
cpu="generic"
intrinsics="none"
+@@ -6705,10 +6699,10 @@ enabled libglslang && { check_lib spirv_compiler glsla
+ enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
+ enabled libharfbuzz && require_pkg_config libharfbuzz harfbuzz hb.h hb_buffer_create
+ enabled libglslang && { check_lib spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \
+- -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen \
++ -lglslang -lMachineIndependent -lOSDependent -lGenericCodeGen \
+ -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm ||
+ require spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \
+- -lglslang -lOSDependent -lHLSL -lOGLCompiler \
++ -lglslang -lOSDependent \
+ -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm; }
+ enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||
+ require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
@@ -7018,7 +7013,7 @@ fi
if enabled x86; then
diff --git a/multimedia/ffmpeg4/files/patch-configure b/multimedia/ffmpeg4/files/patch-configure
index 0488acd7f18b..6135beab7ee8 100644
--- a/multimedia/ffmpeg4/files/patch-configure
+++ b/multimedia/ffmpeg4/files/patch-configure
@@ -23,6 +23,15 @@
;;
bsd/os)
add_extralibs -lpoll -lgnugetopt
+@@ -6369,7 +6369,7 @@ enabled libfribidi && require_pkg_config libfri
+ enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit
+ enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
+ enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
+-enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++
++enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lMachineIndependent -lOSDependent -lGenericCodeGen -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++
+ enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||
+ require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
+ enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
@@ -6758,7 +6753,7 @@ enabled vulkan &&
if enabled x86; then