diff options
| author | Rutger Helling <rhelling@mykolab.com> | 2018-04-23 08:07:10 +0200 |
|---|---|---|
| committer | Rutger Helling <rhelling@mykolab.com> | 2018-04-23 15:44:39 +0200 |
| commit | 06079c196c426cd84242c4e55b7227bcc5ecf290 (patch) | |
| tree | 81752cdf37bdb92e142d9dac83d9c002d7398abe /gnu/packages/video.scm | |
| parent | 5e5d6613a3837586ccab51cd988b44c7df99253b (diff) | |
| download | guix-06079c196c426cd84242c4e55b7227bcc5ecf290.tar guix-06079c196c426cd84242c4e55b7227bcc5ecf290.tar.gz | |
gnu: ffmpeg: Update to 4.0.
* gnu/packages/video.scm (ffmpeg): Update to 4.0.
* gnu/packages/video.scm (ffmpeg@3.4): New variable.
* gnu/packages/video.scm (ffmpeg-git): Remove variable.
* gnu/packages/video.scm (mpv)[inputs]: Build with ffmpeg instead of ffmpeg-git.
* gnu/packages/gstreamer.scm (gst-libav)[inputs]: Build with ffmpeg@3.4 instead
of ffmpeg.
* gnu/packages/messaging.scm (qtox)[inputs]: Build with ffmpeg@3.4 instead of
ffmpeg.
* gnu/packages/emulators.scm (dolphin-emu)[inputs]: Build with ffmpeg@3.4
instead of ffmpeg.
* gnu/packages/gnunet.scm (libextractor)[inputs]: Build with ffmpeg@3.4 instead
of ffmpeg.
Diffstat (limited to 'gnu/packages/video.scm')
| -rw-r--r-- | gnu/packages/video.scm | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e959accf6a..1966d44dfd 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -597,14 +597,14 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).") (define-public ffmpeg (package (name "ffmpeg") - (version "3.4.2") + (version "4.0") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "0h6prjn1ijkzzhkyj8mazp0wpx7m0n9ycadjxagf9czqirbyk4ib")))) + "0gx4ngnhi5glmxh38603qy5n6vq8bl1cr4sqd1xff95i82pmv57d")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) @@ -770,6 +770,18 @@ convert and stream audio and video. It includes the libavcodec audio/video codec library.") (license license:gpl2+))) +(define-public ffmpeg-3.4 + (package + (inherit ffmpeg) + (version "3.4.2") + (source (origin + (method url-fetch) + (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" + version ".tar.xz")) + (sha256 + (base32 + "0h6prjn1ijkzzhkyj8mazp0wpx7m0n9ycadjxagf9czqirbyk4ib")))))) + (define-public ffmpeg-2.8 (package (inherit ffmpeg) @@ -790,25 +802,6 @@ audio/video codec library.") flag)) ,flags)))))) -;; Annoyingly enough, the latest mpv release does not build with the stable -;; release of ffmpeg. Use a git commit until the situation is fixed. -(define-public ffmpeg-git - (let ((commit "3f887440677328c9cfed97ad81d14051ffa32aae") - (revision "1")) - (package - (inherit ffmpeg) - (name "ffmpeg-git") - (version (string-append "3.4-" revision "." (string-take commit 9))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/FFmpeg/FFmpeg.git") - (commit commit))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1b7n3g4m2rbvrwsgbfl8wl91z42g1ld42clwxs8qpl9ny5rwz6sq"))))))) - (define-public vlc (package (name "vlc") @@ -1032,7 +1025,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (inputs `(("alsa-lib" ,alsa-lib) ("enca" ,enca) - ("ffmpeg" ,ffmpeg-git) + ("ffmpeg" ,ffmpeg) ("jack" ,jack-1) ("ladspa" ,ladspa) ("lcms" ,lcms) |