From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B69321584F2 for ; Wed, 12 Mar 2025 06:05:45 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id A2FBD343095 for ; Wed, 12 Mar 2025 06:05:45 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 9963211037F; Wed, 12 Mar 2025 06:05:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 8B7B111037F for ; Wed, 12 Mar 2025 06:05:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2E1FE343092 for ; Wed, 12 Mar 2025 06:05:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 33E11280C for ; Wed, 12 Mar 2025 06:05:42 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1741759498.d0924a55370888a99d6c80b5b79c5408ca9989fb.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/files/, media-libs/libsdl2/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libsdl2/Manifest media-libs/libsdl2/files/libsdl2-2.32.2-pipewire-1.4.patch media-libs/libsdl2/libsdl2-2.32.2.ebuild X-VCS-Directories: media-libs/libsdl2/ media-libs/libsdl2/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d0924a55370888a99d6c80b5b79c5408ca9989fb X-VCS-Branch: master Date: Wed, 12 Mar 2025 06:05:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3b871221-7bd7-470e-af54-d9df4ee33a8e X-Archives-Hash: 4809ab75298e9dfdc835958e5aa33869 commit: d0924a55370888a99d6c80b5b79c5408ca9989fb Author: Kostadin Shishmanov protonmail com> AuthorDate: Tue Mar 11 14:49:15 2025 +0000 Commit: Sam James gentoo org> CommitDate: Wed Mar 12 06:04:58 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0924a55 media-libs/libsdl2: add 2.32.2, patch for pipewire 1.4 Simple bump to 2.32.2, not much changed upstream. Also add a patch [1] that fixes building with soon to be in the tree pipewire 1.4. [1] https://github.com/libsdl-org/SDL/pull/12240 Closes: https://bugs.gentoo.org/951144 Signed-off-by: Kostadin Shishmanov protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/41018 Signed-off-by: Sam James gentoo.org> media-libs/libsdl2/Manifest | 1 + .../files/libsdl2-2.32.2-pipewire-1.4.patch | 31 +++ media-libs/libsdl2/libsdl2-2.32.2.ebuild | 215 +++++++++++++++++++++ 3 files changed, 247 insertions(+) diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index bbca87f72382..52d8c98a8a7f 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1,3 +1,4 @@ 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 +DIST SDL2-2.32.2.tar.gz 7627192 BLAKE2B 5ea13fe60f2388e2ff61f60413ec71be84a429b6b2dbcb98bee8bf59e931396e164347288c68453e2932d9201fc8e53907cfe2fa0e456ae0383edaefa901df9b SHA512 9a608974a69b97fd5589bf8feed4742498f8f07731bcd5b99dd518089acda8b9b4216197b6adf7ca79ef1a9fe47c542033eefe94763e66229b1d9ba5207da5c5 diff --git a/media-libs/libsdl2/files/libsdl2-2.32.2-pipewire-1.4.patch b/media-libs/libsdl2/files/libsdl2-2.32.2-pipewire-1.4.patch new file mode 100644 index 000000000000..5b3ce6a2ff14 --- /dev/null +++ b/media-libs/libsdl2/files/libsdl2-2.32.2-pipewire-1.4.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/951144 + +From c7bad536131532f587caedda9e051855cd79cd58 Mon Sep 17 00:00:00 2001 +From: Neal Gompa +Date: Mon, 10 Feb 2025 05:00:56 -0500 +Subject: [PATCH] pipewire: Ensure that the correct struct is used for + enumeration APIs + +PipeWire now requires the correct struct type is used, otherwise +it will fail to compile. + +Reference: https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/188d920733f0791413d3386e5536ee7377f71b2f + +Fixes: https://github.com/libsdl-org/SDL/issues/12224 +--- + src/audio/pipewire/SDL_pipewire.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/audio/pipewire/SDL_pipewire.c b/src/audio/pipewire/SDL_pipewire.c +index 889e05d..5d1bfc2 100644 +--- a/src/audio/pipewire/SDL_pipewire.c ++++ b/src/audio/pipewire/SDL_pipewire.c +@@ -590,7 +590,7 @@ static void node_event_info(void *object, const struct pw_node_info *info) + + /* Need to parse the parameters to get the sample rate */ + for (i = 0; i < info->n_params; ++i) { +- pw_node_enum_params(node->proxy, 0, info->params[i].id, 0, 0, NULL); ++ pw_node_enum_params((struct pw_node*)node->proxy, 0, info->params[i].id, 0, 0, NULL); + } + + hotplug_core_sync(node); diff --git a/media-libs/libsdl2/libsdl2-2.32.2.ebuild b/media-libs/libsdl2/libsdl2-2.32.2.ebuild new file mode 100644 index 000000000000..f605a2861ff6 --- /dev/null +++ b/media-libs/libsdl2/libsdl2-2.32.2.ebuild @@ -0,0 +1,215 @@ +# 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 ) + kms? ( || ( gles1 gles2 opengl ) ) + 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 + "${FILESDIR}"/libsdl2-2.32.2-pipewire-1.4.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/ +}