CVS commit: pkgsrc/graphics/shaderc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Aug 27 11:17:19 UTC 2026

Modified Files:
        pkgsrc/graphics/shaderc: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/graphics/shaderc/patches: patch-CMakeLists.txt
Added Files:
        pkgsrc/graphics/shaderc/patches: patch-glslc_CMakeLists.txt
            patch-libshaderc__util_CMakeLists.txt

Log Message:
shaderc: fix linking against shaderc, remove third_party - rely on pkgsrc


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/shaderc/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/shaderc/PLIST \
    pkgsrc/graphics/shaderc/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/shaderc/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/shaderc/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/shaderc/patches/patch-glslc_CMakeLists.txt \
    pkgsrc/graphics/shaderc/patches/patch-libshaderc__util_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/shaderc/Makefile
diff -u pkgsrc/graphics/shaderc/Makefile:1.3 pkgsrc/graphics/shaderc/Makefile:1.4
--- pkgsrc/graphics/shaderc/Makefile:1.3        Fri Aug  7 10:40:06 2026
+++ pkgsrc/graphics/shaderc/Makefile    Thu Aug 27 11:17:18 2026
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.3 2026/08/07 10:40:06 kikadf Exp $
+# $NetBSD: Makefile,v 1.4 2026/08/27 11:17:18 adam Exp $
 
 # to get current vulkan SDK version, but we need to override GITHUB_TAG locally
 .include "../../graphics/vulkan-headers/Makefile.common"
 
 DISTNAME=      shaderc-2026.3
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=google/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/google/shaderc/
+HOMEPAGE=      https://github.com/google/shaderc
 COMMENT=       Tools, libraries, and tests for Vulkan shader compilation
 LICENSE=       apache-2.0
 
@@ -18,22 +18,26 @@ USE_TOOLS+= pkg-config
 
 CXXFLAGS+=     -I${BUILDLINK_PREFIX.glslang}/include/glslang
 
-GITHUB_SUBMODULES+=    KhronosGroup SPIRV-Tools vulkan-sdk-${SDK_VERSION} third_party/SPIRV-Tools
-
 # needs local googletest checkout
 CMAKE_CONFIGURE_ARGS+= -DSHADERC_SKIP_TESTS=ON
-CMAKE_CONFIGURE_ARGS+= -Dglslang_SOURCE_DIR:PATH=${PREFIX}/include/glslang
-CMAKE_CONFIGURE_ARGS+= -Dspirv-tools_SOURCE_DIR:PATH=${WRKSRC}/third_party/SPIRV-Tools
+CMAKE_CONFIGURE_ARGS+= -DSHADERC_SKIP_COPYRIGHT_CHECK=ON
 
 PKGCONFIG_OVERRIDE+=   cmake/shaderc.pc.in
 PKGCONFIG_OVERRIDE+=   cmake/shaderc_combined.pc.in
 PKGCONFIG_OVERRIDE+=   cmake/shaderc_static.pc.in
 
-.include "../../lang/python/tool.mk"
+# Remove third_pary dir to avoid symbol conflicts with installed spirv-tools.
+pre-configure:
+       ${RM} -f -r ${WRKSRC}/third_party
+
+pre-build:
+       ${ECHO} "\"${PKGNAME}\"" > ${WRKSRC}/${CMAKE_BUILD_DIR}/build-version.inc
+
 .include "../../devel/cmake/build.mk"
 BUILDLINK_API_DEPENDS.glslang+=                glslang>=${SDK_VERSION}
 .include "../../graphics/glslang/buildlink3.mk"
 BUILDLINK_API_DEPENDS.spirv-headers+=  spirv-headers>=${SDK_VERSION}
+.include "../../lang/python/tool.mk"
 .include "../../parallel/spirv-headers/buildlink3.mk"
 BUILDLINK_API_DEPENDS.spirv-tools+=    spirv-tools>=${SDK_VERSION}
 .include "../../parallel/spirv-tools/buildlink3.mk"

Index: pkgsrc/graphics/shaderc/PLIST
diff -u pkgsrc/graphics/shaderc/PLIST:1.1 pkgsrc/graphics/shaderc/PLIST:1.2
--- pkgsrc/graphics/shaderc/PLIST:1.1   Thu Jul  2 10:55:48 2026
+++ pkgsrc/graphics/shaderc/PLIST       Thu Aug 27 11:17:18 2026
@@ -1,14 +1,26 @@
-@comment $NetBSD: PLIST,v 1.1 2026/07/02 10:55:48 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2026/08/27 11:17:18 adam Exp $
 bin/glslc
+include/shaderc/counting_includer.h
 include/shaderc/env.h
+include/shaderc/file_finder.h
+include/shaderc/format.h
+include/shaderc/io_shaderc.h
+include/shaderc/message.h
+include/shaderc/mutex.h
+include/shaderc/resources.h
 include/shaderc/shaderc.h
 include/shaderc/shaderc.hpp
