SHA256
1
0
forked from jengelh/SDL2

6 Commits

Author SHA256 Message Date
0aa1da57c5 SDL 2.32.10 2025-09-02 16:23:44 +02:00
2594877fbe Reduce SDL2 package to become coinstallable with sdl2_compat 2025-06-05 21:35:50 +02:00
5410ff12f1 SDL 2.32.8 2025-06-03 10:23:14 +02:00
8e0f465649 SDL 2.32.4 2025-03-31 22:20:58 +02:00
a272efc558 Drop require on pkgconfig(x11/xproto) 2025-03-12 17:17:48 +01:00
0a61fdf6d0 SDL 2.32.2 2025-03-02 10:48:06 +01:00
9 changed files with 96 additions and 91 deletions

View File

@@ -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);

BIN
SDL2-2.32.0.tar.gz (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
SDL2-2.32.10.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

BIN
SDL2-2.32.10.tar.gz.sig Normal file

Binary file not shown.

View File

@@ -1,3 +1,56 @@
-------------------------------------------------------------------
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>

View File

@@ -1,7 +1,7 @@
#
# spec file for package SDL2
#
# Copyright (c) 2025 SUSE LLC
# Copyright (c) 2025 SUSE LLC and contributors
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,10 +16,8 @@
#
%define sle_version 0
Name: SDL2
%define lname libSDL2-2_0-0
Version: 2.32.0
Version: 2.32.10
Release: 0
Summary: Simple DirectMedia Layer Library
License: Zlib
@@ -29,9 +27,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: 0001-pipewire-Ensure-that-the-correct-struct-is-used-for.patch
Patch2: alsa-sig.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libdecor-devel
@@ -68,44 +65,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 +97,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

26
alsa-sig.patch Normal file
View File

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

View File

@@ -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>"