gentoo auto-resync : 20:02:2025 - 00:15:26

4 files changed, 138 insertions, 70 deletions

diff --git a/media-libs/sdl2-image/Manifest b/media-libs/sdl2-image/Manifest
index 732ded85faad..b096a61b24d8 100644
--- a/media-libs/sdl2-image/Manifest
+++ b/media-libs/sdl2-image/Manifest
@@ -1,8 +1,8 @@
-DIST SDL2_image-2.0.5_p20210328.tar.gz 12397062 BLAKE2B ae4fe8c30b21bc7dca87e2e78cab43c83e891630962eb020c29ba84c2b206bb749491dccddd8bcc212f2fd07da651691151baf41212fb5ea954427543e3bf994 SHA512 9ba0b671dedfb7bde072424cebfa7d65e79d2d58416833d84548777aff6bf0edda8dbe30c3e423bbb724f794b4b191e609b148f38573b4166eef31203ab0005d
 DIST SDL2_image-2.6.3.tar.gz 9816720 BLAKE2B 24662637e4f621af83d9a66d1cca954549030be97fa47f4b8fc711b2a941eaa409cf99ede137eb91d25999af253791dcfb2d9229080d30ede84cc32d5c5ae997 SHA512 11f1d041a052829708560b6211a2a00b3a1ce26a6f23cb389f57fa5254372027e97d3a6ffe551134a77bc33718c3acea3df21fe8426e93a2b1955176c47c7647
 DIST SDL2_image-2.8.2.tar.gz 11362515 BLAKE2B 8bc8967eed7203ddbd23062e257ae8768eeb28e8efa57bac86db0224a7cdc94dfbb10c6da77dab9c1847f216ec761fae5b7bd5d8ed25c6b3c69ad972dc93ddf5 SHA512 0ff345824f95158dfa72f83f9d4a540601c178cd759334bf849c14a2920b5330d0763413b58c08b3deba8d3a4ccb6ea2a8159f87efe4cbb0e8ea850f63d09454
-EBUILD sdl2-image-2.0.5_p20210328-r1.ebuild 1759 BLAKE2B 5258f7b8c423b2414cdfb4217773bc7fbc2de1fe5c81e47c0f474872393da2a38846fa82903bb640bfe0c0b34174ba4a11882d040e2ffe3b6a1d68404812c867 SHA512 16fc0227ca0c984330853451ee115c6da0921e7cc1390100dc5d80786d598da4137b7dbb5b30cbee0d071957c2b6296971db3365e91601849e0a9122961f0495
+DIST SDL2_image-2.8.5.tar.gz 6874736 BLAKE2B 3907daa3531fc6188c1991ecd6710634b9dfe5567cf73fbb3e84ec79a74b821fdabdf7c716da84d4f25dcb64a44bf2961063f069f57420f4dc94cae724caab49 SHA512 593f881aeaab0920df5767e77c1f7ae6daa5ea7682810f1b649645761c00ceff0533a887bdcfe2c5b226e838b19ffa7fb12df8c904746c318bd4bface96dac43
 EBUILD sdl2-image-2.6.3-r1.ebuild 1941 BLAKE2B 7a62c49b1aae533616fa9dfab092e9513c5fefd1ea2495917e645df05071842f35cc795f898e1e1cec0e9383d8a89d2b54d1f834481650407ba227b99e69cd0e SHA512 e3906f4bccdea0a485b8956ba249a431a7baeaadfad92152038274127617f98c3ea941adc28d88799a5a5943fe5e331979cdb7a345bfd8a7846b75f317b1ef33
 EBUILD sdl2-image-2.6.3.ebuild 1814 BLAKE2B 884b22844c80f1d7f8e0b4360616f04904bb711a8730ee7962a8f76af2fc048276e18333bc2f582f5afa75dc2bb913ef0b869021d7dd3e38073005a4ed044fe3 SHA512 60291c3eb4500e3937676c6d3b34963b50d17500ef6008259bc3eb02adb8c2e4dae03f578db22bf9176778fe2031f3d57a5e0ab39acfc050c5b585aa2d21f773
 EBUILD sdl2-image-2.8.2.ebuild 2042 BLAKE2B 032e8a8fe1e419b38299171bee124d6c70d01c511f4257f60e0845382d3d87c4d27088deb2287bd2d78b15e3f95c7478e6ff4a86cfa492cc4122ccd3caf5b00e SHA512 75513a544d6ddc4c5b9cd372c418648cd698960f11f524cceaa846605e33eaaa577488b1793630a3d99d1bd887454970bb25b02a0ecbdac253fa0cc3be60f6ab
