From b904705edd399b63876cbf1332de551eb19428df Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Wed, 13 May 2020 20:33:08 +0200 Subject: [PATCH] update ffmpeg and aom --- overlays/ffmpeg.nix | 16 +++------------- overlays/libaom.nix | 6 +++--- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/overlays/ffmpeg.nix b/overlays/ffmpeg.nix index 115ac6f..4b1aecd 100644 --- a/overlays/ffmpeg.nix +++ b/overlays/ffmpeg.nix @@ -1,22 +1,21 @@ self: super: { ffmpeggit = super.ffmpeg-full.overrideAttrs (old: rec { - version = "4.2.2"; + version = "4.2.2-04pkq2y2"; src = super.fetchurl { url = "http://www.ffmpeg.org/releases/ffmpeg-snapshot-git.tar.bz2"; - sha256 = "1lj7spgmv2kqiz25dpy2gzbciqdsm7j3q1s1j4csnal5jyq6a28m"; + sha256 = "04pkq2y245l09kyd1hb9b4qb9l2liq8k4q6yr613wy6b1bj8pb81"; }; configureFlags = [ "--enable-gpl" "--enable-version3" - "--enable-static" "--disable-debug" + "--enable-static" "--disable-ffplay" "--disable-indev=sndio" "--disable-outdev=sndio" "--cc=gcc" "--enable-fontconfig" - "--enable-frei0r" "--enable-gnutls" "--enable-gmp" "--enable-libgme" @@ -24,25 +23,16 @@ self: super: "--enable-libaom" "--enable-libfribidi" "--enable-libass" - "--enable-libvmaf" "--enable-libfreetype" - "--enable-libmp3lame" "--enable-libopencore-amrnb" "--enable-libopencore-amrwb" - "--enable-libopenjpeg" "--enable-libsoxr" - "--enable-libspeex" - "--enable-libvorbis" "--enable-libopus" "--enable-libtheora" - "--enable-libvidstab" "--enable-libvo-amrwbenc" - "--enable-libvpx" "--enable-libwebp" "--enable-libx264" - "--enable-libx265" "--enable-libdav1d" - "--enable-libxvid" ]; patches = []; }); diff --git a/overlays/libaom.nix b/overlays/libaom.nix index 27be664..3f64210 100644 --- a/overlays/libaom.nix +++ b/overlays/libaom.nix @@ -1,11 +1,11 @@ self: super: { mylibaom = super.libaom.overrideAttrs (old: rec { - version = "1.0.0-g33e9b7fb1"; + version = "1.0.0-fdca7c6440"; src = super.fetchgit { url = "https://aomedia.googlesource.com/aom"; - rev = "e6a12489069fdf7188963950cdec8ef7ef333f1d"; - sha256 = "1ncvn5l8zczkjxfmld2ppcwqkc80pm38y1qaf1yil1llfx85xvhh"; + rev = "fdca7c64406efeb3a5f9012801bf122b06d2045a"; + sha256 = "00f7cvmcj094sdw0i35633yn1ng9w38wl761k1fx6ns8w0byirv1"; };