commit: da70248ebd82b66c505b09d62518feb893872657 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Sun Oct 6 16:09:06 2024 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Sun Oct 6 18:58:56 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da70248e
media-gfx/exact-image: subs deprecated function Closes: https://bugs.gentoo.org/940766 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> ...xact-image-1.2.1-r1.ebuild => exact-image-1.2.1-r2.ebuild} | 3 ++- media-gfx/exact-image/files/exact-image-1.2.1-libjxl-9.patch | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/media-gfx/exact-image/exact-image-1.2.1-r1.ebuild b/media-gfx/exact-image/exact-image-1.2.1-r2.ebuild similarity index 97% rename from media-gfx/exact-image/exact-image-1.2.1-r1.ebuild rename to media-gfx/exact-image/exact-image-1.2.1-r2.ebuild index 7480e98e5c79..ea33ddee2755 100644 --- a/media-gfx/exact-image/exact-image-1.2.1-r1.ebuild +++ b/media-gfx/exact-image/exact-image-1.2.1-r2.ebuild @@ -24,7 +24,7 @@ RDEPEND=" sys-libs/zlib expat? ( dev-libs/expat ) jpeg? ( media-libs/libjpeg-turbo:= ) - jpegxl? ( <media-libs/libjxl-0.9:= ) + jpegxl? ( media-libs/libjxl:= ) lua? ( ${LUA_DEPS} ) openexr? ( media-libs/openexr:= ) perl? ( dev-lang/perl ) @@ -47,6 +47,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-gcc6.patch "${FILESDIR}"/${PN}-1.0.2-g++.patch + "${FILESDIR}"/${P}-libjxl-9.patch ) src_prepare() { diff --git a/media-gfx/exact-image/files/exact-image-1.2.1-libjxl-9.patch b/media-gfx/exact-image/files/exact-image-1.2.1-libjxl-9.patch new file mode 100644 index 000000000000..520300b85146 --- /dev/null +++ b/media-gfx/exact-image/files/exact-image-1.2.1-libjxl-9.patch @@ -0,0 +1,11 @@ +--- a/codecs/jpegxl.cc 2024-10-06 17:58:07.684805110 +0200 ++++ b/codecs/jpegxl.cc 2024-10-06 17:58:23.929604759 +0200 +@@ -186,7 +186,7 @@ + } + + if (JXL_ENC_SUCCESS != +- JxlEncoderAddImageFrame(JxlEncoderOptionsCreate(enc.get(), nullptr), ++ JxlEncoderAddImageFrame(JxlEncoderFrameSettingsCreate(enc.get(), nullptr), + &pixel_format, image.getRawData(), + image.stride() * image.h)) { + std::cerr << "JxlEncoderAddImageFrame failed" << std::endl;
