about summary refs log tree commit diff
path: root/pkgs/development/libraries/ffmpeg
diff options
context:
space:
mode:
authorCray Elliott <MP2E@archlinux.us>2017-04-22 18:46:23 -0700
committerCray Elliott <MP2E@archlinux.us>2017-04-30 16:52:48 -0700
commitdfd371de9b011e319be6ee1fb53ed0dfcfe10431 (patch)
tree40ca26b9f5fa9499e2a4ba754309b478f809dcee /pkgs/development/libraries/ffmpeg
parent7172556e8d0362901db5c0bf1ff7f86e2251cc95 (diff)
downloadnixlib-dfd371de9b011e319be6ee1fb53ed0dfcfe10431.tar
nixlib-dfd371de9b011e319be6ee1fb53ed0dfcfe10431.tar.gz
nixlib-dfd371de9b011e319be6ee1fb53ed0dfcfe10431.tar.bz2
nixlib-dfd371de9b011e319be6ee1fb53ed0dfcfe10431.tar.lz
nixlib-dfd371de9b011e319be6ee1fb53ed0dfcfe10431.tar.xz
nixlib-dfd371de9b011e319be6ee1fb53ed0dfcfe10431.tar.zst
nixlib-dfd371de9b011e319be6ee1fb53ed0dfcfe10431.zip
ffmpeg: use SDL2 instead of SDL for 3.2 and above
addresses issue #24658

special thanks to codyopel who suggested this solution!
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
-rw-r--r--pkgs/development/libraries/ffmpeg/generic.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 0ac82f98a24b..8c74abc57094 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -6,7 +6,7 @@
 # Build options
 , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
 , multithreadBuild ? true # Multithreading via pthreads/win32 threads
-, sdlSupport ? !stdenv.isArm, SDL ? null
+, sdlSupport ? !stdenv.isArm, SDL ? null, SDL2 ? null
 , vdpauSupport ? !stdenv.isArm, libvdpau ? null
 # Developer options
 , debugDeveloper ? false
@@ -128,7 +128,7 @@ stdenv.mkDerivation rec {
       (ifMinVer "2.4" "--enable-lzma")
       (ifMinVer "2.2" (enableFeature openglSupport "opengl"))
       (disDarwinOrArmFix (ifMinVer "0.9" "--enable-libpulse") "0.9" "--disable-libpulse")
-      (ifMinVer "2.5" (if sdlSupport then "--enable-sdl" else "")) # Only configurable since 2.5, auto detected before then
+      (ifMinVer "2.5" (if sdlSupport && reqMin "3.2" then "--enable-sdl2" else if sdlSupport then "--enable-sdl" else null)) # autodetected before 2.5, SDL1 support removed in 3.2 for SDL2
       (ifMinVer "1.2" "--enable-libsoxr")
       "--enable-libx264"
       "--enable-libxvid"
@@ -155,7 +155,7 @@ stdenv.mkDerivation rec {
     ++ optional isLinux alsaLib
     ++ optionals isDarwin darwinFrameworks
     ++ optional vdpauSupport libvdpau
-    ++ optional sdlSupport SDL;
+    ++ optional sdlSupport (if reqMin "3.2" then SDL2 else SDL);
 
 
   enableParallelBuilding = true;