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

6 files changed, 38 insertions, 7 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index f4d7079f2b2d..9fec25887bc6 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 3b53fd60d78e..bfff9e6c5238 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -15,7 +15,7 @@ EBUILD libaom-3.5.0.ebuild 3314 BLAKE2B 60443b958e7edf5345af61c71bfff8c8614ae51e
 EBUILD libaom-3.6.0.ebuild 4001 BLAKE2B 0f6af46ea95f891dc9ae55fb2fd276c304977dd9d0ce51ed72a3ba11ccec51e6f815e0f3466a10289e102b161a41440c71c0f3b78e4253ede4f7f17b3aa07147 SHA512 80c392f5721c6f913d7fc403f83354eb067f3d8d753b76d1905f82aee6fa430a87a0875070ffae7c6edda3e2529413c6577c8c0144ff38e98cc1973d1df44886
 EBUILD libaom-3.6.1.ebuild 4018 BLAKE2B d58bb60d356880b9f0f6d9d9262a05de51a4fe0ac563f92219219c0554d2de1d61fc24eba5fd55cc5fb7fc1a2d003a72ae375be4494964013bcacf865fe6edcc SHA512 ceb6ca17366b1b14c6b6cfa9d5caa0eb229c19bf43aca9c23c8637d1d156a286891ef851b00a1d0208680d240bb2ca1cbd9fcd1743ab9384c1ea09f4f12fabbb
 EBUILD libaom-3.7.0-r1.ebuild 4077 BLAKE2B 90d69ac4b74320819a390734af21bd1118455028aa300b92e42a524714f7be00f1561e694dfb62070c819974ae166387d111ba0eb4756cb6f70ac5e1c045759d SHA512 354d28904c1a4fe1ee70bfd8a48266556ac654dbe14c0fff1d72c81281246f94bf27957bf9c2481e9fcede85447626dd87e44f1be6bb4972a03162fe44e2132f
-EBUILD libaom-3.7.0-r2.ebuild 4343 BLAKE2B 20a64538bddaa926e9f54139a6f47f61fa29d6d05a6910d0527980621357560f5e57eb0c8598b8fe10086e956a9616563bd9b137e9b193f5764bd8b5e8640c8f SHA512 8fc026560907dfe488115f9ffa2465f98afa2bbcf86edb9b75e6b835da73140839b71a3db6cf299ff7713bcb21e54186112ddcbe19fd9327733be14efed02a44
+EBUILD libaom-3.7.0-r2.ebuild 4410 BLAKE2B 0fcd1e6f02ea4d8c7f724e0507a272acb017d7dbb5a1941cd0a4c47cac605aa0376c594f221625cf55c945c99cee1ea6c6ac099149884d06899edc395cf4529a SHA512 5c7a794b380751001aa7f501057762730240b0e5aec04d5c4bd4eada84731d4003c5fdabf428de6526ced5d8cea91ca9ac02ee970c728b4957ff85116e79f8dd
 EBUILD libaom-3.7.0.ebuild 4023 BLAKE2B aea1f5e374ba3075baa8e72e135fecf063743909f5aa972a1a9b1503be1868e0dad9ae10809a7905f87151f6cd3634104b4493fddf86ddc174b0581d5c971218 SHA512 9d8f6e81729c4c875b4d7d7b986547c68f1024ad01e21d2b16e95572b146c159b4f32196c9e5c8008f64079d03d8216e393c70ffefd9f2a121e918e1c39dd996
-EBUILD libaom-9999.ebuild 4262 BLAKE2B ff64524d8c291c8e8671be54748c6a3e82d7354631fc4cb6b0effb219da06d2c595345707016f09e50d362966923419fc7978ec4bcaa35a0be8c4874af2fb17c SHA512 f188a326fb4d4e5ae28c0c626896024c2765d8e93e0cb40cf95fd73605a1021f463b8f66268b58ccbeca00c8361312cf6f696d6dd64c250af78d6b89df2b0975
+EBUILD libaom-9999.ebuild 4328 BLAKE2B 2adc91033da9c8d66f719d1bd304d89e52d2989e49e96bd252cf428058ff925bc8e3836f51f907628c1ee397e1067d86d5b60e0eae2b3aa60ea63d0b4164980e SHA512 b51e9a9c82e343148223411d78d831db01236bce7376d10c74465f691ae87cad683fc64d551f1e5e01ed60a9a5ae72e4d9c0d0c30a9021a55c369d35a8b8d433
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/libaom-3.7.0-r2.ebuild b/media-libs/libaom/libaom-3.7.0-r2.ebuild
index 3fbef9beb31c..3db5707b362b 100644
--- a/media-libs/libaom/libaom-3.7.0-r2.ebuild
+++ b/media-libs/libaom/libaom-3.7.0-r2.ebuild
@@ -36,7 +36,7 @@ SLOT="0/3"
 IUSE="big-endian doc +examples test"
 IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3"
 IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
-IUSE="${IUSE} cpu_flags_arm_neon"
+IUSE="${IUSE} cpu_flags_arm_neon cpu_flags_ppc_vsx"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
@@ -91,6 +91,8 @@ multilib_src_configure() {
 		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF)
 		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
 		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+
+		-DENABLE_VSX=$(usex cpu_flags_ppc_vsx ON OFF)
 	)
 
 	# For 32-bit multilib builds, force some intrinsics on to work around
diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild
index 80b545dbde32..46033a771095 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-9999.ebuild
@@ -36,7 +36,7 @@ SLOT="0/3"
 IUSE="big-endian doc +examples test"
 IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3"
 IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
-IUSE="${IUSE} cpu_flags_arm_neon"
+IUSE="${IUSE} cpu_flags_arm_neon cpu_flags_ppc_vsx"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
@@ -88,6 +88,7 @@ multilib_src_configure() {
 		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF)
 		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
 		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+		-DENABLE_VSX=$(usex cpu_flags_ppc_vsx ON OFF)
 	)
 
 	# For 32-bit multilib builds, force some intrinsics on to work around
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
 }