summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2022-11-25 16:51:14 +0100
committerConrad Kostecki <conikost@gentoo.org>2022-11-25 18:48:15 +0100
commit0cf8f69b26c2a4b19a3657575199ffab7169007c (patch)
tree07ca4cd3aee99042f6f043ed5569fd3dc105ddd0 /media-libs/libheif
parentapp-backup/bareos: remove unused patches (diff)
downloadgentoo-0cf8f69b26c2a4b19a3657575199ffab7169007c.tar.gz
gentoo-0cf8f69b26c2a4b19a3657575199ffab7169007c.tar.bz2
gentoo-0cf8f69b26c2a4b19a3657575199ffab7169007c.zip
media-libs/libheif: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/28429 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'media-libs/libheif')
-rw-r--r--media-libs/libheif/files/libheif-1.12.0-dav1d-1.0.0.patch45
-rw-r--r--media-libs/libheif/files/libheif-1.12.0-fix-bashism.patch37
2 files changed, 0 insertions, 82 deletions
diff --git a/media-libs/libheif/files/libheif-1.12.0-dav1d-1.0.0.patch b/media-libs/libheif/files/libheif-1.12.0-dav1d-1.0.0.patch
deleted file mode 100644
index d8eb0a54016b..000000000000
--- a/media-libs/libheif/files/libheif-1.12.0-dav1d-1.0.0.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://bugs.gentoo.org/836205
-https://github.com/strukturag/libheif/commit/0f8496f22d284e1a69df12fe0b72f375aed31315
-
-From 0f8496f22d284e1a69df12fe0b72f375aed31315 Mon Sep 17 00:00:00 2001
-From: Dirk Farin <dirk.farin@gmail.com>
-Date: Tue, 5 Apr 2022 12:17:59 +0200
-Subject: [PATCH] fix dav1d decoding: input stream must be flushed with dav1d
- 1.0.0
-
----
- libheif/heif_decoder_dav1d.cc | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/libheif/heif_decoder_dav1d.cc b/libheif/heif_decoder_dav1d.cc
-index a6c42e4f..ecf7382e 100644
---- a/libheif/heif_decoder_dav1d.cc
-+++ b/libheif/heif_decoder_dav1d.cc
-@@ -163,7 +163,10 @@ struct heif_error dav1d_decode_image(void* decoder_raw, struct heif_image** out_
- Dav1dPicture frame;
- memset(&frame, 0, sizeof(Dav1dPicture));
-
-+ bool flushed = false;
-+
- for (;;) {
-+
- int res = dav1d_send_data(decoder->context, &decoder->data);
- if ((res < 0) && (res != DAV1D_ERR(EAGAIN))) {
- err = {heif_error_Decoder_plugin_error,
-@@ -173,11 +176,11 @@ struct heif_error dav1d_decode_image(void* decoder_raw, struct heif_image** out_
- }
-
- res = dav1d_get_picture(decoder->context, &frame);
-- if (res == DAV1D_ERR(EAGAIN)) {
-- err = {heif_error_Decoder_plugin_error,
-- heif_suberror_Unspecified,
-- kEmptyString};
-- return err;
-+ if (!flushed && res == DAV1D_ERR(EAGAIN)) {
-+ if (decoder->data.sz == 0) {
-+ flushed = true;
-+ }
-+ continue;
- }
- else if (res < 0) {
- err = {heif_error_Decoder_plugin_error,
diff --git a/media-libs/libheif/files/libheif-1.12.0-fix-bashism.patch b/media-libs/libheif/files/libheif-1.12.0-fix-bashism.patch
deleted file mode 100644
index 3d4d12495051..000000000000
--- a/media-libs/libheif/files/libheif-1.12.0-fix-bashism.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://github.com/strukturag/libheif/pull/660
-
-From a50ef159794ff66fc0a03d5269b1c36a000673ea Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 16 Aug 2022 02:23:13 +0100
-Subject: [PATCH] configure.ac: fix bashism
-
-configure scripts need to be runnable with a POSIX-compliant /bin/sh.
-
-On many (but not all!) systems, /bin/sh is provided by Bash, so errors
-like this aren't spotted. Notably Debian defaults to /bin/sh provided
-by dash which doesn't tolerate such bashisms as '=='.
-
-This retains compatibility with bash.
-
-Fixes errors/warnings like:
-```
-checking for pthread_create in -lpthread... yes
-checking for simple visibility declarations... yes
-/var/tmp/portage/media-libs/libheif-1.12.0-r2/work/libheif-1.12.0/configure: 18821: test: x: unexpected operator
-checking pkg-config is at least version 0.9.0... yes
-checking for aom... yes
-```
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -85,7 +85,7 @@ AS_IF([test "x$enable_tests" = "xyes"], [
- HAVE_VISIBILITY=0
- CFLAG_VISIBILITY=
- ])
--AM_CONDITIONAL([HAVE_TESTS], [test "x$HAVE_TESTS" == "x1"])
-+AM_CONDITIONAL([HAVE_TESTS], [test "x$HAVE_TESTS" = "x1"])
-
- AM_CONDITIONAL([HAVE_VISIBILITY], [test "x$HAVE_VISIBILITY" != "x0"])
- if eval "test x$enable_visibility = x" ; then enable_visibility=yes ; fi
-