git: 65b938749d0a - main - multimedia/ab-av1: drop rust < 1.80 workaround after bc4fedc1fec0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 27 Aug 2024 00:56:32 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=65b938749d0aafe5d3b0e031f73f4332f880f232
commit 65b938749d0aafe5d3b0e031f73f4332f880f232
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-08-27 00:45:41 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-08-27 00:47:54 +0000
multimedia/ab-av1: drop rust < 1.80 workaround after bc4fedc1fec0
---
multimedia/ab-av1/Makefile | 2 +-
multimedia/ab-av1/Makefile.crates | 30 ++--
multimedia/ab-av1/distinfo | 60 +++----
multimedia/ab-av1/files/patch-rust-1.79 | 295 --------------------------------
4 files changed, 46 insertions(+), 341 deletions(-)
diff --git a/multimedia/ab-av1/Makefile b/multimedia/ab-av1/Makefile
index 555f5029dd39..a6779c9a0d7a 100644
--- a/multimedia/ab-av1/Makefile
+++ b/multimedia/ab-av1/Makefile
@@ -1,7 +1,7 @@
PORTNAME= ab-av1
DISTVERSIONPREFIX= v
DISTVERSION= 0.7.17
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= multimedia
MAINTAINER= jbeich@FreeBSD.org
diff --git a/multimedia/ab-av1/Makefile.crates b/multimedia/ab-av1/Makefile.crates
index b2d7f3f9a70b..e301fbff1a95 100644
--- a/multimedia/ab-av1/Makefile.crates
+++ b/multimedia/ab-av1/Makefile.crates
@@ -1,10 +1,10 @@
CARGO_CRATES= addr2line-0.22.0 \
adler-1.0.2 \
- anstream-0.6.14 \
- anstyle-1.0.7 \
- anstyle-parse-0.2.4 \
- anstyle-query-1.1.0 \
- anstyle-wincon-3.0.3 \
+ anstream-0.6.15 \
+ anstyle-1.0.8 \
+ anstyle-parse-0.2.5 \
+ anstyle-query-1.1.1 \
+ anstyle-wincon-3.0.4 \
anyhow-1.0.86 \
arrayref-0.3.8 \
arrayvec-0.7.4 \
@@ -19,12 +19,12 @@ CARGO_CRATES= addr2line-0.22.0 \
bytes-1.6.1 \
cc-1.1.6 \
cfg-if-1.0.0 \
- clap-4.5.10 \
- clap_builder-4.5.10 \
- clap_complete-4.5.9 \
- clap_derive-4.5.8 \
- clap_lex-0.7.1 \
- colorchoice-1.0.1 \
+ clap-4.5.11 \
+ clap_builder-4.5.11 \
+ clap_complete-4.5.11 \
+ clap_derive-4.5.11 \
+ clap_lex-0.7.2 \
+ colorchoice-1.0.2 \
console-0.15.8 \
constant_time_eq-0.3.0 \
crc32fast-1.4.2 \
@@ -34,8 +34,8 @@ CARGO_CRATES= addr2line-0.22.0 \
dirs-5.0.1 \
dirs-sys-0.4.1 \
encode_unicode-0.3.6 \
- env_filter-0.1.1 \
- env_logger-0.11.4 \
+ env_filter-0.1.2 \
+ env_logger-0.11.5 \
errno-0.3.9 \
fastrand-2.1.0 \
ffprobe-0.4.0 \
@@ -58,7 +58,7 @@ CARGO_CRATES= addr2line-0.22.0 \
indicatif-0.17.8 \
infer-0.16.0 \
instant-0.1.13 \
- is_terminal_polyfill-1.70.0 \
+ is_terminal_polyfill-1.70.1 \
itoa-1.0.11 \
lazy_static-1.5.0 \
libc-0.2.155 \
@@ -71,7 +71,7 @@ CARGO_CRATES= addr2line-0.22.0 \
mio-1.0.1 \
num-conv-0.1.0 \
number_prefix-0.4.0 \
- object-0.36.1 \
+ object-0.36.2 \
option-ext-0.2.0 \
parking_lot-0.11.2 \
parking_lot_core-0.8.6 \
diff --git a/multimedia/ab-av1/distinfo b/multimedia/ab-av1/distinfo
index db99e0a25d94..79da86c09c16 100644
--- a/multimedia/ab-av1/distinfo
+++ b/multimedia/ab-av1/distinfo
@@ -3,16 +3,16 @@ SHA256 (rust/crates/addr2line-0.22.0.crate) = 6e4503c46a5c0c7844e948c9a4d6acd9f5
SIZE (rust/crates/addr2line-0.22.0.crate) = 39156
SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
SIZE (rust/crates/adler-1.0.2.crate) = 12778
-SHA256 (rust/crates/anstream-0.6.14.crate) = 418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b
-SIZE (rust/crates/anstream-0.6.14.crate) = 29160
-SHA256 (rust/crates/anstyle-1.0.7.crate) = 038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b
-SIZE (rust/crates/anstyle-1.0.7.crate) = 15709
-SHA256 (rust/crates/anstyle-parse-0.2.4.crate) = c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4
-SIZE (rust/crates/anstyle-parse-0.2.4.crate) = 23069
-SHA256 (rust/crates/anstyle-query-1.1.0.crate) = ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391
-SIZE (rust/crates/anstyle-query-1.1.0.crate) = 9832
-SHA256 (rust/crates/anstyle-wincon-3.0.3.crate) = 61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19
-SIZE (rust/crates/anstyle-wincon-3.0.3.crate) = 12179
+SHA256 (rust/crates/anstream-0.6.15.crate) = 64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526
+SIZE (rust/crates/anstream-0.6.15.crate) = 29231
+SHA256 (rust/crates/anstyle-1.0.8.crate) = 1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1
+SIZE (rust/crates/anstyle-1.0.8.crate) = 15771
+SHA256 (rust/crates/anstyle-parse-0.2.5.crate) = eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb
+SIZE (rust/crates/anstyle-parse-0.2.5.crate) = 22680
+SHA256 (rust/crates/anstyle-query-1.1.1.crate) = 6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a
+SIZE (rust/crates/anstyle-query-1.1.1.crate) = 9891
+SHA256 (rust/crates/anstyle-wincon-3.0.4.crate) = 5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8
+SIZE (rust/crates/anstyle-wincon-3.0.4.crate) = 12234
SHA256 (rust/crates/anyhow-1.0.86.crate) = b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da
SIZE (rust/crates/anyhow-1.0.86.crate) = 46741
SHA256 (rust/crates/arrayref-0.3.8.crate) = 9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a
@@ -41,18 +41,18 @@ SHA256 (rust/crates/cc-1.1.6.crate) = 2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2
SIZE (rust/crates/cc-1.1.6.crate) = 81585
SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
-SHA256 (rust/crates/clap-4.5.10.crate) = 8f6b81fb3c84f5563d509c59b5a48d935f689e993afa90fe39047f05adef9142
-SIZE (rust/crates/clap-4.5.10.crate) = 55999
-SHA256 (rust/crates/clap_builder-4.5.10.crate) = 5ca6706fd5224857d9ac5eb9355f6683563cc0541c7cd9d014043b57cbec78ac
-SIZE (rust/crates/clap_builder-4.5.10.crate) = 164063
-SHA256 (rust/crates/clap_complete-4.5.9.crate) = faa2032320fd6f50d22af510d204b2994eef49600dfbd0e771a166213844e4cd
-SIZE (rust/crates/clap_complete-4.5.9.crate) = 41938
-SHA256 (rust/crates/clap_derive-4.5.8.crate) = 2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085
-SIZE (rust/crates/clap_derive-4.5.8.crate) = 30024
-SHA256 (rust/crates/clap_lex-0.7.1.crate) = 4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70
-SIZE (rust/crates/clap_lex-0.7.1.crate) = 12766
-SHA256 (rust/crates/colorchoice-1.0.1.crate) = 0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422
-SIZE (rust/crates/colorchoice-1.0.1.crate) = 7895
+SHA256 (rust/crates/clap-4.5.11.crate) = 35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3
+SIZE (rust/crates/clap-4.5.11.crate) = 56252
+SHA256 (rust/crates/clap_builder-4.5.11.crate) = 49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa
+SIZE (rust/crates/clap_builder-4.5.11.crate) = 164100
+SHA256 (rust/crates/clap_complete-4.5.11.crate) = c6ae69fbb0833c6fcd5a8d4b8609f108c7ad95fc11e248d853ff2c42a90df26a
+SIZE (rust/crates/clap_complete-4.5.11.crate) = 42426
+SHA256 (rust/crates/clap_derive-4.5.11.crate) = 5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e
+SIZE (rust/crates/clap_derive-4.5.11.crate) = 30061
+SHA256 (rust/crates/clap_lex-0.7.2.crate) = 1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97
+SIZE (rust/crates/clap_lex-0.7.2.crate) = 12805
+SHA256 (rust/crates/colorchoice-1.0.2.crate) = d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0
+SIZE (rust/crates/colorchoice-1.0.2.crate) = 7924
SHA256 (rust/crates/console-0.15.8.crate) = 0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb
SIZE (rust/crates/console-0.15.8.crate) = 36364
SHA256 (rust/crates/constant_time_eq-0.3.0.crate) = f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2
@@ -71,10 +71,10 @@ SHA256 (rust/crates/dirs-sys-0.4.1.crate) = 520f05a5cbd335fae5a99ff7a6ab86275776
SIZE (rust/crates/dirs-sys-0.4.1.crate) = 10719
SHA256 (rust/crates/encode_unicode-0.3.6.crate) = a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f
SIZE (rust/crates/encode_unicode-0.3.6.crate) = 45741
-SHA256 (rust/crates/env_filter-0.1.1.crate) = c6dc8c8ff84895b051f07a0e65f975cf225131742531338752abfb324e4449ff
-SIZE (rust/crates/env_filter-0.1.1.crate) = 13270
-SHA256 (rust/crates/env_logger-0.11.4.crate) = 06676b12debf7bba6903559720abca942d3a66b8acb88815fd2c7c6537e9ade1
-SIZE (rust/crates/env_logger-0.11.4.crate) = 30529
+SHA256 (rust/crates/env_filter-0.1.2.crate) = 4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab
+SIZE (rust/crates/env_filter-0.1.2.crate) = 13327
+SHA256 (rust/crates/env_logger-0.11.5.crate) = e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d
+SIZE (rust/crates/env_logger-0.11.5.crate) = 30683
SHA256 (rust/crates/errno-0.3.9.crate) = 534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba
SIZE (rust/crates/errno-0.3.9.crate) = 10690
SHA256 (rust/crates/fastrand-2.1.0.crate) = 9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a
@@ -119,8 +119,8 @@ SHA256 (rust/crates/infer-0.16.0.crate) = bc150e5ce2330295b8616ce0e3f53250e53af3
SIZE (rust/crates/infer-0.16.0.crate) = 18830
SHA256 (rust/crates/instant-0.1.13.crate) = e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222
SIZE (rust/crates/instant-0.1.13.crate) = 6305
-SHA256 (rust/crates/is_terminal_polyfill-1.70.0.crate) = f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800
-SIZE (rust/crates/is_terminal_polyfill-1.70.0.crate) = 7451
+SHA256 (rust/crates/is_terminal_polyfill-1.70.1.crate) = 7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf
+SIZE (rust/crates/is_terminal_polyfill-1.70.1.crate) = 7492
SHA256 (rust/crates/itoa-1.0.11.crate) = 49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b
SIZE (rust/crates/itoa-1.0.11.crate) = 10563
SHA256 (rust/crates/lazy_static-1.5.0.crate) = bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe
@@ -145,8 +145,8 @@ SHA256 (rust/crates/num-conv-0.1.0.crate) = 51d515d32fb182ee37cda2ccdcb92950d6a3
SIZE (rust/crates/num-conv-0.1.0.crate) = 7444
SHA256 (rust/crates/number_prefix-0.4.0.crate) = 830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3
SIZE (rust/crates/number_prefix-0.4.0.crate) = 6922
-SHA256 (rust/crates/object-0.36.1.crate) = 081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce
-SIZE (rust/crates/object-0.36.1.crate) = 323865
+SHA256 (rust/crates/object-0.36.2.crate) = 3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e
+SIZE (rust/crates/object-0.36.2.crate) = 324577
SHA256 (rust/crates/option-ext-0.2.0.crate) = 04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d
SIZE (rust/crates/option-ext-0.2.0.crate) = 7345
SHA256 (rust/crates/parking_lot-0.11.2.crate) = 7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99
diff --git a/multimedia/ab-av1/files/patch-rust-1.79 b/multimedia/ab-av1/files/patch-rust-1.79
deleted file mode 100644
index f914504038df..000000000000
--- a/multimedia/ab-av1/files/patch-rust-1.79
+++ /dev/null
@@ -1,295 +0,0 @@
-Revert https://github.com/alexheretic/ab-av1/commit/57d090e70ae0
-until lang/rust >= 1.80 update
-
---- Cargo.lock.orig 2024-07-28 18:16:35 UTC
-+++ Cargo.lock
-@@ -48,9 +48,9 @@ name = "anstream"
-
- [[package]]
- name = "anstream"
--version = "0.6.15"
-+version = "0.6.14"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
-+checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
- dependencies = [
- "anstyle",
- "anstyle-parse",
-@@ -63,33 +63,33 @@ name = "anstyle"
-
- [[package]]
- name = "anstyle"
--version = "1.0.8"
-+version = "1.0.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
-+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
-
- [[package]]
- name = "anstyle-parse"
--version = "0.2.5"
-+version = "0.2.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
-+checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
- dependencies = [
- "utf8parse",
- ]
-
- [[package]]
- name = "anstyle-query"
--version = "1.1.1"
-+version = "1.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
-+checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
- dependencies = [
- "windows-sys 0.52.0",
- ]
-
- [[package]]
- name = "anstyle-wincon"
--version = "3.0.4"
-+version = "3.0.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
-+checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
- dependencies = [
- "anstyle",
- "windows-sys 0.52.0",
-@@ -207,9 +207,9 @@ name = "clap"
-
- [[package]]
- name = "clap"
--version = "4.5.11"
-+version = "4.5.10"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3"
-+checksum = "8f6b81fb3c84f5563d509c59b5a48d935f689e993afa90fe39047f05adef9142"
- dependencies = [
- "clap_builder",
- "clap_derive",
-@@ -217,9 +217,9 @@ name = "clap_builder"
-
- [[package]]
- name = "clap_builder"
--version = "4.5.11"
-+version = "4.5.10"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa"
-+checksum = "5ca6706fd5224857d9ac5eb9355f6683563cc0541c7cd9d014043b57cbec78ac"
- dependencies = [
- "anstream",
- "anstyle",
-@@ -230,18 +230,18 @@ name = "clap_complete"
-
- [[package]]
- name = "clap_complete"
--version = "4.5.11"
-+version = "4.5.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c6ae69fbb0833c6fcd5a8d4b8609f108c7ad95fc11e248d853ff2c42a90df26a"
-+checksum = "faa2032320fd6f50d22af510d204b2994eef49600dfbd0e771a166213844e4cd"
- dependencies = [
- "clap",
- ]
-
- [[package]]
- name = "clap_derive"
--version = "4.5.11"
-+version = "4.5.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e"
-+checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085"
- dependencies = [
- "heck",
- "proc-macro2",
-@@ -251,15 +251,15 @@ name = "clap_lex"
-
- [[package]]
- name = "clap_lex"
--version = "0.7.2"
-+version = "0.7.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
-+checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
-
- [[package]]
- name = "colorchoice"
--version = "1.0.2"
-+version = "1.0.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
-+checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
-
- [[package]]
- name = "console"
-@@ -342,18 +342,18 @@ name = "env_filter"
-
- [[package]]
- name = "env_filter"
--version = "0.1.2"
-+version = "0.1.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
-+checksum = "c6dc8c8ff84895b051f07a0e65f975cf225131742531338752abfb324e4449ff"
- dependencies = [
- "log",
- ]
-
- [[package]]
- name = "env_logger"
--version = "0.11.5"
-+version = "0.11.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
-+checksum = "06676b12debf7bba6903559720abca942d3a66b8acb88815fd2c7c6537e9ade1"
- dependencies = [
- "anstream",
- "anstyle",
-@@ -561,9 +561,9 @@ name = "is_terminal_polyfill"
-
- [[package]]
- name = "is_terminal_polyfill"
--version = "1.70.1"
-+version = "1.70.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
-+checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
-
- [[package]]
- name = "itoa"
-@@ -656,9 +656,9 @@ name = "object"
-
- [[package]]
- name = "object"
--version = "0.36.2"
-+version = "0.36.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e"
-+checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce"
- dependencies = [
- "memchr",
- ]
---- src/ffmpeg.rs.orig 2024-07-28 18:16:35 UTC
-+++ src/ffmpeg.rs
-@@ -12,7 +12,7 @@ use std::{
- hash::{Hash, Hasher},
- path::{Path, PathBuf},
- process::Stdio,
-- sync::{Arc, LazyLock},
-+ sync::{Arc, OnceLock},
- };
- use tokio::process::Command;
- use tokio_stream::Stream;
-@@ -33,17 +33,18 @@ impl FfmpegEncodeArgs<'_> {
-
- impl FfmpegEncodeArgs<'_> {
- pub fn sample_encode_hash(&self, state: &mut impl Hasher) {
-- static SVT_AV1_V: LazyLock<Vec<u8>> = LazyLock::new(|| {
-- std::process::Command::new("SvtAv1EncApp")
-- .arg("--version")
-- .output()
-- .map(|o| o.stdout)
-- .unwrap_or_default()
-- });
-+ static SVT_AV1_V: OnceLock<Vec<u8>> = OnceLock::new();
-
- // hashing svt-av1 version means new encoder releases will avoid old cache data
- if &*self.vcodec == "libsvtav1" {
-- SVT_AV1_V.hash(state);
-+ let svtav1_version = SVT_AV1_V.get_or_init(|| {
-+ use std::process::Command;
-+ match Command::new("SvtAv1EncApp").arg("--version").output() {
-+ Ok(out) => out.stdout,
-+ _ => <_>::default(),
-+ }
-+ });
-+ svtav1_version.hash(state);
- }
-
- // input not relevant to sample encoding
---- src/temporary.rs.orig 2024-07-28 18:16:35 UTC
-+++ src/temporary.rs
-@@ -3,11 +3,9 @@ use std::{
- collections::HashMap,
- env, iter,
- path::{Path, PathBuf},
-- sync::{LazyLock, Mutex},
-+ sync::{Mutex, OnceLock},
- };
-
--static TEMPS: LazyLock<Mutex<HashMap<PathBuf, TempKind>>> = LazyLock::new(<_>::default);
--
- #[derive(Debug, Clone, Copy, PartialEq, Eq)]
- pub enum TempKind {
- /// Should always be deleted at the end of the program.
-@@ -18,15 +16,20 @@ pub fn add(file: impl Into<PathBuf>, kind: TempKind) {
-
- /// Add a file as temporary so it can be deleted later.
- pub fn add(file: impl Into<PathBuf>, kind: TempKind) {
-- TEMPS.lock().unwrap().insert(file.into(), kind);
-+ temp_files().lock().unwrap().insert(file.into(), kind);
- }
-
- /// Remove a previously added file so that it won't be deleted later,
- /// if it hasn't already.
- pub fn unadd(file: &Path) -> bool {
-- TEMPS.lock().unwrap().remove(file).is_some()
-+ temp_files().lock().unwrap().remove(file).is_some()
- }
-
-+fn temp_files() -> &'static Mutex<HashMap<PathBuf, TempKind>> {
-+ static TEMPS: OnceLock<Mutex<HashMap<PathBuf, TempKind>>> = OnceLock::new();
-+ TEMPS.get_or_init(<_>::default)
-+}
-+
- /// Delete all added temporary files.
- /// If `keep_keepables` true don't delete [`TempKind::Keepable`] temporary files.
- pub async fn clean(keep_keepables: bool) {
-@@ -38,7 +41,7 @@ pub async fn clean_all() {
-
- /// Delete all added temporary files.
- pub async fn clean_all() {
-- let mut files: Vec<_> = std::mem::take(&mut *TEMPS.lock().unwrap())
-+ let mut files: Vec<_> = std::mem::take(&mut *temp_files().lock().unwrap())
- .into_keys()
- .collect();
- files.sort_by_key(|f| f.is_dir()); // rm dir at the end
-@@ -52,7 +55,7 @@ async fn clean_non_keepables() {
- }
-
- async fn clean_non_keepables() {
-- let mut matching: Vec<_> = TEMPS
-+ let mut matching: Vec<_> = temp_files()
- .lock()
- .unwrap()
- .iter()
-@@ -66,7 +69,7 @@ async fn clean_non_keepables() {
- true => _ = tokio::fs::remove_dir(&file).await,
- false => _ = tokio::fs::remove_file(&file).await,
- }
-- TEMPS.lock().unwrap().remove(&file);
-+ temp_files().lock().unwrap().remove(&file);
- }
- }
-
-@@ -74,7 +77,8 @@ pub fn process_dir(conf_parent: Option<PathBuf>) -> Pa
- ///
- /// Configured --temp-dir is used as a parent or, if not set, the current working dir.
- pub fn process_dir(conf_parent: Option<PathBuf>) -> PathBuf {
-- static SUBDIR: LazyLock<String> = LazyLock::new(|| {
-+ static SUBDIR: OnceLock<String> = OnceLock::new();
-+ let subdir = SUBDIR.get_or_init(|| {
- let mut subdir = String::from(".ab-av1-");
- subdir.extend(iter::repeat_with(fastrand::alphanumeric).take(12));
- subdir
-@@ -82,7 +86,7 @@ pub fn process_dir(conf_parent: Option<PathBuf>) -> Pa
-
- let mut temp_dir =
- conf_parent.unwrap_or_else(|| env::current_dir().expect("current working directory"));
-- temp_dir.push(&*SUBDIR);
-+ temp_dir.push(subdir);
-
- if !temp_dir.exists() {
- add(&temp_dir, TempKind::Keepable);