commit:     2955cb2f8d9901aa2efde212fa80a7d100be75e5
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 19:53:38 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon May 30 20:25:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2955cb2f

media-libs/freeimage: limit to <tiff-4.4.0 in stable

This relies on a tiff internal function that was replaced in
4.4.0 by a public function, but a simple swap means needing
to depend on >=4.4.0 which is not yet stable. Force dependency
to prevent mishaps.

Also update deprecated jpeg dep while revbumping.

Bug: https://bugs.gentoo.org/848531
Bug: https://bugs.gentoo.org/848534
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../{freeimage-3.18.0-r6.ebuild => freeimage-3.18.0-r7.ebuild}        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/freeimage/freeimage-3.18.0-r6.ebuild 
b/media-libs/freeimage/freeimage-3.18.0-r7.ebuild
similarity index 98%
rename from media-libs/freeimage/freeimage-3.18.0-r6.ebuild
rename to media-libs/freeimage/freeimage-3.18.0-r7.ebuild
index fc7744569906..7f916489e378 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r6.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r7.ebuild
@@ -24,7 +24,7 @@ IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 # uses code from it to handle 16bit<->float conversions.
 RDEPEND="
        sys-libs/zlib
-       jpeg? ( virtual/jpeg:0 )
+       jpeg? ( media-libs/libjpeg-turbo:= )
        jpeg2k? ( media-libs/openjpeg:2= )
        mng? ( media-libs/libmng:= )
        openexr? ( media-libs/openexr:= )
@@ -33,7 +33,7 @@ RDEPEND="
        tiff? (
                >=dev-libs/imath-3.1.4-r2:=
                >=media-libs/openexr-3:0=
-               media-libs/tiff:0
+               <media-libs/tiff-4.4.0
        )
        webp? ( media-libs/libwebp:= )"
 DEPEND="${RDEPEND}"

Reply via email to