9 files changed, 132 insertions, 7 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 3b56e03103c9..450ebbca4256 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/devil/Manifest b/media-libs/devil/Manifest
index 4333680f6900..0b934089f186 100644
--- a/media-libs/devil/Manifest
+++ b/media-libs/devil/Manifest
@@ -7,4 +7,4 @@ AUX devil-1.7.8-nvtt-glut.patch 2493 BLAKE2B 4f96f75a6a49c1cdd4b3b89101be693ce4a
 AUX devil-1.7.8-restrict.patch 587 BLAKE2B 265496bb262c945812182764903497d3b4b851eb48980d32197a7d732337ded032272544f7aef1cd725a796093ed274bf38b43bb4138b3bf199de2601a9c5732 SHA512 9370a94406e98979266d027857d7dd04069eefb6e2ccfb52d254b9eb658d932e5e7e9bd3a38aad57099b870c54aaa0a2d8b337f9bad42d06f6521c10d0a6f8db
 DIST DevIL-1.7.8.tar.gz 2051993 BLAKE2B 7c06549f7d90965fe6dcd7c6b460119a8491ca50f3103c745195fa5483885878717e9ae417eda51f25cbb60c0a96be180b12727115212709199ded13156ecb3e SHA512 a67e1488d6cb366431d9fcb460b8fe5b8a1dd79426ac77f8abd0db4a5aad7512697f72ef0c49ddb0e806469cc37ba1319e10ccd2ebd73942332df2c3c507458e
 EBUILD devil-1.7.8-r4.ebuild 2131 BLAKE2B 85c969d64a766a4141b6f9140fae95a2742c522eb9461af896bfd863e2faf363466451c8c5856d5f99148611551ea6f817f09e0780a0f3ac80077cbc2907003a SHA512 4acf8115f3238d73d84b1c7fbef9ca0b4893baaa0fd6f7eddf2d0fe1e440e05a0bff089f4365e52042489b27d30b972bb10dafd03d31cd3658ebb86192d119ce
-MISC metadata.xml 399 BLAKE2B 2c15e4e1bc8e8252fdf09f8a8efd4e0f5ad5c50b4680854dc971535afc4685b20f271d3a172176694911d7bdd57e8f61e390cbf06cecf19b3f00f3c50cda0e53 SHA512 2fc67e0217b66285f8b29157ae9630245b59bfd0e989b045705e54fe95b86d870933db9f820932ddbbb51b230433a12a98a57f52baa6f9944325c5f34835e3f1
+MISC metadata.xml 452 BLAKE2B 53504a298b738fd432e84b9f725adfabb60792578799bd3394cf5f9f5e01ee6a19833bd46a5299057bf0020a6cf2b15408bb72fc2f08e3bdea137e9b83182292 SHA512 1b15e83da96143ff8c515c0e65fc0925f4547b435185357cd0c46eb01e1179793d2dfaaa74789031224379b9e3a17acc491f929cd526ce4366553e4b0d2412b0
diff --git a/media-libs/devil/metadata.xml b/media-libs/devil/metadata.xml
index 5b50790d86f4..ffed35c22f6a 100644
--- a/media-libs/devil/metadata.xml
+++ b/media-libs/devil/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="allegro">Add support for Allegro</flag>
 	</use>
 	<upstream>
+		<remote-id type="github">DentonW/DevIL</remote-id>
 		<remote-id type="sourceforge">openil</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 678de3af0ccb..73e01ed8ce5c 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -2,7 +2,7 @@ DIST harfbuzz-4.3.0.tar.gz 29200217 BLAKE2B dfe5e3b47e3d89a5ad7c6eaf6d274027a0eb
 DIST harfbuzz-4.4.1.tar.gz 29231251 BLAKE2B 3947084ea2eedd76d64acfc5286ecd14d772ce0507163bc2c54a86579556a8799959ff4d47ea2919ee8472f8fe50d0266d325e3d0a7024f2ae8dcdf48d14f37e SHA512 bbc415d7b74408b1e8d34bfbc19a3cab002471fdd56d71b469c3129f0eae5532d5c7aaae7bb5cc3942fea6008d2ed9e96a7b20b10f4f5e46db63cecfa5c0248e
 DIST harfbuzz-5.0.1.tar.gz 29291175 BLAKE2B a30512dbceba7eb339164cfe77685e6ccd8338c297a080341236e90bbcf7451eb27d5227422e040d92ff4267f4d97c377a66cdcaff45ea2b1e69de0602047ae0 SHA512 9d05b97dfce248634b6b3ff69fac5cc344f0c8265bf05595b74b0b060049dba082d358184662b8ea045cd51c3d07e7c4a4804513052094566b777c33ec5af89c
 EBUILD harfbuzz-4.3.0.ebuild 2568 BLAKE2B cd0fd13772b43e47a8c90a5912ed5839c09599766e865e5fd7633a0694b9f379ad4c19c7c4b28af4aebaa839e5eefe45138254b075954427a9b105fa0247a52c SHA512 6d4ab2b384c575df4da788cb4042ce3ea88010d1513d1a84a340881e26efeefec5eb46179758eb06b377bedeba5ad999f69ef9a5e33c0779c4d25394b9d1aaf7
