up to 2.24.0

diff --git a/SDL2-config.patch b/SDL2-config.patch
index c35ec2d5ae1b90421997ce72bf55b0dcbe5e96bb..8040af3c13fda5d6f4e644c182135865a5147cdb 100644 (file)
--- a/SDL2-config.patch
+++ b/SDL2-config.patch
@@ -1,6 +1,6 @@
---- SDL2-2.0.14/sdl2-config.in.orig    2020-12-23 15:31:32.787369243 +0100
-+++ SDL2-2.0.14/sdl2-config.in 2020-12-23 15:33:31.447775625 +0100
-@@ -45,11 +45,11 @@
+--- SDL2-2.24.0/sdl2-config.in.orig    2022-08-19 19:06:52.080709841 +0200
++++ SDL2-2.24.0/sdl2-config.in 2022-08-19 19:07:49.427138664 +0200
+@@ -49,12 +49,12 @@
        echo -I@includedir@/SDL2 @SDL_CFLAGS@
        ;;
  @ENABLE_SHARED_TRUE@    --libs)
@@ -9,8 +9,9 @@
  @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_LIBS@ @SDL_STATIC_LIBS@
-+@ENABLE_STATIC_TRUE@      echo @SDL_LIBS@ @SDL_STATIC_LIBS@
+ @ENABLE_STATIC_TRUE@      sdl_static_libs=$(echo "@SDL_LIBS@ @SDL_STATIC_LIBS@" | sed -E "s#-lSDL2[ $]#$libdir/libSDL2.a #g")
+-@ENABLE_STATIC_TRUE@      echo -L@libdir@ $sdl_static_libs
++@ENABLE_STATIC_TRUE@      echo $sdl_static_libs
  @ENABLE_STATIC_TRUE@      ;;
      *)
        echo "${usage}" 1>&2

diff --git a/SDL2.spec b/SDL2.spec
index c626962c412acb6572a999371ecd5cb67b11c2ac..1f87f4ea861bfad9c4287a662ee69008bfec47b4 100644 (file)
--- a/SDL2.spec
+++ b/SDL2.spec
@@ -41,11 +41,9 @@
 # libXcursor.so.1
 # libXext.so.6
 # libXi.so.6
-# libXinerama.so.1
 # libXrandr.so.2
 # libXrender.so.1
 # libXss.so.1
-# libXxf86vm.so.1
 %ifarch k6 athlon
 %define        with_3dnow      1
 %endif
@@ -62,12 +60,12 @@ Summary:    SDL (Simple DirectMedia Layer) - Game/Multimedia Library
 Summary(pl.UTF-8):     SDL (Simple DirectMedia Layer) - Biblioteka do gier/multimediów
 Summary(zh_CN.UTF-8):  SDL (Simple DirectMedia Layer) Generic APIs - 游戏/多媒体库
 Name:          SDL2
-Version:       2.0.22
+Version:       2.24.0
 Release:       1
 License:       Zlib (BSD-like)
 Group:         Libraries
 Source0:       http://www.libsdl.org/release/%{name}-%{version}.tar.gz
-# Source0-md5: 40aedb499cb2b6f106d909d9d97f869a
+# Source0-md5: cf539ffe9e0dd6f943ac9de75fd2e56e
 Patch0:                %{name}-config.patch
 URL:           http://www.libsdl.org/
 %{?with_kms:BuildRequires:     Mesa-libgbm-devel >= 11.1.0}
@@ -106,10 +104,8 @@ BuildRequires:     xorg-lib-libXScrnSaver-devel
 BuildRequires: xorg-lib-libXcursor-devel
 BuildRequires: xorg-lib-libXext-devel
 BuildRequires: xorg-lib-libXi-devel
-BuildRequires: xorg-lib-libXinerama-devel
 BuildRequires: xorg-lib-libXrandr-devel
 BuildRequires: xorg-lib-libXrender-devel
-BuildRequires: xorg-lib-libXxf86vm-devel
 %if %{with wayland}
 BuildRequires: xorg-lib-libxkbcommon-devel >= 0.5.0
 %endif