Rebase to 1.2.60

This commit is contained in:
Neal Gompa 2022-10-30 18:52:05 -04:00 committed by Stepan Oksanichenko
parent 9094f9f1f5
commit 009b75ed5d
4 changed files with 36 additions and 3 deletions

1
.sdl12-compat.metadata Normal file
View File

@ -0,0 +1 @@
5e9712564734f439f766bb24117ad910f9ba28c8 sdl12-compat-1.2.60.tar.gz

View File

@ -0,0 +1,26 @@
From 77892a1ef5260fe78e593c8337dbe98874ff336c Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <sezeroz@gmail.com>
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

View File

@ -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 <ngompa@centosproject.org> - 1.2.60-1
- Rebase to 1.2.60
Resolves: rhbz#2127565
* Fri Mar 04 2022 Neal Gompa <ngompa@centosproject.org> - 1.2.52-1
- Rebase to 1.2.52
Resolves: rhbz#2060907

View File

@ -1 +1 @@
SHA512 (sdl12-compat-1.2.52.tar.gz) = cd8f34f61ee9c6d0bd635f4c7a6f3cfb6bb570976f3bf843f1e3893b3a86d087a40bdf5f6bb2de16c9534ec42bc846b6ff599ac557c3b088c447e6106e2558f9
SHA512 (sdl12-compat-1.2.60.tar.gz) = 4eae573054bb98d11356425392f352bf9c54b6406548d225bc8e8e042011e40edaaab6726ddc24e68f3e07cd21d95432df614f5381f1d3d5d0808686ea950732