From 35941b0051b69a503800c1cd0f81f11a0fc17350 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 1 Dec 2021 07:12:15 -0500 Subject: [PATCH] Sync latest version from Fedora Linux 35 This resolves a number of issues with SDL1 emulation on SDL2, and includes a packaging fix to ensure the correct SDL2 library is pulled in at install-time. Reference upstream Fedora package commits: * https://src.fedoraproject.org/rpms/sdl12-compat/c/e1fcdfe683b61257eb65a6bf679ad02ae5dda8ee * https://src.fedoraproject.org/rpms/sdl12-compat/c/b1cae1ce5e2f93bccfa4c24032729c1eb0895999 * https://src.fedoraproject.org/rpms/sdl12-compat/c/32cd0d8f7728a53418c88596d1338aeef5a7e430 * https://src.fedoraproject.org/rpms/sdl12-compat/c/e2ce0bbe240214d7227c82f45f4aa5c67523ce31 * https://src.fedoraproject.org/rpms/sdl12-compat/c/8caed3f0c2b715d5a06a058ddf399f92b314e6e3 Resolves: rhbz#1970507 Signed-off-by: Neal Gompa --- .gitignore | 1 + sdl12-compat.spec | 22 +++++++++++++++++++--- sources | 2 +- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 77578ea..964cd75 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /sdl12-compat-a3bfcb2.tar.gz +/sdl12-compat-4e4527a.tar.gz diff --git a/sdl12-compat.spec b/sdl12-compat.spec index 89e34f4..282c961 100644 --- a/sdl12-compat.spec +++ b/sdl12-compat.spec @@ -1,6 +1,6 @@ -%global commit a3bfcb2f85ec6477c4bc54585c1749934e6486d4 +%global commit 4e4527a123fb99a1677055d89c5fc74323ddc4d8 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20210814 +%global commitdate 20211125 %if 0%{?rhel} # Features disabled for RHEL @@ -41,7 +41,7 @@ Conflicts: SDL < 1.2.50 Provides: SDL = 1.2.50 Provides: SDL%{?_isa} = 1.2.50 # This dlopens SDL2 (?!), so manually depend on it -Requires: SDL2 >= 2.0.14 +Requires: SDL2%{?_isa} >= 2.0.14 %description Simple DirectMedia Layer (SDL) is a cross-platform multimedia library @@ -149,6 +149,22 @@ rm -rf %{buildroot}%{_libdir}/*.a %changelog +* Sat Nov 27 2021 Neal Gompa - 0.0.1~git.20211125.4e4527a-1 +- Update to new snapshot release + +* Sun Nov 07 2021 Neal Gompa - 0.0.1~git.20211107.a10d6b6-1 +- Update to new snapshot release + +* Sun Sep 26 2021 Neal Gompa - 0.0.1~git.20210926.c6cfc8f-1 +- Update to new snapshot release +- Ensure SDL2 dependency is arched + +* Sun Sep 12 2021 Neal Gompa - 0.0.1~git.20210909.a98590a-1 +- Update to new snapshot release + +* Thu Aug 26 2021 Neal Gompa - 0.0.1~git.20210825.b5f7170-1 +- Update to new snapshot release + * Sun Aug 22 2021 Neal Gompa - 0.0.1~git.20210814.a3bfcb2-1 - Update to new snapshot release diff --git a/sources b/sources index 8c02c15..ce9e201 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sdl12-compat-a3bfcb2.tar.gz) = c6102796cf95e15785e05ce294a0ad284390f068e0255cce569b5ab8989760d5f7959cbd183beb8fcc6e49934ef9189e7fbb4ca4e6ec32d50d2f2602e825edfa +SHA512 (sdl12-compat-4e4527a.tar.gz) = bd613d367bc0d0e7e011b31acf5f81075708a783a71073e0bbcf6c4e62538da6ba412a685f7bf50714b8c78fb77e0ce76b54d32dae4ef4110400d42dcac50bb8