5 files changed, 238 insertions, 2 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 2c8790f004e7..63fc38da1729 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 135f1856eaf2..4f0ca41f7cd8 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -2,7 +2,9 @@ AUX libsdl2-2.0.16-static-libs.patch 2118 BLAKE2B 836fabd17be1520ad76baaf92a0ad3
 DIST SDL2-2.28.1.tar.gz 8109697 BLAKE2B c32537d42108dd75ea4f2ba907d6b045ba18d6be29f76a6f8a2f45400d069b0d43223a8855ba3103fa53c3b9d886b2e542133bcce1cd6cfcf5b17800dd5f9911 SHA512 1d5c1912c2a6d606b465938365a56ba5202367c47c6c88d303f4838f0c37826fe14aecbf588a3e86fa996d7118bd831f69559d2cc22c01bc4dbe56d03c5223b1
 DIST SDL2-2.28.3.tar.gz 7340914 BLAKE2B 1ef8950b7736fbbca4607ed9750114f94b8e6e944b2974941840c13b1677643126524cc41ad8c3ead699ea2f90295898888d3d0b31c7a80079420aa9187035fb SHA512 fb7ad4a41e85de3fcb414a3a3d19c3f61e286790a4936004d30025a8472a3f40f9fccf1241cf5cb34f48091567de65df463442fc2ce398ac85e51dbe677251e7
 DIST SDL2-2.28.4.tar.gz 7344208 BLAKE2B 03d1fec4c9c43d5b906ec9fafd69b75040f7c80696d9097b03c33a93760e579ff677b1dd9385c77d44209a5a8dbb295074d47595b8a2e39f00bc11ad32b7f154 SHA512 16950ccedcfdef42ee6eba1a6bf09ed7231ea0205fe8600388de2aed1aba94da2e5450d16e9732dce9f12569a238730b3727bf64b8699f1fed4cb3c5c94c3eaa
+DIST SDL2-2.28.5.tar.gz 7345355 BLAKE2B c96481bc02af6b6d077247238f7e46b0e3ec216664584add29cafb0a91d06dc6ddc637a01519dbd7182d4fa59cfaf26ad6733f72583021cf65849416f9c4b698 SHA512 12593eb78fcca877a8dfb78cf21a4e6feba7dc87c964de378ac462b36d8e41ecb587222cb41d5f56dd35b838e1b9867b8ae0cf2f4d2a01afaf23ac8c11edc84d
 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
 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
