From 7cea28e8a05cce40028aaba74caa09cc643e10a7 Mon Sep 17 00:00:00 2001 From: Mehdi Chinoune Date: Sat, 10 Feb 2024 09:00:56 +0000 Subject: [PATCH] clblast: update to 1.6.2 --- ...e-Fix-DLL-install-directory-in-mingw.patch | 15 ----------- .../0002-CMake-install-pkgconfig-file.patch | 11 -------- mingw-w64-clblast/PKGBUILD | 25 ++++++------------- 3 files changed, 8 insertions(+), 43 deletions(-) delete mode 100644 mingw-w64-clblast/0001-CMake-Fix-DLL-install-directory-in-mingw.patch delete mode 100644 mingw-w64-clblast/0002-CMake-install-pkgconfig-file.patch diff --git a/mingw-w64-clblast/0001-CMake-Fix-DLL-install-directory-in-mingw.patch b/mingw-w64-clblast/0001-CMake-Fix-DLL-install-directory-in-mingw.patch deleted file mode 100644 index b0b7fd361c..0000000000 --- a/mingw-w64-clblast/0001-CMake-Fix-DLL-install-directory-in-mingw.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -350,7 +350,11 @@ - # Installs the library - include(GNUInstallDirs) - --install(TARGETS clblast EXPORT CLBlast DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(TARGETS clblast EXPORT CLBlast -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -+ - install(FILES include/clblast_half.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - if(OPENCL) - install(FILES include/clblast.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/mingw-w64-clblast/0002-CMake-install-pkgconfig-file.patch b/mingw-w64-clblast/0002-CMake-install-pkgconfig-file.patch deleted file mode 100644 index 00b5d43f5b..0000000000 --- a/mingw-w64-clblast/0002-CMake-install-pkgconfig-file.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -370,7 +370,7 @@ - install(EXPORT CLBlast DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/CLBlast FILE CLBlastConfig.cmake) - - # Install pkg-config file on Linux --if(UNIX) -+if(UNIX OR MINGW) - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/clblast.pc.in" - "${CMAKE_CURRENT_BINARY_DIR}/clblast.pc" @ONLY IMMEDIATE) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/clblast.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/mingw-w64-clblast/PKGBUILD b/mingw-w64-clblast/PKGBUILD index 7fee82024e..0704a6bdd5 100644 --- a/mingw-w64-clblast/PKGBUILD +++ b/mingw-w64-clblast/PKGBUILD @@ -3,12 +3,15 @@ _realname=clblast pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=1.6.1 -pkgrel=2 +pkgver=1.6.2 +pkgrel=1 pkgdesc="Tuned OpenCL BLAS (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url='https://github.com/CNugteren/CLBlast' +msys2_references=( + 'archlinux: clblast' +) license=('spdx:Apache-2.0') depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-libwinpthread-git" @@ -17,20 +20,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-opencl-headers") -source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/CNugteren/${_realname}/archive/${pkgver}.tar.gz" - 0001-CMake-Fix-DLL-install-directory-in-mingw.patch - 0002-CMake-install-pkgconfig-file.patch) -sha256sums=('e68d026108447cab53cb18d473b4363ab3958d7c8f97c522bbee1651069eec66' - '7b8af2508017d983810e68aaf7305e4300832023c59dbd48b657a18466ecf32a' - 'ccedeae315c2b6dbcf1e396f410660e8b1b4a09f72eda22ce7646b7597a04a76') - -prepare() { - cd "${_realname}-${pkgver}" - - # https://github.com/CNugteren/CLBlast/pull/505 - patch -p1 -i "${srcdir}/0001-CMake-Fix-DLL-install-directory-in-mingw.patch" - patch -p1 -i "${srcdir}/0002-CMake-install-pkgconfig-file.patch" -} +source=("https://github.com/CNugteren/${_realname}/archive/${pkgver}/${_realname}-${pkgver}.tar.gz") +sha256sums=('d7c1fb61162a6e2fa4eb6e95fafacbe22ee8460cd82371478f794f195aad267f') build() { mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}