From ff8e28135b3955bec76302e0d50b364a3a497726 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Sep 26 2023 23:54:38 +0000
Subject: Update to 1.2.68


---

diff --git a/.gitignore b/.gitignore
index 79f4287..285b16e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /sdl12-compat-1.2.52.tar.gz
 /sdl12-compat-1.2.56.tar.gz
 /sdl12-compat-1.2.60.tar.gz
+/sdl12-compat-1.2.68.tar.gz
diff --git a/0001-fix-SDL12COMPAT_MAX_VIDMODE.patch b/0001-fix-SDL12COMPAT_MAX_VIDMODE.patch
deleted file mode 100644
index 83074ba..0000000
--- a/0001-fix-SDL12COMPAT_MAX_VIDMODE.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-
diff --git a/sdl12-compat-1.2.60-Fixed-infinite-loop-in-SDL_FreeYUVOverlay.patch b/sdl12-compat-1.2.60-Fixed-infinite-loop-in-SDL_FreeYUVOverlay.patch
deleted file mode 100644
index 1643456..0000000
--- a/sdl12-compat-1.2.60-Fixed-infinite-loop-in-SDL_FreeYUVOverlay.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 683234e8708a081224942181710ca5dd3cee409e Mon Sep 17 00:00:00 2001
-From: Sam Lantinga <slouken@libsdl.org>
-Date: Thu, 17 Nov 2022 07:55:07 -0800
-Subject: [PATCH] Fixed infinite loop in SDL_FreeYUVOverlay()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes https://github.com/libsdl-org/sdl12-compat/issues/275
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- src/SDL12_compat.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/SDL12_compat.c b/src/SDL12_compat.c
-index 6964e2b..fb657a6 100644
---- a/src/SDL12_compat.c
-+++ b/src/SDL12_compat.c
-@@ -7535,6 +7535,7 @@ SDL_FreeYUVOverlay(SDL12_Overlay *overlay12)
-             if (overlay->overlay12 == overlay12) {
-                 overlay->overlay12 = NULL;  /* don't try to draw this later. */
-             }
-+            overlay = overlay->next;
-         }
- 
-         if (renderer) {
--- 
-2.39.2
-
diff --git a/sdl12-compat.spec b/sdl12-compat.spec
index f649a0b..ddac077 100644
--- a/sdl12-compat.spec
+++ b/sdl12-compat.spec
@@ -6,8 +6,8 @@
 %endif
 
 Name:           sdl12-compat
-Version:        1.2.60
-Release:        4%{?dist}
+Version:        1.2.68
+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
@@ -18,11 +18,6 @@ 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
-# Fix a hang in SDL_FreeYUVOverlay(), in upstream after 1.2.60, RH#2173510,
-# <https://github.com/libsdl-org/sdl12-compat/issues/275>
-Patch0002:      sdl12-compat-1.2.60-Fixed-infinite-loop-in-SDL_FreeYUVOverlay.patch
 
 # Proposed patches (0501~1000)
 
@@ -155,6 +150,9 @@ rm -rf %{buildroot}%{_libdir}/*.a
 
 
 %changelog
+* Tue Sep 26 2023 Neal Gompa <ngompa@fedoraproject.org> - 1.2.68-1
+- Update to 1.2.68
+
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.60-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index b2f502e..e208185 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sdl12-compat-1.2.60.tar.gz) = 4eae573054bb98d11356425392f352bf9c54b6406548d225bc8e8e042011e40edaaab6726ddc24e68f3e07cd21d95432df614f5381f1d3d5d0808686ea950732
+SHA512 (sdl12-compat-1.2.68.tar.gz) = d0e71e75f312402bf075f6553d9fd6493a3db9dd42719bb753287a35e6c40ee37c6092b157ff2384f3055400a3113645595d1269590cd50ea1e0c8f247240858