-MISC metadata.xml 407 BLAKE2B 122a2c297d075149603d7459f0e871213c975e19ddbcf4769cbba637c1de3b6758723e0e251c3f40b11b6d9cbc479cd3f6af6825d4f04ee35f7322d52ab187e9 SHA512 ee9a456a63a91542e2a9c635bc1c69e2a93c1f80eb525b898359e8b735b79e1e927f6a8b23ed55a99497e2459480b746252dd5dc295a4e6c421becaf9ebe62eb
+EBUILD sdl2-image-2.8.5.ebuild 3990 BLAKE2B b824ae2b8268c7143df2fd5776bfefb5114630004f8fd07163e4a30135fe671baf1c660a1719a0e1016dcb3c88995f646d931377d303b4816e8eab746a098a7c SHA512 eaa7dec8f4f11bc6e53bd75233815c08e19efae1f9273db3f125549e18d46a8ad7202e28989c341abc71de6a87cb2c9e0e1382fb3efb9d3352d007548b38bec1
+MISC metadata.xml 476 BLAKE2B be2ea088e9507cbfcb75c8d9a932056adf8e1d7390dbae3ca66270beb2d1e74a4ef19c190c6093c33536a3675c5ed2f9b9c6043a455b8b2ebbc766647aa714b3 SHA512 1df88195badb12ca5896678ef4a5431d1badf90f032bcb03430efc0d22537c3b15d99834f14733b85527eb3b081c726d46dad3aa83edabb2e78ee1ecea1e8800
diff --git a/media-libs/sdl2-image/metadata.xml b/media-libs/sdl2-image/metadata.xml
index ba95051be881..7bc0ccaf0f65 100644
--- a/media-libs/sdl2-image/metadata.xml
+++ b/media-libs/sdl2-image/metadata.xml
@@ -5,6 +5,9 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<use>
+		<flag name="samples">Install sample programs</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">libsdl-org/SDL_image</remote-id>
 		<bugs-to>https://github.com/libsdl-org/SDL_image/issues</bugs-to>
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.5_p20210328-r1.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.5_p20210328-r1.ebuild
deleted file mode 100644
index 7d4fd801f434..000000000000
--- a/media-libs/sdl2-image/sdl2-image-2.0.5_p20210328-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib multilib-minimal toolchain-funcs
-
-MY_P="SDL2_image-${PV}"
-MY_COMMIT="f36684864e82538da2d2cf57fa3db077a3be42c7"
-DESCRIPTION="Image file loading library"
-HOMEPAGE="https://www.libsdl.org/projects/SDL_image/"
-SRC_URI="https://github.com/libsdl-org/SDL_image/archive/${MY_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="gif jpeg png static-libs tiff webp"
-
-RDEPEND="
-	>=media-libs/libsdl2-2.0.9[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
-	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-3.9.7-r1:=[${MULTILIB_USEDEP}] )
-	webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )"
-DEPEND=${RDEPEND}
-
-S=${WORKDIR}/SDL_image-${MY_COMMIT}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		--disable-sdltest
-		--enable-bmp
-		$(use_enable gif)
-		$(use_enable jpeg jpg)
-		--disable-jpg-shared
-		--enable-lbm
-		--enable-pcx
-		$(use_enable png)
-		--disable-png-shared
-		--enable-pnm
-		--enable-tga
-		$(use_enable tiff tif)
-		--disable-tif-shared
-		--enable-xcf
-		--enable-xpm
-		--enable-xv
-		$(use_enable webp)
-		--disable-webp-shared
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake OBJC="$(tc-getCC)"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi && newbin .libs/showimage$(get_exeext) showimage2$(get_exeext)
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,README}.txt
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/media-libs/sdl2-image/sdl2-image-2.8.5.ebuild b/media-libs/sdl2-image/sdl2-image-2.8.5.ebuild
new file mode 100644
index 000000000000..f0c42e91997c
--- /dev/null
+++ b/media-libs/sdl2-image/sdl2-image-2.8.5.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib multibuild
+
+MY_P="SDL2_image-${PV}"
+DESCRIPTION="Image file loading library"
+HOMEPAGE="https://www.libsdl.org/projects/SDL_image/"
+SRC_URI="https://github.com/libsdl-org/SDL_image/releases/download/release-${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~sparc ~x86"
+IUSE="avif gif jpeg jpegxl png samples static-libs test tiff webp"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( jpeg png )"
+
+RDEPEND="
+	>=media-libs/libsdl2-2.0.9[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	avif? ( >=media-libs/libavif-1.0.0:=[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+	jpegxl? ( media-libs/libjxl:=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.7-r1:=[${MULTILIB_USEDEP}] )
+	webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( shared-libs $(usev static-libs) )
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# 1. Install non standard license installation
+	# 2/3. Add suffixes to sample programs
+	sed -i \
+		-e '/install(FILES "LICENSE.txt"/,/\s)$/d' \
+		-e 's/\(\W\)showanim\(\W\)/\1showanim2\2/' \
+		-e 's/\(\W\)showimage\(\W\)/\1showimage2\2/' \
+		CMakeLists.txt || die
+}
+
+multilib_src_configure() {
+	# hack because because of layered multibuilds
+	if [[ -n ${is_shared} ]]; then
+		mycmakeargs+=( -DSDL2IMAGE_SAMPLES=$(multilib_native_usex samples) )
+	fi
+	cmake_src_configure
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=(
+			-DSDL2IMAGE_AVIF=$(usex avif)
+			-DSDL2IMAGE_BMP=ON
+			-DSDL2IMAGE_GIF=$(usex gif)
+			-DSDL2IMAGE_JPG=$(usex jpeg)
+			-DSDL2IMAGE_JXL=$(usex jpegxl)
+			-DSDL2IMAGE_LBM=ON
+			-DSDL2IMAGE_PCX=ON
+			-DSDL2IMAGE_PNG=$(usex png)
+			-DSDL2IMAGE_PNM=ON
+			-DSDL2IMAGE_QOI=ON
+			-DSDL2IMAGE_SVG=ON
+			-DSDL2IMAGE_TGA=ON
+			-DSDL2IMAGE_TIF=$(usex tiff)
+			-DSDL2IMAGE_WEBP=$(usex webp)
+			-DSDL2IMAGE_XCF=ON
+			-DSDL2IMAGE_XPM=ON
+			-DSDL2IMAGE_XV=ON
+
+			# change?
+			-DSDL2IMAGE_BACKEND_STB=OFF
+			-DSDL2IMAGE_DEPS_SHARED=OFF
+			-DSDL2IMAGE_SAMPLES_INSTALL=ON
+			-DSDL2IMAGE_TESTS=$(usex test)
+			-DSDL2IMAGE_TESTS_INSTALL=OFF
+			-DSDL2IMAGE_VENDORED=OFF
+		)
+		if [[ "${MULTIBUILD_VARIANT}" == "shared-libs" ]]; then
+			mycmakeargs+=( -DBUILD_SHARED_LIBS=ON )
+			local is_shared=1
+		else
+			mycmakeargs+=(
+				-DBUILD_SHARED_LIBS=OFF
+				-DSDL2IMAGE_SAMPLES=OFF
+			)
+		fi
+
+		cmake-multilib_src_configure
+	}
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake-multilib_src_compile
+}
+
+src_test() {
+	# https://github.com/libsdl-org/SDL_image/tree/main/test#asserting-format-support
+	# Match same order as src_configure. The intent is to catch build system
+	# bugs, so it may need updating sometimes for legitimate changes in
+	# sdl2-image support.
+	local -x SDL_IMAGE_TEST_REQUIRE_{LOAD,SAVE}_AVIF=$(usex avif 1 0)
+	local -x SDL_IMAGE_TEST_REQUIRE_LOAD_BMP=1
+	local -x SDL_IMAGE_TEST_REQUIRE_LOAD_GIF=$(usex gif 1 0)
+	local -x SDL_IMAGE_TEST_REQUIRE_{LOAD,SAVE}_JPG=$(usex jpeg 1 0)
+	local -x SDL_IMAGE_TEST_REQUIRE_{LOAD,SAVE}_JXL=$(usex jpegxl 1 0)
+	local -x SDL_IMAGE_TEST_REQUIRE_{LOAD,SAVE}_LBM=1
+	local -x SDL_IMAGE_TEST_REQUIRE_LOAD_PCX=1
+	local -x SDL_IMAGE_TEST_REQUIRE_{LOAD,SAVE}_PNG=$(usex png 1 0)
+	local -x SDL_IMAGE_TEST_REQUIRE_LOAD_QOI=1
+	local -x SDL_IMAGE_TEST_REQUIRE_LOAD_SVG=1
+	local -x SDL_IMAGE_TEST_REQUIRE_LOAD_TGA=1
+	local -x SDL_IMAGE_TEST_REQUIRE_LOAD_TIF=$(usex tiff 1 0)
+	local -x SDL_IMAGE_TEST_REQUIRE_LOAD_WEBP=$(usex webp 1 0)
+	local -x SDL_IMAGE_TEST_REQUIRE_LOAD_XCF=1
+	local -x SDL_IMAGE_TEST_REQUIRE_LOAD_XPM=1
+	local -x SDL_IMAGE_TEST_REQUIRE_LOAD_XV=1
+
+	multibuild_foreach_variant cmake-multilib_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant cmake-multilib_src_install
+}