diff options
| author | Anthony Cowley <acowley@gmail.com> | 2016-08-31 14:03:58 -0400 |
|---|---|---|
| committer | Anthony Cowley <acowley@gmail.com> | 2016-08-31 19:00:27 -0400 |
| commit | 7b8668892316f1b5fb25d4526330f8e908c27c28 (patch) | |
| tree | 1b446dcb2171858aff3f1dcead87b7129c657d2f | |
| parent | 087f4b37e2e2d5c6cf5b4e5f5551c919c34b8a5b (diff) | |
| download | nixlib-7b8668892316f1b5fb25d4526330f8e908c27c28.tar nixlib-7b8668892316f1b5fb25d4526330f8e908c27c28.tar.gz nixlib-7b8668892316f1b5fb25d4526330f8e908c27c28.tar.bz2 nixlib-7b8668892316f1b5fb25d4526330f8e908c27c28.tar.lz nixlib-7b8668892316f1b5fb25d4526330f8e908c27c28.tar.xz nixlib-7b8668892316f1b5fb25d4526330f8e908c27c28.tar.zst nixlib-7b8668892316f1b5fb25d4526330f8e908c27c28.zip | |
ffmpeg-full: 3.0.2 -> 3.1.3
This required a minor patch to work with the darwin stdenv on OS X 10.11 and newer.
| -rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 13 insertions, 8 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 8ec1dd283e20..f4621216a092 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -141,7 +141,8 @@ /* * Darwin frameworks */ -, Cocoa, CoreServices, AVFoundation, MediaToolbox, VideoDecodeAcceleration, CF +, Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox +, VideoDecodeAcceleration, CF }: /* Maintainer notes: @@ -236,14 +237,17 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "3.0.2"; + version = "3.1.3"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "08sjp4dxgcinmv9ly7nm24swmn2cnbbhvph44ihlplf4n33kr542"; + sha256 = "08l8290gipm632dhrqndnphdpkc5ncqc1j3hxdx46r1a3q3mqmzq"; }; - patchPhase = ''patchShebangs .''; + patchPhase = ''patchShebangs . + '' + stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/#ifndef __MAC_10_11/#if 1/' ./libavcodec/audiotoolboxdec.c + ''; configureFlags = [ /* @@ -412,8 +416,8 @@ stdenv.mkDerivation rec { ++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optionals isLinux [ alsaLib libraw1394 libv4l ] ++ optionals nvenc [ nvidia-video-sdk ] - ++ optionals stdenv.isDarwin [ Cocoa CoreServices AVFoundation MediaToolbox - VideoDecodeAcceleration ]; + ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation + MediaToolbox VideoDecodeAcceleration ]; # Build qt-faststart executable buildPhase = optional qtFaststartProgram ''make tools/qt-faststart''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb682895acbc..e2f375cd1fc2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7204,8 +7204,9 @@ in x265 = if stdenv.isDarwin then null else x265; xavs = if stdenv.isDarwin then null else xavs; inherit (darwin) CF; - inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices AVFoundation - MediaToolbox VideoDecodeAcceleration; + inherit (darwin.apple_sdk.frameworks) + Cocoa CoreServices CoreAudio AVFoundation MediaToolbox + VideoDecodeAcceleration; }; ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { |