update ffmpeg and aom

This commit is contained in:
Daniel Olsen 2020-05-13 20:33:08 +02:00
parent 284bd33a6c
commit b904705edd
2 changed files with 6 additions and 16 deletions

View File

@ -1,22 +1,21 @@
self: super: self: super:
{ {
ffmpeggit = super.ffmpeg-full.overrideAttrs (old: rec { ffmpeggit = super.ffmpeg-full.overrideAttrs (old: rec {
version = "4.2.2"; version = "4.2.2-04pkq2y2";
src = super.fetchurl { src = super.fetchurl {
url = "http://www.ffmpeg.org/releases/ffmpeg-snapshot-git.tar.bz2"; url = "http://www.ffmpeg.org/releases/ffmpeg-snapshot-git.tar.bz2";
sha256 = "1lj7spgmv2kqiz25dpy2gzbciqdsm7j3q1s1j4csnal5jyq6a28m"; sha256 = "04pkq2y245l09kyd1hb9b4qb9l2liq8k4q6yr613wy6b1bj8pb81";
}; };
configureFlags = [ configureFlags = [
"--enable-gpl" "--enable-gpl"
"--enable-version3" "--enable-version3"
"--enable-static"
"--disable-debug" "--disable-debug"
"--enable-static"
"--disable-ffplay" "--disable-ffplay"
"--disable-indev=sndio" "--disable-indev=sndio"
"--disable-outdev=sndio" "--disable-outdev=sndio"
"--cc=gcc" "--cc=gcc"
"--enable-fontconfig" "--enable-fontconfig"
"--enable-frei0r"
"--enable-gnutls" "--enable-gnutls"
"--enable-gmp" "--enable-gmp"
"--enable-libgme" "--enable-libgme"
@ -24,25 +23,16 @@ self: super:
"--enable-libaom" "--enable-libaom"
"--enable-libfribidi" "--enable-libfribidi"
"--enable-libass" "--enable-libass"
"--enable-libvmaf"
"--enable-libfreetype" "--enable-libfreetype"
"--enable-libmp3lame"
"--enable-libopencore-amrnb" "--enable-libopencore-amrnb"
"--enable-libopencore-amrwb" "--enable-libopencore-amrwb"
"--enable-libopenjpeg"
"--enable-libsoxr" "--enable-libsoxr"
"--enable-libspeex"
"--enable-libvorbis"
"--enable-libopus" "--enable-libopus"
"--enable-libtheora" "--enable-libtheora"
"--enable-libvidstab"
"--enable-libvo-amrwbenc" "--enable-libvo-amrwbenc"
"--enable-libvpx"
"--enable-libwebp" "--enable-libwebp"
"--enable-libx264" "--enable-libx264"
"--enable-libx265"
"--enable-libdav1d" "--enable-libdav1d"
"--enable-libxvid"
]; ];
patches = []; patches = [];
}); });

View File

@ -1,11 +1,11 @@
self: super: self: super:
{ {
mylibaom = super.libaom.overrideAttrs (old: rec { mylibaom = super.libaom.overrideAttrs (old: rec {
version = "1.0.0-g33e9b7fb1"; version = "1.0.0-fdca7c6440";
src = super.fetchgit { src = super.fetchgit {
url = "https://aomedia.googlesource.com/aom"; url = "https://aomedia.googlesource.com/aom";
rev = "e6a12489069fdf7188963950cdec8ef7ef333f1d"; rev = "fdca7c64406efeb3a5f9012801bf122b06d2045a";
sha256 = "1ncvn5l8zczkjxfmld2ppcwqkc80pm38y1qaf1yil1llfx85xvhh"; sha256 = "00f7cvmcj094sdw0i35633yn1ng9w38wl761k1fx6ns8w0byirv1";
}; };