diff options
| author | Graham Christensen <graham@grahamc.com> | 2016-08-31 20:33:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-31 20:33:14 -0400 |
| commit | 43d38c0fea6c6583a1b1545cad6af78055c8a106 (patch) | |
| tree | 640ce5d1aa30b800a7ba0e64272f2b66c5fab520 /pkgs | |
| parent | 96004b9d8c14c7d49560173dcf8d40b3a77f6e89 (diff) | |
| parent | 7b8668892316f1b5fb25d4526330f8e908c27c28 (diff) | |
Merge pull request #18174 from acowley/ffmpeg-update-3.1.3
ffmpeg-full: 3.0.2 -> 3.1.3
Diffstat (limited to 'pkgs')
| -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 8ec1dd283e20e..f4621216a092d 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 0bd693c8b23b6..fa627377b625c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7209,8 +7209,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 { |