mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-21 01:26:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: rav1e: Update to 0.5.1; also update rust-aom-sys to 0.3.0.

Browse source 
* gnu/packages/crates-graphics.scm (rust-aom-sys-0.2): Rename to...
(rust-aom-sys-0.3): ... this, updating to 0.3.0.
(rust-aom-sys-0.1): Delete unused variable.
* gnu/packages/video.scm (rav1e): Update to 0.5.1.
[cargo-test-flags]: New argument.
[cargo-inputs]: Add rust-aom-sys-0.3.
Update rust-arrayvec and rust-av-metrics to 0.7.
Update rust-rustc-version to 0.4.
Update rust-dav1d-sys to 0.3.4.
[cargo-development-inputs]: Update rust-assert-cmd to 2.
Update rust-pretty-assertions to 0.7.  Update rust-semver to 1.
[phases]{relax-versions}: New phase.
This commit is contained in:
Maxim Cournoyer 2022-01-02 21:55:13 -05:00
parent 633733696c
commit 9495b7800b
No known key found for this signature in database
GPG key ID: 1260E46482E63562
2 changed files with 23 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
gnu/packages/crates-graphics.scm
View file

@ -192,10 +192,10 @@ (define-public rust-ansi-term-0.9
"1xif1bh938qpfc3d0f9xgidibpm65xix11w9gszwqnia00q7rb13"))))
(arguments `())))
(define-public rust-aom-sys-0.2
(define-public rust-aom-sys-0.3
(package
(name "rust-aom-sys")
(version "0.2.1")
(version "0.3.0")
(source
(origin
(method url-fetch)
@ -204,7 +204,7 @@ (define-public rust-aom-sys-0.2
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"03a0xhaafjn0hlpcf9ba73hv557m0jqnmj9wl57wzrcnka96zvgj"))))
"0dhikfl7l5nacspajbllbhhysad3vl845cpfplqgm5mf67nmx9w8"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@ -219,30 +219,6 @@ (define-public rust-aom-sys-0.2
(description "This package provides FFI bindings to aom.")
(license license:expat)))
(define-public rust-aom-sys-0.1
(package
(inherit rust-aom-sys-0.2)
(name "rust-aom-sys")
(version "0.1.4")
(source
(origin
(method url-fetch)
(uri (crate-uri "aom-sys" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"1bqcpkycv1d67r6jcl9npfbw6rkl829rdq9w6vlpb0rjqxp0xzsn"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-bindgen" ,rust-bindgen-0.53)
("rust-metadeps" ,rust-metadeps-1))))
(native-inputs
(list pkg-config))
(inputs
(list libaom clang llvm))))
(define-public rust-ascii-canvas-2
(package
(name "rust-ascii-canvas")

32
gnu/packages/video.scm
View file

@ -49,7 +49,7 @@
;;; Copyright © 2021 Alexey Abramov <levenson@mmer.org>
;;; Copyright © 2021 Andrew Tropin <andrew@trop.in>
;;; Copyright © 2021 David Wilson <david@daviwil.com>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021,2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 Thiago Jung Bauermann <bauermann@kolabnow.com>
@ -5203,7 +5203,7 @@ (define rust-dav1d-sys-0.3.2
(define-public rav1e
(package
(name "rav1e")
(version "0.4.1")
(version "0.5.1")
(source
(origin
(method url-fetch)
@ -5212,15 +5212,18 @@ (define-public rav1e
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"00rjil6qbrwfxhhlq9yvidxm0gp9qdbywhf5zvkj85lykbhyff09"))))
"006bfcmjwg0phg8gc25b1sl2ngjrb2bh1b3fd0s5gbf9nlkr8qsn"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-aom-sys" ,rust-aom-sys-0.2)
`(;; Strip the '--release' flag to work around the doctest failures with
;; Rust 1.57 (see: https://github.com/xiph/rav1e/issues/2851).
#:cargo-test-flags '()
#:cargo-inputs
(("rust-aom-sys" ,rust-aom-sys-0.3)
("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-arrayvec" ,rust-arrayvec-0.7)
("rust-av-metrics" ,rust-av-metrics-0.7)
("rust-backtrace" ,rust-backtrace-0.3)
("rust-bitstream-io" ,rust-bitstream-io-1)
("rust-byteorder" ,rust-byteorder-1)
@ -5228,7 +5231,7 @@ (define-public rav1e
("rust-clap" ,rust-clap-2)
("rust-console" ,rust-console-0.14)
("rust-crossbeam" ,rust-crossbeam-0.8)
("rust-dav1d-sys" ,rust-dav1d-sys-0.3.2)
("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)
@ -5247,7 +5250,7 @@ (define-public rav1e
("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.3)
("rust-rustc-version" ,rust-rustc-version-0.4)
("rust-scan-fmt" ,rust-scan-fmt-0.2)
("rust-serde" ,rust-serde-1)
("rust-signal-hook" ,rust-signal-hook-0.3)
@ -5259,16 +5262,21 @@ (define-public rav1e
("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-assert-cmd" ,rust-assert-cmd-2)
("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-pretty-assertions" ,rust-pretty-assertions-0.7)
("rust-rand" ,rust-rand-0.8)
("rust-rand-chacha" ,rust-rand-chacha-0.3)
("rust-semver" ,rust-semver-0.11))
("rust-semver" ,rust-semver-1))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'relax-versions
(lambda _
(substitute* "Cargo.toml"
;; Allow using more recent versions of
(("~3.1.2") "~3"))))
(replace 'build
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))