~ruther/guix-local

b1c01503dfcb915c39af4a45716ebafafb806549 — Rutger Helling 8 years ago 6b88912
gnu: Add ffmpeg@3.3 and use it on packages that fail with 3.4.

* gnu/packages/gstreamer.scm (gst-libav)[inputs]: Change ffmpeg to ffmpeg-3.3.
* gnu/packages/messaging.scm (qtox)[inputs]: Change ffmpeg to ffmpeg-3.3.
* gnu/packages/video.scm (ffmpeg-3.3): New variable.

Signed-off-by: Marius Bakke <mbakke@fastmail.com>
3 files changed, 14 insertions(+), 2 deletions(-)

M gnu/packages/gstreamer.scm
M gnu/packages/messaging.scm
M gnu/packages/video.scm
M gnu/packages/gstreamer.scm => gnu/packages/gstreamer.scm +1 -1
@@ 409,7 409,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.")
       ("python" ,python)))
    (inputs
     `(("gst-plugins-base" ,gst-plugins-base)
       ("ffmpeg" ,ffmpeg)
       ("ffmpeg" ,ffmpeg-3.3)
       ("orc" ,orc)
       ("zlib" ,zlib)))
    (home-page "http://gstreamer.freedesktop.org/")

M gnu/packages/messaging.scm => gnu/packages/messaging.scm +1 -1
@@ 822,7 822,7 @@ instant messenger with audio and video chat capabilities.")
               (("TIMESTAMP") "\"\""))
             #t)))))
    (inputs
     `(("ffmpeg" ,ffmpeg)
     `(("ffmpeg" ,ffmpeg-3.3)
       ("glib" ,glib)
       ("gtk+" ,gtk+-2)
       ("libsodium" ,libsodium)

M gnu/packages/video.scm => gnu/packages/video.scm +12 -0
@@ 751,6 751,18 @@ convert and stream audio and video.  It includes the libavcodec
audio/video codec library.")
    (license license:gpl2+)))

(define-public ffmpeg-3.3
  (package
    (inherit ffmpeg)
    (version "3.3.4")
    (source (origin
             (method url-fetch)
             (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
                                 version ".tar.xz"))
             (sha256
              (base32
               "0mx9dvad3lkyhvsrblf280x2bz6dxajya1ylnspbdzldj0dpxfcq"))))))

(define-public ffmpeg-2.8
  (package
    (inherit ffmpeg)