new file mode 100644
index 000000000000..e01e4f109cd0
--- /dev/null
+++ b/media-libs/libsdl2/libsdl2-2.28.5.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multilib-minimal
+
+MY_P="SDL2-${PV}"
+DESCRIPTION="Simple Direct Media Layer"
+HOMEPAGE="https://www.libsdl.org/"
+SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+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"
+REQUIRED_USE="
+	alsa? ( sound )
+	fcitx4? ( dbus )
+	gles1? ( video )
+	gles2? ( video )
+	haptic? ( joystick )
+	ibus? ( dbus )
+	jack? ( sound )
+	nas? ( sound )
+	opengl? ( video )
+	pulseaudio? ( sound )
+	sndio? ( sound )
+	vulkan? ( video )
+	wayland? ( gles2 )
+	xscreensaver? ( X )
+"
+
+COMMON_DEPEND="
+	virtual/libiconv[${MULTILIB_USEDEP}]
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	fcitx4? ( app-i18n/fcitx:4 )
+	gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1] )
+	gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
+	ibus? ( app-i18n/ibus )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	kms? (
+		>=x11-libs/libdrm-2.4.82[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm(+)]
+	)
+	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
+	nas? (
+		>=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
+		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+	)
+	opengl? (
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+	)
+	pipewire? ( media-video/pipewire:=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
+	udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.20[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2,wayland]
+		>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-6.0.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	vulkan? ( media-libs/vulkan-loader )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+	vulkan? ( dev-util/vulkan-headers )
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	wayland? ( >=dev-util/wayland-scanner-1.20 )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/SDL2/SDL_config.h
+	/usr/include/SDL2/SDL_platform.h
+	/usr/include/SDL2/begin_code.h
+	/usr/include/SDL2/close_code.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.16-static-libs.patch
+)
+
+src_prepare() {
+	default
+
+	# Unbundle some headers.
+	rm -r src/video/khronos || die
+	ln -s "${ESYSROOT}/usr/include" src/video/khronos || die
+
+	# SDL seems to customize SDL_config.h.in to remove macros like
+	# PACKAGE_NAME. Add AT_NOEAUTOHEADER="yes" to prevent those macros from
+	# being reintroduced.
+	# https://bugs.gentoo.org/764959
+	AT_NOEAUTOHEADER="yes" AT_M4DIR="${BROOT}/usr/share/aclocal acinclude" \
+		eautoreconf
+}
+
+multilib_src_configure() {
+	use custom-cflags || strip-flags
+
+	if use ibus; then
+		local -x IBUS_CFLAGS="-I${ESYSROOT}/usr/include/ibus-1.0 -I${ESYSROOT}/usr/include/glib-2.0 -I${ESYSROOT}/usr/$(get_libdir)/glib-2.0/include"
+	fi
+
+	# sorted by `./configure --help`
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		--enable-system-iconv
+		--enable-atomic
+		$(use_enable sound audio)
+		$(use_enable video)
+		--enable-render
+		--enable-events
+		$(use_enable joystick)
+		$(use_enable haptic)
+		--enable-power
+		--enable-filesystem
+		$(use_enable threads pthreads)
+		--enable-timers
+		--enable-file
+		--enable-loadso
+		--enable-cpuinfo
+		--enable-assembly
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_sse ssemath)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_3dnow 3dnow)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable oss)
+		$(use_enable alsa)
+		--disable-alsa-shared
+		$(use_enable jack)
+		--disable-jack-shared
+		--disable-esd
+		$(use_enable pipewire)
+		--disable-pipewire-shared
+		$(use_enable pulseaudio)
+		--disable-pulseaudio-shared
+		--disable-arts
+		$(use_enable libsamplerate)
+		--disable-libsamplerate-shared
+		--disable-werror
+		$(use_enable nas)
+		--disable-nas-shared
+		$(use_enable sndio)
+		--disable-sndio-shared
+		$(use_enable sound diskaudio)
+		$(use_enable sound dummyaudio)
+		$(use_enable wayland video-wayland)
+		--disable-wayland-shared
+		$(use_enable video_cards_vc4 video-rpi)
+		$(use_enable X video-x11)
+		--disable-x11-shared
+		$(use_enable X video-x11-xcursor)
+		$(use_enable X video-x11-xdbe)
+		$(use_enable X video-x11-xfixes)
+		$(use_enable X video-x11-xinput)
+		$(use_enable X video-x11-xrandr)
+		$(use_enable xscreensaver video-x11-scrnsaver)
+		$(use_enable X video-x11-xshape)
+		$(use_enable aqua video-cocoa)
+		--disable-video-directfb
+		--disable-fusionsound
+		--disable-fusionsound-shared
+		$(use_enable kms video-kmsdrm)
+		--disable-kmsdrm-shared
+		$(use_enable video video-dummy)
+		$(use_enable opengl video-opengl)
+		$(use_enable gles1 video-opengles1)
+		$(use_enable gles2 video-opengles2)
+		$(use_enable vulkan video-vulkan)
+		$(use_enable udev libudev)
+		$(use_enable dbus)
+		$(use_enable fcitx4 fcitx)
+		$(use_enable ibus)
+		--disable-directx
+		--disable-rpath
+		--disable-render-d3d
+		$(use_with X x)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use doc; then
+		cd docs || die
+		doxygen || die
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# Do not delete the static .a libraries here as some are
+	# mandatory. They may be needed even when linking dynamically.
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	dodoc {BUGS,CREDITS,README-SDL,TODO,WhatsNew}.txt README.md docs/README*.md
+	use doc && dodoc -r docs/output/html/
+}
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 21ffc8cc3537..5df3c95d13e1 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -3,6 +3,6 @@ DIST waffle-v1.7.3.tar.bz2 305863 BLAKE2B efbffd252d085140f587a02e626a3eda75fd5b
 DIST waffle-v1.8.0.tar.bz2 310657 BLAKE2B cfc5f6fb32ae379457d9e1a9806504f8e2d22a2e320afab81db04a8e459cc2e127ea546e27a01a36cbb76a3095ca1d87bf96d40286f78f8ef7e1c270a6170521 SHA512 432786f1e255638a866af5c95d4ec0421ce9ffa661696482f9b40f9dbad9198f93caca484a0739a34d37d7a7070efb007771fcc6ea7acb70152c34892466e1e4
 EBUILD waffle-1.7.2.ebuild 1781 BLAKE2B 5634eb6ba97b53e1fb3478cb088505b077af97ad97ee7e856e2fc9b44096c9bc3617c799e523a7874c89a254d7eeb34456f538c6161557e5fe67581300ef6a01 SHA512 1471e3b0972c2742989b40b8b2cd9f84b14c74d0e9b41f1e6500f66bc7d0d506078f4f8d4a29aff7daa7ac8c81de2c4ac2442112752dcb0d8cc6b6a416a0b573
 EBUILD waffle-1.7.3.ebuild 1784 BLAKE2B 843f6302e66c98430f3fff54c9686112a8b93c61307046fc986ac8569827709e45b6ec55f130d4b93fbf80907247275ddbd0389999f83bc20def70d6ac7de3d0 SHA512 0722fab6e73e38b2483e2a39f229a3674cd4a54dc7203786cea794ae164f0a3fc4cb5913bf23980853c11a033dd00731f431a41d8d5a3b36a14bb186aff0596d
