summaryrefslogtreecommitdiff
path: root/gnu/packages/video.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-08-08 00:35:37 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-08-08 00:35:37 +0200
commit8e7f97b9ffee10af3cf16958ebc0a7d410a19ca8 (patch)
treeb3836f9cea849fd8bfb61a77ba225a0054babe58 /gnu/packages/video.scm
parentfa228db78bc9dcb0e7da607dd8783224c76d7ef5 (diff)
parentba7ff983d613f735ee270f0b0e3c5dba5cbeda3c (diff)
downloadpatches-8e7f97b9ffee10af3cf16958ebc0a7d410a19ca8.tar
patches-8e7f97b9ffee10af3cf16958ebc0a7d410a19ca8.tar.gz
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/video.scm')
-rw-r--r--gnu/packages/video.scm42
1 files changed, 16 insertions, 26 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index e46984e9ab..1ebeb41aff 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -473,16 +473,18 @@ and creating Matroska files from other media files (@code{mkvmerge}).")
(define-public x265
(package
(name "x265")
- (version "3.1.1")
+ (version "3.1.2")
(outputs '("out" "static"))
(source
(origin
(method url-fetch)
- (uri (string-append "https://download.videolan.org/videolan/x265/"
- "x265_" version ".tar.gz"))
+ (uri (list (string-append "https://bitbucket.org/multicoreware/x265"
+ "/downloads/x265_" version ".tar.gz")
+ (string-append "https://download.videolan.org/videolan/x265/"
+ "x265_" version ".tar.gz")))
(sha256
(base32
- "1l68lgdbsi4wjz5vad98ggx7mf92rnvzlq34m6w0a08ark3h0yc2"))
+ "1ajr59gjj47gnczfb2qhmzclj746pdiq9a1d81b0mq22k8f5yy3g"))
(patches (search-patches "x265-arm-flags.patch"))
(modules '((guix build utils)))
(snippet '(begin
@@ -790,17 +792,18 @@ operate properly.")
(define-public ffmpeg
(package
(name "ffmpeg")
- (version "4.1.4")
+ (version "4.2")
(source (origin
(method url-fetch)
(uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
version ".tar.xz"))
(sha256
(base32
- "1qd7a10gs12ifcp31gramcgqjl77swskjfp7cijibgyg5yl4kw7i"))))
+ "1mgcxm7sqkajx35px05szsmn9mawwm03cfpmk3br7bcp3a1i0gq2"))))
(build-system gnu-build-system)
(inputs
- `(("fontconfig" ,fontconfig)
+ `(("dav1d" ,dav1d)
+ ("fontconfig" ,fontconfig)
("freetype" ,freetype)
("frei0r-plugins" ,frei0r-plugins)
("gnutls" ,gnutls)
@@ -899,6 +902,7 @@ operate properly.")
"--enable-libbluray"
"--enable-libcaca"
"--enable-libcdio"
+ "--enable-libdav1d"
"--enable-libfreetype"
"--enable-libmp3lame"
"--enable-libopus"
@@ -981,9 +985,10 @@ audio/video codec library.")
(arguments
(substitute-keyword-arguments (package-arguments ffmpeg)
((#:configure-flags flags)
- `(delete "--enable-libaom" ,flags))))
- (inputs (alist-delete "libaom"
- (package-inputs ffmpeg)))))
+ `(delete "--enable-libdav1d" (delete "--enable-libaom"
+ ,flags)))))
+ (inputs (alist-delete "dav1d" (alist-delete "libaom"
+ (package-inputs ffmpeg))))))
(define-public ffmpeg-for-stepmania
(hidden-package
@@ -2061,12 +2066,6 @@ capabilities.")
("libass" ,libass)
("tesseract-ocr" ,tesseract-ocr)
("zimg" ,zimg)))
- (arguments
- '(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'autogen
- (lambda _
- (invoke "sh" "autogen.sh"))))))
(home-page "http://www.vapoursynth.com/")
(synopsis "Video processing framework")
(description "VapourSynth is a C++ library and Python module for video
@@ -2509,12 +2508,6 @@ Other features include a live preview and live streaming.")
(base32
"18yfkr70lr1x1hc8snn2ldnbzdcc7b64xmkqrfk8w59gpg7sl1xn"))))
(build-system gnu-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'autogen.sh
- (lambda _
- (invoke "sh" "autogen.sh"))))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)))
@@ -2894,10 +2887,7 @@ practically any type of media.")
(add-after 'unpack 'change-to-build-dir
(lambda _
(chdir "Project/GNU/Library")
- #t))
- (add-after 'change-to-build-dir 'autogen
- (lambda _
- (invoke "sh" "autogen.sh"))))))
+ #t)))))
(home-page "https://mediaarea.net/en/MediaInfo")
(synopsis "Library for retrieving media metadata")
(description "MediaInfo is a library used for retrieving technical