diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-04-23 18:18:41 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-04-23 20:03:25 +0200 |
| commit | bb5c508c12db269017cec41350f30ac1e3edd644 (patch) | |
| tree | ba9404408cf14eecdc3f04f2eda9032f15dd59b0 /gnu/packages | |
| parent | 0b909ab6bb8a8520ebb7d1293e419589d213b5f3 (diff) | |
| download | guix-bb5c508c12db269017cec41350f30ac1e3edd644.tar guix-bb5c508c12db269017cec41350f30ac1e3edd644.tar.gz | |
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.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/cdrom.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/music.scm | 4 | ||||
| -rw-r--r-- | 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 @@ capacity is user-selectable.") ("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 @@ tune-in sender list from @url{http://opml.radiotime.com}.") ("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 @@ available memory.") `(("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 @@ from sites like Twitch.tv and pipes them into a video player of choice.") #t))))) (inputs `(("alsa-lib" ,alsa-lib) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("fftw" ,fftw) ("libxml2" ,libxml2) ("jack" ,jack-1) @@ -2082,7 +2082,7 @@ making @dfn{screencasts}.") ;; 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 @@ It counts more than 100 plugins.") ("pkg-config" ,pkg-config))) (inputs `(("libjpeg" ,libjpeg) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("sqlite" ,sqlite))) (arguments '(#:phases (modify-phases %standard-phases |