mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 22:08:16 -05:00
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>
This commit is contained in:
parent
6b88912eb6
commit
b1c01503df
3 changed files with 14 additions and 2 deletions
|
@ -409,7 +409,7 @@ (define-public gst-libav
|
||||||
("python" ,python)))
|
("python" ,python)))
|
||||||
(inputs
|
(inputs
|
||||||
`(("gst-plugins-base" ,gst-plugins-base)
|
`(("gst-plugins-base" ,gst-plugins-base)
|
||||||
("ffmpeg" ,ffmpeg)
|
("ffmpeg" ,ffmpeg-3.3)
|
||||||
("orc" ,orc)
|
("orc" ,orc)
|
||||||
("zlib" ,zlib)))
|
("zlib" ,zlib)))
|
||||||
(home-page "http://gstreamer.freedesktop.org/")
|
(home-page "http://gstreamer.freedesktop.org/")
|
||||||
|
|
|
@ -822,7 +822,7 @@ (define-public qtox
|
||||||
(("TIMESTAMP") "\"\""))
|
(("TIMESTAMP") "\"\""))
|
||||||
#t)))))
|
#t)))))
|
||||||
(inputs
|
(inputs
|
||||||
`(("ffmpeg" ,ffmpeg)
|
`(("ffmpeg" ,ffmpeg-3.3)
|
||||||
("glib" ,glib)
|
("glib" ,glib)
|
||||||
("gtk+" ,gtk+-2)
|
("gtk+" ,gtk+-2)
|
||||||
("libsodium" ,libsodium)
|
("libsodium" ,libsodium)
|
||||||
|
|
|
@ -751,6 +751,18 @@ (define-public ffmpeg
|
||||||
audio/video codec library.")
|
audio/video codec library.")
|
||||||
(license license:gpl2+)))
|
(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
|
(define-public ffmpeg-2.8
|
||||||
(package
|
(package
|
||||||
(inherit ffmpeg)
|
(inherit ffmpeg)
|
||||||
|
|
Loading…
Reference in a new issue