Update version to 2.0.20

This commit is contained in:
Aleksandr Proklov 2022-04-03 11:08:17 +03:00
parent 04bff88064
commit 35906984ff
4 changed files with 7 additions and 59 deletions

View file

@ -1,2 +1,2 @@
sources:
SDL2-2.0.16.tar.gz: 57825428174adb2ac947e4014080c262505aa972
SDL2-2.0.20.tar.gz: 18ce006cbf07502f48abfedc088c14404091f3d3

View file

@ -1,40 +0,0 @@
diff -urN SDL2-2.0.16/CMakeLists.txt SDL2-2.0.16-patched/CMakeLists.txt
--- SDL2-2.0.16/CMakeLists.txt 2021-08-11 10:25:55.913261762 +1000
+++ SDL2-2.0.16-patched/CMakeLists.txt 2021-08-11 10:26:35.993263176 +1000
@@ -2659,15 +2659,15 @@
##### Installation targets #####
install(TARGETS ${_INSTALL_LIBS} EXPORT SDL2Targets
- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}"
- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}"
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
##### Export files #####
if (WINDOWS)
set(PKG_PREFIX "cmake")
else ()
- set(PKG_PREFIX "${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}/cmake/SDL2")
+ set(PKG_PREFIX "${CMAKE_INSTALL_LIBDIR}/cmake/SDL2")
endif ()
include(CMakePackageConfigHelpers)
@@ -2714,7 +2714,7 @@
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
\"lib${SONAME}${SOPOSTFIX}${SOEXT}\" \"libSDL2${SOPOSTFIX}${SOEXT}\"
WORKING_DIRECTORY \"${SDL2_BINARY_DIR}\")")
- install(FILES ${SDL2_BINARY_DIR}/libSDL2${SOPOSTFIX}${SOEXT} DESTINATION "${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}")
+ install(FILES ${SDL2_BINARY_DIR}/libSDL2${SOPOSTFIX}${SOEXT} DESTINATION "${CMAKE_INSTALL_LIBDIR}")
endif()
endif()
if(FREEBSD)
@@ -2722,7 +2722,7 @@
install(FILES ${SDL2_BINARY_DIR}/sdl2.pc DESTINATION "libdata/pkgconfig")
else()
install(FILES ${SDL2_BINARY_DIR}/sdl2.pc
- DESTINATION "${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}/pkgconfig")
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
endif()
install(PROGRAMS ${SDL2_BINARY_DIR}/sdl2-config DESTINATION "${CMAKE_INSTALL_BINDIR}")
# TODO: what about the .spec file? Is it only needed for RPM creation?

View file

@ -1,13 +0,0 @@
diff -urN SDL2-2.0.3/CMakeLists.txt SDL2-2.0.3-patched/CMakeLists.txt
--- SDL2-2.0.3/CMakeLists.txt 2014-03-16 13:31:41.000000000 +1100
+++ SDL2-2.0.3-patched/CMakeLists.txt 2014-06-08 21:15:39.121190857 +1100
@@ -148,9 +148,6 @@
set(CMAKE_C_FLAGS "$ENV{CFLAGS}")
list(APPEND EXTRA_CFLAGS "$ENV{CFLAGS}")
endif()
-if(NOT ("$ENV{CFLAGS}" STREQUAL "")) # Hackish, but does the trick on Win32
- list(APPEND EXTRA_LDFLAGS "$ENV{LDFLAGS}")
-endif()
if(MSVC)
option(FORCE_STATIC_VCRT "Force /MT for static VC runtimes" OFF)

View file

@ -1,4 +1,4 @@
%define oversion 0.16.0
%define oversion 0.18.2
%define api 2.0
%define major 0
@ -7,18 +7,15 @@
Summary: Simple DirectMedia Layer
Name: SDL2
Version: 2.0.16
Version: 2.0.20
Release: 1
License: Zlib
Group: System/Libraries
Url: http://www.libsdl.org/
Source0: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
Source1: FindSDL2.cmake
Patch0: SDL2-2.0.3-cmake.patch
# Keep major stable, should be 0
Patch1: SDL2-2.0.16-soversion.patch
# Avoid /usr/lib6464
Patch2: SDL2-2.0.16-libdir.patch
BuildRequires: cmake
BuildRequires: nas-devel
BuildRequires: pkgconfig(alsa)
@ -26,7 +23,11 @@ BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(egl)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glu)
BuildRequires: pkgconfig(jack)
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libpipewire-0.3)
BuildRequires: pkgconfig(samplerate)
BuildRequires: pkgconfig(sndio)
BuildRequires: pkgconfig(libusb)
BuildRequires: pkgconfig(udev)
BuildRequires: pkgconfig(wayland-client)