pkgsrc-WIP-changes archive

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

stable-diffusion.cpp: use libwebm package



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon Jul 13 16:41:25 2026 +0200
Changeset:	2f62fcc087ca10ecc1396aab7695b82a46a1b0c6

Modified Files:
	stable-diffusion.cpp/Makefile
	stable-diffusion.cpp/distinfo

Log Message:
stable-diffusion.cpp: use libwebm package

Stop depending on ggml package, it used internal copy anyway.

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

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

diffstat:
 stable-diffusion.cpp/Makefile | 20 ++++++++++----------
 stable-diffusion.cpp/distinfo |  9 +++------
 2 files changed, 13 insertions(+), 16 deletions(-)

diffs:
diff --git a/stable-diffusion.cpp/Makefile b/stable-diffusion.cpp/Makefile
index 722df07a96..9ca52b778f 100644
--- a/stable-diffusion.cpp/Makefile
+++ b/stable-diffusion.cpp/Makefile
@@ -17,24 +17,24 @@ USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
 
 CMAKE_CONFIGURE_ARGS+=	-DSD_USE_SYSTEM_WEBP=ON
-CMAKE_CONFIGURE_ARGS+=	-DSD_USE_SYSTEM_GGML=ON
-# the libwebm source code provides neither .pc nor .cmake files for auto-detection
-# so we need to use the git submodule
-#CMAKE_CONFIGURE_ARGS+=	-DSD_USE_SYSTEM_WEBM=ON
-#CMAKE_CONFIGURE_ARGS+=	-DWEBM_INCLUDE_DIR=${BUILDLINK_PREFIX.libwebm}/include
-#CMAKE_CONFIGURE_ARGS+=	-DWEBM_LIBRARY=${BUILDLINK_PREFIX.libwebm}/lib/libwebm.so
+#CMAKE_CONFIGURE_ARGS+=	-DSD_USE_SYSTEM_GGML=ON
+CMAKE_CONFIGURE_ARGS+=	-DSD_USE_SYSTEM_WEBM=ON
 
 # upstream always uses the latest commit; for pkgsrc use git head
 # commits as of packaging date, update them when updating this package
-GITHUB_SUBMODULES+=	leejet ggml 3af5f5760e19a96427f5f7a93b79cbdf3d4b265b ggml
+GITHUB_SUBMODULES+=	leejet ggml eced84c86f8b012c752c016f7fe789adea168e1e ggml
 GITHUB_SUBMODULES+=	leejet sdcpp-webui c4bce3d6b3f236614cca21014f076083b7270ba8 examples/server/frontend
-GITHUB_SUBMODULES+=	webmproject libwebm 6184f4484a826724b5293837134ab9492261b941 thirdparty/libwebm
 
 PKGCONFIG_OVERRIDE+=	cmake/stable-diffusion.pc.in
 
+post-install:
+	${RM} -f ${DESTDIR}${PREFIX}/lib/libggml*
+
 BUILDLINK_API_DEPENDS.libwebp+=	libwebp>=1.6.0nb2
 .include "../../graphics/libwebp/buildlink3.mk"
-#.include "../../wip/libwebm/buildlink3.mk"
-.include "../../math/ggml/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libwebm+=	libwebm>=1.0.0.32nb1
+.include "../../wip/libwebm/buildlink3.mk"
+# uses: #include "ggml/src/ggml-impl.h" so needs internal copy
+#.include "../../math/ggml/buildlink3.mk"
 .include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/stable-diffusion.cpp/distinfo b/stable-diffusion.cpp/distinfo
index c3e4c1cdb1..46cf603264 100644
--- a/stable-diffusion.cpp/distinfo
+++ b/stable-diffusion.cpp/distinfo
@@ -1,15 +1,12 @@
 $NetBSD$
 
-BLAKE2s (leejet-ggml-3af5f5760e19a96427f5f7a93b79cbdf3d4b265b.tar.gz) = fe6bb6af031acfb504044ea591d75adbe394c438d1b3d83ac2a39596c68be55f
-SHA512 (leejet-ggml-3af5f5760e19a96427f5f7a93b79cbdf3d4b265b.tar.gz) = f12f7e91dc473775d4ed55756580ec4b8f9b65e88b2b35cbb5728367974618eb8cb6afa2e7a8ea2341d1857e9ed0a691964865aff5a392437277618a39a4ce13
-Size (leejet-ggml-3af5f5760e19a96427f5f7a93b79cbdf3d4b265b.tar.gz) = 3167114 bytes
+BLAKE2s (leejet-ggml-eced84c86f8b012c752c016f7fe789adea168e1e.tar.gz) = a84226587da86c1650ad86dfc6d13ed611c6a08c7886d73eb40d0bd39820ffc6
+SHA512 (leejet-ggml-eced84c86f8b012c752c016f7fe789adea168e1e.tar.gz) = 3295c064aff295b0387249d5dec7860b620de82c8361197888df186be18270ede253ab7bce3358b1fb3020f11d01f0f8a29f7d268bff44666f8a8f3ea832781e
+Size (leejet-ggml-eced84c86f8b012c752c016f7fe789adea168e1e.tar.gz) = 3231425 bytes
 BLAKE2s (leejet-sdcpp-webui-c4bce3d6b3f236614cca21014f076083b7270ba8.tar.gz) = cc3b7416fd27254dcf1cc86947194667af6855701cd356ecdbc8a18c60b75247
 SHA512 (leejet-sdcpp-webui-c4bce3d6b3f236614cca21014f076083b7270ba8.tar.gz) = 11a245bd2e0f700d21d17071261b6d105dc0c8b3338a94b953d2c0f2ee12fb1c0fd6d704b666af5728e3fa7d2611441a481b58fe96fa284cdcc9441718df37b9
 Size (leejet-sdcpp-webui-c4bce3d6b3f236614cca21014f076083b7270ba8.tar.gz) = 31280 bytes
 BLAKE2s (master-775-b5d8120.tar.gz) = c350f48525f747180219c2ded0234eda023e33a2222c7914539d429c07fb2fea
 SHA512 (master-775-b5d8120.tar.gz) = 91302b3ed757ccad766b345669bcebb132778feba152b2a776e7dfb1b688fdf7a0708c7eb115b31c3cbe42dcb6ea413b36bc078ad8c5dea4e3c190bf8de6a762
 Size (master-775-b5d8120.tar.gz) = 110960902 bytes
-BLAKE2s (webmproject-libwebm-6184f4484a826724b5293837134ab9492261b941.tar.gz) = b2e8edec43ed3e29cbe9a440db93ec26503b476e8b5692d4474cd18d849c6ace
-SHA512 (webmproject-libwebm-6184f4484a826724b5293837134ab9492261b941.tar.gz) = 2a6f0537fe72803821fcef5652ae1558ab056fb3e5f5ca9ce7c218389cf5c06c514d7b3dfdcd86a8e0e9c88d47648ef47f13f197ded210d73750979b8123ad53
-Size (webmproject-libwebm-6184f4484a826724b5293837134ab9492261b941.tar.gz) = 502935 bytes
 SHA1 (patch-ggml_CMakeLists.txt) = 0d6e54711f56cb55ef4173c24034ef7e9856dfe7


Home | Main Index | Thread Index | Old Index