public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ffmpeg-full: 3.0.2 -> 3.1.3

Browse Source 
This required a minor patch to work with the darwin stdenv on OS X 10.11
and newer.
This commit is contained in:
Anthony Cowley 2016-08-31 14:03:58 -04:00
parent 087f4b37e2
commit 7b86688923
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/ffmpeg-full/default.nix
View File

@ -141,7 +141,8 @@
/* /*
* Darwin frameworks * Darwin frameworks
*/ */
, Cocoa, CoreServices, AVFoundation, MediaToolbox, VideoDecodeAcceleration, CF , Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox
, VideoDecodeAcceleration, CF
}: }:
/* Maintainer notes: /* Maintainer notes:
@ -236,14 +237,17 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ffmpeg-full-${version}"; name = "ffmpeg-full-${version}";
version = "3.0.2"; version = "3.1.3";
src = fetchurl { src = fetchurl {
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; 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 = [ configureFlags = [
/* /*
@ -412,8 +416,8 @@ stdenv.mkDerivation rec {
++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optional ((isLinux || isFreeBSD) && libva != null) libva
++ optionals isLinux [ alsaLib libraw1394 libv4l ] ++ optionals isLinux [ alsaLib libraw1394 libv4l ]
++ optionals nvenc [ nvidia-video-sdk ] ++ optionals nvenc [ nvidia-video-sdk ]
++ optionals stdenv.isDarwin [ Cocoa CoreServices AVFoundation MediaToolbox ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation
VideoDecodeAcceleration ]; MediaToolbox VideoDecodeAcceleration ];
# Build qt-faststart executable # Build qt-faststart executable
buildPhase = optional qtFaststartProgram ''make tools/qt-faststart''; buildPhase = optional qtFaststartProgram ''make tools/qt-faststart'';

5
pkgs/top-level/all-packages.nix
View File

@ -7204,8 +7204,9 @@ in
x265 = if stdenv.isDarwin then null else x265; x265 = if stdenv.isDarwin then null else x265;
xavs = if stdenv.isDarwin then null else xavs; xavs = if stdenv.isDarwin then null else xavs;
inherit (darwin) CF; inherit (darwin) CF;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices AVFoundation inherit (darwin.apple_sdk.frameworks)
MediaToolbox VideoDecodeAcceleration; Cocoa CoreServices CoreAudio AVFoundation MediaToolbox
VideoDecodeAcceleration;
}; };
ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer {