import sdl12-compat-1.2.60-1.el9

.gitignore

@@ -1 +1 @@
-SOURCES/sdl12-compat-4e4527a.tar.gz
+SOURCES/sdl12-compat-1.2.60.tar.gz

.sdl12-compat.metadata

@@ -1 +1 @@
-1e5f8f43b1ceef2003b83cc63c3b90542c5c880b SOURCES/sdl12-compat-4e4527a.tar.gz
+5e9712564734f439f766bb24117ad910f9ba28c8 SOURCES/sdl12-compat-1.2.60.tar.gz

SOURCES/0001-fix-SDL12COMPAT_MAX_VIDMODE.patch

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

SPECS/sdl12-compat.spec

@@ -1,7 +1,3 @@
-%global commit 4e4527a123fb99a1677055d89c5fc74323ddc4d8
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20211125
-
 %if 0%{?rhel}
 # Features disabled for RHEL
 %bcond_with static
@@ -10,18 +6,20 @@
 %endif
 
 Name:           sdl12-compat
-Version:        0.0.1~git.%{commitdate}.%{shortcommit}
-Release:        3%{?dist}
+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
 # SDL_opengl.h is zlib and MIT
 License:        zlib and (Public Domain or MIT-0) and MIT
 URL:            https://github.com/libsdl-org/sdl12-compat
-Source0:        %{url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
+Source0:        %{url}/archive/release-%{version}/%{name}-%{version}.tar.gz
 # Multilib aware-header stub
 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)
 
@@ -38,10 +36,10 @@ BuildRequires:  mesa-libGLU-devel
 # This replaces SDL
 Obsoletes:      SDL < 1.2.15-49
 Conflicts:      SDL < 1.2.50
-Provides:       SDL = 1.2.50
-Provides:       SDL%{?_isa} = 1.2.50
+Provides:       SDL = %{version}
+Provides:       SDL%{?_isa} = %{version}
 # This dlopens SDL2 (?!), so manually depend on it
-Requires:       SDL2%{?_isa} >= 2.0.14
+Requires:       SDL2%{?_isa} >= 2.0.18
 
 %description
 Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
@@ -58,13 +56,14 @@ Summary:        Files to develop SDL 1.2 applications using SDL 2.0
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 # This replaces SDL-devel
 Obsoletes:      SDL-devel < 1.2.15-49
+Conflicts:      SDL-devel < 1.2.50
+Provides:       SDL-devel = %{version}
+Provides:       SDL-devel%{?_isa} = %{version}
 %if ! %{with static}
 # We don't provide the static library, but we want to replace SDL-static anyway
 Obsoletes:      SDL-static < 1.2.15-49
+Conflicts:      SDL-static < 1.2.50
 %endif
-Conflicts:      SDL-devel < 1.2.50
-Provides:       SDL-devel = 1.2.50
-Provides:       SDL-devel%{?_isa} = 1.2.50
 # Add deps required to compile SDL apps
 ## For SDL_opengl.h
 Requires:       pkgconfig(gl)
@@ -91,8 +90,8 @@ Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
 # This replaces SDL-static
 Obsoletes:      SDL-static < 1.2.15-49
 Conflicts:      SDL-static < 1.2.50
-Provides:       SDL-static = 1.2.50
-Provides:       SDL-static%{?_isa} = 1.2.50
+Provides:       SDL-static = %{version}
+Provides:       SDL-static%{?_isa} = %{version}
 
 %description static
 Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
@@ -110,7 +109,7 @@ this layer.
 
 
 %prep
-%autosetup -n %{name}-%{commit} -S git_am
+%autosetup -n %{name}-release-%{version} -S git_am
 
 
 %build
@@ -134,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
@@ -153,6 +152,17 @@ 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
+
+* Sat Dec 11 2021 Neal Gompa <ngompa@centosproject.org> - 0.0.1~git.20211125.4e4527a-4
+- Conflict with all old SDL subpackages properly
+
 * Tue Dec 07 2021 Wim Taymans <wtaymans@redhat.com> - 0.0.1~git.20211125.4e4527a-3
 - Bump for rebuild after resync