diff options
| author | Carles Pagès <page@ruiec.cat> | 2021-01-17 00:03:46 +0100 |
|---|---|---|
| committer | Carles Pagès <page@ruiec.cat> | 2021-01-17 00:06:38 +0100 |
| commit | d07276113a2a98680777d456dcdc9b24305bb6cf (patch) | |
| tree | 3c85b71687b41a0a36cba93cb6871704a091fbd0 | |
| parent | ac253c6eed1deef2b57aa59b922aa0d2eda03387 (diff) | |
| download | nixpkgs-d07276113a2a98680777d456dcdc9b24305bb6cf.tar nixpkgs-d07276113a2a98680777d456dcdc9b24305bb6cf.tar.gz nixpkgs-d07276113a2a98680777d456dcdc9b24305bb6cf.tar.bz2 nixpkgs-d07276113a2a98680777d456dcdc9b24305bb6cf.tar.lz nixpkgs-d07276113a2a98680777d456dcdc9b24305bb6cf.tar.xz nixpkgs-d07276113a2a98680777d456dcdc9b24305bb6cf.tar.zst nixpkgs-d07276113a2a98680777d456dcdc9b24305bb6cf.zip | |
SDL2: 2.0.12 -> 2.0.14
| -rw-r--r-- | pkgs/development/libraries/SDL2/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/SDL2/find-headers.patch | 17 |
2 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 31624bee2fb..b2dd5039d4c 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -25,11 +25,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "SDL2"; - version = "2.0.12"; + version = "2.0.14"; src = fetchurl { url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; - sha256 = "0qy8wbqvfkb5ps8kxgaaf2zzpkjqbsw712hlp74znbn0jpv6i4il"; + sha256 = "1g1jahknv5r4yhh1xq5sf0md20ybdw1zh1i15lry26sq39bmn8fq"; }; dontDisableStatic = withStatic; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/SDL2/find-headers.patch b/pkgs/development/libraries/SDL2/find-headers.patch index 69dde41c7e2..a2e0c483703 100644 --- a/pkgs/development/libraries/SDL2/find-headers.patch +++ b/pkgs/development/libraries/SDL2/find-headers.patch @@ -1,6 +1,6 @@ -diff -ru3 SDL2-2.0.12/sdl2-config.cmake.in SDL2-2.0.12-new/sdl2-config.cmake.in ---- SDL2-2.0.12/sdl2-config.cmake.in 2020-03-11 02:36:18.000000000 +0100 -+++ SDL2-2.0.12-new/sdl2-config.cmake.in 2020-11-11 11:59:05.178703826 +0100 +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 @@ -6,7 +6,8 @@ set(SDL2_PREFIX "@prefix@") set(SDL2_EXEC_PREFIX "@prefix@") @@ -18,7 +18,7 @@ diff -ru3 SDL2-2.0.12/sdl2-config.cmake.in SDL2-2.0.12-new/sdl2-config.cmake.in - INTERFACE_INCLUDE_DIRECTORIES "@includedir@/SDL2" + INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" IMPORTED_LINK_INTERFACE_LANGUAGES "C" - IMPORTED_LOCATION "@libdir@/libSDL2.so" + IMPORTED_LOCATION "@libdir@/${CMAKE_SHARED_LIBRARY_PREFIX}SDL2${CMAKE_SHARED_LIBRARY_SUFFIX}" INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS}") add_library(SDL2::SDL2-static STATIC IMPORTED) @@ -26,12 +26,11 @@ diff -ru3 SDL2-2.0.12/sdl2-config.cmake.in SDL2-2.0.12-new/sdl2-config.cmake.in - INTERFACE_INCLUDE_DIRECTORIES "@includedir@/SDL2" + INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" IMPORTED_LINK_INTERFACE_LANGUAGES "C" - IMPORTED_LOCATION "@libdir@/libSDL2.a" + IMPORTED_LOCATION "@libdir@/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2${CMAKE_STATIC_LIBRARY_SUFFIX}" INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS_STATIC}") -Només a SDL2-2.0.12-new/: sdl2-config.cmake.in.orig -diff -ru3 SDL2-2.0.12/sdl2-config.in SDL2-2.0.12-new/sdl2-config.in ---- SDL2-2.0.12/sdl2-config.in 2020-03-11 02:36:18.000000000 +0100 -+++ SDL2-2.0.12-new/sdl2-config.in 2020-11-11 11:56:26.432955479 +0100 +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 @@ -42,7 +42,11 @@ echo @SDL_VERSION@ ;; |