summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonen Wolkens <ionen@gentoo.org>2023-12-01 11:47:31 -0500
committerIonen Wolkens <ionen@gentoo.org>2023-12-01 11:47:43 -0500
commit99a1d81656e1272b443063867b09683b5d1162bd (patch)
tree23eca6bd2bd1ac10bd592894870d15e26e5505e4
parentapp-admin/entr: remove unused patch(es) (diff)
downloadgentoo-99a1d81656e1272b443063867b09683b5d1162bd.tar.gz
gentoo-99a1d81656e1272b443063867b09683b5d1162bd.tar.bz2
gentoo-99a1d81656e1272b443063867b09683b5d1162bd.zip
media-libs/vips: fix build with USE=-jpeg
Closes: https://bugs.gentoo.org/918954 Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
-rw-r--r--media-libs/vips/files/vips-8.15.0-disabled-jpeg.patch18
-rw-r--r--media-libs/vips/vips-8.15.0.ebuild4
2 files changed, 22 insertions, 0 deletions
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 <ionen@gentoo.org>
+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
}