diff --git a/graphics/shaderc/Makefile b/graphics/shaderc/Makefile index ed4bb91cf940..ede6500c3f4b 100644 --- a/graphics/shaderc/Makefile +++ b/graphics/shaderc/Makefile @@ -1,59 +1,61 @@ PORTNAME= shaderc DISTVERSIONPREFIX= v -DISTVERSION= 2025.5 -PORTREVISION= 2 +DISTVERSION= 2026.1 CATEGORIES= graphics devel MAINTAINER= tagattie@FreeBSD.org COMMENT= GLSL/HLSL to SPIR-V shader compiler WWW= https://github.com/google/shaderc LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= glslang>0:graphics/glslang \ spirv-tools>0:graphics/spirv-tools TEST_DEPENDS= googletest>0:devel/googletest USES= cmake:testing compiler:c++11-lib localbase:ldflags \ python:build shebangfix USE_GITHUB= yes GH_ACCOUNT= google -GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-454-gb824a46:headers/third_party/spirv-headers +# for GH_TAGNAME in GH_TUPLE +# git clone --quiet https://github.com/KhronosGroup/SPIRV-Headers.git && git -C SPIRV-Headers describe +# for COMMIT_HASH see ${WRKSRC}/DEPS +GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-461-g04f10f6:headers/third_party/spirv-headers USE_LDCONFIG= yes SHEBANG_FILES= utils/add_copyright.py CMAKE_ARGS= -Dglslang_SOURCE_DIR:PATH="${LOCALBASE}/include/glslang" \ -DSPIRV-Headers_SOURCE_DIR:PATH="${WRKSRC}/third_party/spirv-headers" CMAKE_ON+= ${CMAKE_TESTING_OFF} CMAKE_TESTING_OFF= SHADERC_SKIP_TESTS LDFLAGS+= -Wl,-z,defs # glslang PORTDOCS= AUTHORS CHANGES CONTRIBUTING.md CONTRIBUTORS \ DEVELOPMENT.howto.md README.md OPTIONS_DEFINE= DOCS post-patch: # Disable bundled dependencies ${REINPLACE_CMD} '/third_party/d' ${WRKSRC}/CMakeLists.txt # Unbreak tests with system spirv-tools ${REINPLACE_CMD} 's,\$$,\1,' \ ${WRKSRC}/glslc/test/CMakeLists.txt pre-configure: # Extract (snapshot) version from the port instead of CHANGES + .git/ ${REINPLACE_CMD} '/build-version/d' ${WRKSRC}/glslc/CMakeLists.txt ${ECHO_CMD} "\"${PORTNAME} ${DISTVERSIONFULL}\n\"" >> ${WRKSRC}/glslc/src/build-version.inc ${ECHO_CMD} "\"`${PKG_BIN} query '%n v%v' spirv-tools`\n\"" >> ${WRKSRC}/glslc/src/build-version.inc ${ECHO_CMD} "\"`${PKG_BIN} query '%n %v' glslang`\n\"" >> ${WRKSRC}/glslc/src/build-version.inc post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include diff --git a/graphics/shaderc/distinfo b/graphics/shaderc/distinfo index c9a98825fd2a..fa505b8f52bb 100644 --- a/graphics/shaderc/distinfo +++ b/graphics/shaderc/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1764578536 -SHA256 (google-shaderc-v2025.5_GH0.tar.gz) = fca5041b1fdea6daba167b63e04e55e5059fab40828342126169336643445447 -SIZE (google-shaderc-v2025.5_GH0.tar.gz) = 228956 -SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-454-gb824a46_GH0.tar.gz) = 15a0224e5c31245651a8a9fc9fc4a86d80c8589614c969861f9be343b3dc6af1 -SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-454-gb824a46_GH0.tar.gz) = 558851 +TIMESTAMP = 1770145546 +SHA256 (google-shaderc-v2026.1_GH0.tar.gz) = 245002feccbe7f8361b223545a5654cea69780745886872d7efff50a38d96c66 +SIZE (google-shaderc-v2026.1_GH0.tar.gz) = 229148 +SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-461-g04f10f6_GH0.tar.gz) = e80ea5fb765506024dc9d7dbdd797acbdcd19ba2f6c2845d7b099a03282026a3 +SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-461-g04f10f6_GH0.tar.gz) = 561518 diff --git a/graphics/shaderc/files/patch-system-glslang b/graphics/shaderc/files/patch-system-glslang index 71447f9e3410..0e27dc136de6 100644 --- a/graphics/shaderc/files/patch-system-glslang +++ b/graphics/shaderc/files/patch-system-glslang @@ -1,36 +1,36 @@ ld: error: undefined symbol: spvBinaryDestroy >>> referenced by shaderc.cc >>> shaderc.cc.o:(shaderc_compilation_result_spv_binary::~shaderc_compilation_result_spv_binary()) in archive libshaderc/./libshaderc_combined.a >>> referenced by shaderc.cc >>> shaderc.cc.o:(shaderc_compilation_result_spv_binary::~shaderc_compilation_result_spv_binary()) in archive libshaderc/./libshaderc_combined.a ld: error: undefined symbol: glslang::InitializeProcess() >>> referenced by compiler.cc >>> compiler.cc.o:(shaderc_util::GlslangInitializer::GlslangInitializer()) in archive libshaderc_util/libshaderc_util.a ld: error: undefined symbol: ConstructCompiler(EShLanguage, int) >>> referenced by ShaderLang.cpp >>> ShaderLang.cpp.o:(ShConstructCompiler) in archive /usr/local/lib/libMachineIndependent.a ---- libshaderc/CMakeLists.txt.orig 2020-12-09 21:30:21 UTC +--- libshaderc/CMakeLists.txt.orig 2026-01-23 16:57:47 UTC +++ libshaderc/CMakeLists.txt -@@ -114,7 +114,7 @@ endif(SHADERC_ENABLE_INSTALL) +@@ -102,7 +102,7 @@ shaderc_add_tests( shaderc_add_tests( TEST_PREFIX shaderc_combined - LINK_LIBS shaderc_combined ${CMAKE_THREAD_LIBS_INIT} + LINK_LIBS shaderc_combined ${SHADERC_LIBS} INCLUDE_DIRS include ${shaderc_SOURCE_DIR}/libshaderc_util/include ${glslang_SOURCE_DIR} ${spirv-tools_SOURCE_DIR}/include ${SPIRV-Headers_SOURCE_DIR}/include ---- libshaderc_util/CMakeLists.txt.orig 2024-01-03 17:45:00 UTC +--- libshaderc_util/CMakeLists.txt.orig 2026-01-23 16:57:47 UTC +++ libshaderc_util/CMakeLists.txt @@ -46,8 +46,8 @@ target_link_libraries(shaderc_util PRIVATE find_package(Threads) target_link_libraries(shaderc_util PRIVATE - glslang SPIRV - SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) + glslang MachineIndependent GenericCodeGen SPIRV + SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT}) shaderc_add_tests( TEST_PREFIX shaderc_util