+include/shaderc/spirv_tools_wrapper.h
 include/shaderc/status.h
+include/shaderc/string_piece.h
+include/shaderc/universal_unistd.h
+include/shaderc/version_profile.h
 include/shaderc/visibility.h
 lib/libshaderc.a
 lib/libshaderc_combined.a
 lib/libshaderc_shared.so
 lib/libshaderc_shared.so.1
+lib/libshaderc_util.a
 lib/pkgconfig/shaderc.pc
 lib/pkgconfig/shaderc_combined.pc
 lib/pkgconfig/shaderc_static.pc
Index: pkgsrc/graphics/shaderc/buildlink3.mk
diff -u pkgsrc/graphics/shaderc/buildlink3.mk:1.1 pkgsrc/graphics/shaderc/buildlink3.mk:1.2
--- pkgsrc/graphics/shaderc/buildlink3.mk:1.1   Wed Aug 26 10:59:43 2026
+++ pkgsrc/graphics/shaderc/buildlink3.mk       Thu Aug 27 11:17:18 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2026/08/26 10:59:43 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2026/08/27 11:17:18 adam Exp $
 
 BUILDLINK_TREE+=       shaderc
 
@@ -8,6 +8,8 @@ SHADERC_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.shaderc+=        shaderc>=2026.3nb1
 BUILDLINK_PKGSRCDIR.shaderc?=  ../../graphics/shaderc
 
+.include "../../graphics/glslang/buildlink3.mk"
+.include "../../parallel/spirv-tools/buildlink3.mk"
 .endif # SHADERC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -shaderc

Index: pkgsrc/graphics/shaderc/distinfo
diff -u pkgsrc/graphics/shaderc/distinfo:1.2 pkgsrc/graphics/shaderc/distinfo:1.3
--- pkgsrc/graphics/shaderc/distinfo:1.2        Wed Jul 29 14:01:02 2026
+++ pkgsrc/graphics/shaderc/distinfo    Thu Aug 27 11:17:18 2026
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.2 2026/07/29 14:01:02 kikadf Exp $
+$NetBSD: distinfo,v 1.3 2026/08/27 11:17:18 adam Exp $
 
-BLAKE2s (KhronosGroup-SPIRV-Tools-vulkan-sdk-1.4.357.0.tar.gz) = 70b9719e8ffb4f7e1d6345e109dacf0901ea1e2914e95d8de7145726ad60195f
-SHA512 (KhronosGroup-SPIRV-Tools-vulkan-sdk-1.4.357.0.tar.gz) = e853b7a08d1d1001a45e8d8f7179be7b02d803959d598bd9d097f096b33fd2a380bcecc8c9c1c446941b9df41018271b45d7995f79f8d360e15feb0c32d43f39
-Size (KhronosGroup-SPIRV-Tools-vulkan-sdk-1.4.357.0.tar.gz) = 3518451 bytes
 BLAKE2s (shaderc-2026.3.tar.gz) = ca7e77c30abeaecc186b5fd4a086c9604d862a014bafa3d99eb0beb4e7773acf
 SHA512 (shaderc-2026.3.tar.gz) = 795a2c59c31b11c23e7110fd01fc7ee7c07cadae621c9a11c2df56bc85fcb43c25a1c5504fab36e3df21bad1eb1a2af28872ee9bcf745cd2dec815acd189bcfd
 Size (shaderc-2026.3.tar.gz) = 230772 bytes
-SHA1 (patch-CMakeLists.txt) = 2bd347afc30d601779d945d48a763267cc05f68b
+SHA1 (patch-CMakeLists.txt) = 4a09242dfcd8f154900dce480a8671be9187662f
+SHA1 (patch-glslc_CMakeLists.txt) = da46fc8282fa25b9a0c2f88bcdbf90ae20ca19cc
+SHA1 (patch-libshaderc__util_CMakeLists.txt) = 1e84d1223f8473dd0ad93adc7727b808291065fd

Index: pkgsrc/graphics/shaderc/patches/patch-CMakeLists.txt
diff -u pkgsrc/graphics/shaderc/patches/patch-CMakeLists.txt:1.1 pkgsrc/graphics/shaderc/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/graphics/shaderc/patches/patch-CMakeLists.txt:1.1    Thu Jul  2 10:55:48 2026
+++ pkgsrc/graphics/shaderc/patches/patch-CMakeLists.txt        Thu Aug 27 11:17:18 2026
@@ -1,16 +1,35 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2026/07/02 10:55:48 wiz Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2026/08/27 11:17:18 adam Exp $
 
-We provide the dependencies manually or from pkgsrc,
+We provide the dependencies and build version manually or from pkgsrc,
 avoid hacking detection.
+Fix linking in pkgconfig file.
 
