[bug#45077] [PATCH 1/3] gnu: Add rust-aom-sys-0.2.

[bug#45077] [PATCH 1/3] gnu: Add rust-aom-sys-0.2.

[Antoine Côté]

* gnu/packages/crates-graphics.scm (rust-aom-sys-0.2): New variable.
(rust-aom-sys-0.1): Inherit from rust-aom-sys-0.2.
---
 gnu/packages/crates-graphics.scm | 37 +++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 9a755d46b4..02bf7b27a4 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2020 Antoine Côté <antoine.cote@posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -167,8 +168,38 @@ text or blue underlined text, on ANSI terminals.")
          "1xif1bh938qpfc3d0f9xgidibpm65xix11w9gszwqnia00q7rb13"))))
     (arguments `())))
 
+(define-public rust-aom-sys-0.2
+  (package
+    (name "rust-aom-sys")
+    (version "0.2.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "aom-sys" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "03a0xhaafjn0hlpcf9ba73hv557m0jqnmj9wl57wzrcnka96zvgj"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-bindgen" ,rust-bindgen-0.54)
+         ("rust-metadeps" ,rust-metadeps-1.1))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libaom" ,libaom)
+       ("clang" ,clang)
+       ("llvm" ,llvm)))
+    (home-page "https://github.com/rust-av/aom-rs")
+    (synopsis "FFI bindings to aom")
+    (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
@@ -190,11 +221,7 @@ text or blue underlined text, on ANSI terminals.")
     (inputs
      `(("libaom" ,libaom)
        ("clang" ,clang)
-       ("llvm" ,llvm)))
-    (home-page "https://github.com/rust-av/aom-rs")
-    (synopsis "FFI bindings to aom")
-    (description "This package provides FFI bindings to aom.")
-    (license license:expat)))
+       ("llvm" ,llvm)))))
 
 (define-public rust-ascii-canvas-2
   (package
-- 
2.29.2

[bug#45076] [PATCH 2/3] gnu: Add rust-nasm-rs-0.2.

[Antoine Côté]

* gnu/packages/crate-io.scm (rust-nasm-rs-0.2): New variable.
(rust-nasm-rs-0.1): Inherit from rust-nasm-rs-0.2.
---
 gnu/packages/crates-io.scm | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index eb39a04e23..09a4dfdccc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com>
 ;;; Copyright © 2020 André Batista <nandre@riseup.net>
 ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2020 Antoine Côté <antoine.cote@posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -16177,8 +16178,32 @@ a default trait implementation you've defined.")
 libmysqlclient.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-nasm-rs-0.2
+  (package
+    (name "rust-nasm-rs")
+    (version "0.2.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "nasm-rs" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1lgc3gg32hj4pcbfp07vzwy013smdm27469fyy4rqgyil3x46vx7"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-arrayvec" ,rust-arrayvec-0.5)
+         ("rust-rayon" ,rust-rayon-1))))
+    (home-page "https://github.com/medek/nasm-rs")
+    (synopsis "Run NASM during your Cargo build")
+    (description "Run NASM during your Cargo build.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-nasm-rs-0.1
   (package
+    (inherit rust-nasm-rs-0.2)
     (name "rust-nasm-rs")
     (version "0.1.7")
     (source
@@ -16194,11 +16219,7 @@ libmysqlclient.")
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-       (("rust-rayon" ,rust-rayon-1))))
-    (home-page "https://github.com/medek/nasm-rs")
-    (synopsis "Run NASM during your Cargo build")
-    (description "Run NASM during your Cargo build.")
-    (license (list license:expat license:asl2.0))))
+       (("rust-rayon" ,rust-rayon-1))))))
 
 (define-public rust-nalgebra-0.21
   (package
-- 
2.29.2

[bug#45078] [PATCH 3/3] gnu: rav1e: Update to 0.3.4.

[Antoine Côté]

* gnu/packages/video.scm (rav1e): Update to 0.3.4.
[arguments]: In cargo-inputs replace rust-aom-sys-0.1 with 0.2, rust-nasm-rs-0.1 with 0.2.
---
 gnu/packages/video.scm | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 4a8ff1d40d..56c2b244a0 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -46,6 +46,7 @@
 ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
 ;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@posteo.ro>
 ;;; Copyright © 2020 Ivan Kozlov <kanichos@yandex.ru>
+;;; Copyright © 2020 Antoine Côté <antoine.cote@posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4637,7 +4638,7 @@ result in several formats:
 (define-public rav1e
   (package
     (name "rav1e")
-    (version "0.3.3")
+    (version "0.3.4")
     (source
       (origin
         (method url-fetch)
@@ -4646,17 +4647,18 @@ result in several formats:
          (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "053bh8hc6jj81ydq4gcak01b0ady59hvkl7d87im3y8nafg7xzb4"))))
+          "1mx6jlx2rdhmyh68h9h34kn9ssa7lv0y97j8fd9qm7qhs2q1n0cj"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-aom-sys" ,rust-aom-sys-0.1)
+       (("rust-aom-sys" ,rust-aom-sys-0.2)
         ("rust-arbitrary" ,rust-arbitrary-0.2)
         ("rust-arg-enum-proc-macro" ,rust-arg-enum-proc-macro-0.3)
         ("rust-arrayvec" ,rust-arrayvec-0.5)
         ("rust-backtrace" ,rust-backtrace-0.3)
         ("rust-bitstream-io" ,rust-bitstream-io-0.8)
         ("rust-byteorder" ,rust-byteorder-1)
+        ("rust-cc" ,rust-cc-1)
         ("rust-cfg-if" ,rust-cfg-if-0.1)
         ("rust-clap" ,rust-clap-2)
         ("rust-console" ,rust-console-0.11)
@@ -4668,6 +4670,7 @@ result in several formats:
         ("rust-ivf" ,rust-ivf-0.1)
         ("rust-libc" ,rust-libc-0.2)
         ("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-num-derive" ,rust-num-derive-0.3)
         ("rust-num-traits" ,rust-num-traits-0.2)
@@ -4676,17 +4679,15 @@ result in several formats:
         ("rust-rand-chacha" ,rust-rand-chacha-0.2)
         ("rust-rayon" ,rust-rayon-1)
         ("rust-rust-hawktracer" ,rust-rust-hawktracer-0.7)
+        ("rust-rustc-version" ,rust-rustc-version-0.2)
         ("rust-scan-fmt" ,rust-scan-fmt-0.2)
         ("rust-serde" ,rust-serde-1)
         ("rust-signal-hook" ,rust-signal-hook-0.1)
         ("rust-simd-helpers" ,rust-simd-helpers-0.1)
         ("rust-thiserror" ,rust-thiserror-1)
         ("rust-toml" ,rust-toml-0.5)
-        ("rust-y4m" ,rust-y4m-0.5)
-        ("rust-cc" ,rust-cc-1)
-        ("rust-nasm-rs" ,rust-nasm-rs-0.1)
-        ("rust-rustc-version" ,rust-rustc-version-0.2)
-        ("rust-vergen" ,rust-vergen-3.1))
+        ("rust-vergen" ,rust-vergen-3.1)
+        ("rust-y4m" ,rust-y4m-0.5))
        #:cargo-development-inputs
        (("rust-assert-cmd" ,rust-assert-cmd-1)
         ("rust-criterion" ,rust-criterion-0.3)
-- 
2.29.2

[bug#45079] [PATCH 1/3] gnu: Add rust-aom-sys-0.2.

[Antoine Côté]

[-- Attachment #1.1: Type: text/plain, Size: 2224 bytes --]

* gnu/packages/crates-graphics.scm (rust-aom-sys-0.2): New variable.
(rust-aom-sys-0.1): Inherit from rust-aom-sys-0.2.
---
gnu/packages/crates-graphics.scm | 37 +++++++++++++++++++++++++++-----
1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-graphics.scm
b/gnu/packages/crates-graphics.scm
index 9a755d46b4..02bf7b27a4 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2020 Antoine Côté <antoine.cote@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -167,8 +168,38 @@ text or blue underlined text, on ANSI terminals.")
"1xif1bh938qpfc3d0f9xgidibpm65xix11w9gszwqnia00q7rb13"))))
(arguments `())))
+(define-public rust-aom-sys-0.2
+ (package
+ (name "rust-aom-sys")
+ (version "0.2.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "aom-sys" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "03a0xhaafjn0hlpcf9ba73hv557m0jqnmj9wl57wzrcnka96zvgj"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-bindgen" ,rust-bindgen-0.54)
+ ("rust-metadeps" ,rust-metadeps-1.1))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("libaom" ,libaom)
+ ("clang" ,clang)
+ ("llvm" ,llvm)))
+ (home-page "https://github.com/rust-av/aom-rs")
+ (synopsis "FFI bindings to aom")
+ (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
@@ -190,11 +221,7 @@ text or blue underlined text, on ANSI terminals.")
(inputs
`(("libaom" ,libaom)
("clang" ,clang)
- ("llvm" ,llvm)))
- (home-page "https://github.com/rust-av/aom-rs")
- (synopsis "FFI bindings to aom")
- (description "This package provides FFI bindings to aom.")
- (license license:expat)))
+ ("llvm" ,llvm)))))
(define-public rust-ascii-canvas-2
(package

-- 
2.29.2



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#45079] [PATCH 3/3] gnu: rav1e: Update to 0.3.4.

[Antoine Côté]

[-- Attachment #1.1: Type: text/plain, Size: 2803 bytes --]

* gnu/packages/video.scm (rav1e): Update to 0.3.4.
[arguments]: In cargo-inputs replace rust-aom-sys-0.1 with 0.2,
rust-nasm-rs-0.1 with 0.2.
---
gnu/packages/video.scm | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 4a8ff1d40d..56c2b244a0 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -46,6 +46,7 @@
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@posteo.ro>
;;; Copyright © 2020 Ivan Kozlov <kanichos@yandex.ru>
+;;; Copyright © 2020 Antoine Côté <antoine.cote@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -4637,7 +4638,7 @@ result in several formats:
(define-public rav1e
(package
(name "rav1e")
- (version "0.3.3")
+ (version "0.3.4")
(source
(origin
(method url-fetch)
@@ -4646,17 +4647,18 @@ result in several formats:
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "053bh8hc6jj81ydq4gcak01b0ady59hvkl7d87im3y8nafg7xzb4"))))
+ "1mx6jlx2rdhmyh68h9h34kn9ssa7lv0y97j8fd9qm7qhs2q1n0cj"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-aom-sys" ,rust-aom-sys-0.1)
+ (("rust-aom-sys" ,rust-aom-sys-0.2)
("rust-arbitrary" ,rust-arbitrary-0.2)
("rust-arg-enum-proc-macro" ,rust-arg-enum-proc-macro-0.3)
("rust-arrayvec" ,rust-arrayvec-0.5)
("rust-backtrace" ,rust-backtrace-0.3)
("rust-bitstream-io" ,rust-bitstream-io-0.8)
("rust-byteorder" ,rust-byteorder-1)
+ ("rust-cc" ,rust-cc-1)
("rust-cfg-if" ,rust-cfg-if-0.1)
("rust-clap" ,rust-clap-2)
("rust-console" ,rust-console-0.11)
@@ -4668,6 +4670,7 @@ result in several formats:
("rust-ivf" ,rust-ivf-0.1)
("rust-libc" ,rust-libc-0.2)
("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-num-derive" ,rust-num-derive-0.3)
("rust-num-traits" ,rust-num-traits-0.2)
@@ -4676,17 +4679,15 @@ result in several formats:
("rust-rand-chacha" ,rust-rand-chacha-0.2)
("rust-rayon" ,rust-rayon-1)
("rust-rust-hawktracer" ,rust-rust-hawktracer-0.7)
+ ("rust-rustc-version" ,rust-rustc-version-0.2)
("rust-scan-fmt" ,rust-scan-fmt-0.2)
("rust-serde" ,rust-serde-1)
("rust-signal-hook" ,rust-signal-hook-0.1)
("rust-simd-helpers" ,rust-simd-helpers-0.1)
("rust-thiserror" ,rust-thiserror-1)
("rust-toml" ,rust-toml-0.5)
- ("rust-y4m" ,rust-y4m-0.5)
- ("rust-cc" ,rust-cc-1)
- ("rust-nasm-rs" ,rust-nasm-rs-0.1)
- ("rust-rustc-version" ,rust-rustc-version-0.2)
- ("rust-vergen" ,rust-vergen-3.1))
+ ("rust-vergen" ,rust-vergen-3.1)
+ ("rust-y4m" ,rust-y4m-0.5))
#:cargo-development-inputs
(("rust-assert-cmd" ,rust-assert-cmd-1)
("rust-criterion" ,rust-criterion-0.3)

-- 
2.29.2



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#45077: [PATCH 1/3] gnu: Add rust-aom-sys-0.2.

[Nicolas Goaziou]

Hello,

Antoine Côté <antoine.cote@posteo.net> writes:

> * gnu/packages/crates-graphics.scm (rust-aom-sys-0.2): New variable.
> (rust-aom-sys-0.1): Inherit from rust-aom-sys-0.2.

All patches applied. Thank you.

Regards,
-- 
Nicolas Goaziou

bug#45076: [PATCH 2/3] gnu: Add rust-nasm-rs-0.2.

[Nicolas Goaziou]

> * gnu/packages/crate-io.scm (rust-nasm-rs-0.2): New variable.
> (rust-nasm-rs-0.1): Inherit from rust-nasm-rs-0.2.

Applied. Thank you.

I suggest to use the same bug number next time.

Regards,

bug#45078: [PATCH 3/3] gnu: rav1e: Update to 0.3.4.

[Nicolas Goaziou]

Antoine Côté <antoine.cote@posteo.net> writes:

> * gnu/packages/video.scm (rav1e): Update to 0.3.4.
> [arguments]: In cargo-inputs replace rust-aom-sys-0.1 with 0.2,
> rust-nasm-rs-0.1 with 0.2.

Applied. Thank you.

Regards,

bug#45079: [PATCH 3/3] gnu: rav1e: Update to 0.3.4.

[Nicolas Goaziou]

Hello,

Antoine Côté <antoine.cote@posteo.net> writes:

> * gnu/packages/video.scm (rav1e): Update to 0.3.4.
> [arguments]: In cargo-inputs replace rust-aom-sys-0.1 with 0.2,
> rust-nasm-rs-0.1 with 0.2.

Applied from another bug report.

Regards,