5 files changed, 174 insertions, 3 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index dc4d1402cdb8..ffa3c4cc936a 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index 1bdf99d63ca5..f04c6547338a 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -13,5 +13,5 @@ DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb5
 DIST FreeImage3180.zip 7415716 BLAKE2B b695271f4e80eb304eccde66e38b5095eceae51fbe0dd97df69c55f364f8440d8c97139b8edc2f01c400f5c53a7336fdfab1e28aa3ea04f485901d5def443d25 SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
 DIST freeimage-3.18.0-unbundling.patch 20960 BLAKE2B 61ee63e7be0d5db7bf4a3bc053bb67f5a6ce6949ed252b1729e7542addd432d1105b7e70d834f05210be3c5c81a5378a2cb00d5b9d8e21590672a1ac6e1135fa SHA512 c56062099e17e8a16447fccc4bdf3089e7992273f1a09a2ff7f591b3bd68a8d1e80842400aaffdc8394ed64273e26a4f01e12fc8c55bb40d346db96eb5dcbe30
 EBUILD freeimage-3.18.0-r10.ebuild 3433 BLAKE2B 733f4af807476237cf4d79361b18da579b61bd62a0cc7e75ecee6da81f05249bf0bc5e0458890c7b9bd2cd30fac0835a9059ee4bdeb8ddff1546d1995008aeb7 SHA512 e0ce9af89f287d7fe03e325effc8240b6d4274552561c065b551dc0d77bb36f38a40874ad7a34115b3fcc3ce7d216566a1c324fa07081ceead11747b21e3fa6c
-EBUILD freeimage-3.18.0-r11.ebuild 3540 BLAKE2B 04a500e1fa5229c4002bf4800dfc58393d7ebf2aae8ee4da98da97a09c9a0c5651ae1f98779324614ef127aff5064c28d6fd25d7213dc395132bb28b2529da10 SHA512 881320f55ad44fa21772b38b72e3e84e9725efb3180404a7dac92653d6e7d42a3edfb98ce8f4a321c960944d54f0de7c742e7b7caf00bc1b5af08122bd37c758
+EBUILD freeimage-3.18.0-r11.ebuild 3539 BLAKE2B c518c96fa75087f7dccce63c9b4727dd0db80fba2e1596d64601618e19856be8346c867163dce57b83f9ecba9c11d2ea62b90858678bc1d69e2770bd6067dbb2 SHA512 7641236ae411fd37db367c2c9dae9a8cb910cc8161a0b0332a42bf81ee4fed488ace560bb14905b2595a2985ab1d2252c105f0b6e2548b8df2577bb71d09435e
 MISC metadata.xml 404 BLAKE2B 09c1635a36f53e8e3a48bd43d03d6cafaf9d511caf5bc3174fea2434970e1372eb1dbb979eb093e88078960c968cd578fcc4b74b67a34f55bf078f074ee97ab3 SHA512 d271f95c2295b4370c5434a172e838467daeab733399c26a1a730771ffae5a46bef879fd7e424b182177a2dd14f9abcc903cfa1c35052f84a2517f8803856836
diff --git a/media-libs/freeimage/freeimage-3.18.0-r11.ebuild b/media-libs/freeimage/freeimage-3.18.0-r11.ebuild
index 727d83891786..c07115b6c4f9 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r11.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 
 # The tiff/imath+openexr isn't a typo. The TIFF plugin cheats and
diff --git a/media-libs/vips/Manifest b/media-libs/vips/Manifest
index f3cf0e8b6a05..b52b593e4812 100644
--- a/media-libs/vips/Manifest
+++ b/media-libs/vips/Manifest
@@ -1,3 +1,5 @@
 DIST vips-8.15.1.tar.xz 18648116 BLAKE2B 734f9d6bba794cf01ef38de0f0ed25fe93d2924579bbe966de94739ff1c7309815924e8926a86f90d9138daeeb6fba255be4be41496c1725e44cb52f22873628 SHA512 41f81c3bcb49e570c548d47494b0b705c5dbf870e16d67a85098a00c3f198a6f04e43899d97f92efe9bfdd5cedde79f51cc112c6953574748e1905d91d083dfa
