pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

shaderc: remove, imported to pkgsrc/graphics



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Thu Jul 2 12:56:59 2026 +0200
Changeset:	cb0a03985ceca50f6e02d00fc4f128f631c46ace

Modified Files:
	Makefile
	ggml/options.mk
Removed Files:
	shaderc/DESCR
	shaderc/Makefile
	shaderc/PLIST
	shaderc/distinfo
	shaderc/patches/patch-CMakeLists.txt

Log Message:
shaderc: remove, imported to pkgsrc/graphics

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cb0a03985ceca50f6e02d00fc4f128f631c46ace

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

diffstat:
 Makefile                             |  1 -
 ggml/options.mk                      |  2 +-
 shaderc/DESCR                        |  5 -----
 shaderc/Makefile                     | 37 ------------------------------------
 shaderc/PLIST                        | 14 --------------
 shaderc/distinfo                     |  9 ---------
 shaderc/patches/patch-CMakeLists.txt | 16 ----------------
 7 files changed, 1 insertion(+), 83 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index de59ba83e3..b1d8b426e9 100644
--- a/Makefile
+++ b/Makefile
@@ -5416,7 +5416,6 @@ SUBDIR+=	sflphoned
 SUBDIR+=	sftpgo
 SUBDIR+=	sgmltools-lite
 SUBDIR+=	shaarli
-SUBDIR+=	shaderc
 SUBDIR+=	shadow
 SUBDIR+=	shairport-sync
 SUBDIR+=	shaper
diff --git a/ggml/options.mk b/ggml/options.mk
index 5bbe1bb6da..2a6dbee0a4 100644
--- a/ggml/options.mk
+++ b/ggml/options.mk
@@ -10,7 +10,7 @@ PLIST_VARS+=		vulkan
 PRINT_PLIST_AWK+=	/libggml-vulkan/ { $$0 = "$${PLIST.vulkan}" $$0 }
 
 .if !empty(PKG_OPTIONS:Mvulkan)
-DEPENDS+=		shaderc-[0-9]*:../../wip/shaderc
+DEPENDS+=		shaderc-[0-9]*:../../graphics/shaderc
 CMAKE_CONFIGURE_ARGS+=	-DGGML_VULKAN=ON
 PLIST.vulkan=		yes
 .include "../../graphics/vulkan-headers/buildlink3.mk"
diff --git a/shaderc/DESCR b/shaderc/DESCR
deleted file mode 100644
index 51af0b282f..0000000000
--- a/shaderc/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-A collection of tools, libraries and tests for shader compilation.
-At the moment it includes:
-
-- glslc, a command line compiler for GLSL/HLSL to SPIR-V, and
-- libshaderc, a library API for accessing `glslc` functionality.
diff --git a/shaderc/Makefile b/shaderc/Makefile
deleted file mode 100644
index f51fd81b80..0000000000
--- a/shaderc/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD$
-
-# to get current vulkan SDK version, but we need to override GITHUB_TAG locally
-.include "../../graphics/vulkan-headers/Makefile.common"
-
-DISTNAME=	shaderc-2026.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/
-COMMENT=	Tools, libraries, and tests for Vulkan shader compilation
-LICENSE=	apache-2.0
-
-USE_TOOLS+=	pkg-config
-USE_LANGUAGES=	c c++
-
-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
-
-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"
-.include "../../devel/cmake/build.mk"
-.include "../../graphics/glslang/buildlink3.mk"
-.include "../../parallel/spirv-headers/buildlink3.mk"
-.include "../../parallel/spirv-tools/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/shaderc/PLIST b/shaderc/PLIST
deleted file mode 100644
index 9127454a46..0000000000
--- a/shaderc/PLIST
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $NetBSD$
-bin/glslc
-include/shaderc/env.h
-include/shaderc/shaderc.h
-include/shaderc/shaderc.hpp
-include/shaderc/status.h
-include/shaderc/visibility.h
-lib/libshaderc.a
-lib/libshaderc_combined.a
-lib/libshaderc_shared.so
-lib/libshaderc_shared.so.1
-lib/pkgconfig/shaderc.pc
-lib/pkgconfig/shaderc_combined.pc
-lib/pkgconfig/shaderc_static.pc
diff --git a/shaderc/distinfo b/shaderc/distinfo
deleted file mode 100644
index 70a8bb668e..0000000000
--- a/shaderc/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD$
-
-BLAKE2s (KhronosGroup-SPIRV-Tools-vulkan-sdk-1.4.350.1.tar.gz) = 3afb3a428623ab729c270d7941cf377804db03f07a90827c9fe6e35b2f44caaa
-SHA512 (KhronosGroup-SPIRV-Tools-vulkan-sdk-1.4.350.1.tar.gz) = 97732eccca2292e80c1c2ca3d1a24fdd89ec342a4c312cb06949b29033c70b4ac3abc1551d8dacafe843e3719e4e160d4dd153195f7483584f40a646ecb74905
-Size (KhronosGroup-SPIRV-Tools-vulkan-sdk-1.4.350.1.tar.gz) = 3472729 bytes
-BLAKE2s (shaderc-2026.2.tar.gz) = 729d2b0ae3424ee3955666dc6d47118472b57ae15f58026d3563e50ee625ac6f
-SHA512 (shaderc-2026.2.tar.gz) = 733f85a83db4b71814c7f251c44e6010b485ed03d7e2389db5c14f8426942bebf6c95a35e5eaef80e51c29f8efa28cc0577226344630a427553200c6a87349ec
-Size (shaderc-2026.2.tar.gz) = 228959 bytes
-SHA1 (patch-CMakeLists.txt) = 2bd347afc30d601779d945d48a763267cc05f68b
diff --git a/shaderc/patches/patch-CMakeLists.txt b/shaderc/patches/patch-CMakeLists.txt
deleted file mode 100644
index 908ad12ea9..0000000000
--- a/shaderc/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-We provide the dependencies manually or from pkgsrc,
-avoid hacking detection.
-
---- CMakeLists.txt.orig	2026-07-01 09:30:46.386568682 +0000
-+++ CMakeLists.txt
-@@ -130,7 +130,7 @@ 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)


Home | Main Index | Thread Index | Old Index