ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ungoogled-chromium: Build with ffmpeg@4.2.

Browse source 
Fixes <https://bugs.gnu.org/41987>.
Reported by Jonathan Brielmaier <jonathan.brielmaier@web.de>.

* gnu/packages/video.scm (ffmpeg-4.2): New public variable.
* gnu/packages/chromium.scm (ungoogled-chromium)[inputs]: Change from FFMPEG
to FFMPEG-4.2.
This commit is contained in:
Marius Bakke 2020-06-22 16:58:54 +02:00
parent 402d03751c
commit 3d5a217d5e
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gnu/packages/chromium.scm
View file

@ -785,7 +785,11 @@ (define-public ungoogled-chromium
("dbus-glib" ,dbus-glib)
("expat" ,expat)
("flac" ,flac)
("ffmpeg" ,ffmpeg)
;; FIXME: Change to ffmpeg 4.3 when supported, see
;; <https://bugs.chromium.org/p/chromium/issues/detail?id=1095962>.
("ffmpeg" ,ffmpeg-4.2)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
("gdk-pixbuf" ,gdk-pixbuf)

18
gnu/packages/video.scm
View file

@ -1126,6 +1126,24 @@ (define-public ffmpeg
audio/video codec library.")
(license license:gpl2+)))
;; ungoogled-chromium crashes with ffmpeg 4.3, so stick with this version for
;; now. See <https://issues.guix.gnu.org/41987>.
(define-public ffmpeg-4.2
(package
(inherit ffmpeg)
(version "4.2.3")
(source (origin
(method url-fetch)
(uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
version ".tar.xz"))
(sha256
(base32
"0cddkb5sma9dzy8i59sfls19rhjlq40zn9mh3x666dqkxl5ckxlx"))))
(arguments
(substitute-keyword-arguments (package-arguments ffmpeg)
((#:configure-flags flags)
`(delete "--enable-librav1e" ,flags))))))
(define-public ffmpeg-3.4
(package
(inherit ffmpeg)