From: Mathieu Baudier <redacted>
Date: Tue, 11 Mar 2025 14:00:48 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/upstream/latest' into debian/latest
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=0bcaa38083e80b65309292964e19c0b7f3b12c3e;p=pkg%2Fggml%2Fsources%2Fllama.cpp

Merge remote-tracking branch 'origin/upstream/latest' into debian/latest
---

0bcaa38083e80b65309292964e19c0b7f3b12c3e
diff --cc debian/changelog
index 72cda300,00000000..ce98b9e2
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,5 @@@
- llama-cpp (0.0.4719-2) unstable; urgency=medium
++llama-cpp (0.0.4853-1) unstable; urgency=medium
 +
-   * Improve packaging based on mentoring feedback
++  * Update upstream
 +
-  -- Mathieu Baudier <mbaudier@argeo.org>  Sun, 23 Feb 2025 06:21:05 +0000
++ -- Mathieu Baudier <mbaudier@argeo.org>  Tue, 11 Mar 2025 14:00:28 +0000
diff --cc debian/cmake/debian-llama-cpp.cmake
index 479a21a0,00000000..8ae9071b
mode 100644,000000..100644
--- a/debian/cmake/debian-llama-cpp.cmake
+++ b/debian/cmake/debian-llama-cpp.cmake
@@@ -1,24 -1,0 +1,24 @@@
 +# GGML dependencies
 +# libggml-base as external library
 +find_library(GGML_BASE_LOCATION ggml-base)
 +message (STATUS "Found GGML base library: ${GGML_BASE_LOCATION}") 
 +add_library(ggml-base SHARED IMPORTED GLOBAL)
 +set_target_properties(ggml-base PROPERTIES IMPORTED_LOCATION ${GGML_BASE_LOCATION})
 +
 +# libggml as external library
 +# defines GGML as target so that it is disabled in llama.cpp build
 +find_library(GGML_LOCATION ggml)
 +message (STATUS "Found GGML library: ${GGML_LOCATION}") 
 +add_library(ggml SHARED IMPORTED GLOBAL)
 +set_target_properties(ggml PROPERTIES IMPORTED_LOCATION ${GGML_LOCATION})
 +# transitive dependency
 +target_link_libraries(ggml INTERFACE ${GGML_BASE_LOCATION})
 +
 +add_compile_definitions(NDEBUG)
 +
 +install(DIRECTORY ${CMAKE_BINARY_DIR}/common/ DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE}/llama.cpp/common FILES_MATCHING PATTERN "*.a" )
 +install(DIRECTORY ${CMAKE_SOURCE_DIR}/common/ DESTINATION include/llama.cpp/common FILES_MATCHING PATTERN "*.h" )
 +
 +# build number, in line with changelog
- set(BUILD_NUMBER 4719)
++set(BUILD_NUMBER 4853)
 +