Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-gpt4all for openSUSE:Factory checked in at 2025-02-24 15:51:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-gpt4all (Old) and /work/SRC/openSUSE:Factory/.python-gpt4all.new.1873 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-gpt4all" Mon Feb 24 15:51:25 2025 rev:4 rq:1248176 version:3.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-gpt4all/python-gpt4all.changes 2024-12-17 19:26:03.648161826 +0100 +++ /work/SRC/openSUSE:Factory/.python-gpt4all.new.1873/python-gpt4all.changes 2025-02-24 15:51:57.059239009 +0100 @@ -1,0 +2,5 @@ +Mon Feb 24 14:08:15 UTC 2025 - Daniel Garcia <[email protected]> + +- Add vk301.patch to fix build with latest vulkan + +------------------------------------------------------------------- New: ---- vk301.patch BETA DEBUG BEGIN: New: - Add vk301.patch to fix build with latest vulkan BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-gpt4all.spec ++++++ --- /var/tmp/diff_new_pack.cPmByd/_old 2025-02-24 15:51:57.823270936 +0100 +++ /var/tmp/diff_new_pack.cPmByd/_new 2025-02-24 15:51:57.827271103 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-gpt4all # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,6 +33,8 @@ # Apache-2.0 Source2: https://github.com/nomic-ai/kompute/archive/%{komputevers}.tar.gz#/kompute-%{komputevers}.tar.gz Source3: %{name}.rpmlintrc +# PATCH-FIX-OPENSUSE vk301.patch gh#KhronosGroup/Vulkan-Samples#1269 +Patch1: vk301.patch BuildRequires: %{python_module setuptools} BuildRequires: cmake BuildRequires: fdupes @@ -87,14 +89,17 @@ %prep %setup -n gpt4all-%{version} -cd gpt4all-backend/deps/ +pushd gpt4all-backend/deps/ rmdir llama.cpp-mainline tar xzf %{S:1} mv llama.cpp-%{llamavers}* llama.cpp-mainline -cd llama.cpp-mainline/ggml/src +pushd llama.cpp-mainline/ggml/src rmdir kompute tar xzf %{S:2} mv kompute-%{komputevers}* kompute +popd +popd +%patch -P1 -p1 %build %if 0%{?sle_version} == 150600 ++++++ vk301.patch ++++++ Index: gpt4all-3.4.2/gpt4all-backend/deps/llama.cpp-mainline/ggml/src/kompute/src/include/kompute/Manager.hpp =================================================================== --- gpt4all-3.4.2.orig/gpt4all-backend/deps/llama.cpp-mainline/ggml/src/kompute/src/include/kompute/Manager.hpp +++ gpt4all-3.4.2/gpt4all-backend/deps/llama.cpp-mainline/ggml/src/kompute/src/include/kompute/Manager.hpp @@ -255,7 +255,11 @@ class Manager bool mFreeInstance = false; std::shared_ptr<vk::PhysicalDevice> mPhysicalDevice = nullptr; std::shared_ptr<vk::Device> mDevice = nullptr; +#if VK_HEADER_VERSION >= 301 + std::shared_ptr<vk::detail::DynamicLoader> mDynamicLoader = nullptr; +#else std::shared_ptr<vk::DynamicLoader> mDynamicLoader = nullptr; +#endif bool mFreeDevice = false; // -------------- ALWAYS OWNED RESOURCES @@ -271,8 +275,12 @@ class Manager #ifndef KOMPUTE_DISABLE_VK_DEBUG_LAYERS vk::DebugReportCallbackEXT mDebugReportCallback; +#if VK_HEADER_VERSION >= 301 + vk::detail::DispatchLoaderDynamic mDebugDispatcher; +#else vk::DispatchLoaderDynamic mDebugDispatcher; #endif +#endif // Create functions void createInstance(); Index: gpt4all-3.4.2/gpt4all-backend/deps/llama.cpp-mainline/ggml/src/kompute/src/Manager.cpp =================================================================== --- gpt4all-3.4.2.orig/gpt4all-backend/deps/llama.cpp-mainline/ggml/src/kompute/src/Manager.cpp +++ gpt4all-3.4.2/gpt4all-backend/deps/llama.cpp-mainline/ggml/src/kompute/src/Manager.cpp @@ -181,7 +181,12 @@ Manager::createInstance() } try { +#if VK_HEADER_VERSION >= 301 + mDynamicLoader = std::make_shared<vk::detail::DynamicLoader>(); +#else mDynamicLoader = std::make_shared<vk::DynamicLoader>(); +#endif + } catch (const std::exception & err) { return; }
