swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #52444: ffmpeg{_3_4,_4,-full}: updates

Browse source
This commit is contained in:
Vladimír Čunát 2019-01-19 16:56:21 +01:00
parent 23eb5e846d 19d6c32fcf
commit b277551a4b
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
5 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/libraries/ffmpeg-full/default.nix
View file

@ -95,6 +95,7 @@
, libxcbxfixesExtlib ? true # X11 grabbing mouse rendering , libxcbxfixesExtlib ? true # X11 grabbing mouse rendering
, libxcbshapeExtlib ? true # X11 grabbing shape rendering , libxcbshapeExtlib ? true # X11 grabbing shape rendering
, libXv ? null # Xlib support , libXv ? null # Xlib support
, libXext ? null # Xlib support
, lzma ? null # xz-utils , lzma ? null # xz-utils
, nvenc ? false, nvidia-video-sdk ? null, nv-codec-headers ? null # NVIDIA NVENC support , nvenc ? false, nvidia-video-sdk ? null, nv-codec-headers ? null # NVIDIA NVENC support
, callPackage # needed for NVENC to access external ffmpeg nvidia headers , callPackage # needed for NVENC to access external ffmpeg nvidia headers
@ -139,7 +140,7 @@
* Darwin frameworks * Darwin frameworks
*/ */
, Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox , Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox
, VideoDecodeAcceleration, CF , VideoDecodeAcceleration, cf-private
}: }:
/* Maintainer notes: /* Maintainer notes:
@ -230,11 +231,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ffmpeg-full-${version}"; name = "ffmpeg-full-${version}";
version = "4.0.2"; version = "4.1";
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 = "15rgzcmdccy4flajs63gkz4n3k24wkkg50r13l1r83lrxg4hqp59"; sha256 = "150rrm549fy1x71c9whmyi5knyd9sliwvmcsm438bdgg4v8c93m3";
}; };
prePatch = '' prePatch = ''
@ -355,7 +356,7 @@ stdenv.mkDerivation rec {
(enableFeature (libvorbis != null) "libvorbis") (enableFeature (libvorbis != null) "libvorbis")
(enableFeature (libvpx != null) "libvpx") (enableFeature (libvpx != null) "libvpx")
(enableFeature (libwebp != null) "libwebp") (enableFeature (libwebp != null) "libwebp")
(enableFeature (libX11 != null && libXv != null) "xlib") (enableFeature (libX11 != null && libXv != null && libXext != null) "xlib")
(enableFeature (libxcb != null) "libxcb") (enableFeature (libxcb != null) "libxcb")
(enableFeature libxcbshmExtlib "libxcb-shm") (enableFeature libxcbshmExtlib "libxcb-shm")
(enableFeature libxcbxfixesExtlib "libxcb-xfixes") (enableFeature libxcbxfixesExtlib "libxcb-xfixes")
@ -408,7 +409,7 @@ stdenv.mkDerivation rec {
bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm
libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa
libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11
libxcb libXv lzma openal openjpeg libpulseaudio rtmpdump opencore-amr libxcb libXv libXext lzma openal openjpeg libpulseaudio rtmpdump opencore-amr
samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore
zeromq4 zlib zeromq4 zlib
] ++ optional openglExtlib libGLU_combined ] ++ optional openglExtlib libGLU_combined
@ -431,7 +432,7 @@ stdenv.mkDerivation rec {
FILES+=($(ls $out/lib/*.dylib)) FILES+=($(ls $out/lib/*.dylib))
for f in ''${FILES[@]}; do for f in ''${FILES[@]}; do
if [ ! -h "$f" ]; then if [ ! -h "$f" ]; then
install_name_tool -change ${CF}/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation "$f" install_name_tool -change ${cf-private}/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation "$f"
fi fi
done done
''; '';

4
pkgs/development/libraries/ffmpeg/3.4.nix
View file

@ -6,7 +6,7 @@
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = "${branch}"; version = "${branch}";
branch = "3.4.4"; branch = "3.4.5";
sha256 = "0xmcijcpa7b59ws5ycmnp0a3pjmnpgly0zv8yff6if4p7pw7406f"; sha256 = "0cbzysj9pskxh1kfdwmq2848fn6gi4pvh5y3insv10pdhpcjp8a3";
darwinFrameworks = [ Cocoa CoreMedia ]; darwinFrameworks = [ Cocoa CoreMedia ];
}) })

4
pkgs/development/libraries/ffmpeg/4.nix
View file

@ -6,7 +6,7 @@
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = "${branch}"; version = "${branch}";
branch = "4.0.2"; branch = "4.1";
sha256 = "0mnh41j3kzi3x3clai1yhqasr1kc8zvd5cz0283pxhs2bxrm2v1l"; sha256 = "19d16dhb4gx3akhbqd8844awx1axxli91bsjwsm4qp2a4i1zp15n";
darwinFrameworks = [ Cocoa CoreMedia ]; darwinFrameworks = [ Cocoa CoreMedia ];
}) })

8
pkgs/development/libraries/libaom/default.nix
View file

@ -2,22 +2,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libaom-${version}"; name = "libaom-${version}";
version = "1.0.0"; version = "1.0.0-errata1";
src = fetchgit { src = fetchgit {
url = "https://aomedia.googlesource.com/aom"; url = "https://aomedia.googlesource.com/aom";
rev = "v${version}"; rev = "v${version}";
sha256 = "07h2vhdiq7c3fqaz44rl4vja3dgryi6n7kwbwbj1rh485ski4j82"; sha256 = "090phh4jl9z6m2pwpfpwcjh6iyw0byngb2n112qxkg6a3gsaa62f";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
yasm perl cmake pkgconfig python3 yasm perl cmake pkgconfig python3
]; ];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
];
preConfigure = '' preConfigure = ''
# build uses `git describe` to set the build version # build uses `git describe` to set the build version
cat > $NIX_BUILD_TOP/git << "EOF" cat > $NIX_BUILD_TOP/git << "EOF"

2
pkgs/top-level/all-packages.nix
View file

@ -9752,7 +9752,7 @@ in
vid-stab = if stdenv.isDarwin then null else vid-stab; vid-stab = if stdenv.isDarwin then null else vid-stab;
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-private;
inherit (darwin.apple_sdk.frameworks) inherit (darwin.apple_sdk.frameworks)
Cocoa CoreServices CoreAudio AVFoundation MediaToolbox Cocoa CoreServices CoreAudio AVFoundation MediaToolbox
VideoDecodeAcceleration; VideoDecodeAcceleration;