-EBUILD waffle-1.8.0.ebuild 2230 BLAKE2B e4ef122bee3b43d68beb43758d38e68045788ba41a61d46e2495bc9f4718fd956ed359705af25cdbe36b4d57f9faf37fce824a806c0715ff827204c15530c96e SHA512 b8973cdb6881aab4d4d57ed2b0e468aa1a80c0d14aba5c734e1afdc119b760c5e549aad9fd8d2702ae77704482a06c1bc4fc55354dbba07d719bdfa8cf9f204d
+EBUILD waffle-1.8.0.ebuild 2229 BLAKE2B df6682b229e294b1f80575c2c3031583a55581cc5bb7e24d6b04aa48d5c2aec939caaf78be54b888872ac6dad26535c3b01cd3abeaaa684cacfff924a7950a86 SHA512 2e3ae36dbdb946abebf2198eacfe2b9b0bbc09438cddf96d580f3430ce1c0e37d3b0c5b429ef21af19bbec3075cb6446f79620f2c3ffb16dbd6075623bee577d
 EBUILD waffle-9999.ebuild 2232 BLAKE2B ff02fd006b2aa45fa80bc122f8b3ff7c36a209d84d96aa878e9902ffe080b7cf7efbd82e1fabf59bda989d069962e549b76297fe4ee8fa6012b5bb9dd267b40b SHA512 eb360c4bea12fe6f9296c29bf7249d61e1423e5864666681470a5b60b2486938708a3a558258d2dbeb2b743256fa36273aeae43957bf7da2ee859a9768072700
 MISC metadata.xml 532 BLAKE2B c0c240a536c012ce3eb478dff1af25d8ddb0b9ce0d565df3a5a82941179c661552d3b6616c2851344a8c47c1a3b568b0f042e003e6133218be46313262f47d1f SHA512 d75a395ae334e6d3c364db676a654939560d591cae77c2ccc55d4c44474b168a9922b68c01349243a899feb0214d057c260f64a6a5029ee292cc86f6ade01906
diff --git a/media-libs/waffle/waffle-1.8.0.ebuild b/media-libs/waffle/waffle-1.8.0.ebuild
index 1076c7f0ebf0..6902993d4b1b 100644
--- a/media-libs/waffle/waffle-1.8.0.ebuild
+++ b/media-libs/waffle/waffle-1.8.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	GIT_ECLASS="git-r3"
 else
 	SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
-	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
 	S="${WORKDIR}"/${PN}-v${PV}
 fi
 inherit meson-multilib multilib virtualx ${GIT_ECLASS}