commit: 547225b02c24b53d302a694c8e2c341f89121311 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Wed Feb 19 13:47:14 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Feb 19 14:35:00 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=547225b0
media-libs/libsdl2: add 2.32.0 Bug: https://bugs.gentoo.org/932644 Bug: https://bugs.gentoo.org/949387 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/40651 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/libsdl2/Manifest | 1 + ....0-fix-tests-for-disabled-vulkan-and-gles.patch | 40 ++++ media-libs/libsdl2/libsdl2-2.32.0.ebuild | 213 +++++++++++++++++++++ 3 files changed, 254 insertions(+) diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index 9be0d64d75df..8ea94e91037c 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1,3 +1,4 @@ DIST SDL2-2.28.5.tar.gz 7345355 BLAKE2B c96481bc02af6b6d077247238f7e46b0e3ec216664584add29cafb0a91d06dc6ddc637a01519dbd7182d4fa59cfaf26ad6733f72583021cf65849416f9c4b698 SHA512 12593eb78fcca877a8dfb78cf21a4e6feba7dc87c964de378ac462b36d8e41ecb587222cb41d5f56dd35b838e1b9867b8ae0cf2f4d2a01afaf23ac8c11edc84d DIST SDL2-2.30.11.tar.gz 7585207 BLAKE2B e6038cbf79bec299fae9cfdc4b84ff3e28343abe782942af17e052d7da93111ea04a2ae15b063bfa0ad0d13a1810890dd29d895189f7f417f1bccce715badde1 SHA512 cd4c040ebe4ec74250e32b401a292658353721dda30ad1066522b2a9de9a07560313978880a0bad7e7f5103cc14278fcbe27dbc5a188189e7fb6f097e7308550 DIST SDL2-2.30.7.tar.gz 7525092 BLAKE2B a494ca856f43009957f62ef4e5d401777c2d1f8518e4cc1a1b9fc9a2efedc5031b9cb5e2965aeb7347821310153cf3abc4c898dd493962fb268c5c55081ed7c3 SHA512 1a16c10f500dea97bd4e4ca5f560fe4ab8e746c975d30751b7cf567868743d105ce84055d480e4c18b290adac485e67d1bb14ae1719644d6e42223d96f299a16 +DIST SDL2-2.32.0.tar.gz 7625288 BLAKE2B 491796e2b222a49eaead76e60bb6e58bed881667cc61d0ba81ed0e083134b6b13089ca2c4658f6576b2924ddeaffcc9ff5c7532841e7b0797c6bd1769ad74a53 SHA512 a91b8105125f06118e8bfce2a5553fe053f7158dd02f06a36cfc535f09c401eb7da11072e576c6bf6e41fa2e02b08483b9cc4e11c658578b762e1b6c326a45bb diff --git a/media-libs/libsdl2/files/libsdl2-2.32.0-fix-tests-for-disabled-vulkan-and-gles.patch b/media-libs/libsdl2/files/libsdl2-2.32.0-fix-tests-for-disabled-vulkan-and-gles.patch new file mode 100644 index 000000000000..21ea1e342671 --- /dev/null +++ b/media-libs/libsdl2/files/libsdl2-2.32.0-fix-tests-for-disabled-vulkan-and-gles.patch @@ -0,0 +1,40 @@ +From 22b304a0f30fa6d95dff5363d8d9e10b4eddd826 Mon Sep 17 00:00:00 2001 +From: Alfred Wingate <[email protected]> +Date: Wed, 19 Feb 2025 15:30:01 +0200 +Subject: [PATCH] Build vulkan and opengles tests only if its enabled in the + build + +Bug: https://bugs.gentoo.org/932644 +Bug: https://bugs.gentoo.org/949387 +Signed-off-by: Alfred Wingate <[email protected]> +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -139,12 +139,14 @@ add_sdl_test_executable(testgamecontroller NEEDS_RESOURCES testgamecontroller.c + add_sdl_test_executable(testgeometry testgeometry.c testutils.c) + add_sdl_test_executable(testgesture testgesture.c) + add_sdl_test_executable(testgl2 testgl2.c) ++if(SDL_OPENGLES) + add_sdl_test_executable(testgles testgles.c) + add_sdl_test_executable(testgles2 testgles2.c) + add_sdl_test_executable(testgles2_sdf NEEDS_RESOURCES testgles2_sdf.c testutils.c) + if(APPLE) + set_property(TARGET testgles testgles2 testgles2_sdf APPEND PROPERTY COMPILE_DEFINITIONS "GLES_SILENCE_DEPRECATION") + endif() ++endif() + add_sdl_test_executable(testhaptic testhaptic.c) + add_sdl_test_executable(testhotplug testhotplug.c) + add_sdl_test_executable(testrumble testrumble.c) +@@ -211,7 +213,9 @@ add_sdl_test_executable(testqsort NONINTERACTIVE testqsort.c) + add_sdl_test_executable(testbounds testbounds.c) + add_sdl_test_executable(testcustomcursor testcustomcursor.c) + add_sdl_test_executable(controllermap NEEDS_RESOURCES controllermap.c testutils.c) +-add_sdl_test_executable(testvulkan testvulkan.c) ++if(SDL_VULKAN) ++ add_sdl_test_executable(testvulkan testvulkan.c) ++endif() + add_sdl_test_executable(testoffscreen testoffscreen.c) + + if(N3DS) +-- +2.48.1 + diff --git a/media-libs/libsdl2/libsdl2-2.32.0.ebuild b/media-libs/libsdl2/libsdl2-2.32.0.ebuild new file mode 100644 index 000000000000..ed73f48b7f42 --- /dev/null +++ b/media-libs/libsdl2/libsdl2-2.32.0.ebuild @@ -0,0 +1,213 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib flag-o-matic + +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 ~loong ~mips ~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 cpu_flags_x86_sse3 custom-cflags dbus doc fcitx gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test udev +video vulkan wayland X xscreensaver" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + alsa? ( sound ) + fcitx? ( dbus ) + gles1? ( video ) + gles2? ( video ) + haptic? ( joystick ) + ibus? ( dbus ) + jack? ( sound ) + nas? ( sound ) + opengl? ( video ) + pulseaudio? ( sound ) + sndio? ( sound ) + test? ( static-libs ) + 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}] ) + 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}] + gui-libs/libdecor[${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} + fcitx? ( app-i18n/fcitx:* ) + gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1(+)] ) + gles2? ( media-libs/mesa[${MULTILIB_USEDEP},gles2(+)] ) + vulkan? ( media-libs/vulkan-loader ) +" +DEPEND=" + ${COMMON_DEPEND} + gles1? ( media-libs/libglvnd ) + gles2? ( media-libs/libglvnd ) + ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) + test? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) + vulkan? ( dev-util/vulkan-headers ) + X? ( x11-base/xorg-proto ) +" +BDEPEND=" + virtual/pkgconfig + doc? ( + app-text/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}"/libsdl2-2.32.0-fix-tests-for-disabled-vulkan-and-gles.patch +) + +src_prepare() { + cmake_src_prepare + + # Unbundle some headers. + rm -r src/video/khronos || die + ln -s "${ESYSROOT}/usr/include" src/video/khronos || die +} + +src_configure() { + use custom-cflags || strip-flags + + local mycmakeargs=( + -DSDL_STATIC=$(usex static-libs) + -DSDL_SYSTEM_ICONV=ON + -DSDL_GCC_ATOMICS=ON + -DSDL_AUDIO=$(usex sound) + -DSDL_VIDEO=$(usex video) + -DSDL_JOYSTICK=$(usex joystick) + -DSDL_HAPTIC=$(usex haptic) + -DSDL_POWER=ON + -DSDL_FILESYSTEM=ON + -DSDL_TIMERS=ON + -DSDL_FILE=ON + -DSDL_LOADSO=ON + -DSDL_ASSEMBLY=ON + -DSDL_ALTIVEC=$(usex cpu_flags_ppc_altivec) + -DSDL_SSEMATH=$(usex cpu_flags_x86_sse) + -DSDL_MMX=$(usex cpu_flags_x86_mmx) + -DSDL_3DNOW=$(usex cpu_flags_x86_3dnow) + -DSDL_SSE=$(usex cpu_flags_x86_sse) + -DSDL_SSE2=$(usex cpu_flags_x86_sse2) + -DSDL_SSE3=$(usex cpu_flags_x86_sse3) + -DSDL_OSS=$(usex oss) + -DSDL_ALSA=$(usex alsa) + -DSDL_ALSA_SHARED=OFF + -DSDL_JACK=$(usex jack) + -DSDL_JACK_SHARED=OFF + -DSDL_ESD=OFF + -DSDL_PIPEWIRE=$(usex pipewire) + -DSDL_PIPEWIRE_SHARED=OFF + -DSDL_PULSEAUDIO=$(usex pulseaudio) + -DSDL_PULSEAUDIO_SHARED=OFF + -DSDL_ARTS=OFF + -DSDL_LIBSAMPLERATE=$(usex libsamplerate) + -DSDL_LIBSAMPLERATE_SHARED=OFF + -DSDL_WERROR=OFF + -DSDL_NAS=$(usex nas) + -DSDL_NAS_SHARED=OFF + -DSDL_SNDIO=$(usex sndio) + -DSDL_SNDIO_SHARED=OFF + -DSDL_DISKAUDIO=$(usex sound) + -DSDL_DUMMYAUDIO=$(usex sound) + -DSDL_WAYLAND=$(usex wayland) + -DSDL_WAYLAND_SHARED=OFF + -DSDL_WAYLAND_LIBDECOR=$(usex wayland) + -DSDL_WAYLAND_LIBDECOR_SHARED=OFF + -DSDL_RPI=OFF + -DSDL_X11=$(usex X) + -DSDL_X11_SHARED=OFF + -DSDL_X11_XSCRNSAVER=$(usex xscreensaver) + -DSDL_COCOA=$(usex aqua) + -DSDL_DIRECTFB=OFF + -DSDL_FUSIONSOUND=OFF + -DSDL_KMSDRM=$(usex kms) + -DSDL_KMSDRM_SHARED=OFF + -DSDL_DUMMYVIDEO=$(usex video) + -DSDL_OPENGL=$(usex opengl) + -DSDL_OPENGLES=$(use gles1 || use gles2 && echo ON || echo OFF) + -DSDL_VULKAN=$(usex vulkan) + -DSDL_LIBUDEV=$(usex udev) + -DSDL_DBUS=$(usex dbus) + -DSDL_IBUS=$(usex ibus) + -DSDL_CCACHE=OFF + -DSDL_DIRECTX=OFF + -DSDL_RPATH=OFF + -DSDL_VIDEO_RENDER_D3D=OFF + -DSDL_TESTS=$(usex test) + ) + cmake-multilib_src_configure +} + +src_compile() { + multilib-minimal_src_compile + + if use doc; then + cd docs || die + doxygen || die + fi +} + +src_test() { + # Unset all SDL_* variables as they cause issues for tests. + unset "${!SDL_@}" + cmake-multilib_src_test +} + +multilib_src_install_all() { + rm -r "${ED}"/usr/share/licenses/ || die + dodoc {BUGS,CREDITS,README-SDL,TODO,WhatsNew}.txt README.md docs/README*.md + use doc && dodoc -r docs/output/html/ +}
