diff --git a/mingw-w64-libheif/002-pkg-config-add-dav1d-rav1e.patch b/mingw-w64-libheif/002-pkg-config-add-dav1d-rav1e.patch deleted file mode 100644 index dbbc249029..0000000000 --- a/mingw-w64-libheif/002-pkg-config-add-dav1d-rav1e.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 76a45f58e4c84e35634b095821b3268091bce144 Mon Sep 17 00:00:00 2001 -From: Kleis Auke Wolthuizen -Date: Wed, 23 Dec 2020 19:53:17 +0100 -Subject: [PATCH] pkg-config: add missing Requires.private field for - dav1d/rav1e - ---- - CMakeLists.txt | 6 ++++++ - configure.ac | 2 ++ - 2 files changed, 8 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 05afd5da..961186fe 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -124,6 +124,12 @@ endif() - if (AOM_DECODER_FOUND OR AOM_ENCODER_FOUND) - list(APPEND REQUIRES_PRIVATE "aom") - endif() -+if (DAV1D_FOUND) -+ list(APPEND REQUIRES_PRIVATE "dav1d") -+endif() -+if (RAV1E_FOUND) -+ list(APPEND REQUIRES_PRIVATE "rav1e") -+endif() - if (AOM_DECODER_FOUND OR DAV1D_FOUND) - set(have_avif_decoder yes) - else() -diff --git a/configure.ac b/configure.ac -index c545c894..ef5974da 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -250,6 +250,7 @@ if eval "test x$enable_rav1e != xno"; then - AC_SUBST(rav1e_CFLAGS) - AC_SUBST(rav1e_LIBS) - have_avif_encoder="yes" -+ REQUIRES_PRIVATE="$REQUIRES_PRIVATE rav1e" - have_rav1e="yes" - ], [have_rav1e="no"]) - else -@@ -263,6 +264,7 @@ PKG_CHECK_MODULES([dav1d], [dav1d], [ - AC_SUBST(dav1d_CFLAGS) - AC_SUBST(dav1d_LIBS) - have_avif_decoder="yes" -+ REQUIRES_PRIVATE="$REQUIRES_PRIVATE dav1d" - have_dav1d="yes" - ], [have_dav1d="no"]) - AM_CONDITIONAL([HAVE_DAV1D], [test "x$have_dav1d" = "xyes"]) diff --git a/mingw-w64-libheif/PKGBUILD b/mingw-w64-libheif/PKGBUILD index fb17bd557d..c74f98af45 100644 --- a/mingw-w64-libheif/PKGBUILD +++ b/mingw-w64-libheif/PKGBUILD @@ -3,8 +3,8 @@ _realname=libheif pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.10.0 -pkgrel=3 +pkgver=1.11.0 +pkgrel=1 pkgdesc="HEIF image decoder/encoder library and tools (mingw-w64)" arch=('any') url="https://github.com/strukturag/libheif" @@ -20,22 +20,14 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-libwinpthread-git" "${MINGW_PACKAGE_PREFIX}-rav1e" "${MINGW_PACKAGE_PREFIX}-x265") -options=('strip') source=("https://github.com/strukturag/libheif/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz" - "001-fix-pkgconfig-provide-includedir.patch" - "002-pkg-config-add-dav1d-rav1e.patch") -sha256sums=('ad5af1276f341277dc537b0d19a4193e0833c247b2aacb936e0c5494141533ae' - 'b782444a8f2c3f23c3b57e6e0a25ebe1313656aeeb72fad2335b1c6ee4b90a0b' - '06f4a4c1b966f19ba3177de895f4c8a7879a94668ab9f593d0c63b7094b5c637') + "001-fix-pkgconfig-provide-includedir.patch") +sha256sums=('c550938f56ff6dac83702251a143f87cb3a6c71a50d8723955290832d9960913' + 'b782444a8f2c3f23c3b57e6e0a25ebe1313656aeeb72fad2335b1c6ee4b90a0b') prepare() { cd "${srcdir}/${_realname}-${pkgver}" patch -Np1 -i "${srcdir}/001-fix-pkgconfig-provide-includedir.patch" - - # https://github.com/strukturag/libheif/pull/408/files - patch -Np1 -i "${srcdir}/002-pkg-config-add-dav1d-rav1e.patch" - - autoreconf -fiv } build() {