commit: 8e1da5f2ba79e953fecbe2959817c1c9123b2048 Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> AuthorDate: Wed Dec 25 14:57:02 2024 +0000 Commit: Julien Roy <julien <AT> jroy <DOT> ca> CommitDate: Wed Dec 25 14:57:02 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8e1da5f2
media-video/walksnail-osd-tool: add missing DEPEND Closes: https://bugs.gentoo.org/928480 Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com> media-video/walksnail-osd-tool/Manifest | 4 ++-- .../files/walksnail-osd-tool-0.3.0-rust-1.80.patch | 28 ++++++++++++++++++++++ ...1.ebuild => walksnail-osd-tool-0.3.0-r2.ebuild} | 25 +++++++++++-------- .../walksnail-osd-tool-9999.ebuild | 11 +++++++-- 4 files changed, 54 insertions(+), 14 deletions(-) diff --git a/media-video/walksnail-osd-tool/Manifest b/media-video/walksnail-osd-tool/Manifest index b1ed61392..5620e4827 100644 --- a/media-video/walksnail-osd-tool/Manifest +++ b/media-video/walksnail-osd-tool/Manifest @@ -351,9 +351,9 @@ DIST thiserror-1.0.56.crate 20592 BLAKE2B e98c8bba8d21342c981646e88b72a7cbc146c6 DIST thiserror-impl-1.0.56.crate 15367 BLAKE2B 6fad787eb1e2c0f25fee7bef160be794fb8000a0aa292ec0d2d66d7a4d1fcb226c3e2e690ff6a61ba2d8704208014eea84044dba27523d4b2c26d2f7d4ba64d5 SHA512 da66f4674cf699083f7142f3a60c1c9334767b4de3690b4c7af460ffda787fab2089f5bca231e92b6e71724d46fe7dbdcaa19073f5d8100838536d10971efbde DIST thread_local-1.1.7.crate 13585 BLAKE2B f497dbcdfaf7dbc8b4b0dd97f77ba93df15b63303e7894c9032c9822a5b8111e0a21db2fa8cfdce5a503f70959ac9cdf48c840b925bdd850dc15e8436ba72379 SHA512 3772452c2a349fb564d29bb06e13c8ae64807db27c3ee217fa04fd0e9847e94adeea582b82ffc2d9116f31ff478eb088550caf1346c263de49b55fa17b431c31 DIST tiff-0.9.1.crate 1423953 BLAKE2B d01949cc3a76a32f2e802a151a4c1d4bbe47c7f217f198f940293d02fd6a1a6d3087c66b3fbc099da3e155f959774d2a9d4d8c5f5f00cd6486f5f44571a1dedd SHA512 82419e671c6a896f1d639d46a3c5a019e3bff6c75d961b838f5311e5ecb31c3baafc5f88fe928e88f6b3b31881a867ea4ca9905f43e3e24f77f183260dc27b93 -DIST time-0.3.34.crate 118430 BLAKE2B 6d04a20596c9b0961ca104748d9d360f07b16059719d7410fdf1a7a0d5f2aa02aaebf640999464835964bbded2d3257d79c4b0ca3080fbecf13dd2d0aa6962fc SHA512 3997e1b8d9be2f54184ebc9e1355d4b65f0b7bc9439b2b29e4a4acd86ad3a3aa019261112a24d998d76a7f66b266a86536fa50412279911b14d4d7aa7078c116 +DIST time-0.3.36.crate 119805 BLAKE2B d4da96368ab8565373d034edce261e0d8867036f2ba87e84b5e4a506a70ed3b62b93ba10734aecb39847e258cf7008b6ae57f92df8d0e5229cd3fec488d14caf SHA512 83da6e27691d1f0ef37ed276528e927686a06dab4811b6e29d625ef7a0f7c30fbb86896d74a2b087726e7a24a951b0a83aa1f5f22d711ead54f447d36ac47133 DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52 -DIST time-macros-0.2.17.crate 24443 BLAKE2B 5045af9352961db0c97cae2f6ca3e8d2c4f89a129c7ac2ec1d8d20804292aa9f2901a61f910a564954614b68f39311bd381deeb66fed8bdac423227d077f3d14 SHA512 c81747f0b74e68d3b3f36d378ac5911dece8c6b511e5ac793807f854cc31c812b927d0df941f55ff90d3d67512d0ac6a5f63f2de4322c81b05da42f46b4a661c +DIST time-macros-0.2.18.crate 24361 BLAKE2B 09fa325be0b1a5b922285f035484b0de8e339306b49595c87f6374e46459d6777c6db4b12c1a0c6ea9795ae8c741188fbb81208d0499a651760b9f5089323fc7 SHA512 557786115add272290be8305ab79c44f5b4425b64eb698492fe300f15879d9e013c66933cae8aa8faad9c109e2917e7a0e43c8a5eed7f4b0f0fdad092089efe4 DIST tiny-skia-0.8.4.crate 193684 BLAKE2B 3d1ee412e2927afee401c48d76cd8d8dfe3f442d505883ab9cfcdc6f5e258f67a65e39d22c50bf95aa9e2685d2bbeac12b1a97b884459a989e45464f6db68a3a SHA512 6a688870a2e20ca8bbe2a273c493e559276badc9ead1c643cba35d51d78c19a47e6d8700d928029584dd93b06e5121ec3e922f94420cbfcc845f247a052eb90b DIST tiny-skia-path-0.8.4.crate 45814 BLAKE2B 4f09582b0244c860f72122ebca3ad5db8c3dd6fd384cbf456652a9b3cd3564c919cff72cd0d20191f2e6655413d014f2491ad0ba298b351d8178b260e6385e85 SHA512 ffdba4e6fa75c845167408c832e04920c68b76e0f92f2fe37bf8ed84747c65a6bfd170c0e249a4b664c73b4e5939b6bd1ec10cc603960bcb1cf09921944c276b DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c diff --git a/media-video/walksnail-osd-tool/files/walksnail-osd-tool-0.3.0-rust-1.80.patch b/media-video/walksnail-osd-tool/files/walksnail-osd-tool-0.3.0-rust-1.80.patch new file mode 100644 index 000000000..3e82b8bcd --- /dev/null +++ b/media-video/walksnail-osd-tool/files/walksnail-osd-tool-0.3.0-rust-1.80.patch @@ -0,0 +1,28 @@ +https://github.com/time-rs/time/issues/693 +Fix build with rust-1.80. +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -3587,9 +3587,9 @@ + + [[package]] + name = "time" +-version = "0.3.34" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index"; +-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", +@@ -3608,9 +3608,9 @@ + + [[package]] + name = "time-macros" +-version = "0.2.17" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index"; +-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ + "num-conv", + "time-core", diff --git a/media-video/walksnail-osd-tool/walksnail-osd-tool-0.3.0-r1.ebuild b/media-video/walksnail-osd-tool/walksnail-osd-tool-0.3.0-r2.ebuild similarity index 97% rename from media-video/walksnail-osd-tool/walksnail-osd-tool-0.3.0-r1.ebuild rename to media-video/walksnail-osd-tool/walksnail-osd-tool-0.3.0-r2.ebuild index a68dc8003..d721e2ff9 100644 --- a/media-video/walksnail-osd-tool/walksnail-osd-tool-0.3.0-r1.ebuild +++ b/media-video/walksnail-osd-tool/walksnail-osd-tool-0.3.0-r2.ebuild @@ -355,9 +355,9 @@ CRATES=" [email protected] [email protected] [email protected] - [email protected] + [email protected] [email protected] - [email protected] + [email protected] [email protected] [email protected] [email protected] @@ -474,9 +474,6 @@ declare -A GIT_CRATES=( [poll-promise]="https://github.com/EmbarkStudios/poll-promise;b493586107b0e508860aa2e9d18049fd8cd9d13f"; ) -# <[email protected] -# https://github.com/time-rs/time/issues/693 -RUST_MAX_VER="1.79.0" RUST_MIN_VER="1.71.1" inherit cargo desktop xdg-utils @@ -490,11 +487,19 @@ LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 GPL SLOT="0" KEYWORDS="~amd64" -RDEPEND="media-video/ffmpeg" +DEPEND=" + dev-libs/openssl:= + x11-libs/gtk+:3 +" +RDEPEND=" + ${DEPEND} + media-video/ffmpeg +" PATCHES=( "${FILESDIR}/${P}-version-parse-fix.patch" "${FILESDIR}/${P}-build-remove-git-dep.patch" + "${FILESDIR}/${P}-rust-1.80.patch" ) QA_FLAGS_IGNORED="usr/bin/${PN}" @@ -502,15 +507,15 @@ QA_FLAGS_IGNORED="usr/bin/${PN}" src_unpack() { cargo_src_unpack # rename the repo to match what the build expects - mv ffprobe-rs-8c863431ebf0df913e325ec490589023b193402f ffprobe-8c863431ebf0df913e325ec490589023b193402f + mv ffprobe-rs-8c863431ebf0df913e325ec490589023b193402f ffprobe-8c863431ebf0df913e325ec490589023b193402f || die } src_install() { - cd ui + cd ui || die cargo_src_install - cd .. - cp resources/icons/app-icon.svg walksnail-osd-tool.svg + cd .. || die + cp resources/icons/app-icon.svg walksnail-osd-tool.svg || die doicon -s scalable walksnail-osd-tool.svg make_desktop_entry walksnail-osd-tool 'Walksnail OSD Tool' walksnail-osd-tool } diff --git a/media-video/walksnail-osd-tool/walksnail-osd-tool-9999.ebuild b/media-video/walksnail-osd-tool/walksnail-osd-tool-9999.ebuild index 328fa11bb..3f83674ad 100644 --- a/media-video/walksnail-osd-tool/walksnail-osd-tool-9999.ebuild +++ b/media-video/walksnail-osd-tool/walksnail-osd-tool-9999.ebuild @@ -14,7 +14,14 @@ EGIT_REPO_URI="https://github.com/avsaase/walksnail-osd-tool.git"; LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 GPL-3 ISC UbuntuFontLicense-1.0 MIT MPL-2.0 OFL-1.1 Unicode-DFS-2016 Unlicense XC ZLIB" SLOT="0" -RDEPEND="media-video/ffmpeg" +DEPEND=" + dev-libs/openssl:= + x11-libs/gtk+:3 +" +RDEPEND=" + ${DEPEND} + media-video/ffmpeg +" QA_FLAGS_IGNORED="usr/bin/${PN}" @@ -30,7 +37,7 @@ src_configure() { src_install() { cargo_src_install --path ./ui - cp resources/icons/app-icon.svg walksnail-osd-tool.svg + cp resources/icons/app-icon.svg walksnail-osd-tool.svg || die doicon -s scalable walksnail-osd-tool.svg make_desktop_entry walksnail-osd-tool 'Walksnail OSD Tool' walksnail-osd-tool }
