commit: 99a1d81656e1272b443063867b09683b5d1162bd Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Fri Dec 1 16:47:31 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Fri Dec 1 16:47:43 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99a1d816
media-libs/vips: fix build with USE=-jpeg Closes: https://bugs.gentoo.org/918954 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> media-libs/vips/files/vips-8.15.0-disabled-jpeg.patch | 18 ++++++++++++++++++ media-libs/vips/vips-8.15.0.ebuild | 4 ++++ 2 files changed, 22 insertions(+) diff --git a/media-libs/vips/files/vips-8.15.0-disabled-jpeg.patch b/media-libs/vips/files/vips-8.15.0-disabled-jpeg.patch new file mode 100644 index 000000000000..47f2a4685aa9 --- /dev/null +++ b/media-libs/vips/files/vips-8.15.0-disabled-jpeg.patch @@ -0,0 +1,18 @@ +https://bugs.gentoo.org/918954 +https://github.com/libvips/libvips/pull/3772 +From: Ionen Wolkens <[email protected]> +Date: Fri, 1 Dec 2023 11:33:13 -0500 +Subject: [PATCH] Sync vips__jpeg_region_write_target definitions + +Prevents a build failure in the off-chance jpeg was disabled. +--- a/libvips/foreign/vips2jpeg.c ++++ b/libvips/foreign/vips2jpeg.c +@@ -1035,7 +1035,7 @@ vips__jpeg_region_write_target(VipsRegion *region, VipsRect *rect, + VipsTarget *target, + int Q, const char *profile, + gboolean optimize_coding, gboolean progressive, +- gboolean strip, gboolean trellis_quant, ++ VipsForeignKeep keep, gboolean trellis_quant, + gboolean overshoot_deringing, gboolean optimize_scans, + int quant_table, VipsForeignSubsample subsample_mode, + int restart_interval) diff --git a/media-libs/vips/vips-8.15.0.ebuild b/media-libs/vips/vips-8.15.0.ebuild index a7cf33376ada..bbf67050980e 100644 --- a/media-libs/vips/vips-8.15.0.ebuild +++ b/media-libs/vips/vips-8.15.0.ebuild @@ -96,6 +96,10 @@ BDEPEND=" vala? ( $(vala_depend) ) " +PATCHES=( + "${FILESDIR}"/${P}-disabled-jpeg.patch +) + pkg_setup() { use python && python-single-r1_pkg_setup }
