New version 2.0.16

This commit is contained in:
Andrey Bondrov 2021-08-11 10:33:03 +10:00
parent b3264dae33
commit 15492212f5
5 changed files with 63 additions and 20 deletions

View file

@ -1,2 +1,2 @@
sources:
SDL2-2.0.12.tar.gz: e8ba91bf5eb438dbcf1fedf0530a1bcbe30d3bb6
SDL2-2.0.16.tar.gz: 57825428174adb2ac947e4014080c262505aa972

40
SDL2-2.0.16-libdir.patch Normal file
View file

@ -0,0 +1,40 @@
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

@ -0,0 +1,12 @@
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:17:18.363243527 +1000
+++ SDL2-2.0.16-patched/CMakeLists.txt 2021-08-11 10:18:52.446580179 +1000
@@ -2564,7 +2564,7 @@
elseif(UNIX AND NOT ANDROID)
set_target_properties(SDL2 PROPERTIES
VERSION ${LT_VERSION}
- SOVERSION ${LT_MAJOR}
+ SOVERSION 0
OUTPUT_NAME "SDL2-${LT_RELEASE}")
else()
if(WINDOWS OR CYGWIN)

View file

@ -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-10-24 05:27:45.000000000 +1000
+++ SDL2-2.0.7-patched/CMakeLists.txt 2017-11-17 11:57:50.811762729 +1000
@@ -1699,7 +1699,7 @@
elseif(UNIX AND NOT ANDROID)
set_target_properties(SDL2 PROPERTIES
VERSION ${LT_VERSION}
- SOVERSION ${LT_REVISION}
+ SOVERSION 0
OUTPUT_NAME "SDL2-${LT_RELEASE}")
else()
set_target_properties(SDL2 PROPERTIES

View file

@ -1,4 +1,4 @@
%define oversion 0.12.0
%define oversion 0.16.0
%define api 2.0
%define major 0
@ -7,7 +7,7 @@
Summary: Simple DirectMedia Layer
Name: SDL2
Version: 2.0.12
Version: 2.0.16
Release: 1
License: Zlib
Group: System/Libraries
@ -15,7 +15,10 @@ 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
Patch1: SDL2-2.0.7-soversion.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: wayland-doc
BuildRequires: nas-devel
@ -59,7 +62,7 @@ This package contains the library needed to run programs dynamically
linked with %{name}.
%files -n %{libname}
%doc README.txt README-SDL.txt CREDITS.txt COPYING.txt BUGS.txt WhatsNew.txt
%doc README.md README-SDL.txt CREDITS.txt LICENSE.txt BUGS.txt WhatsNew.txt
%{_libdir}/libSDL2-%{api}.so.%{major}
%{_libdir}/libSDL2-%{api}.so.%{oversion}
@ -76,14 +79,14 @@ This package contains the headers that programmers will need to develop
applications which will use %{name}.
%files -n %{devname}
%doc README.txt README-SDL.txt CREDITS.txt COPYING.txt BUGS.txt WhatsNew.txt
%doc README.md README-SDL.txt CREDITS.txt LICENSE.txt BUGS.txt WhatsNew.txt
%{_bindir}/sdl2-config
%{_libdir}/cmake/SDL2/
%dir %{_libdir}/cmake/SDL2/
%{_libdir}/cmake/SDL2/*
%{_libdir}/pkgconfig/sdl2.pc
%{_libdir}/*.so
%{_libdir}/libSDL2main.a
%{_datadir}/cmake/Modules/FindSDL2.cmake
%{_libdir}/cmake/SDL2/*
%dir %{_includedir}/SDL2
%{_includedir}/SDL2/*.h
%{_datadir}/aclocal/sdl2.m4