diff --git a/mingw-w64-frei0r-plugins/0001-backport-eb9e96d.patch b/mingw-w64-frei0r-plugins/0001-backport-eb9e96d.patch deleted file mode 100644 index 64b99694e9..0000000000 --- a/mingw-w64-frei0r-plugins/0001-backport-eb9e96d.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required (VERSION 3.1) -+cmake_minimum_required (VERSION 3.12...3.31) - - list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) - diff --git a/mingw-w64-frei0r-plugins/PKGBUILD b/mingw-w64-frei0r-plugins/PKGBUILD index cbd73b2cd6..de40eeead1 100644 --- a/mingw-w64-frei0r-plugins/PKGBUILD +++ b/mingw-w64-frei0r-plugins/PKGBUILD @@ -5,12 +5,13 @@ _realname=frei0r-plugins pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=2.3.3 -pkgrel=4 +pkgver=2.4.0 +pkgrel=1 pkgdesc='Minimalistic plugin API for video effects (mingw-w64)' arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://frei0r.dyne.org/" +msys2_repository_url="https://github.com/dyne/frei0r" license=('spdx:GPL-2.0-or-later') depends=("${MINGW_PACKAGE_PREFIX}-cc-libs") makedepends=("${MINGW_PACKAGE_PREFIX}-cc" @@ -26,17 +27,10 @@ if [[ ${CARCH} != i686 ]]; then optdepends+=("${MINGW_PACKAGE_PREFIX}-gavl: rgbparade, scale0tilt and vectorscope plugins" "${MINGW_PACKAGE_PREFIX}-opencv: facebl0r and facedetect plugins") fi -source=("https://github.com/dyne/frei0r/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz" - 0001-backport-eb9e96d.patch) -sha256sums=('aeeefe3a9b44761b2cf110017d2b1dfa2ceeb873da96d283ba5157380c5d0ce5' - 'd1ee0822b722778bc50263c568b91331ba7e6fc67c0e6fccf45176e0e00f6794') +source=("https://github.com/dyne/frei0r/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz") +sha256sums=('6b3491ee65c775b251ecd0ba2cb86955ca2469de47c73718170442732cb9ce75') validpgpkeys=('6113D89CA825C5CEDD02C87273B35DA54ACB7D10') # Denis Roio (Jaromil) -prepare() { - cd "frei0r-${pkgver}" - patch -p1 -i "${srcdir}"/0001-backport-eb9e96d.patch -} - build() { mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" @@ -52,21 +46,21 @@ build() { fi MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ - ${MINGW_PREFIX}/bin/cmake.exe -Wno-dev \ + cmake -Wno-dev \ -G"Ninja" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ "${_extra_config[@]}" \ ../frei0r-${pkgver} - ${MINGW_PREFIX}/bin/cmake --build . + cmake --build . } check() { - cd "${srcdir}/build-${MSYSTEM}" + cd "build-${MSYSTEM}" # make check } package() { - cd "${srcdir}/build-${MSYSTEM}" - DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install . + cd "build-${MSYSTEM}" + DESTDIR="${pkgdir}" cmake --install . }