+DIST vips-8.15.2.tar.xz 18653840 BLAKE2B fa46d58d77ec835cbb7036764bcc40554a72c2d6a854adee31905d04cb189de131340f990b432293935bc8563236816d14fa45c08ba858de6b1be5ee3ea148ec SHA512 f746e4590f0105cb40dbb4ee35fe4b177acbf09d7fc4202f623812018030b9cfdfcbe585742724b35f40ef9b68717ebd015243f3db293086621d9eac3d89a5b2
 EBUILD vips-8.15.1.ebuild 4146 BLAKE2B 9457ec33ef8f637376dfa089572c1976a3af667dc370e47c3724265c6eb57b2a446d1e0267fa03bf64da7fd6d1e081d832fd8a62ed1329f0b7eb7a0a57850ee8 SHA512 ea55af487b52230a364b3f7f78b92a6be748493f3be7f5411bb67172132748a42053aed22f19d4691bde5344067d18c55ba0692ed9bf74a601c36a6fa223b143
+EBUILD vips-8.15.2.ebuild 4184 BLAKE2B 66178158da5a9c4907ea07fd3b7901a8c29a6ef536506577c07267e7ec775083bc8c77c173bc9f07fb1a73f0ff51aff2befb5c9a08ba029bc5ef9563e0d2f010 SHA512 7f5081aac076c3dd52d1fbb6f92688f1439310a3cf1f89b45ea0d674b3f2c15e2185901c5aca73c1f4aac20d716a26b928739836ec6df37996257d1d5c5d47df
 MISC metadata.xml 1040 BLAKE2B c8af14c5f65716cb6dfa16319ac8411cde2151f846c9fe7ab8ac0484a032d4c9d11e03e0ab82c1817f26e70194df7b88f5fad2e7b8998c951238449ff8f1e9e2 SHA512 d00ecc6c916d40a2b3ac3fd64ce2089afa75261f8c388d65cd6c12ad72c327e8c56df26f0d46285ed39088fb457447970ca8d16141adb4febfd8057755f30f76