-EBUILD harfbuzz-4.4.1.ebuild 2573 BLAKE2B 1a1b4b0753a1f7dfe7c7a853341e963302ba33cd1ccfefc3f5d869ba5c8f9be9402f10b1ea7c2369e2ee00a42f70fb65561d08064e70ffeb351c6ca4bb9c1a0a SHA512 ca602cd7d26c0158c57088f18df1961b7083150f377977dc37319c92caa68fa9608ee8418a8f3d56c6962cb1ceffdb07af8668785738b157faa473e1a818a3da
+EBUILD harfbuzz-4.4.1.ebuild 2572 BLAKE2B 6c809070543cf057578bc35d0ae40a38aae24811df2881a198b6e30442b04d3205012706de04ec7d29f99513e3ad93b1c792281f208a613232944d8fb5bc2141 SHA512 a2a34f21678a20780abea83e62369a83cdb22c27334b47f336adc63be9c21dd9f55dc099d2e1973144b6ce2a0ee65892418f4635f8715fc6d4b470ce087ffe38
 EBUILD harfbuzz-5.0.1.ebuild 2582 BLAKE2B a1bf615e3b0e26a5e44504f9b65795e6431df96e35a8dc1cfc1f03f97538b2297aa1fba6a2a137cda94b3b41d2b29683d15447fa69fc9f55e9bc27a85424a91c SHA512 b50293b623a32972a5ba1c3dfa2a0aa44ec076bdb2f44cea30131309ab238cf816bf87c3740dd567e042c8a053514e49d02f3eec5ed14ff5bd47f4f426a58325
 EBUILD harfbuzz-9999.ebuild 2582 BLAKE2B a1bf615e3b0e26a5e44504f9b65795e6431df96e35a8dc1cfc1f03f97538b2297aa1fba6a2a137cda94b3b41d2b29683d15447fa69fc9f55e9bc27a85424a91c SHA512 b50293b623a32972a5ba1c3dfa2a0aa44ec076bdb2f44cea30131309ab238cf816bf87c3740dd567e042c8a053514e49d02f3eec5ed14ff5bd47f4f426a58325
 MISC metadata.xml 706 BLAKE2B 8f8639d60a36707cea3dce7e25634fbc6204c6a685dd73d2a470678ae5cca042749378e84a9472a888532310fa001dc0db42cdb60b02f9534e422da67d34e05b SHA512 c573f3ccb80e692a061944ec0d8d54342f9a4ae3f082e784e729e13ecb4b20f0d4ab59d6446ec51a8755842653315922469475d9c2e508db5b3712609fa70411
diff --git a/media-libs/harfbuzz/harfbuzz-4.4.1.ebuild b/media-libs/harfbuzz/harfbuzz-4.4.1.ebuild
index afc920532543..3f66ce57b768 100644
--- a/media-libs/harfbuzz/harfbuzz-4.4.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-4.4.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 7cb371975ecc..572079cd4a87 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,4 +1,6 @@
+AUX libheif-1.12.0-dav1d-1.0.0.patch 1569 BLAKE2B 1cd1629a3d519ef574a5b98ce5cfc5b8f074847b5d4fc6544fdeab3476c35b764739c98fda9a8d0a4f4921fd25412b08e124118f07694fe540b04f306716f6c2 SHA512 62a1afe3f42d1a61b3c314aaae9804dbd436f141075fa4daac415db07a1542c1033dd42cef6906b29ea0f072726888f5ef5f9b7c13c6ec8dca57b6e2bfdfd119
 DIST libheif-1.12.0.tar.gz 1684355 BLAKE2B 6d84678b39476f2d797d586c6dcaabc9a82351fe3bad536cd90edab16dabf91cbdcdb291195ff45061c7b0ad164748c53f87cbb2dc1e318b2cd458fcba74f644 SHA512 9e6f74dd52841a33b6021a1581ab28c56123d927caa7972acd284444e90888bbdae983b6d847d20eac7651dacea2193d27eb8df45928cb0774229ef8eea23294
 EBUILD libheif-1.12.0-r1.ebuild 1798 BLAKE2B 737d57dde4f9a3a0566c0a91b1d6ec0c167dc6bb59c16b3acb9ffa28135eac395328b41418381ac2e22999852d1182580845d2227b9fa8e2c0e13bd4eff42e63 SHA512 112f937a560ef0e3dd666c7e4c7e0e973738fd31942cfd52e3c5f27b1e4aa4c3305e4a0d9ee66d6a24f3a02d47a895f511684688fdbed88ad709ff1be783309a
