nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-18 03:34:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
c2eb9a753a
nixpkgs/pkgs/development/libraries/SDL2/find-headers.patch

47 lines
2.0 KiB
Diff
Raw Normal View History

SDL2: 2.0.12 -> 2.0.14
2021-01-16 23:03:46 +00:00
diff -ru3 SDL2-2.0.14/sdl2-config.cmake.in SDL2-2.0.14-new/sdl2-config.cmake.in
--- SDL2-2.0.14/sdl2-config.cmake.in 2020-12-21 18:44:36.000000000 +0100
+++ SDL2-2.0.14-new/sdl2-config.cmake.in 2021-01-16 23:53:40.721121792 +0100
SDL2: fix cmake interface includes for SDL2::SDL2 Fixes #103346. The environment var for finding the cmake companion libs headers was missing from the SDL2::SDL2 target, it only worked when using SDL2_INCLUDE_DIRS.
2020-11-11 11:53:49 +00:00
@@ -6,7 +6,8 @@
SDL2: cleanup and add patch to discover extensions
2016-08-22 03:24:32 +00:00
set(SDL2_PREFIX "@prefix@")
set(SDL2_EXEC_PREFIX "@prefix@")
set(SDL2_LIBDIR "@libdir@")
-set(SDL2_INCLUDE_DIRS "@includedir@/SDL2")
+set(SDL2_INCLUDE_DIRS "@includedir@/SDL2" $ENV{SDL2_PATH})
SDL2: don't mix space-separated / lists in cmake config The SDL2_PATH environment variable is space-separated. However, CMake lists are semicolon separated, and doing set(list "a" ${var}) will end up with list containing "a;b c d". This causes downstream users to fail parsing the include dirs list. Normalize the include dirs list to a normal CMake semicolon-separated list using separate_arguments.
2019-08-21 08:54:40 +00:00
+separate_arguments(SDL2_INCLUDE_DIRS)
SDL2: cleanup and add patch to discover extensions
2016-08-22 03:24:32 +00:00
set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@")
SDL2: fix cmake interface includes for SDL2::SDL2 Fixes #103346. The environment var for finding the cmake companion libs headers was missing from the SDL2::SDL2 target, it only worked when using SDL2_INCLUDE_DIRS.
2020-11-11 11:53:49 +00:00
string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES)
@@ -20,14 +21,14 @@
add_library(SDL2::SDL2 SHARED IMPORTED)
set_target_properties(SDL2::SDL2 PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "@includedir@/SDL2"
+ INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}"
IMPORTED_LINK_INTERFACE_LANGUAGES "C"
SDL2: 2.0.12 -> 2.0.14
2021-01-16 23:03:46 +00:00
IMPORTED_LOCATION "@libdir@/${CMAKE_SHARED_LIBRARY_PREFIX}SDL2${CMAKE_SHARED_LIBRARY_SUFFIX}"
SDL2: fix cmake interface includes for SDL2::SDL2 Fixes #103346. The environment var for finding the cmake companion libs headers was missing from the SDL2::SDL2 target, it only worked when using SDL2_INCLUDE_DIRS.
2020-11-11 11:53:49 +00:00
INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS}")
add_library(SDL2::SDL2-static STATIC IMPORTED)
set_target_properties(SDL2::SDL2-static PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "@includedir@/SDL2"
+ INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}"
IMPORTED_LINK_INTERFACE_LANGUAGES "C"
SDL2: 2.0.12 -> 2.0.14
2021-01-16 23:03:46 +00:00
IMPORTED_LOCATION "@libdir@/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2${CMAKE_STATIC_LIBRARY_SUFFIX}"
SDL2: fix cmake interface includes for SDL2::SDL2 Fixes #103346. The environment var for finding the cmake companion libs headers was missing from the SDL2::SDL2 target, it only worked when using SDL2_INCLUDE_DIRS.
2020-11-11 11:53:49 +00:00
INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS_STATIC}")
SDL2: 2.0.12 -> 2.0.14
2021-01-16 23:03:46 +00:00
diff -ru3 SDL2-2.0.14/sdl2-config.in SDL2-2.0.14-new/sdl2-config.in
--- SDL2-2.0.14/sdl2-config.in 2020-12-21 18:44:36.000000000 +0100
+++ SDL2-2.0.14-new/sdl2-config.in 2021-01-16 23:57:11.940353171 +0100
SDL2: cleanup and add patch to discover extensions
2016-08-22 03:24:32 +00:00
@@ -42,7 +42,11 @@
echo @SDL_VERSION@
;;
--cflags)
- echo -I@includedir@/SDL2 @SDL_CFLAGS@
+ SDL_CFLAGS=""
+ for i in @includedir@/SDL2 $SDL2_PATH; do
+ SDL_CFLAGS="$SDL_CFLAGS -I$i"
+ done
+ echo $SDL_CFLAGS @SDL_CFLAGS@
;;
@ENABLE_SHARED_TRUE@ --libs)
@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
Reference in New Issue Copy Permalink