Reduce SDL2 package to become coinstallable with sdl2_compat

0001-pipewire-Ensure-that-the-correct-struct-is-used-for.patch

@@ -1,29 +0,0 @@
-From d35bef64e913dd7d5dd3153a4b61f10ef837dad6 Mon Sep 17 00:00:00 2001
-From: Neal Gompa <neal@gompa.dev>
-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 4e71dd52aa794..dfb5d6cf3eebb 100644
---- a/src/audio/pipewire/SDL_pipewire.c
-+++ b/src/audio/pipewire/SDL_pipewire.c
-@@ -548,7 +548,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);

SDL2.changes

@@ -1,3 +1,44 @@
+-------------------------------------------------------------------
+Thu Jun  5 19:28:29 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Reduce the SDL2 package to produce just the binary, for rare
+  cases when sdl2_compat is unable to do something. Place the
+  library in /usr/lib64/SDL2 so it can be selectively chosen via
+  LD_LIBRARY_PATH and does not interfere with sdl2_compat.
+
+-------------------------------------------------------------------
+Tue Jun  3 08:01:33 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 2.32.8
+  * Fixed a rare crash in SDL_WaitEvent()
+  * Fixed swapped red/blue channels when updating a YUV texture
+    on OpenGL ES 2.0
+
+-------------------------------------------------------------------
+Mon Mar 31 20:18:00 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 2.32.4
+  * Fixed detecting PlayStation controller sensors on Linux when
+    HIDAPI is not being used
+  * Fixed crash enumerating some input devices
+- Delete 0001-pipewire-Ensure-that-the-correct-struct-is-used-for.patch
+  (merged)
+
+-------------------------------------------------------------------
+Wed Mar 12 16:16:23 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Remove SDL2-devel requiring pkgconfig(xproto/x11), because X11
+  is an optional dependency (e.g. in favor of Wayland).
+
+-------------------------------------------------------------------
+Sun Mar  2 09:46:27 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 2.32.2
+  * Fixed flushing audio forever in some cases when recording
+    PulseAudio on Linux.
+  * Added SDL_HINT_JOYSTICK_HAPTIC_AXES to specify how many haptic
+    axes a device has.
+
 -------------------------------------------------------------------
 Tue Feb 11 09:14:51 UTC 2025 - Antonio Larrosa <alarrosa@suse.com>
 

SDL2.spec

@@ -16,10 +16,8 @@
 #
 
 
-%define sle_version 0
 Name:           SDL2
-%define lname   libSDL2-2_0-0
-Version:        2.32.0
+Version:        2.32.8
 Release:        0
 Summary:        Simple DirectMedia Layer Library
 License:        Zlib
@@ -29,9 +27,7 @@ URL:            https://libsdl.org/
 Source:         https://libsdl.org/release/%name-%version.tar.gz
 Source2:        https://libsdl.org/release/%name-%version.tar.gz.sig
 Source3:        %name.keyring
-Source4:        baselibs.conf
 Patch1:         sdl2-symvers.patch
-Patch2:         0001-pipewire-Ensure-that-the-correct-struct-is-used-for.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  libdecor-devel
@@ -68,44 +64,20 @@ BuildRequires:  pkgconfig(xkbcommon)
 BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(xscrnsaver)
 BuildRequires:  pkgconfig(xxf86vm)
+%define __global_provides_exclude_from %_libdir/SDL2
 
 %description
 This is the "Simple DirectMedia Layer" library. It provides a generic
 API for access to audio, keyboard, mouse, and display framebuffer
 across multiple platforms.
 
-%package -n %lname
-Summary:        Simple DirectMedia Layer Library
-Group:          System/Libraries
-Provides:       SDL2 = %version-%release
-
-%description -n %lname
-This is the "Simple DirectMedia Layer" library. It provides a generic
-API for access to audio, keyboard, mouse, and display framebuffer
-across multiple platforms.
+This package is provided for corner cases when sdl2_compat is
+insufficient. To use original SDL2, exercise with the
+LD_LIBRARY_PATH="%_libdir/SDL2" mechanism.
 
 SDL2 uses dlopen, so if you experience problems under X11, check
 again that libXrandr2 and libXi6 are in fact installed.
 
-%package devel
-Summary:        SDL2 Library Developer Files
-Group:          Development/Libraries/X11
-Requires:       %lname = %version-%release
-Requires:       c_compiler
-Requires:       pkgconfig
-Requires:       pkgconfig(gl)
-Requires:       pkgconfig(glesv1_cm)
-Requires:       pkgconfig(glesv2)
-Requires:       pkgconfig(glu)
-Requires:       pkgconfig(x11)
-Requires:       pkgconfig(xproto)
-Obsoletes:      libSDL2-devel < %version-%release
-Provides:       libSDL2-devel = %version-%release
-
-%description devel
-This package contains files needed for development with the SDL2
-library.
-
 %prep
 %autosetup -p1
 perl -i -pe 's{\r\n}{\n}g' *.txt README.md
@@ -124,25 +96,14 @@ perl -i -pe 's{\r\n}{\n}g' *.txt README.md
 
 %install
 %make_install
-rm -f "%buildroot/%_libdir"/*.la
-rm -fv "%buildroot/%_libdir/libSDL2.a"
+b="%buildroot"
+mkdir -pv "$b/%_libdir/SDL2"
+mv -v "$b/%_libdir"/libSDL2-2.0.so.* "$b/%_libdir/SDL2/"
+rm -Rf "$b/%_bindir" "$b/%_datadir" "$b/%_includedir" "$b/%_libdir/pkgconfig" \
+	"$b/%_libdir"/lib* "$b/%_libdir/cmake"
 
-%ldconfig_scriptlets -n %lname
-
-%files -n %lname
+%files
 %license LICENSE.txt
-%doc README.md README-SDL.txt
-%_libdir/libSDL2-2*.so.*
-
-%files devel
-%doc WhatsNew.txt
-%_bindir/sdl2-config
-%_libdir/libSDL2.so
-%_includedir/SDL2/
-%_datadir/aclocal/sdl2.m4
-%_libdir/pkgconfig/sdl2.pc
-%_libdir/cmake/SDL2/
-%_libdir/libSDL2main.a
-%_libdir/libSDL2_test.a
+%_libdir/SDL2/
 
 %changelog

baselibs.conf

@@ -1,7 +0,0 @@
-libSDL2-2_0-0
-	provides "SDL2-<targettype> = <version>"
-SDL2-devel
-	obsoletes "libSDL2-devel-<targettype>"
-	provides "libSDL2-devel-<targettype> = <version>"
-	requires -libSDL2-<targettype>
-	requires "libSDL2-2_0-0-<targettype> = <version>"