whisper.cpp: install fewer files to avoid conflict with llama.cpp

[Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon Apr 21 10:52:28 2025 +0200
Changeset:	418ed0d1365b44b3d3fda8517771cefd39a583a9

Modified Files:
	whisper.cpp/Makefile
	whisper.cpp/PLIST
	whisper.cpp/distinfo
	whisper.cpp/patches/patch-ggml_CMakeLists.txt

Log Message:
whisper.cpp: install fewer files to avoid conflict with llama.cpp

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

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

diffstat:
 whisper.cpp/Makefile                          |  4 ++++
 whisper.cpp/PLIST                             |  3 ---
 whisper.cpp/distinfo                          |  2 +-
 whisper.cpp/patches/patch-ggml_CMakeLists.txt | 14 ++++++++++++--
 4 files changed, 17 insertions(+), 6 deletions(-)

diffs:
diff --git a/whisper.cpp/Makefile b/whisper.cpp/Makefile
index d7fdac5955..fbbfe81308 100644
--- a/whisper.cpp/Makefile
+++ b/whisper.cpp/Makefile
@@ -42,6 +42,10 @@ SUBST_MESSAGE.findblas=	Fixing libpci soname
 SUBST_FILES.findblas+=	ggml/src/ggml-blas/CMakeLists.txt
 SUBST_SED.findblas+=	-e 's,DepBLAS openblas64,DepBLAS ${BLAS_PC},'
 
+# avoid conflict with llama.cpp
+post-install:
+	${RM} ${DESTDIR}${PREFIX}/lib/libggml-cpu.so
+
 #.include "../../devel/SDL2/buildlink3.mk"
 .include "../../multimedia/ffmpeg6/buildlink3.mk"
 .include "../../wip/llama.cpp/buildlink3.mk"
diff --git a/whisper.cpp/PLIST b/whisper.cpp/PLIST
index 185c59d129..dda4b2bfab 100644
--- a/whisper.cpp/PLIST
+++ b/whisper.cpp/PLIST
@@ -3,11 +3,8 @@ bin/whisper-bench
 bin/whisper-cli
 bin/whisper-server
 include/whisper.h
-lib/cmake/ggml/ggml-config.cmake
-lib/cmake/ggml/ggml-version.cmake
 lib/cmake/whisper/whisper-config.cmake
 lib/cmake/whisper/whisper-version.cmake
-lib/libggml-cpu.so
 lib/libwhisper.so
 lib/libwhisper.so.1
 lib/libwhisper.so.${PKGVERSION}
diff --git a/whisper.cpp/distinfo b/whisper.cpp/distinfo
index 0929bccfdc..3b061df811 100644
--- a/whisper.cpp/distinfo
+++ b/whisper.cpp/distinfo
@@ -3,4 +3,4 @@ $NetBSD$
 BLAKE2s (whisper.cpp-1.7.5.tar.gz) = 3aa20b82bfa56066b89fff839dece8436a6d744a1d4af7a6f731b166f0db59c6
 SHA512 (whisper.cpp-1.7.5.tar.gz) = 35efd976f60261e108972e3af7b322d723e36be30f5265db3be63752caaed0b52b9da3ece02975da2b83ff30f1eb32663e77fbaaf15f3037e35a525939071c0b
 Size (whisper.cpp-1.7.5.tar.gz) = 6216643 bytes
-SHA1 (patch-ggml_CMakeLists.txt) = 4de575a735f81e280a1c5e4f2e51e9117b1833e4
+SHA1 (patch-ggml_CMakeLists.txt) = a468406617387a6f68d33a5b35191d62e4c65682
diff --git a/whisper.cpp/patches/patch-ggml_CMakeLists.txt b/whisper.cpp/patches/patch-ggml_CMakeLists.txt
index 266c212c8b..afa92ade68 100644
--- a/whisper.cpp/patches/patch-ggml_CMakeLists.txt
+++ b/whisper.cpp/patches/patch-ggml_CMakeLists.txt
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- ggml/CMakeLists.txt.orig	2025-01-11 13:17:23.722292800 +0000
+--- ggml/CMakeLists.txt.orig	2025-04-02 13:39:48.000000000 +0000
 +++ ggml/CMakeLists.txt
-@@ -249,8 +249,8 @@ set_target_properties(ggml PROPERTIES PU
+@@ -275,8 +275,8 @@ set_target_properties(ggml PROPERTIES PU
  #if (GGML_METAL)
  #    set_target_properties(ggml PROPERTIES RESOURCE "${CMAKE_CURRENT_SOURCE_DIR}/src/ggml-metal.metal")
  #endif()
@@ -13,3 +13,13 @@ $NetBSD$
  
  if (GGML_STANDALONE)
      configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ggml.pc.in
+@@ -357,6 +357,6 @@ write_basic_package_version_file(
+     VERSION ${GGML_INSTALL_VERSION}
+     COMPATIBILITY SameMajorVersion)
+ 
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ggml-config.cmake
+-              ${CMAKE_CURRENT_BINARY_DIR}/ggml-version.cmake
+-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ggml)
++#install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ggml-config.cmake
++#              ${CMAKE_CURRENT_BINARY_DIR}/ggml-version.cmake
++#        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ggml)