gentoo auto-resync : 25:11:2022 - 19:13:11

3 files changed, 0 insertions, 84 deletions

diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index caa0c10e8b66..2aad4d8932ac 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,5 +1,3 @@
-AUX libheif-1.12.0-dav1d-1.0.0.patch 1569 BLAKE2B 1cd1629a3d519ef574a5b98ce5cfc5b8f074847b5d4fc6544fdeab3476c35b764739c98fda9a8d0a4f4921fd25412b08e124118f07694fe540b04f306716f6c2 SHA512 62a1afe3f42d1a61b3c314aaae9804dbd436f141075fa4daac415db07a1542c1033dd42cef6906b29ea0f072726888f5ef5f9b7c13c6ec8dca57b6e2bfdfd119
-AUX libheif-1.12.0-fix-bashism.patch 1325 BLAKE2B 5a43b5f2611e256a48603ce9f5d59ae9e08fec30c58af829a82d62ba04e09eb263d0f439b3aecd39d8a053ccfdb4b4f5dbdc5ec8792cd5ffb767e0c2c64e4e66 SHA512 47250ccf9ad920f2067477728f79d46cf9ee70d581b72fecacd33b927c77cb3af2744a6995c7f6b21aad64a9477bcdf702a3cea30bebf99980d93c8c3a560718
 DIST libheif-1.13.0.tar.gz 1703950 BLAKE2B e79af787c514c02f49eb9deb42c9727a4719584d16ebb73b8ab276d9e5452c5463f359a1ace30819466f4dab30db69fec5afa2eefeaadc828e2272e91c7d4cf7 SHA512 44cb12ec7191bdf8ef2193c075d5d7a064a7a90c00625e5346624de1ebbedd064601998d042c8336d6c5b2aaef4cd3b439b850d0ab5882daa2e22dcc8722c779
 EBUILD libheif-1.13.0.ebuild 2057 BLAKE2B fe52e45b8ad8663f468cc9d71015e655022da9dd77ac66bbfff09d144e6785cd30feeb4d7e247d37a0cc87fc835764f9829c6cd2a03b7a4fcba88dadd6266e4e SHA512 5f0ecb6ad7159f6d86021a5c7db5578dcc20d989b765ad91e20b502cbd9da6aa25febfb0445084d6a2388cf020bf49eb8e14aed727cd599788d324313da54260
 EBUILD libheif-9999.ebuild 2001 BLAKE2B 02130e50e78e847a881aeab0b1f4f86e1aab701500d42b430d3ba073715369bd444eff39150e8d948e1482341cd4e1c685a7eda59dfa697a4517de11c34799c7 SHA512 ad3efd5f606d0c5e5f747353f22d5953d4e1f68e964e945b9bc8c652753dd36ed85ea681ae41b7c270f34c9a131f84e229b49eb41eb4787d80ee909eb1ed9a62
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
-