diff --git a/media-libs/vips/vips-8.15.2.ebuild b/media-libs/vips/vips-8.15.2.ebuild
new file mode 100644
index 000000000000..1334fa469c63
--- /dev/null
+++ b/media-libs/vips/vips-8.15.2.ebuild
@@ -0,0 +1,169 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit flag-o-matic meson python-single-r1 toolchain-funcs vala
+
+MY_PV=${PV}a # cleanup next bump
+
+DESCRIPTION="VIPS Image Processing Library"
+HOMEPAGE="https://libvips.github.io/libvips/"
+SRC_URI="https://github.com/libvips/libvips/releases/download/v${MY_PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+ MIT"
+SLOT="0/42" # soname
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="
+	archive deprecated doc exif fftw fits fontconfig graphicsmagick
+	gtk-doc heif +highway imagemagick imagequant +introspection +jpeg
+	jpeg2k jpegxl lcms matio openexr orc pango pdf +png python svg
+	test tiff vala webp
+"
+REQUIRED_USE="
+	fontconfig? ( pango )
+	graphicsmagick? ( imagemagick )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( jpeg png webp )
+	vala? ( introspection )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/expat
+	virtual/libintl
+	archive? ( app-arch/libarchive:= )
+	exif? ( media-libs/libexif )
+	fftw? ( sci-libs/fftw:3.0= )
+	fits? ( sci-libs/cfitsio:= )
+	fontconfig? ( media-libs/fontconfig )
+	heif? ( media-libs/libheif:= )
+	highway? ( >=dev-cpp/highway-1.0.5 )
+	!highway? (
+		orc? ( dev-lang/orc )
+	)
+	imagemagick? (
+		graphicsmagick? ( media-gfx/graphicsmagick:= )
+		!graphicsmagick? ( media-gfx/imagemagick:= )
+	)
+	imagequant? ( media-gfx/libimagequant )
+	introspection? ( dev-libs/gobject-introspection )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( media-libs/openjpeg:= )
+	jpegxl? ( media-libs/libjxl:= )
+	lcms? ( media-libs/lcms:2 )
+	matio? ( sci-libs/matio:= )
+	openexr? ( media-libs/openexr:= )
+	pango? (
+		x11-libs/cairo
+		x11-libs/pango
+	)
+	pdf? (
+		app-text/poppler[cairo]
+		x11-libs/cairo
+	)
+	png? ( media-libs/libpng:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
+	)
+	svg? (
+		gnome-base/librsvg:2
+		sys-libs/zlib:=
+		x11-libs/cairo
+	)
+	tiff? ( media-libs/tiff:= )
+	webp? ( media-libs/libwebp:= )
+"
+DEPEND="
+	${RDEPEND}
+	pango? ( x11-base/xorg-proto )
+	pdf? ( x11-base/xorg-proto )
+	svg? ( x11-base/xorg-proto )
+	test? (
+		tiff? ( media-libs/tiff[jpeg] )
+	)
+"
+BDEPEND="
+	dev-util/glib-utils
+	sys-devel/gettext
+	doc? (
+		app-text/doxygen
+		media-gfx/graphviz
+	)
+	gtk-doc? ( dev-util/gtk-doc )
+	python? ( ${PYTHON_DEPS} )
+	vala? ( $(vala_depend) )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	use vala && vala_setup
+
+	sed -i "s/'vips-doc'/'${PF}'/" cplusplus/meson.build || die
+
+	sed -i "/subdir('fuzz')/d" meson.build || die
+}
+
+src_configure() {
+	# workaround for bug in lld (bug #921728)
+	tc-ld-is-lld && filter-lto
+
+	local emesonargs=(
+		$(meson_use deprecated)
+		$(meson_use doc doxygen)
+		-Dexamples=false
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use vala vapi)
+		-Dcgif=disabled # not packaged, and not used to view gif (only saving)
+		$(meson_feature archive)
+		$(meson_feature exif)
+		$(meson_feature fftw)
+		$(meson_feature fits cfitsio)
+		$(meson_feature fontconfig)
+		$(meson_feature heif)
+		$(meson_feature highway)
+		$(meson_feature imagemagick magick)
+		-Dmagick-package=$(usex graphicsmagick GraphicsMagick MagickCore)
+		$(meson_feature imagequant)
+		$(meson_feature introspection)
+		$(meson_feature jpeg)
+		$(meson_feature jpeg2k openjpeg)
+		$(meson_feature jpegxl jpeg-xl)
+		$(meson_feature lcms)
+		$(meson_feature matio)
+		-Dnifti=disabled # not packaged
+		$(meson_feature openexr)
+		-Dopenslide=disabled # not packaged
+		$(meson_feature orc) # no-op if USE=highway is set
+		$(meson_feature pango pangocairo)
+		-Dpdfium=disabled # not packaged, can use poppler instead
+		$(meson_feature png)
+		$(meson_feature pdf poppler)
+		-Dquantizr=disabled # not packaged, can use imagequant instead
+		-Dspng=disabled # not packaged, can use libpng instead
+		$(meson_feature svg rsvg)
+		$(meson_feature tiff)
+		$(meson_feature webp)
+		$(meson_feature svg zlib) # zlib is currently only used by svgload.c
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use python; then
+		python_fix_shebang "${ED}"/usr/bin/vipsprofile
+	else
+		rm -- "${ED}"/usr/{bin/vipsprofile,share/man/man1/vipsprofile.1} || die
+	fi
+}