From: Mathieu Baudier Date: Sat, 18 Oct 2025 08:29:46 +0000 (+0200) Subject: Adapt to upstream changes X-Git-Tag: debian/0.9.4.185-1~6 X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=cac7b231b727e8df1df503936e6d312b9cdcd6fd;p=pkg%2Fggml%2Fsources%2Fggml Adapt to upstream changes --- diff --git a/debian/changelog b/debian/changelog index 037d2311..deb17bc7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ggml (0.9.4.58-1) unstable; urgency=medium + + * Upstream llama.cpp sync + + -- Mathieu Baudier Sat, 18 Oct 2025 08:29:05 +0000 + ggml (0.9.4-1) unstable; urgency=medium * Upstream release diff --git a/debian/patches/0001-improve-cmake-build.patch b/debian/patches/0001-improve-cmake-build.patch index e34d7b7b..46712816 100644 --- a/debian/patches/0001-improve-cmake-build.patch +++ b/debian/patches/0001-improve-cmake-build.patch @@ -7,10 +7,10 @@ Subject: improve-cmake-build 1 file changed, 4 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index c8f3d85..1dde35d 100644 +index 892c233..cef289b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -415,5 +415,9 @@ if (BUILD_SHARED_LIBS) +@@ -418,5 +418,9 @@ if (BUILD_SHARED_LIBS) set_target_properties(${target} PROPERTIES POSITION_INDEPENDENT_CODE ON) target_compile_definitions(${target} PRIVATE GGML_BUILD) target_compile_definitions(${target} PUBLIC GGML_SHARED) diff --git a/debian/patches/0002-revert-vulkan-dynamic-dispatcher.patch b/debian/patches/0002-revert-vulkan-dynamic-dispatcher.patch deleted file mode 100644 index 5262d97f..00000000 --- a/debian/patches/0002-revert-vulkan-dynamic-dispatcher.patch +++ /dev/null @@ -1,52 +0,0 @@ -From: Mathieu Baudier -Date: Fri, 10 Oct 2025 15:38:31 +0200 -Subject: revert-vulkan-dynamic-dispatcher - ---- - src/ggml-vulkan/ggml-vulkan.cpp | 16 ++++------------ - 1 file changed, 4 insertions(+), 12 deletions(-) - -diff --git a/src/ggml-vulkan/ggml-vulkan.cpp b/src/ggml-vulkan/ggml-vulkan.cpp -index 2608cbd..1296caf 100644 ---- a/src/ggml-vulkan/ggml-vulkan.cpp -+++ b/src/ggml-vulkan/ggml-vulkan.cpp -@@ -7,14 +7,12 @@ - - // See https://github.com/KhronosGroup/Vulkan-Hpp?tab=readme-ov-file#extensions--per-device-function-pointers- - #define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC 1 --// We use VULKAN_HPP_DEFAULT_DISPATCHER, but not VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE --// to avoid conflicts with applications or other libraries who might use it. --namespace vk::detail { class DispatchLoaderDynamic; } --vk::detail::DispatchLoaderDynamic & ggml_vk_default_dispatcher(); --#define VULKAN_HPP_DEFAULT_DISPATCHER ggml_vk_default_dispatcher() - - #include - -+// See https://github.com/KhronosGroup/Vulkan-Hpp?tab=readme-ov-file#extensions--per-device-function-pointers- -+VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE -+ - #include - #include - #include -@@ -4538,12 +4536,6 @@ static bool ggml_vk_instance_portability_enumeration_ext_available(const std::ve - static bool ggml_vk_instance_debug_utils_ext_available(const std::vector & instance_extensions); - static bool ggml_vk_device_is_supported(const vk::PhysicalDevice & vkdev); - --static vk::detail::DispatchLoaderDynamic ggml_vk_default_dispatcher_instance; -- --vk::detail::DispatchLoaderDynamic & ggml_vk_default_dispatcher() { -- return ggml_vk_default_dispatcher_instance; --} -- - static void ggml_vk_instance_init() { - if (vk_instance_initialized) { - return; -@@ -4551,7 +4543,7 @@ static void ggml_vk_instance_init() { - VK_LOG_DEBUG("ggml_vk_instance_init()"); - - // See https://github.com/KhronosGroup/Vulkan-Hpp?tab=readme-ov-file#extensions--per-device-function-pointers- -- ggml_vk_default_dispatcher_instance.init(vkGetInstanceProcAddr); -+ VULKAN_HPP_DEFAULT_DISPATCHER.init(vkGetInstanceProcAddr); - - uint32_t api_version = vk::enumerateInstanceVersion(); - diff --git a/debian/patches/series b/debian/patches/series index 96e9c398..b9192bb5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 0001-improve-cmake-build.patch -0002-revert-vulkan-dynamic-dispatcher.patch