From 65161ebb1b310c0ad0e6f734ca813bc08e7baeb9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 29 May 2021 16:41:03 +0200 Subject: gnu: svt-hevc: Update to 1.5.1. * gnu/packages/video.scm (svt-hevc): Update to 1.5.1. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 961094a80b..2eef76558a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -286,7 +286,7 @@ video and audio streams from a DVD.") (define-public svt-hevc (package (name "svt-hevc") - (version "1.5.0") + (version "1.5.1") (source (origin (method git-fetch) @@ -296,7 +296,7 @@ video and audio streams from a DVD.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "038r3x3axil895vh2dq6223623ybrc45vn58vfmfb7cikz68sy23")))) + (base32 "0rac70p6rpvdx9v0bdd8nphgr7imdxb7nz0x77n3p7h3180zz9x0")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; Test script is stand-alone -- cgit v1.2.3 From c00b1760f605255719a525e52c268b222a1f5184 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 May 2021 11:51:30 +0200 Subject: gnu: vapoursynth: Wrap with own PYTHONPATH. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes, e.g., ‘vspipe -v’ in a pure environment. * gnu/packages/video.scm (vapoursynth)[arguments]: Add a 'wrap phase. Reported by maddo of #guix. --- gnu/packages/video.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2eef76558a..5975004049 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2817,6 +2817,18 @@ capabilities.") (base32 "1krfdzc2x2vxv4nq9kiv1c09hgj525qn120ah91fw2ikq8ldvmx4")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'wrap + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (site (string-append out "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages"))) + (wrap-program (string-append out "/bin/vspipe") + `("PYTHONPATH" ":" = (,site))))))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From 296fe37aaa062799817f19429ea51e6be75aa588 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 May 2021 11:59:16 +0200 Subject: gnu: vapoursynth: Make python a regular input. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This follows up on c00b1760f605255719a525e52c268b222a1f5184, although meson-build-system's lack of cross-compilation makes it theoretical. * gnu/packages/video.scm (vapoursynth)[native-inputs]: Move python from here… [inputs]: …to here. --- gnu/packages/video.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 5975004049..50ede7cc0a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2835,11 +2835,11 @@ capabilities.") ("cython" ,python-cython) ("libtool" ,libtool) ("pkg-config" ,pkg-config) - ("python" ,python) ("yasm" ,yasm))) (inputs `(("ffmpeg" ,ffmpeg) ("libass" ,libass) + ("python" ,python) ("tesseract-ocr" ,tesseract-ocr) ("zimg" ,zimg))) (home-page "http://www.vapoursynth.com/") -- cgit v1.2.3 From 32a44fb581e80b3800c6f5481c3a5046cee6d7d9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 May 2021 14:19:30 +0200 Subject: gnu: vapoursynth: Update to 53. * gnu/packages/video.scm (vapoursynth): Update to 53. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 50ede7cc0a..2e9f9e3267 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2806,7 +2806,7 @@ capabilities.") (define-public vapoursynth (package (name "vapoursynth") - (version "52") + (version "53") (source (origin (method git-fetch) (uri (git-reference @@ -2815,7 +2815,7 @@ capabilities.") (file-name (git-file-name name version)) (sha256 (base32 - "1krfdzc2x2vxv4nq9kiv1c09hgj525qn120ah91fw2ikq8ldvmx4")))) + "0qcsfkpkry0cmvi60khjwvfz4fqhy23nqmn4pb9qrwll26sn9dcr")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From f6a979860c4550e35b595d3ecdfc5be490c40836 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Thu, 3 Jun 2021 08:49:18 +0200 Subject: gnu: openshot: Use free font. * gnu/packages/video.scm (openshot)[inputs]: Use font-dejavu. [patch-font-location]: Adjust accordingly. --- gnu/packages/video.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2e9f9e3267..d85a4045f1 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4535,7 +4535,7 @@ API. It includes bindings for Python, Ruby, and other languages.") (build-system python-build-system) (inputs `(("ffmpeg" ,ffmpeg) - ("font-ubuntu" ,font-ubuntu) + ("font-dejavu" ,font-dejavu) ("libopenshot" ,libopenshot) ("python" ,python) ("python-pyqt" ,python-pyqt) @@ -4556,10 +4556,11 @@ API. It includes bindings for Python, Ruby, and other languages.") (invoke "python" "src/tests/query_tests.py"))) (add-after 'unpack 'patch-font-location (lambda* (#:key inputs #:allow-other-keys) - (let ((font (assoc-ref inputs "font-ubuntu"))) + (let ((font (assoc-ref inputs "font-dejavu"))) (substitute* "src/classes/app.py" (("info.IMAGES_PATH") (string-append "\"" font "\"")) - (("fonts") "share/fonts/truetype"))) + (("fonts") "share/fonts/truetype") + (("[A-Za-z_-]+.ttf") "DejaVuSans.ttf"))) #t)) (add-before 'install 'set-tmp-home (lambda _ -- cgit v1.2.3 From 636e478bacd01ddc1050e416430f1a6219ecfa6c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 2 Jun 2021 22:30:19 -0400 Subject: gnu: rav1e: Update to 0.4.1. * gnu/packages/video.scm (rav1e): Update to 0.4.1. [source]: Fix indentation. [cargo-inputs]{rust-arbitrary}: Update to 0.4. {rust-av-metrics}: New input. {rust-bitstream-io}: Update to 1. {rust-cfg-if}: Update to 1. {rust-console}: Update to 0.14. {rust-crossbeam}: New input. {rust-itertools}: Update to 0.10. {rust-libfuzzer-sys}: New input. {rust-noop-proc-macro}: Update to 0.3. {rust-paste}: Update to 1. {rust-rand}: Update to 0.8. {rust-rand-chacha}: Update to 0.3. {rust-regex}: New input. {rust-rustc-version}: Update to 0.3. {rust-signal-hook}: Update to 0.3. {rust-v-frame, rust-wasm-bindgen}: New inputs. {rust-cc: Move to... [cargo-development-inputs]: ... here. {rust-rand}: Update to 0.8. {rust-rand-chacha}: Update to 0.3. {rust-semver}: Update to 0.11. [inputs]{nasm}: Move to... [native-inputs]: ... here. This was spotted by 'guix lint'. [synopsis]: Focus on facts, toning down marketing. [description]: Expound. --- gnu/packages/video.scm | 69 +++++++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 31 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index d85a4045f1..f40736f51a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -50,6 +50,7 @@ ;;; Copyright © 2021 Alexey Abramov ;;; Copyright © 2021 Andrew Tropin ;;; Copyright © 2021 David Wilson +;;; Copyright © 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -4864,64 +4865,70 @@ result in several formats: (define-public rav1e (package (name "rav1e") - (version "0.3.5") + (version "0.4.1") (source - (origin - (method url-fetch) - (uri (crate-uri "rav1e" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0c40gq4qid2apmlgzx98f6826jmn2n61prk0rn7sjxaw7yimw854")))) + (origin + (method url-fetch) + (uri (crate-uri "rav1e" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "00rjil6qbrwfxhhlq9yvidxm0gp9qdbywhf5zvkj85lykbhyff09")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-aom-sys" ,rust-aom-sys-0.2) - ("rust-arbitrary" ,rust-arbitrary-0.2) + ("rust-arbitrary" ,rust-arbitrary-0.4) ("rust-arg-enum-proc-macro" ,rust-arg-enum-proc-macro-0.3) ("rust-arrayvec" ,rust-arrayvec-0.5) + ("rust-av-metrics" ,rust-av-metrics-0.6) ("rust-backtrace" ,rust-backtrace-0.3) - ("rust-bitstream-io" ,rust-bitstream-io-0.8) + ("rust-bitstream-io" ,rust-bitstream-io-1) ("rust-byteorder" ,rust-byteorder-1) - ("rust-cc" ,rust-cc-1) - ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-cfg-if" ,rust-cfg-if-1) ("rust-clap" ,rust-clap-2) - ("rust-console" ,rust-console-0.11) + ("rust-console" ,rust-console-0.14) + ("rust-crossbeam" ,rust-crossbeam-0.8) ("rust-dav1d-sys" ,rust-dav1d-sys-0.3) ("rust-fern" ,rust-fern-0.6) ("rust-image" ,rust-image-0.23) ("rust-interpolate-name" ,rust-interpolate-name-0.2) - ("rust-itertools" ,rust-itertools-0.9) + ("rust-itertools" ,rust-itertools-0.10) ("rust-ivf" ,rust-ivf-0.1) ("rust-libc" ,rust-libc-0.2) + ("rust-libfuzzer-sys" ,rust-libfuzzer-sys-0.3) ("rust-log" ,rust-log-0.4) ("rust-nasm-rs" ,rust-nasm-rs-0.2) - ("rust-noop-proc-macro" ,rust-noop-proc-macro-0.2) + ("rust-noop-proc-macro" ,rust-noop-proc-macro-0.3) ("rust-num-derive" ,rust-num-derive-0.3) ("rust-num-traits" ,rust-num-traits-0.2) - ("rust-paste" ,rust-paste-0.1) - ("rust-rand" ,rust-rand-0.7) - ("rust-rand-chacha" ,rust-rand-chacha-0.2) + ("rust-paste" ,rust-paste-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-rand-chacha" ,rust-rand-chacha-0.3) ("rust-rayon" ,rust-rayon-1) + ("rust-regex" ,rust-regex-1) ("rust-rust-hawktracer" ,rust-rust-hawktracer-0.7) - ("rust-rustc-version" ,rust-rustc-version-0.2) + ("rust-rustc-version" ,rust-rustc-version-0.3) ("rust-scan-fmt" ,rust-scan-fmt-0.2) ("rust-serde" ,rust-serde-1) - ("rust-signal-hook" ,rust-signal-hook-0.1) + ("rust-signal-hook" ,rust-signal-hook-0.3) ("rust-simd-helpers" ,rust-simd-helpers-0.1) ("rust-thiserror" ,rust-thiserror-1) ("rust-toml" ,rust-toml-0.5) + ("rust-v-frame" ,rust-v-frame-0.2) ("rust-vergen" ,rust-vergen-3) - ("rust-y4m" ,rust-y4m-0.5)) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-y4m" ,rust-y4m-0.7)) #:cargo-development-inputs (("rust-assert-cmd" ,rust-assert-cmd-1) + ("rust-cc" ,rust-cc-1) ("rust-criterion" ,rust-criterion-0.3) ("rust-interpolate-name" ,rust-interpolate-name-0.2) ("rust-pretty-assertions" ,rust-pretty-assertions-0.6) - ("rust-rand" ,rust-rand-0.7) - ("rust-rand-chacha" ,rust-rand-chacha-0.2) - ("rust-semver" ,rust-semver-0.9)) + ("rust-rand" ,rust-rand-0.8) + ("rust-rand-chacha" ,rust-rand-chacha-0.3) + ("rust-semver" ,rust-semver-0.11)) #:phases (modify-phases %standard-phases (replace 'build @@ -4930,13 +4937,13 @@ result in several formats: (invoke "cargo" "cinstall" "--release" (string-append "--prefix=" out)))))))) (native-inputs - `(("cargo-c" ,rust-cargo-c))) - (inputs - `(("nasm" ,nasm))) + `(("cargo-c" ,rust-cargo-c) + ("nasm" ,nasm))) (home-page "https://github.com/xiph/rav1e/") - (synopsis "The fastest and safest AV1 encoder") - (description - "The fastest and safest AV1 encoder.") + (synopsis "Fast and safe AV1 encoder") + (description "@code{rav1e} is an AV1 video encoder. It is designed to +eventually cover all use cases, though in its current form it is most suitable +for cases where libaom (the reference encoder) is too slow.") (license license:bsd-2))) (define-public peek -- cgit v1.2.3 From f02b9d6d2ce336fe0cd746bb60199085cd18834b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 2 Jun 2021 15:03:23 -0400 Subject: gnu: ffmpeg: Update to 4.4. * gnu/packages/video.scm (ffmpeg): Update to 4.4. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f40736f51a..7140052e89 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1422,14 +1422,14 @@ operate properly.") (define-public ffmpeg (package (name "ffmpeg") - (version "4.3.2") + (version "4.4") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "1nyd9jlcy0pqnwzi29a7sg50hq37vb0g3f9l16y3q8yh3m7ydr26")))) + "02fr8mvf2agwmyb9q2bmh9p09gpz3xxmpcbbbj8iydz57hc0mc86")))) (build-system gnu-build-system) (inputs `(("dav1d" ,dav1d) -- cgit v1.2.3 From 30eccefa398ee05fa372efb5ae16db1cc7c0fc59 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 5 Jun 2021 17:23:57 -0400 Subject: gnu: Add ffmpeg-4.3. * gnu/packages/video.scm (ffmpeg-4.3): New variable. --- gnu/packages/video.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 7140052e89..f3a0436786 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1613,6 +1613,17 @@ convert and stream audio and video. It includes the libavcodec audio/video codec library.") (license license:gpl2+))) +(define-public ffmpeg-4.3 + (package/inherit ffmpeg + (version "4.3.2") + (source (origin + (method url-fetch) + (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" + version ".tar.xz")) + (sha256 + (base32 + "1nyd9jlcy0pqnwzi29a7sg50hq37vb0g3f9l16y3q8yh3m7ydr26")))))) + (define-public ffmpeg-3.4 (package (inherit ffmpeg) -- cgit v1.2.3 From 6a0d0c3c473d51d113d0c4efd7ed85d542f45c09 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 5 Jun 2021 17:24:10 -0400 Subject: gnu: libopenshot: Use ffmpeg-4.3. * gnu/packages/video.scm (libopenshot) [propagated-inputs]{ffmpeg}: Downgrade to ffmpeg 4.3 to fix build. --- gnu/packages/video.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f3a0436786..e01594fb28 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4494,7 +4494,9 @@ create smoother and stable videos.") ("unittest++" ,unittest-cpp))) (propagated-inputs ;all referenced in installed headers `(("cppzmq" ,cppzmq) - ("ffmpeg" ,ffmpeg) + ;; libopenshot doesn't yet build with ffmpeg 4.4 (see: + ;; https://github.com/OpenShot/libopenshot/issues/676). + ("ffmpeg" ,ffmpeg-4.3) ("imagemagick" ,imagemagick) ("jsoncpp" ,jsoncpp) ("libopenshot-audio" ,libopenshot-audio) -- cgit v1.2.3 From 876f4071ab4379875d4490c83d4c0ca19a4eb366 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 6 Jun 2021 01:12:55 -0400 Subject: gnu: libvpx: Update to 1.10.0. * gnu/packages/video.scm (libvpx): Update to 1.10.0. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e01594fb28..7d072dd7ec 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2148,7 +2148,7 @@ To load this plugin, specify the following option when starting mpv: (define-public libvpx (package (name "libvpx") - (version "1.9.0") + (version "1.10.0") (source (origin (method git-fetch) (uri (git-reference @@ -2157,7 +2157,7 @@ To load this plugin, specify the following option when starting mpv: (file-name (git-file-name name version)) (sha256 (base32 - "16xv6ambc82g14h1y0q1vyy57wp6j9fbp0nk0wd5csnrw407rhry")) + "1p4v6j1505n3gnvx3iksciyi818ymxpazj9fmdrchzbl9pfzg4qi")) (patches (search-patches "libvpx-CVE-2016-2818.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From e2ad110f4c2a54cecaa8fed3792ba2dbe5fa2af4 Mon Sep 17 00:00:00 2001 From: Solene Rapenne via Guix-patches via Date: Sun, 6 Jun 2021 11:02:07 +0200 Subject: gnu: vlc: Update to 3.0.14. * gnu/packages/video.scm (vlc): Update to 3.0.14. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 7d072dd7ec..e352cbf6fd 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1763,7 +1763,7 @@ videoformats depend on the configuration flags of ffmpeg.") (define-public vlc (package (name "vlc") - (version "3.0.12") + (version "3.0.14") (source (origin (method url-fetch) (uri (string-append @@ -1772,7 +1772,7 @@ videoformats depend on the configuration flags of ffmpeg.") "/vlc-" version ".tar.xz")) (sha256 (base32 - "0ygqihw2c5vvzv8950dlf7rdwz1cpz1668jgyja604ljibrmix7g")))) + "19imhm6wd85nm2r4xwa7g500rmya021aj93b1q33gany6ddkxfa9")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) -- cgit v1.2.3