From f0727e282d9d0b9f6cfe4d0943500f6fefbbd395 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 21 Jan 2021 16:29:21 +0000 Subject: [PATCH] Update to 2.0.14 --- .gitignore | 1 + SDL2.spec | 8 ++++++-- multilib.patch | 12 ++++++------ sources | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 8c47f41..3ab0d13 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /SDL2-2.0.9.tar.gz /SDL2-2.0.10.tar.gz /SDL2-2.0.12.tar.gz +/SDL2-2.0.14.tar.gz diff --git a/SDL2.spec b/SDL2.spec index c32a839..8d2aa2f 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -5,8 +5,8 @@ %endif Name: SDL2 -Version: 2.0.12 -Release: 5%{?dist} +Version: 2.0.14 +Release: 1%{?dist} Summary: Cross-platform multimedia library License: zlib and MIT @@ -147,6 +147,10 @@ rm -vf %{buildroot}%{_libdir}/*.la %{_libdir}/lib*.a %changelog +* Thu Jan 21 2021 Pete Walter - 2.0.14-1 +- Update to 2.0.14 +- Rebase multilib.patch + * Tue Jan 12 2021 Wim Taymans - 2.0.12-5 - Disable JACK on rhel >= 8 diff --git a/multilib.patch b/multilib.patch index 955b398..875a20f 100644 --- a/multilib.patch +++ b/multilib.patch @@ -1,6 +1,6 @@ -diff -uNr SDL2-2.0.0.orig/sdl2-config.in SDL2-2.0.0/sdl2-config.in ---- SDL2-2.0.0.orig/sdl2-config.in 2013-08-12 06:57:54.000000000 +0400 -+++ SDL2-2.0.0/sdl2-config.in 2013-08-24 12:50:01.630268642 +0400 +diff -up SDL2-2.0.14/sdl2-config.in.orig SDL2-2.0.14/sdl2-config.in +--- SDL2-2.0.14/sdl2-config.in.orig 2020-12-21 17:44:36.000000000 +0000 ++++ SDL2-2.0.14/sdl2-config.in 2021-01-21 16:26:35.663960042 +0000 @@ -3,7 +3,6 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -9,7 +9,7 @@ diff -uNr SDL2-2.0.0.orig/sdl2-config.in SDL2-2.0.0/sdl2-config.in @ENABLE_STATIC_FALSE@usage="\ @ENABLE_STATIC_FALSE@Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]" -@@ -45,11 +44,11 @@ +@@ -45,11 +44,11 @@ while test $# -gt 0; do echo -I@includedir@/SDL2 @SDL_CFLAGS@ ;; @ENABLE_SHARED_TRUE@ --libs) @@ -18,8 +18,8 @@ diff -uNr SDL2-2.0.0.orig/sdl2-config.in SDL2-2.0.0/sdl2-config.in @ENABLE_SHARED_TRUE@ ;; @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs) @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs) --@ENABLE_STATIC_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@ -+@ENABLE_STATIC_TRUE@ echo @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@ +-@ENABLE_STATIC_TRUE@ echo -L@libdir@ @SDL_LIBS@ @SDL_STATIC_LIBS@ ++@ENABLE_STATIC_TRUE@ echo @SDL_LIBS@ @SDL_STATIC_LIBS@ @ENABLE_STATIC_TRUE@ ;; *) echo "${usage}" 1>&2 diff --git a/sources b/sources index 2003a7d..de25c7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SDL2-2.0.12.tar.gz) = 3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317 +SHA512 (SDL2-2.0.14.tar.gz) = ebc482585bd565bf3003fbcedd91058b2183e333b9ea566d2f386da0298ff970645d9d25c1aa4459c7c96e9ea839fd1c5f2da0242a56892865b2e456cdd027ee