Sync changes to SLFO-1.2 branch

- Add patch from upstream to fix building with pipewire-1.3.82.
  * 0001-pipewire-Ensure-that-the-correct-struct-is-used-for.patch

OBS-URL: https://build.opensuse.org/request/show/1245149
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/SDL2?expand=0&rev=75

SDL2.changes

@@ -1,120 +1,3 @@
--------------------------------------------------------------------
-Mon Sep  1 22:07:50 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 2.32.10
-  * Report the correct device audio format when using Pipewire.
-  * Support the "ambient" value for SDL_HINT_AUDIO_CATEGORY on
-    iOS.
-  * Improved thumbstick range for Nintendo Switch Pro Controllers.
-  * Fixed loading user calibration for Nintendo Switch Pro
-    Controllers.
-- Add alsa-sig.patch to cure a build failure
-
--------------------------------------------------------------------
-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>
-
-- Add patch from upstream to fix building with pipewire-1.3.82.
-  * 0001-pipewire-Ensure-that-the-correct-struct-is-used-for.patch
-
--------------------------------------------------------------------
-Sat Feb  8 20:01:16 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 2.32.0
-  * Allow destroying a window and its renderer in either order
-  * Added cursor-shape-v1 protocol support on Wayland
-  * Improved event processing latency when gamepad/sensor is open
-  * Fixed conditional effect playback on Moza Racing devices
-  * Fixed input for Thrustmaster PlayStation wheels when
-    hid-tmff2 is installed
-
--------------------------------------------------------------------
-Sun Feb  2 12:18:26 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 2.30.12
-  * Added support for the 8BitDo Ultimate 2C Wireless in
-    Bluetooth mode
-  * Fixed Steam Deck controller not being visible to games
-    running on Proton 9 and older
-  * Fixed a crash when hot-plugging keyboards and mice on Linux
-
--------------------------------------------------------------------
-Thu Jan  2 09:55:58 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 2.30.11
-  * Fixed a crash if the controller product name is NULL
-  * Corrected CoreAudio surround sound channel layouts
-
--------------------------------------------------------------------
-Sun Dec  8 23:43:33 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 2.30.10
-  * Improved the performance of whole surface fill operations
-  * Fixed an assertion when connecting/disconnecting over RDP
-  * Added support for mouse wheel and extended buttons on PS Vita
-  * Fixed a rare crash on KMSDRM
-
--------------------------------------------------------------------
-Sat Nov  2 11:45:47 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 2.30.9
-  * Fixed flicker when entering/exiting fullscreen or moving the
-    window between scaled and non-scaled displays under Wayland.
-
--------------------------------------------------------------------
-Tue Oct  1 23:24:41 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 2.30.8
-  * Fixed a crash in XInput code at startup
-  * Fixed flooding the OS with I/O when a PS4/PS5 controller is
-    disconnected
-  * Added SDL_VIDEO_DOUBLE_BUFFER support to the Wayland backend
-  * SDL_WINDOWEVENT_EXPOSED is sent appropriately when using
-    Wayland
-  * Fixed hang at startup in audio code when the application has
-    large stack usage on Linux
-  * Fixed initializing KMSDRM on older Linux systems
-
 -------------------------------------------------------------------
 Tue Sep  3 23:59:48 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
 

SDL2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package SDL2
 #
-# Copyright (c) 2025 SUSE LLC and contributors
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,10 @@
 #
 
 
+%define sle_version 0
 Name:           SDL2
-Version:        2.32.10
+%define lname   libSDL2-2_0-0
+Version:        2.30.7
 Release:        0
 Summary:        Simple DirectMedia Layer Library
 License:        Zlib
@@ -27,8 +29,8 @@ 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:         alsa-sig.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  libdecor-devel
@@ -65,20 +67,44 @@ 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.
 
-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.
+%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.
 
 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
@@ -97,14 +123,25 @@ perl -i -pe 's{\r\n}{\n}g' *.txt README.md
 
 %install
 %make_install
-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"
+rm -f "%buildroot/%_libdir"/*.la
+rm -fv "%buildroot/%_libdir/libSDL2.a"
 
-%files
+%ldconfig_scriptlets -n %lname
+
+%files -n %lname
 %license LICENSE.txt
-%_libdir/SDL2/
+%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
 
 %changelog

alsa-sig.patch

@@ -1,26 +0,0 @@
-From 05c9b16183743925e59a489c4348141c8a050603 Mon Sep 17 00:00:00 2001
-From: Ozkan Sezer <sezeroz@gmail.com>
-Date: Tue, 2 Sep 2025 17:02:28 +0300
-Subject: [PATCH] alsa: fix signature of snd_pcm_info_free
-
-Reference issue: https://github.com/libsdl-org/SDL/issues/13845.
----
- src/audio/alsa/SDL_alsa_audio.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/audio/alsa/SDL_alsa_audio.c b/src/audio/alsa/SDL_alsa_audio.c
-index 8f3a49c81..7af711411 100644
---- a/src/audio/alsa/SDL_alsa_audio.c
-+++ b/src/audio/alsa/SDL_alsa_audio.c
-@@ -88,7 +88,7 @@ static const char *(*ALSA_snd_pcm_info_get_name)(const snd_pcm_info_t *);
- static int (*ALSA_snd_pcm_info_get_card)(const snd_pcm_info_t *);
- static int (*ALSA_snd_card_get_name)(int, char **);
- static int (*ALSA_snd_pcm_info_malloc)(snd_pcm_info_t **);
--static int (*ALSA_snd_pcm_info_free)(snd_pcm_info_t *);
-+static void (*ALSA_snd_pcm_info_free)(snd_pcm_info_t *);
- #ifdef SND_CHMAP_API_VERSION
- static snd_pcm_chmap_t *(*ALSA_snd_pcm_get_chmap)(snd_pcm_t *);
- static int (*ALSA_snd_pcm_chmap_print)(const snd_pcm_chmap_t *map, size_t maxlen, char *buf);
--- 
-2.51.0
-

baselibs.conf

@@ -0,0 +1,7 @@
+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>"