gentoo auto-resync : 01:12:2023 - 23:01:08

3 files changed, 24 insertions, 1 deletions

diff --git a/media-libs/vips/Manifest b/media-libs/vips/Manifest
index 05749253b33a..554f1333c004 100644
--- a/media-libs/vips/Manifest
+++ b/media-libs/vips/Manifest
@@ -1,5 +1,6 @@
+AUX vips-8.15.0-disabled-jpeg.patch 766 BLAKE2B a385afa943ef6c9db9f374526f1eccc33a4edd0e302fb42644ad3f7089601aaa61ced020c1b2d080c4ed017d025e74141eab1648ae1235dd0f190abba5996e33 SHA512 ccfdb443ed03ee96052ddb97b1f7f07261ec7014950a9312f931f4adf62566f31263fd5860a8f59df74b4cbd0f17ace7ed52ff7345359efe6e01248930c15f76
 DIST vips-8.14.5.tar.xz 18652928 BLAKE2B 033359fcb7e52ec11daf7cf85641789e3c4b858644bce6290742920cbee8a1d8bc2f56ffdcd52ccb6d4da9f8bf24fbab626e121bba063eb97201af28eb440d57 SHA512 ceea6e4d378ac99eb026293e91da530b91febbd5d775b57ab807bcd60f39ca44a088161a713e31b972694d3797d4acaa97028f0e1d3ce4d9db7f8078c005dbe1
 DIST vips-8.15.0.tar.xz 18653932 BLAKE2B 3c5dfbf12de1d2fce5a0d1e11311d20d9f431276c42a72a9cbd4229ad9abbc2af3549c2b12934f1baefce688170346ae4b68f8c5bbbc07be005f44167d81e277 SHA512 2b5ba9529c3bb9c0fb80ef19dc958ba272611599a1e56395b4516c5dc66981b7a2dfea1039437843dc16f22f8d15a5a6233ec673c796d195154717d2d5167f67
 EBUILD vips-8.14.5.ebuild 3893 BLAKE2B 0c2fbaa24eba581df5ebd09a30a2500affecf86305896fc3d3ab55fb3f083c9b0bdf172f5af6c655b2a580a389bdd58a776982226cf05def6feecade45eef93a SHA512 2e8eadf3378d3a0af5a8e0979ce36cde821cd30905c374d315c318e85f234c4d7332653ded7a54d68c92831f2ebf127a580dcf32b61ecd567cd71f594bef9c8a
-EBUILD vips-8.15.0.ebuild 4031 BLAKE2B 88635e2dd4a40f9fba23629185db0659ed84488ed9e753a4827055b8daaf3d2da2016d9d6320ad17af8a28589ce48b8fe122a810c0ab9a06cb5508ba4d0472df SHA512 df436e171540b282dc06ebc95d22e7ce917942869c91b37074d2e761ea2f30c2834ad58f92e582c17ab6607c542c11e7b17b7e66498d0069f3deecff4b4a020e
+EBUILD vips-8.15.0.ebuild 4084 BLAKE2B cc3ddc73123431d348474571e97cd68e01b9796f0183d95ec82dcc0e7093ebe5b141e53815d2a5c1066cb6197d311fd79c00860fb5f3d4bc5f3e38053ade3c75 SHA512 3312eb86fd27f31d16940cc3f2878e09d4320540c213f34e1b7336011a90b112b62eb92d76c5bc3f635e4ac068ce394b813763bf2e98d97f246d0402f749ec75
 MISC metadata.xml 1138 BLAKE2B d9730c955f74f4ede8d780f623b2ee9bc2220b68bbd6da1ee3e8521b2e56a56c435cc41ca3e3761485c6d3176c6de8091c1b18d042b0a6bfe47e6a6f3c8a09dd SHA512 28bf03b63f631e0d9bd7450a2275129d504d04c09523dd2efdf1f234380192538da82a8614f4344e7efdda9fd45c955b6d0fa6915753135b837bad4af0089bde
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
 }