-EBUILD libheif-9999.ebuild 1803 BLAKE2B 28cd644e40633597b07806b39f19cfdc8251132f99d5687337f68e4cbfadf578f4cee9aa198888a610c1df515e9824ada89b36a326cc6211ea30a704fb7fa7f3 SHA512 8e5af8dd952faf2bd431631ffae82faeb7adfa4cdd369741a1f031cbb12676dbead9157fbaeb16bc365da4034ab82deac627e9cfd4bbfd2e9b098a996d8ebd8a
+EBUILD libheif-1.12.0-r2.ebuild 1866 BLAKE2B 3908454dcb15f492e1e29282b147679f0512bdafdb0f5467cc706210dd24507afe732edcc349a9f46315d46bfb5d0c75f260e92fa90c516ca06404771c48ac57 SHA512 f19da664d0a2f22b7fe59de90fb741e2ae98bb7d5e124d0d8bc76bce7438071c6c1cbb68647a8a7c061e3ddb6c1c6aa6380b4f76db64b35e6942d1cdde119f8f
+EBUILD libheif-9999.ebuild 1815 BLAKE2B 694addf8cd1ccd79432b8f9ed2ec87184242ea16daebc190e66fbeb9437cfe3d1ca657f6229e9581285f9805e2b0eca4dfe4e046b8e23ff50428f9c3d7fc7d4b SHA512 509b7de549b17ff8032143d42a8e0d68b30e0ba7477871bff239c5d704061f5cb641d6a7b4cb3686c32f88f8b064dba6e579b7c998f8f47d14985046265bc437
 MISC metadata.xml 805 BLAKE2B 99457c3561cc5ad915c5503f96e52b6261981157de467073ac7a8ece68af3798b9db516b40b7db9e0bd92388b083898926d877fb3bbc8fd1701b280bfd4baa09 SHA512 e5461f86bd18b9878a0e4857fc25ad7554e4095b8b71b2a8de2334b49b7d6c62ccbc2d6bc31e016e65ba3c8bd3a872b5f00b2c2bf39e1d04306124bfedb8486f
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
new file mode 100644
index 000000000000..d8eb0a54016b
--- /dev/null
+++ b/media-libs/libheif/files/libheif-1.12.0-dav1d-1.0.0.patch
@@ -0,0 +1,45 @@
+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/libheif-1.12.0-r2.ebuild b/media-libs/libheif/libheif-1.12.0-r2.ebuild
new file mode 100644
index 000000000000..663b509679e8
--- /dev/null
+++ b/media-libs/libheif/libheif-1.12.0-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg multilib-minimal
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/strukturag/libheif.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
+HOMEPAGE="https://github.com/strukturag/libheif"
+
+LICENSE="GPL-3"
+SLOT="0/1.12"
+IUSE="+aom gdk-pixbuf go rav1e test +threads x265"
+REQUIRED_USE="test? ( go )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-lang/go )"
+DEPEND="
+	media-libs/dav1d:=[${MULTILIB_USEDEP}]
+	media-libs/libde265:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=[${MULTILIB_USEDEP}]
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
+	aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] )
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
+	go? ( dev-lang/go )
+	rav1e? ( media-video/rav1e:= )
+	x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-dav1d-1.0.0.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's:-Werror::' configure.ac || die
+
+	eautoreconf
+
+	# prevent "stat heif-test.go: no such file or directory"
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	export GO111MODULE=auto
+	local econf_args=(
+		--enable-libde265
+		--disable-static
+		$(multilib_is_native_abi && use go || echo --disable-go)
+		$(use_enable aom)
+		$(use_enable gdk-pixbuf)
+		$(use_enable rav1e)
+		$(use_enable threads multithreading)
+		$(use_enable x265)
+	)
+	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
+}
+
+multilib_src_test() {
+	default
+	emake -C go test
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild
index a1837ad0964d..b319e000d0c7 100644
--- a/media-libs/libheif/libheif-9999.ebuild
+++ b/media-libs/libheif/libheif-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools xdg multilib-minimal
 
@@ -28,7 +28,7 @@ DEPEND="
 	media-libs/libde265:=[${MULTILIB_USEDEP}]
 	media-libs/libpng:0=[${MULTILIB_USEDEP}]
 	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+	media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
 	aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] )
 	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
 	go? ( dev-lang/go )