Date: Mon, 29 Jul 2024 22:54:52 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 26542883d067 - 2024Q3 - multimedia/ab-av1: update to 0.7.17 Message-ID: <202407292254.46TMsq1f048859@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=26542883d067e52c7886166fe14de064d8e0947f commit 26542883d067e52c7886166fe14de064d8e0947f Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-07-28 18:16:35 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2024-07-29 22:54:47 +0000 multimedia/ab-av1: update to 0.7.17 Changes: https://github.com/alexheretic/ab-av1/releases/tag/v0.7.17 Reported by: GitHub (watch releases) (cherry picked from commit b7d83326d28c3834a7735a60849a5b5ea7cf54b6) --- multimedia/ab-av1/Makefile | 2 +- multimedia/ab-av1/Makefile.crates | 33 ++-- multimedia/ab-av1/distinfo | 72 ++++---- multimedia/ab-av1/files/patch-rust-1.79 | 295 ++++++++++++++++++++++++++++++++ 4 files changed, 347 insertions(+), 55 deletions(-) diff --git a/multimedia/ab-av1/Makefile b/multimedia/ab-av1/Makefile index 5d6b5e2a245d..d1f4821f1f1d 100644 --- a/multimedia/ab-av1/Makefile +++ b/multimedia/ab-av1/Makefile @@ -1,6 +1,6 @@ PORTNAME= ab-av1 DISTVERSIONPREFIX= v -DISTVERSION= 0.7.16 +DISTVERSION= 0.7.17 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org diff --git a/multimedia/ab-av1/Makefile.crates b/multimedia/ab-av1/Makefile.crates index 6b350b045c41..b2d7f3f9a70b 100644 --- a/multimedia/ab-av1/Makefile.crates +++ b/multimedia/ab-av1/Makefile.crates @@ -6,7 +6,7 @@ CARGO_CRATES= addr2line-0.22.0 \ anstyle-query-1.1.0 \ anstyle-wincon-3.0.3 \ anyhow-1.0.86 \ - arrayref-0.3.7 \ + arrayref-0.3.8 \ arrayvec-0.7.4 \ async-stream-0.3.5 \ async-stream-impl-0.3.5 \ @@ -14,14 +14,14 @@ CARGO_CRATES= addr2line-0.22.0 \ backtrace-0.3.73 \ bitflags-1.3.2 \ bitflags-2.6.0 \ - blake3-1.5.1 \ + blake3-1.5.3 \ byteorder-1.5.0 \ - bytes-1.6.0 \ - cc-1.1.0 \ + bytes-1.6.1 \ + cc-1.1.6 \ cfg-if-1.0.0 \ - clap-4.5.9 \ - clap_builder-4.5.9 \ - clap_complete-4.5.8 \ + 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 \ @@ -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.0 \ - env_logger-0.11.3 \ + env_filter-0.1.1 \ + env_logger-0.11.4 \ errno-0.3.9 \ fastrand-2.1.0 \ ffprobe-0.4.0 \ @@ -68,9 +68,8 @@ CARGO_CRATES= addr2line-0.22.0 \ log-0.4.22 \ memchr-2.7.4 \ miniz_oxide-0.7.4 \ - mio-0.8.11 \ + mio-1.0.1 \ num-conv-0.1.0 \ - num_cpus-1.16.0 \ number_prefix-0.4.0 \ object-0.36.1 \ option-ext-0.2.0 \ @@ -78,7 +77,7 @@ CARGO_CRATES= addr2line-0.22.0 \ parking_lot_core-0.8.6 \ pin-project-lite-0.2.14 \ pin-utils-0.1.0 \ - portable-atomic-1.6.0 \ + portable-atomic-1.7.0 \ powerfmt-0.2.0 \ proc-macro2-1.0.86 \ quote-1.0.36 \ @@ -97,15 +96,15 @@ CARGO_CRATES= addr2line-0.22.0 \ sled-0.34.7 \ smallvec-1.13.2 \ strsim-0.11.1 \ - syn-2.0.70 \ + syn-2.0.72 \ terminal_size-0.3.0 \ - thiserror-1.0.61 \ - thiserror-impl-1.0.61 \ + thiserror-1.0.63 \ + thiserror-impl-1.0.63 \ time-0.3.36 \ time-core-0.1.2 \ time-macros-0.2.18 \ - tokio-1.38.0 \ - tokio-macros-2.3.0 \ + tokio-1.39.2 \ + tokio-macros-2.4.0 \ tokio-process-stream-0.4.0 \ tokio-stream-0.1.15 \ tokio-util-0.7.11 \ diff --git a/multimedia/ab-av1/distinfo b/multimedia/ab-av1/distinfo index bbc40aa1f0e3..db99e0a25d94 100644 --- a/multimedia/ab-av1/distinfo +++ b/multimedia/ab-av1/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1720685888 +TIMESTAMP = 1722190595 SHA256 (rust/crates/addr2line-0.22.0.crate) = 6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678 SIZE (rust/crates/addr2line-0.22.0.crate) = 39156 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe @@ -15,8 +15,8 @@ SHA256 (rust/crates/anstyle-wincon-3.0.3.crate) = 61a38449feb7068f52bb06c1275900 SIZE (rust/crates/anstyle-wincon-3.0.3.crate) = 12179 SHA256 (rust/crates/anyhow-1.0.86.crate) = b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da SIZE (rust/crates/anyhow-1.0.86.crate) = 46741 -SHA256 (rust/crates/arrayref-0.3.7.crate) = 6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545 -SIZE (rust/crates/arrayref-0.3.7.crate) = 9620 +SHA256 (rust/crates/arrayref-0.3.8.crate) = 9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a +SIZE (rust/crates/arrayref-0.3.8.crate) = 10279 SHA256 (rust/crates/arrayvec-0.7.4.crate) = 96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711 SIZE (rust/crates/arrayvec-0.7.4.crate) = 29856 SHA256 (rust/crates/async-stream-0.3.5.crate) = cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51 @@ -31,22 +31,22 @@ SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c9 SIZE (rust/crates/bitflags-1.3.2.crate) = 23021 SHA256 (rust/crates/bitflags-2.6.0.crate) = b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de SIZE (rust/crates/bitflags-2.6.0.crate) = 45357 -SHA256 (rust/crates/blake3-1.5.1.crate) = 30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52 -SIZE (rust/crates/blake3-1.5.1.crate) = 170239 +SHA256 (rust/crates/blake3-1.5.3.crate) = e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210 +SIZE (rust/crates/blake3-1.5.3.crate) = 172698 SHA256 (rust/crates/byteorder-1.5.0.crate) = 1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b SIZE (rust/crates/byteorder-1.5.0.crate) = 23288 -SHA256 (rust/crates/bytes-1.6.0.crate) = 514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9 -SIZE (rust/crates/bytes-1.6.0.crate) = 60605 -SHA256 (rust/crates/cc-1.1.0.crate) = eaff6f8ce506b9773fa786672d63fc7a191ffea1be33f72bbd4aeacefca9ffc8 -SIZE (rust/crates/cc-1.1.0.crate) = 80751 +SHA256 (rust/crates/bytes-1.6.1.crate) = a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952 +SIZE (rust/crates/bytes-1.6.1.crate) = 60723 +SHA256 (rust/crates/cc-1.1.6.crate) = 2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f +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.9.crate) = 64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462 -SIZE (rust/crates/clap-4.5.9.crate) = 56348 -SHA256 (rust/crates/clap_builder-4.5.9.crate) = 6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942 -SIZE (rust/crates/clap_builder-4.5.9.crate) = 164088 -SHA256 (rust/crates/clap_complete-4.5.8.crate) = 5b4be9c4c4b1f30b78d8a750e0822b6a6102d97e62061c583a6c1dea2dfb33ae -SIZE (rust/crates/clap_complete-4.5.8.crate) = 39228 +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 @@ -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.0.crate) = a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea -SIZE (rust/crates/env_filter-0.1.0.crate) = 11553 -SHA256 (rust/crates/env_logger-0.11.3.crate) = 38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9 -SIZE (rust/crates/env_logger-0.11.3.crate) = 29704 +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/errno-0.3.9.crate) = 534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba SIZE (rust/crates/errno-0.3.9.crate) = 10690 SHA256 (rust/crates/fastrand-2.1.0.crate) = 9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a @@ -139,12 +139,10 @@ SHA256 (rust/crates/memchr-2.7.4.crate) = 78ca9ab1a0babb1e7d5695e3530886289c18cf SIZE (rust/crates/memchr-2.7.4.crate) = 96670 SHA256 (rust/crates/miniz_oxide-0.7.4.crate) = b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08 SIZE (rust/crates/miniz_oxide-0.7.4.crate) = 56119 -SHA256 (rust/crates/mio-0.8.11.crate) = a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c -SIZE (rust/crates/mio-0.8.11.crate) = 102983 +SHA256 (rust/crates/mio-1.0.1.crate) = 4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4 +SIZE (rust/crates/mio-1.0.1.crate) = 102654 SHA256 (rust/crates/num-conv-0.1.0.crate) = 51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9 SIZE (rust/crates/num-conv-0.1.0.crate) = 7444 -SHA256 (rust/crates/num_cpus-1.16.0.crate) = 4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43 -SIZE (rust/crates/num_cpus-1.16.0.crate) = 15713 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 @@ -159,8 +157,8 @@ SHA256 (rust/crates/pin-project-lite-0.2.14.crate) = bda66fc9667c18cb2758a2ac84d SIZE (rust/crates/pin-project-lite-0.2.14.crate) = 28817 SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184 SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580 -SHA256 (rust/crates/portable-atomic-1.6.0.crate) = 7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0 -SIZE (rust/crates/portable-atomic-1.6.0.crate) = 140689 +SHA256 (rust/crates/portable-atomic-1.7.0.crate) = da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265 +SIZE (rust/crates/portable-atomic-1.7.0.crate) = 145385 SHA256 (rust/crates/powerfmt-0.2.0.crate) = 439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391 SIZE (rust/crates/powerfmt-0.2.0.crate) = 15165 SHA256 (rust/crates/proc-macro2-1.0.86.crate) = 5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77 @@ -197,24 +195,24 @@ SHA256 (rust/crates/smallvec-1.13.2.crate) = 3c5e1a9a646d36c3599cd173a41282daf47 SIZE (rust/crates/smallvec-1.13.2.crate) = 35216 SHA256 (rust/crates/strsim-0.11.1.crate) = 7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f SIZE (rust/crates/strsim-0.11.1.crate) = 14266 -SHA256 (rust/crates/syn-2.0.70.crate) = 2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16 -SIZE (rust/crates/syn-2.0.70.crate) = 266388 +SHA256 (rust/crates/syn-2.0.72.crate) = dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af +SIZE (rust/crates/syn-2.0.72.crate) = 267069 SHA256 (rust/crates/terminal_size-0.3.0.crate) = 21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7 SIZE (rust/crates/terminal_size-0.3.0.crate) = 10096 -SHA256 (rust/crates/thiserror-1.0.61.crate) = c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709 -SIZE (rust/crates/thiserror-1.0.61.crate) = 21264 -SHA256 (rust/crates/thiserror-impl-1.0.61.crate) = 46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533 -SIZE (rust/crates/thiserror-impl-1.0.61.crate) = 15786 +SHA256 (rust/crates/thiserror-1.0.63.crate) = c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724 +SIZE (rust/crates/thiserror-1.0.63.crate) = 21537 +SHA256 (rust/crates/thiserror-impl-1.0.63.crate) = a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261 +SIZE (rust/crates/thiserror-impl-1.0.63.crate) = 16047 SHA256 (rust/crates/time-0.3.36.crate) = 5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885 SIZE (rust/crates/time-0.3.36.crate) = 119805 SHA256 (rust/crates/time-core-0.1.2.crate) = ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3 SIZE (rust/crates/time-core-0.1.2.crate) = 7191 SHA256 (rust/crates/time-macros-0.2.18.crate) = 3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf SIZE (rust/crates/time-macros-0.2.18.crate) = 24361 -SHA256 (rust/crates/tokio-1.38.0.crate) = ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a -SIZE (rust/crates/tokio-1.38.0.crate) = 774094 -SHA256 (rust/crates/tokio-macros-2.3.0.crate) = 5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a -SIZE (rust/crates/tokio-macros-2.3.0.crate) = 11753 +SHA256 (rust/crates/tokio-1.39.2.crate) = daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1 +SIZE (rust/crates/tokio-1.39.2.crate) = 780859 +SHA256 (rust/crates/tokio-macros-2.4.0.crate) = 693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752 +SIZE (rust/crates/tokio-macros-2.4.0.crate) = 12501 SHA256 (rust/crates/tokio-process-stream-0.4.0.crate) = 2f09c7fc9546d3b9586bc95c58ac2bdb48b07c538a26e317b558e6de2fac98b8 SIZE (rust/crates/tokio-process-stream-0.4.0.crate) = 5453 SHA256 (rust/crates/tokio-stream-0.1.15.crate) = 267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af @@ -273,5 +271,5 @@ SHA256 (rust/crates/windows_x86_64_msvc-0.48.5.crate) = ed94fce61571a4006852b738 SIZE (rust/crates/windows_x86_64_msvc-0.48.5.crate) = 798412 SHA256 (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec SIZE (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 832564 -SHA256 (alexheretic-ab-av1-v0.7.16_GH0.tar.gz) = 934da95163872d395a0b10e78b28b86b1dc1e3f1ef04ab97969590d394fea16a -SIZE (alexheretic-ab-av1-v0.7.16_GH0.tar.gz) = 49691 +SHA256 (alexheretic-ab-av1-v0.7.17_GH0.tar.gz) = e3c0a7127cf1b9bbcc5596b125373c74c7cdfb6d8c0ffc169963ef1bd136f440 +SIZE (alexheretic-ab-av1-v0.7.17_GH0.tar.gz) = 50379 diff --git a/multimedia/ab-av1/files/patch-rust-1.79 b/multimedia/ab-av1/files/patch-rust-1.79 new file mode 100644 index 000000000000..f914504038df --- /dev/null +++ b/multimedia/ab-av1/files/patch-rust-1.79 @@ -0,0 +1,295 @@ +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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407292254.46TMsq1f048859>