rpms/SDL2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Refresh SDL target split patch to include targets correctly

Browse Source
This commit is contained in:
Neal Gompa 2022-01-07 14:07:08 -05:00
parent e70051f69c
commit 2ddcff2faa
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
PR5171-split-static-cmake-targets.patch
View File

@ -1,6 +1,6 @@
From 7393bdae70b445334157410f61372937b922cdc6 Mon Sep 17 00:00:00 2001 From f68563f1889a3786b74167bdbb286925ff7008be Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com> From: Neal Gompa <ngompa13@gmail.com>
Date: Tue, 4 Jan 2022 09:35:41 -0500 Date: Fri, 7 Jan 2022 13:56:36 -0500
Subject: [PATCH] cmake: Split SDL2-static and SDL2main into their own target Subject: [PATCH] cmake: Split SDL2-static and SDL2main into their own target
exports exports
@ -8,8 +8,9 @@ This makes it so that the generated targets are not interdependent,
which allows Linux distributions to split libraries into the which allows Linux distributions to split libraries into the
appropriate subpackages as needed. appropriate subpackages as needed.
--- ---
CMakeLists.txt | 56 +++++++++++++++++++++++++++++++++++++++----------- CMakeLists.txt | 56 +++++++++++++++++++++++++++++++++++++-----------
1 file changed, 44 insertions(+), 12 deletions(-) SDL2Config.cmake | 6 ++++++
2 files changed, 50 insertions(+), 12 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76cc3c516..be15edc74 100644 index 76cc3c516..be15edc74 100644
@ -106,6 +107,21 @@ index 76cc3c516..be15edc74 100644
install( install(
FILES FILES
${CMAKE_CURRENT_SOURCE_DIR}/SDL2Config.cmake ${CMAKE_CURRENT_SOURCE_DIR}/SDL2Config.cmake
diff --git a/SDL2Config.cmake b/SDL2Config.cmake
index 7c31469f1..831eab6e8 100644
--- a/SDL2Config.cmake
+++ b/SDL2Config.cmake
@@ -1,4 +1,10 @@
include("${CMAKE_CURRENT_LIST_DIR}/SDL2Targets.cmake")
+if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2mainTargets.cmake")
+ include("${CMAKE_CURRENT_LIST_DIR}/SDL2mainTargets.cmake")
+endif()
+if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2staticTargets.cmake")
+ include("${CMAKE_CURRENT_LIST_DIR}/SDL2staticTargets.cmake")
+endif()
# on static-only builds create an alias
if(NOT TARGET SDL2::SDL2 AND TARGET SDL2::SDL2-static)
-- --
2.33.1 2.33.1

5
SDL2.spec
View File

@ -10,7 +10,7 @@
Name: SDL2 Name: SDL2
Version: 2.0.18 Version: 2.0.18
Release: 4%{?dist} Release: 5%{?dist}
Summary: Cross-platform multimedia library Summary: Cross-platform multimedia library
License: zlib and MIT License: zlib and MIT
URL: http://www.libsdl.org/ URL: http://www.libsdl.org/
@ -175,6 +175,9 @@ install -p -m 644 %{SOURCE2} %{buildroot}%{_includedir}/SDL2/SDL_revision.h
%{_libdir}/cmake/SDL2/SDL2staticTargets*.cmake %{_libdir}/cmake/SDL2/SDL2staticTargets*.cmake
%changelog %changelog
* Fri Jan 07 2022 Neal Gompa <ngompa@fedoraproject.org> - 2.0.18-5
- Refresh SDL target split patch to include targets correctly
* Fri Jan 07 2022 Neal Gompa <ngompa@fedoraproject.org> - 2.0.18-4 * Fri Jan 07 2022 Neal Gompa <ngompa@fedoraproject.org> - 2.0.18-4
- Move libSDLmain from -static to -devel - Move libSDLmain from -static to -devel