gentoo auto-resync : 20:11:2023 - 11:14:01

2 files changed, 31 insertions, 3 deletions

diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 4f0ca41f7cd8..83c4d86d4102 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -6,5 +6,5 @@ DIST SDL2-2.28.5.tar.gz 7345355 BLAKE2B c96481bc02af6b6d077247238f7e46b0e3ec2166
 EBUILD libsdl2-2.28.1.ebuild 6444 BLAKE2B c1a1c122d0d4165afa8e93b1df6cbd7e69824a28af1d2b76cc688bcf1e8780c8e3d75692f056efdaeacf96657895f05c40dca6b0a507ff450f2d5f434ff4f2fa SHA512 64c6e52f5c5426c43d5dce68c1862fb71f3734d57759d9d22663e7aeaa8c94489b1db4e9ec15c909756b1e53e22e0642db18230f8525f6a09a32d031f5276d5a
 EBUILD libsdl2-2.28.3.ebuild 6447 BLAKE2B 1802df51a04eaab67d0f0ba7c1c3148ed987bcf58627c565fb043c44c8444c0535cc0f4c4c409f3ae1c095dd14506a5c43f058e77cb0ffa0eca5147e741c69b0 SHA512 5188884cc2bc58dee58467648d9ebba42353076c993ab8282dbfa8def81df914206fc66a3de2b6224115171706baf27f56913df242f3d55039054009cc8666e4
 EBUILD libsdl2-2.28.4-r1.ebuild 6504 BLAKE2B 7795100ed40b0b027b73a25cdb727f95def2215281acc5e5cdd5e24a6f4562189ccae8a4c352735475ac129e413fae842977701719af29cc08cb8b85a029d61e SHA512 513eca1677da2526f5f5c4968aa784c338ce06db08943a515081c69fa250aa62802ebf01f1b0808a0cc97f1fdd7e36e4d53531a41217830cda64a6ed6367030c
-EBUILD libsdl2-2.28.5.ebuild 6504 BLAKE2B 7795100ed40b0b027b73a25cdb727f95def2215281acc5e5cdd5e24a6f4562189ccae8a4c352735475ac129e413fae842977701719af29cc08cb8b85a029d61e SHA512 513eca1677da2526f5f5c4968aa784c338ce06db08943a515081c69fa250aa62802ebf01f1b0808a0cc97f1fdd7e36e4d53531a41217830cda64a6ed6367030c
+EBUILD libsdl2-2.28.5.ebuild 7307 BLAKE2B 5257084ae74dfedf49d90aa0df132d1665eada2dea6ac4e7cd8fce155b17407244f3387717c75526ab1cdfbd39a4d948c4572f48722777f5847c26e4fbfe411c SHA512 59d1a654e2120c836b768b2450a4e04f3a1269b9884b792c231f53dffb632626005bc186b6b2e680e827b952ca07cdd1ced425d4900614842a06b68b2c1f35a7
 MISC metadata.xml 2003 BLAKE2B b0233c893c0ee157dc23c5b85ac253e0e830955fdbc78f8698c7f1059182076d7d10d842469d50d40abcc8a176e0c356c43aa55def05e1a2048ec178732c5f2c SHA512 7f0e86d7a53ed52f6b8bf39c14e0170a255398fbbd5da6e1707bdcc2e1de20153f4e7a2433e247e5a80b93895f9225eed133cb3fef94526679ff3aab7892da47
diff --git a/media-libs/libsdl2/libsdl2-2.28.5.ebuild b/media-libs/libsdl2/libsdl2-2.28.5.ebuild
index e01e4f109cd0..b37d436cf46e 100644
--- a/media-libs/libsdl2/libsdl2-2.28.5.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.28.5.ebuild
@@ -15,7 +15,8 @@ LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
-IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver"
+IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	alsa? ( sound )
 	fcitx4? ( dbus )
@@ -110,6 +111,10 @@ src_prepare() {
 	# Unbundle some headers.
 	rm -r src/video/khronos || die
 	ln -s "${ESYSROOT}/usr/include" src/video/khronos || die
+	if ! use vulkan
+	then
+		sed -i '/testvulkan$(EXE) \\/d' "test/Makefile.in" || die
+	fi
 
 	# SDL seems to customize SDL_config.h.in to remove macros like
 	# PACKAGE_NAME. Add AT_NOEAUTOHEADER="yes" to prevent those macros from
@@ -202,13 +207,32 @@ multilib_src_configure() {
 		--disable-rpath
 		--disable-render-d3d
 		$(use_with X x)
+		ac_cv_header_libunwind_h=no
 	)
 
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if use test; then
+		# Most of these workarounds courtesy Debian
+		# https://salsa.debian.org/sdl-team/libsdl2/-/blob/debian/latest/debian/rules
+		local mytestargs=(
+			--x-includes="/usr/include"
+			--x-libraries="/usr/$(get_libdir)"
+			SDL_CFLAGS="-I${S}/include"
+			SDL_LIBS="-L${BUILD_DIR}/build/.libs -lSDL2"
+			ac_cv_lib_SDL2_ttf_TTF_Init=no
+			CFLAGS="${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+		)
+
+		mkdir "${BUILD_DIR}/test" || die
+		cd "${BUILD_DIR}/test" || die
+		ECONF_SOURCE="${S}/test" econf "${mytestargs[@]}"
+	fi
 }
 
 multilib_src_compile() {
-	emake V=1
+	emake all V=1
+	use test && emake -C test all V=1
 }
 
 src_compile() {
@@ -220,6 +244,10 @@ src_compile() {
 	fi
 }
 
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/build/.libs" emake -C test check V=1
+}
+
 multilib_src_install() {
 	emake DESTDIR="${D}" install
 }