From e31d988a8793b5889a8791d3b15933263eb75035 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 30 Oct 2022 18:52:05 -0400 Subject: [PATCH] Rebase to 1.2.60 Resolves: rhbz#2127565 Signed-off-by: Neal Gompa --- 0001-fix-SDL12COMPAT_MAX_VIDMODE.patch | 26 ++++++++++++++++++++++++++ sdl12-compat.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 0001-fix-SDL12COMPAT_MAX_VIDMODE.patch diff --git a/0001-fix-SDL12COMPAT_MAX_VIDMODE.patch b/0001-fix-SDL12COMPAT_MAX_VIDMODE.patch new file mode 100644 index 0000000..83074ba --- /dev/null +++ b/0001-fix-SDL12COMPAT_MAX_VIDMODE.patch @@ -0,0 +1,26 @@ +From 77892a1ef5260fe78e593c8337dbe98874ff336c Mon Sep 17 00:00:00 2001 +From: Ozkan Sezer +Date: Tue, 25 Oct 2022 15:56:50 +0300 +Subject: [PATCH] fix SDL12COMPAT_MAX_VIDMODE, + +.. was broken by commit 7be4b3c99a436e360a43aefc929087c46cdadee9 +--- + src/SDL12_compat.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/SDL12_compat.c b/src/SDL12_compat.c +index 64ba56f..1123cc9 100644 +--- a/src/SDL12_compat.c ++++ b/src/SDL12_compat.c +@@ -2119,6 +2119,8 @@ Init12VidModes(void) + SDL_sscanf(maxmodestr, "%ux%u", &w, &h); + if (w > 0xFFFF) w = 0xFFFF; + if (h > 0xFFFF) h = 0xFFFF; ++ maxw = w; ++ maxh = h; + } + + for (i = 0; i < total; ++i) { +-- +2.38.1 + diff --git a/sdl12-compat.spec b/sdl12-compat.spec index 16e5a04..8099945 100644 --- a/sdl12-compat.spec +++ b/sdl12-compat.spec @@ -6,7 +6,7 @@ %endif Name: sdl12-compat -Version: 1.2.52 +Version: 1.2.60 Release: 1%{?dist} Summary: SDL 1.2 runtime compatibility library using SDL 2.0 # mp3 decoder code is MIT-0/PD @@ -18,6 +18,8 @@ Source0: %{url}/archive/release-%{version}/%{name}-%{version}.tar.gz Source1: SDL_config.h # Backports from upstream (0001~0500) +## From: https://github.com/libsdl-org/sdl12-compat/commit/77892a1ef5260fe78e593c8337dbe98874ff336c +Patch0001: 0001-fix-SDL12COMPAT_MAX_VIDMODE.patch # Proposed patches (0501~1000) @@ -131,7 +133,7 @@ rm -rf %{buildroot}%{_libdir}/*.a %files %license LICENSE.txt -%doc README.md BUGS.txt +%doc README.md BUGS.md COMPATIBILITY.md %{_libdir}/libSDL-1.2.so.* %files devel @@ -150,6 +152,10 @@ rm -rf %{buildroot}%{_libdir}/*.a %changelog +* Sun Oct 30 2022 Neal Gompa - 1.2.60-1 +- Rebase to 1.2.60 + Resolves: rhbz#2127565 + * Fri Mar 04 2022 Neal Gompa - 1.2.52-1 - Rebase to 1.2.52 Resolves: rhbz#2060907 diff --git a/sources b/sources index 33b6f11..b2f502e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sdl12-compat-1.2.52.tar.gz) = cd8f34f61ee9c6d0bd635f4c7a6f3cfb6bb570976f3bf843f1e3893b3a86d087a40bdf5f6bb2de16c9534ec42bc846b6ff599ac557c3b088c447e6106e2558f9 +SHA512 (sdl12-compat-1.2.60.tar.gz) = 4eae573054bb98d11356425392f352bf9c54b6406548d225bc8e8e042011e40edaaab6726ddc24e68f3e07cd21d95432df614f5381f1d3d5d0808686ea950732