diff --git a/.abf.yml b/.abf.yml index f47a456..936abb9 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - SDL2-2.0.9.tar.gz: 4354c6baad9a48486182656a7506abfb63e9bff5 + SDL2-2.0.10.tar.gz: fb31312ea1d4b45db839796ae2336dfe3d5884e5 diff --git a/SDL2-2.0.10-cmake-libdir.patch b/SDL2-2.0.10-cmake-libdir.patch new file mode 100644 index 0000000..8d417b1 --- /dev/null +++ b/SDL2-2.0.10-cmake-libdir.patch @@ -0,0 +1,12 @@ +diff -urN SDL2-2.0.10/CMakeLists.txt SDL2-2.0.10-patched/CMakeLists.txt +--- SDL2-2.0.10/CMakeLists.txt 2019-07-25 14:32:36.000000000 +1000 ++++ SDL2-2.0.10-patched/CMakeLists.txt 2019-08-30 21:49:54.390555194 +1000 +@@ -1885,7 +1885,7 @@ + if (WINDOWS) + set(PKG_PREFIX "cmake") + else () +- set(PKG_PREFIX "lib/cmake/SDL2") ++ set(PKG_PREFIX "lib${LIB_SUFFIX}/cmake/SDL2") + endif () + + include(CMakePackageConfigHelpers) diff --git a/SDL2-2.0.7-cmake-libdir.patch b/SDL2-2.0.7-cmake-libdir.patch deleted file mode 100644 index 75695cf..0000000 --- a/SDL2-2.0.7-cmake-libdir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN SDL2-2.0.7/CMakeLists.txt SDL2-2.0.7-patched/CMakeLists.txt ---- SDL2-2.0.7/CMakeLists.txt 2017-11-17 12:09:51.064776019 +1000 -+++ SDL2-2.0.7-patched/CMakeLists.txt 2017-11-17 12:27:57.151796060 +1000 -@@ -1750,7 +1750,7 @@ - elseif (WINDOWS) - set(PKG_PREFIX "cmake") - else () -- set(PKG_PREFIX "lib/cmake/SDL2") -+ set(PKG_PREFIX "lib${LIB_SUFFIX}/cmake/SDL2") - endif () - - include(CMakePackageConfigHelpers) diff --git a/SDL2.spec b/SDL2.spec index 1c3aaac..35686f7 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -1,4 +1,4 @@ -%define oversion 0.9.0 +%define oversion 0.10.0 %define api 2.0 %define major 0 @@ -7,15 +7,15 @@ Summary: Simple DirectMedia Layer Name: SDL2 -Version: 2.0.9 -Release: 3 +Version: 2.0.10 +Release: 1 License: Zlib Group: System/Libraries Url: http://www.libsdl.org/ Source0: http://www.libsdl.org/release/%{name}-%{version}.tar.gz Patch0: SDL2-2.0.3-cmake.patch Patch1: SDL2-2.0.7-soversion.patch -Patch2: SDL2-2.0.7-cmake-libdir.patch +Patch2: SDL2-2.0.10-cmake-libdir.patch BuildRequires: cmake BuildRequires: wayland-doc BuildRequires: nas-devel