From 2ffe01af4c5332ead0ca0ed8767d9dc16ba1a432 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 28 Mar 2023 12:05:38 +0000 Subject: [PATCH] import sdl12-compat-1.2.60-1.el9 --- .gitignore | 2 +- .sdl12-compat.metadata | 2 +- .../0001-fix-SDL12COMPAT_MAX_VIDMODE.patch | 26 +++++++++++++++++++ SPECS/sdl12-compat.spec | 10 +++++-- 4 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 SOURCES/0001-fix-SDL12COMPAT_MAX_VIDMODE.patch diff --git a/.gitignore b/.gitignore index f602dcf..e4f2ea5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/sdl12-compat-1.2.52.tar.gz +SOURCES/sdl12-compat-1.2.60.tar.gz diff --git a/.sdl12-compat.metadata b/.sdl12-compat.metadata index 3856483..20af9e5 100644 --- a/.sdl12-compat.metadata +++ b/.sdl12-compat.metadata @@ -1 +1 @@ -9e90950c7c98c55adef3c75397ffd5bf8bfed6af SOURCES/sdl12-compat-1.2.52.tar.gz +5e9712564734f439f766bb24117ad910f9ba28c8 SOURCES/sdl12-compat-1.2.60.tar.gz diff --git a/SOURCES/0001-fix-SDL12COMPAT_MAX_VIDMODE.patch b/SOURCES/0001-fix-SDL12COMPAT_MAX_VIDMODE.patch new file mode 100644 index 0000000..83074ba --- /dev/null +++ b/SOURCES/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/SPECS/sdl12-compat.spec b/SPECS/sdl12-compat.spec index 16e5a04..8099945 100644 --- a/SPECS/sdl12-compat.spec +++ b/SPECS/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