From d15818f55a2d82ccbb591d2f9356a2c00671d22b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 17 Dec 2018 07:53:18 -0600 Subject: [PATCH 1/9] ffmpeg: 4.0.2 -> 4.0.3 https://www.ffmpeg.org/download.html#releases https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n4.0.3 --- pkgs/development/libraries/ffmpeg/4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index b470d45ba43f..6d559f5511b5 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "4.0.2"; - sha256 = "0mnh41j3kzi3x3clai1yhqasr1kc8zvd5cz0283pxhs2bxrm2v1l"; + branch = "4.0.3"; + sha256 = "0v40nygrv79inyvzcnv9zi75jya63n033j4gpm2r3hwnma40hr39"; darwinFrameworks = [ Cocoa CoreMedia ]; }) From 842e9184a955ccf307ff00b2a671330a65ce0013 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 17 Dec 2018 08:01:45 -0600 Subject: [PATCH 2/9] ffmpeg-full: 4.0.2 -> 4.0.3 --- pkgs/development/libraries/ffmpeg-full/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 4c1ad34f6da3..9f34c86107c0 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -232,11 +232,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "15rgzcmdccy4flajs63gkz4n3k24wkkg50r13l1r83lrxg4hqp59"; + sha256 = "1vg229mxcrm415cq6q1nfm891hm4x56mb5p4cqjnlqnky7ikfg15"; }; prePatch = '' From 6ba05c7dac6dbba27f997ceff0ad400da6bb7854 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 17 Dec 2018 08:07:59 -0600 Subject: [PATCH 3/9] ffmpeg_3_4: 3.4.4 -> 3.4.5 --- pkgs/development/libraries/ffmpeg/3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix index b99c7240daec..f8343e668a67 100644 --- a/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/pkgs/development/libraries/ffmpeg/3.4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "3.4.4"; - sha256 = "0xmcijcpa7b59ws5ycmnp0a3pjmnpgly0zv8yff6if4p7pw7406f"; + branch = "3.4.5"; + sha256 = "0cbzysj9pskxh1kfdwmq2848fn6gi4pvh5y3insv10pdhpcjp8a3"; darwinFrameworks = [ Cocoa CoreMedia ]; }) From 2420e969905ff1afccef94745055f2a4d7cefa04 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 17 Dec 2018 08:13:09 -0600 Subject: [PATCH 4/9] ffmpeg{_4,-full}: 4.0.3 -> 4.1 --- pkgs/development/libraries/ffmpeg-full/default.nix | 4 ++-- pkgs/development/libraries/ffmpeg/4.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 9f34c86107c0..6ec08e1111f1 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -232,11 +232,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "4.0.3"; + version = "4.1"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "1vg229mxcrm415cq6q1nfm891hm4x56mb5p4cqjnlqnky7ikfg15"; + sha256 = "150rrm549fy1x71c9whmyi5knyd9sliwvmcsm438bdgg4v8c93m3"; }; prePatch = '' diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 6d559f5511b5..9821357de3b9 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "4.0.3"; - sha256 = "0v40nygrv79inyvzcnv9zi75jya63n033j4gpm2r3hwnma40hr39"; + branch = "4.1"; + sha256 = "19d16dhb4gx3akhbqd8844awx1axxli91bsjwsm4qp2a4i1zp15n"; darwinFrameworks = [ Cocoa CoreMedia ]; }) From 8ac99ab1f4691ed50a65258b2424d4cd0ba8ff72 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 17 Dec 2018 09:48:54 -0600 Subject: [PATCH 5/9] ffmpeg-full: added missing libXext dep, needed for 'xlib' support --- pkgs/development/libraries/ffmpeg-full/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 6ec08e1111f1..d20d7a9e6b25 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -95,6 +95,7 @@ , libxcbxfixesExtlib ? true # X11 grabbing mouse rendering , libxcbshapeExtlib ? true # X11 grabbing shape rendering , libXv ? null # Xlib support +, libXext ? null # Xlib support , lzma ? null # xz-utils , nvenc ? false, nvidia-video-sdk ? null # NVIDIA NVENC support , callPackage # needed for NVENC to access external ffmpeg nvidia headers @@ -357,7 +358,7 @@ stdenv.mkDerivation rec { (enableFeature (libvorbis != null) "libvorbis") (enableFeature (libvpx != null) "libvpx") (enableFeature (libwebp != null) "libwebp") - (enableFeature (libX11 != null && libXv != null) "xlib") + (enableFeature (libX11 != null && libXv != null && libXext != null) "xlib") (enableFeature (libxcb != null) "libxcb") (enableFeature libxcbshmExtlib "libxcb-shm") (enableFeature libxcbxfixesExtlib "libxcb-xfixes") @@ -410,7 +411,7 @@ stdenv.mkDerivation rec { bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa 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 zeromq4 zlib ] ++ optional openglExtlib libGLU_combined From d9c1dd28027343ff8ebc145f809d42f969836e59 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 29 Dec 2018 17:51:06 -0600 Subject: [PATCH 6/9] libaom: 1.0.0 -> 1.0.0.errata.1 --- pkgs/development/libraries/libaom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index f6ff7e758956..43916d27d24f 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "libaom-${version}"; - version = "1.0.0"; + version = "1.0.0.errata.1"; src = fetchgit { url = "https://aomedia.googlesource.com/aom"; rev = "v${version}"; - sha256 = "07h2vhdiq7c3fqaz44rl4vja3dgryi6n7kwbwbj1rh485ski4j82"; + sha256 = "090phh4jl9z6m2pwpfpwcjh6iyw0byngb2n112qxkg6a3gsaa62f"; }; nativeBuildInputs = [ From d349cfee88384b4cc353dba8d1154f230520bcc4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 29 Dec 2018 23:17:58 -0600 Subject: [PATCH 7/9] libaom: go back to building libraries however upstream decides Presently this means static, instead of the shared we started building after a recent change (my blame). Darwin build breaks with this, and it was introduced on a whim so instead of making this platform-specific, go back to how things were previously. --- pkgs/development/libraries/libaom/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 43916d27d24f..6ce84bef15e4 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -14,10 +14,6 @@ stdenv.mkDerivation rec { yasm perl cmake pkgconfig python3 ]; - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - ]; - preConfigure = '' # build uses `git describe` to set the build version cat > $NIX_BUILD_TOP/git << "EOF" From 471804736d2187b41b3e49cdefa1dadf11b423ed Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 31 Dec 2018 11:00:03 -0600 Subject: [PATCH 8/9] ffmpeg-full: use cf-private to fix Darwin build --- pkgs/development/libraries/ffmpeg-full/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index d20d7a9e6b25..202ca502d688 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -140,7 +140,7 @@ * Darwin frameworks */ , Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox -, VideoDecodeAcceleration, CF +, VideoDecodeAcceleration, cf-private }: /* Maintainer notes: @@ -434,7 +434,7 @@ stdenv.mkDerivation rec { FILES+=($(ls $out/lib/*.dylib)) for f in ''${FILES[@]}; do 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 done ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0ccf05902d1..5170802e046a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9731,7 +9731,7 @@ in vid-stab = if stdenv.isDarwin then null else vid-stab; x265 = if stdenv.isDarwin then null else x265; xavs = if stdenv.isDarwin then null else xavs; - inherit (darwin) CF; + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices CoreAudio AVFoundation MediaToolbox VideoDecodeAcceleration; From 19d6c32fcf216a9312c99dc2d9896bd26c09d0f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 19 Jan 2019 16:55:08 +0100 Subject: [PATCH 9/9] libaom: fix fetch (and tweak version accordingly) Apparently, upstream renamed the tag in the meantime :-/ --- pkgs/development/libraries/libaom/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 6ce84bef15e4..c7d7bfb1e824 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "libaom-${version}"; - version = "1.0.0.errata.1"; + version = "1.0.0-errata1"; src = fetchgit { url = "https://aomedia.googlesource.com/aom";