diff --git a/mingw-w64-ggml/PKGBUILD b/mingw-w64-ggml/PKGBUILD index 6cff5e5f0b..b7e8b18e21 100644 --- a/mingw-w64-ggml/PKGBUILD +++ b/mingw-w64-ggml/PKGBUILD @@ -3,7 +3,7 @@ _realname=ggml pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=0.9.4.r237.g781baf2a +pkgver=0.9.4.r371.gd80bac55 pkgrel=1 pkgdesc="Tensor library for machine learning (mingw-w64)" arch=('any') @@ -27,9 +27,9 @@ makedepends=( "${MINGW_PACKAGE_PREFIX}-vulkan-headers" "git" ) -_commit="781baf2a14d9e0aaee542b2e1bb918bfc4132199" +_commit="d80bac55f6d0c57e57143f80cbb6e3155dec1cc7" source=("git+https://github.com/ggml-org/ggml.git#commit=${_commit}") -sha256sums=('332872114681d0e57555e5cc401017fcc969bca2bc77af5571f6a29e236321a2') +sha256sums=('5fa00aa8ebfc085dfd97e2f5deaa53245afbd48ad2ab202907f25e978d388de1') pkgver() { cd "${_realname}" diff --git a/mingw-w64-llama.cpp/001-fix-link-cpp-httplib.patch b/mingw-w64-llama.cpp/001-fix-link-cpp-httplib.patch deleted file mode 100644 index c2dd4cb57d..0000000000 --- a/mingw-w64-llama.cpp/001-fix-link-cpp-httplib.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- llama.cpp-b7132/vendor/cpp-httplib/CMakeLists.txt.orig 2025-11-23 11:16:28.842405300 +0100 -+++ llama.cpp-b7132/vendor/cpp-httplib/CMakeLists.txt 2025-11-23 11:16:31.981633700 +0100 -@@ -77,6 +77,9 @@ - message(STATUS "OpenSSL found: ${OPENSSL_VERSION}") - set(CPPHTTPLIB_OPENSSL_SUPPORT TRUE) - target_link_libraries(${TARGET} PUBLIC OpenSSL::SSL OpenSSL::Crypto) -+ if(WIN32) -+ target_link_libraries(${TARGET} PUBLIC crypt32) -+ endif() - endif() - else() - message(STATUS "OpenSSL not found, SSL support disabled") diff --git a/mingw-w64-llama.cpp/PKGBUILD b/mingw-w64-llama.cpp/PKGBUILD index 3fb8db572f..c00329aed6 100644 --- a/mingw-w64-llama.cpp/PKGBUILD +++ b/mingw-w64-llama.cpp/PKGBUILD @@ -4,7 +4,7 @@ _realname=llama.cpp pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") epoch=1 -pkgver=b7132 +pkgver=b7376 pkgrel=1 pkgdesc="Library and tools for running inference with Meta's LLaMA model (and derivatives) in C/C++ (mingw-w64)" arch=('any') @@ -22,19 +22,14 @@ makedepends=( "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" ) -source=("https://github.com/ggml-org/llama.cpp/archive/${pkgver}/${_realname}-${pkgver}.tar.gz" - "001-fix-link-cpp-httplib.patch") -sha256sums=('dd61c0c706337afe5f7d01bf90c520a85c2780da041552abc08fd44c5af4485b' - '731a19aec9fc53b9f4ab55b3aec8e80bc23aa1a1eb8905d9f48da9f110ffbe57') +source=("https://github.com/ggml-org/llama.cpp/archive/${pkgver}/${_realname}-${pkgver}.tar.gz") +sha256sums=('66b400cafd0742e1d1bf47617f9c8eacd7ef1dbab0c07ca0badbaec962c2429d') prepare() { cd ${_realname}-${pkgver} - patch -p1 -i "${srcdir}"/001-fix-link-cpp-httplib.patch } build() { - mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" - declare -a extra_config if check_option "debug" "n"; then extra_config+=("-DCMAKE_BUILD_TYPE=Release") @@ -55,15 +50,14 @@ build() { -DLLAMA_CURL=ON \ -DLLAMA_OPENSSL=ON \ -DLLAMA_USE_SYSTEM_GGML=ON \ - ../${_realname}-${pkgver} + -S ${_realname}-${pkgver} \ + -B build-${MSYSTEM} - cmake --build . + cmake --build build-${MSYSTEM} } package() { - cd "${srcdir}/build-${MSYSTEM}" - - DESTDIR="${pkgdir}" cmake --install . + DESTDIR="${pkgdir}" cmake --install build-${MSYSTEM} # Rename output files by prefixing them with llama (if not already prefixed and if not DLL) for i in "${pkgdir}"${MINGW_PREFIX}/bin/*.{exe,py}; do diff --git a/mingw-w64-whisper.cpp/PKGBUILD b/mingw-w64-whisper.cpp/PKGBUILD index b572ac04d5..5f835dd124 100644 --- a/mingw-w64-whisper.cpp/PKGBUILD +++ b/mingw-w64-whisper.cpp/PKGBUILD @@ -4,7 +4,7 @@ _realname=whisper.cpp pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") epoch=1 -pkgver=1.8.2.r181.g19ceec8e +pkgver=1.8.2.r320.gf0c9017a pkgrel=1 pkgdesc="Port of OpenAI's Whisper model in C/C++ (mingw-w64)" arch=('any') @@ -22,10 +22,10 @@ makedepends=( "${MINGW_PACKAGE_PREFIX}-ninja" "git" ) -_commit=19ceec8eac980403b714d603e5ca31653cd42a3f +_commit=f0c9017a2f5913b68295e7be9444f79e0c7de7eb source=("git+https://github.com/ggml-org/whisper.cpp#commit=${_commit}") #source=("https://github.com/ggml-org/whisper.cpp/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz") -sha256sums=('045741a480602f3d8338ec5786b7a083cba8d66b3d874d492163357f107406af') +sha256sums=('03424b16ac0eb465575e1c91fbfa376eb09d573dfd5e042c23ca43607c94c564') pkgver() { cd "${_realname}" @@ -33,8 +33,6 @@ pkgver() { } build() { - mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" - declare -a extra_config if check_option "debug" "n"; then extra_config+=("-DCMAKE_BUILD_TYPE=Release") @@ -56,15 +54,14 @@ build() { -DWHISPER_BUILD_TESTS=OFF \ -DWHISPER_ALL_WARNINGS=OFF \ "${extra_config[@]}" \ - ../${_realname} + -S ${_realname} \ + -B build-${MSYSTEM} - cmake --build . + cmake --build build-${MSYSTEM} } package() { - cd "${srcdir}/build-${MSYSTEM}" - - DESTDIR="${pkgdir}" cmake --install . + DESTDIR="${pkgdir}" cmake --install build-${MSYSTEM} # Rename output files by prefixing them with whisper (if not already prefixed and if not DLL) for i in "${pkgdir}"${MINGW_PREFIX}/bin/*.{exe,py,sh}; do