From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 95356158020 for ; Fri, 25 Nov 2022 17:49:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2F969E0AAF; Fri, 25 Nov 2022 17:49:19 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 127C9E0AAF for ; Fri, 25 Nov 2022 17:49:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 366FE341427 for ; Fri, 25 Nov 2022 17:49:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A98A763 for ; Fri, 25 Nov 2022 17:49:16 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1669398495.0cf8f69b26c2a4b19a3657575199ffab7169007c.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libheif/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libheif/files/libheif-1.12.0-dav1d-1.0.0.patch media-libs/libheif/files/libheif-1.12.0-fix-bashism.patch X-VCS-Directories: media-libs/libheif/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 0cf8f69b26c2a4b19a3657575199ffab7169007c X-VCS-Branch: master Date: Fri, 25 Nov 2022 17:49:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9922a2b3-7b60-4939-97c4-d993d74b4354 X-Archives-Hash: 99600a0e38059f5d788d4f58e76862c3 commit: 0cf8f69b26c2a4b19a3657575199ffab7169007c Author: Michael Mair-Keimberger levelnine at> AuthorDate: Fri Nov 25 15:51:14 2022 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Fri Nov 25 17:48:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cf8f69b media-libs/libheif: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/28429 Signed-off-by: Conrad Kostecki gentoo.org> .../libheif/files/libheif-1.12.0-dav1d-1.0.0.patch | 45 ---------------------- .../libheif/files/libheif-1.12.0-fix-bashism.patch | 37 ------------------ 2 files changed, 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 -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 -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 ---- 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 -