---- CMakeLists.txt.orig        2026-07-01 09:30:46.386568682 +0000
+--- CMakeLists.txt.orig        2026-07-16 15:11:57.000000000 +0000
 +++ CMakeLists.txt
-@@ -130,7 +130,7 @@ endif(MSVC)
+@@ -135,7 +135,6 @@ endif(MSVC)
  
  # Configure subdirectories.
  # We depend on these for later projects, so they should come first.
 -add_subdirectory(third_party)
-+#add_subdirectory(third_party)
  
  add_subdirectory(libshaderc_util)
  add_subdirectory(libshaderc)
+@@ -144,11 +143,6 @@ if(${SHADERC_ENABLE_EXAMPLES})
+     add_subdirectory(examples)
+ endif()
+ 
+-add_custom_target(build-version
+-  ${Python_EXECUTABLE}
+-  ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py
+-  ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc
+-  COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).")
+ 
+ function(define_pkg_config_file NAME LIBS)
+   add_custom_target(${NAME}-pkg-config ALL
+@@ -173,5 +167,5 @@ function(define_pkg_config_file NAME LIB
+ endfunction()
+ 
+ define_pkg_config_file(shaderc -lshaderc_shared)
+-define_pkg_config_file(shaderc_static "-lshaderc ${EXTRA_STATIC_PKGCONFIG_LIBS} -lshaderc_util")
++define_pkg_config_file(shaderc_static "-lshaderc -lshaderc_util -lglslang -lSPIRV-Tools-opt -lSPIRV-Tools -lSPIRV-Tools-link")
+ define_pkg_config_file(shaderc_combined -lshaderc_combined)

Added files:

Index: pkgsrc/graphics/shaderc/patches/patch-glslc_CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/shaderc/patches/patch-glslc_CMakeLists.txt:1.1
--- /dev/null   Thu Aug 27 11:17:19 2026
+++ pkgsrc/graphics/shaderc/patches/patch-glslc_CMakeLists.txt  Thu Aug 27 11:17:19 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-glslc_CMakeLists.txt,v 1.1 2026/08/27 11:17:19 adam Exp $
+
+Get package version from pkgsrc, to avoid scanning third_party dir.
+
+--- glslc/CMakeLists.txt.orig  2026-08-26 18:38:57.273819375 +0000
++++ glslc/CMakeLists.txt
+@@ -54,7 +54,6 @@ if(SHADERC_ENABLE_EXECUTABLES)
+   target_include_directories(glslc_exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/.. ${spirv-tools_SOURCE_DIR}/include)
+   set_target_properties(glslc_exe PROPERTIES OUTPUT_NAME glslc)
+   target_link_libraries(glslc_exe PRIVATE glslc shaderc_util shaderc)
+-  add_dependencies(glslc_exe build-version)
+ endif(SHADERC_ENABLE_EXECUTABLES)
+ 
+ shaderc_add_tests(
Index: pkgsrc/graphics/shaderc/patches/patch-libshaderc__util_CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/shaderc/patches/patch-libshaderc__util_CMakeLists.txt:1.1
--- /dev/null   Thu Aug 27 11:17:19 2026
+++ pkgsrc/graphics/shaderc/patches/patch-libshaderc__util_CMakeLists.txt       Thu Aug 27 11:17:19 2026
@@ -0,0 +1,37 @@
+$NetBSD: patch-libshaderc__util_CMakeLists.txt,v 1.1 2026/08/27 11:17:19 adam Exp $
+
+Install libshaderc_util.a, which is required by libsharedrc.a.
+
+--- libshaderc_util/CMakeLists.txt.orig        2026-07-16 15:11:57.000000000 +0000
++++ libshaderc_util/CMakeLists.txt
+@@ -64,6 +64,30 @@ shaderc_add_tests(
+     mutex
+     version_profile)
+ 
++if(SHADERC_ENABLE_INSTALL)
++  install(
++    FILES
++      include/libshaderc_util/counting_includer.h
++      include/libshaderc_util/file_finder.h
++      include/libshaderc_util/format.h
++      include/libshaderc_util/io_shaderc.h
++      include/libshaderc_util/mutex.h
++      include/libshaderc_util/message.h
++      include/libshaderc_util/resources.h
++      include/libshaderc_util/spirv_tools_wrapper.h
++      include/libshaderc_util/string_piece.h
++      include/libshaderc_util/universal_unistd.h
++      include/libshaderc_util/version_profile.h
++    DESTINATION
++      ${CMAKE_INSTALL_INCLUDEDIR}/shaderc)
++
++  install(TARGETS shaderc_util
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++    BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++endif(SHADERC_ENABLE_INSTALL)
++
+ if(${SHADERC_ENABLE_TESTS})
+   target_include_directories(shaderc_util_counting_includer_test
+     PRIVATE ${glslang_SOURCE_DIR})