From bb5c508c12db269017cec41350f30ac1e3edd644 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Apr 2018 18:18:41 +0200 Subject: gnu: Use ffmpeg@3.4 in packages not ready for 4.0. * gnu/packages/cdrom.scm (dvdstyler)[inputs]: Change FFMPEG with FFMPEG-3.4. * gnu/packages/video.scm (mlt, motion, simplescreenrecorder)[inputs]: Likewise. * gnu/packages/music.scm (moc, pianobar)[inputs]: Likewise. --- gnu/packages/cdrom.scm | 2 +- gnu/packages/music.scm | 4 ++-- gnu/packages/video.scm | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 3d35ff51f4..5f9117c637 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -392,7 +392,7 @@ (define-public dvdstyler ("fontconfig" ,fontconfig) ("libexif" ,libexif) ("libjpeg" ,libjpeg) - ("ffmpeg" ,ffmpeg))) + ("ffmpeg" ,ffmpeg-3.4))) (native-inputs `(("pkg-config" ,pkg-config) ("flex" ,flex) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index aea7395d41..c27055e0c1 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2391,7 +2391,7 @@ (define-public pianobar ("curl" ,curl) ("libgcrypt" ,libgcrypt) ("json-c" ,json-c) - ("ffmpeg" ,ffmpeg))) + ("ffmpeg" ,ffmpeg-3.4))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "http://6xq.net/projects/pianobar/") @@ -2792,7 +2792,7 @@ (define-public moc `(("alsa-lib" ,alsa-lib) ("curl" ,curl) ("faad2" ,faad2) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("file" ,file) ("jack" ,jack-1) ("libid3tag" ,libid3tag) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 1966d44dfd..dc5a375664 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1847,7 +1847,7 @@ (define-public mlt #t))))) (inputs `(("alsa-lib" ,alsa-lib) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("fftw" ,fftw) ("libxml2" ,libxml2) ("jack" ,jack-1) @@ -2082,7 +2082,7 @@ (define-public simplescreenrecorder ;; As a result, they are omitted. Please add them back if problems appear. (inputs `(("alsa-lib" ,alsa-lib) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("glu" ,glu) ("jack" ,jack-1) ("libxi" ,libxi) @@ -2794,7 +2794,7 @@ (define-public motion ("pkg-config" ,pkg-config))) (inputs `(("libjpeg" ,libjpeg) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("sqlite" ,sqlite))) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3