libavif: update to 0.8.1

Changes:
* Add rav1e and zlib as dependencies.
* Enable rav1e codec and building tests.
* Remove pixbuf crash fix patch file.
* Add patch file to include stdlib.h in gdk-pixbuf/loader.c file.
This commit is contained in:
Biswapriyo Nath
2020-08-31 09:09:22 +05:30
parent dce87f95dc
commit aef79be9c8
3 changed files with 41 additions and 35 deletions

View File

@@ -1,23 +0,0 @@
From 9759bc7346802faa8ec96bb38456d8b8170580aa Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Fri, 17 Jul 2020 21:41:48 +0200
Subject: [PATCH] Fix a crash in the gdk-pixbuf loader when error is NULL
---
contrib/gdk-pixbuf/loader.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/contrib/gdk-pixbuf/loader.c b/contrib/gdk-pixbuf/loader.c
index b197b20..24a25a1 100644
--- a/contrib/gdk-pixbuf/loader.c
+++ b/contrib/gdk-pixbuf/loader.c
@@ -182,7 +182,8 @@ static gboolean load_increment(gpointer data, const guchar * buf, guint size, GE
{
struct avif_context * context = (struct avif_context *) data;
g_byte_array_append(context->data, buf, size);
- *error = NULL;
+ if (error)
+ *error = NULL;
return TRUE;
}

View File

@@ -0,0 +1,24 @@
From 117246d5faa5bc3c4c217bf548c2727e07e9ff9b Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Sat, 29 Aug 2020 19:17:45 +0530
Subject: [PATCH] gdk-pixbuf/loader.c: Include stdlib.h for strtol
---
contrib/gdk-pixbuf/loader.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/contrib/gdk-pixbuf/loader.c b/contrib/gdk-pixbuf/loader.c
index af0e775..6531ec0 100644
--- a/contrib/gdk-pixbuf/loader.c
+++ b/contrib/gdk-pixbuf/loader.c
@@ -3,6 +3,7 @@
*/
#include <avif/avif.h>
+#include <stdlib.h>
#define GDK_PIXBUF_ENABLE_BACKEND
#include <gdk-pixbuf/gdk-pixbuf-io.h>
--
2.27.0

View File

@@ -3,26 +3,29 @@
_realname=libavif
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=0.8.0
pkgrel=2
pkgver=0.8.1
pkgrel=1
pkgdesc="Library for encoding and decoding .avif files (mingw-w64)"
arch=('any')
url="https://github.com/AOMediaCodec/libavif"
license=('BSD')
depends=("${MINGW_PACKAGE_PREFIX}-aom"
"${MINGW_PACKAGE_PREFIX}-dav1d"
"${MINGW_PACKAGE_PREFIX}-rav1e"
"${MINGW_PACKAGE_PREFIX}-libjpeg-turbo"
"${MINGW_PACKAGE_PREFIX}-libpng")
"${MINGW_PACKAGE_PREFIX}-libpng"
"${MINGW_PACKAGE_PREFIX}-zlib")
makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-ninja"
"${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2"
"${MINGW_PACKAGE_PREFIX}-nasm")
"${MINGW_PACKAGE_PREFIX}-nasm"
"${MINGW_PACKAGE_PREFIX}-pkg-config")
source=("${_realname}-${pkgver}.tar.gz::https://github.com/AOMediaCodec/libavif/archive/v${pkgver}.tar.gz"
002-pixbuf-install-repfix.patch
003-fix-pixbuf-crash.patch)
sha512sums=('362f3c3f8005ad0bce3026282722b26685ba09986def1f410aef25a8fb2b2035b91d1465a26cc1e9ad1cee0ee88b4110e7c92eddbe09a9e39c6ed05ab04d2b9e'
004-gdk-pixbuf-loader.c-Include-stdlib.h-for-strtol.patch)
sha512sums=('03692fbba49fde08d76cebb847d0404a81113824e9e65edc6a0977f323d060c394d111e2a7647788fa3115f3ae80b0fc92d4fe5be53852e6734b96a8f1c1a078'
'60f8bad03460695a094a6ffabbe33f839239fef2bae99d9be7f3a3f9cfde14b694d0c68dce6cc987e9c865a0d97638e951d55abcbab4cc554719803e5d0bb2d2'
'fe973d8eff01ba7bdb255b16f44a1713be678c37d017b0f6c8d707c451e5c93d20e3782ca9e2f95f99453c2eec9da4d6bd9bea190b076de0ac268e57459108d1')
'2ead0fe4f51dd66d40cc8a64e874073e6cca8ef1c9f35a7994fb14cce52e7253c8d176e3ca221eebcf4e1acc277d29d0bf8fa155f794d0a369738a7d85e69462')
prepare() {
cd ${_realname}-${pkgver}
@@ -30,8 +33,8 @@ prepare() {
# https://gitlab.kitware.com/cmake/cmake/-/issues/19632
patch -p1 -i ${srcdir}/002-pixbuf-install-repfix.patch
# https://github.com/AOMediaCodec/libavif/pull/236
patch -p1 -i ${srcdir}/003-fix-pixbuf-crash.patch
# https://github.com/AOMediaCodec/libavif/pull/295
patch -p1 -i ${srcdir}/004-gdk-pixbuf-loader.c-Include-stdlib.h-for-strtol.patch
}
build() {
@@ -46,20 +49,22 @@ build() {
-DAVIF_BUILD_APPS=ON \
-DAVIF_CODEC_AOM=ON \
-DAVIF_CODEC_DAV1D=ON \
-DAVIF_CODEC_RAV1E=ON \
-DAVIF_BUILD_GDK_PIXBUF=ON \
-DAVIF_BUILD_TESTS=ON \
../${_realname}-${pkgver}
${MINGW_PREFIX}/bin/cmake --build .
${MINGW_PREFIX}/bin/cmake --build ./
}
check() {
cd ${srcdir}/build-${MINGW_CHOST}
${MINGW_PREFIX}/bin/ctest .
${MINGW_PREFIX}/bin/ctest ./ || true
}
package() {
cd ${srcdir}/build-${MINGW_CHOST}
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build . --target install
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build ./ --target install
install -Dm644 ${srcdir}/${_realname}-${pkgver}/README.md ${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}/README.md
install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE