Gentoo Archives: gentoo-commits

From: Jian Lin <jlin.gentoo@×××××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: media-video/qliveplayer/
Date: Fri, 10 Sep 2021 16:25:52
Message-Id: 1631291110.5e0f35e777cf2a98e2d2006a81b8b34212e59b5f.jian@gentoo
1 commit: 5e0f35e777cf2a98e2d2006a81b8b34212e59b5f
2 Author: Jian Lin <jlin.gentoo <AT> outlook <DOT> com>
3 AuthorDate: Fri Sep 10 16:25:10 2021 +0000
4 Commit: Jian Lin <jlin.gentoo <AT> outlook <DOT> com>
5 CommitDate: Fri Sep 10 16:25:10 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5e0f35e7
7
8 media-video/qliveplayer: minor improvement
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Jian Lin <jlin.gentoo <AT> outlook.com>
12
13 media-video/qliveplayer/Manifest | 2 +-
14 .../qliveplayer/qliveplayer-4.0.1-r1.ebuild | 38 ++++------------------
15 2 files changed, 7 insertions(+), 33 deletions(-)
16
17 diff --git a/media-video/qliveplayer/Manifest b/media-video/qliveplayer/Manifest
18 index 3e5394ac9..8d4e3b56e 100644
19 --- a/media-video/qliveplayer/Manifest
20 +++ b/media-video/qliveplayer/Manifest
21 @@ -1,5 +1,6 @@
22 DIST QLivePlayer-3.22.4.tar.gz 640975 BLAKE2B 313d6a68d9ab2914680e3c8f3478659fc8cae4e060f2006c0dba4441796c7880611ad1ca9d2d754bacd5cc542774eefcb0e46807b6dacc20a04c1538bda0394f SHA512 08fc3abb7b923baba09c60c86185431fe3754a1e06978247247e1482100e3b41c2a5185bc5fea1270fd2e7e9d90509880ea4ba4e8bb133cc4745f229c93744d3
23 DIST QLivePlayer-4.0.1.tar.gz 565349 BLAKE2B 63ad63714820d39c8d1836b07a381a653d41012384710f491a3e11d80aab31b1436c821ecd0a42a91f1235c154826ca39ee6faa3121f9c7df31fb594b339fc30 SHA512 f63ac6ec483355ae7cdc31296b4640af2c56f7cc1f011abb7072a7b18f588f77331e6bf0399668e7b44890a6bc6b7647d60db1124e7d0137e0aa89df5908c516
24 +DIST QLivePlayer-Lib-03d3c7b0bf010986710182ba4ab9a887b4c3b42d.tar.gz 35875 BLAKE2B 67c321f1515a891e131876e189fa54199222b1f6eaafaf68b2b4901eee85b5efaa3c459208bc6cc93b1ec8b8bc650ae8257720e84c1a986a0060f40a6a8f2729 SHA512 4330f869d325117f59b11300c50cbf69af31173ffe9c909cb7fb8bc752c23a5a49cb402fd95097540ec091f68382c1d34aa406c3a231774d348cb339a1dc1939
25 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
26 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
27 DIST async-compression-0.3.8.crate 57977 BLAKE2B 228e279c9ba68531f9444862c05029af85c1cd9ff751be4101fefa82688f0a5472a798257c21f3812e7c37c18fe0fabbc0c4ed0b6316e1473044b97a89ddd2d3 SHA512 8ef6c186d3d5131034322540dedce6d8108bf1f00f9e73433772c06a77eb33567124f303a217f77f6daeb697f26fe9d6dd8ed6b9ae1e16ddb6e0f3053ab2bb06
28 @@ -92,7 +93,6 @@ DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3
29 DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
30 DIST proc-macro-nested-0.1.7.crate 6495 BLAKE2B c27ad92b57837ab1ce220958846253ed29de12ee1ed849948e5202913371d877bb648e6880ac3e6619b8d48342e1fe105df56a0abda1b13bd62262bea4c85fff SHA512 dc5d898c6d5588d279aa0852193105bbb3824798a05875e2181c66da8c3849fcb32189d9b213cad09054242aa4ae9cb602f9c2d1b5e7302963bac244bbaa27c2
31 DIST proc-macro2-1.0.28.crate 38732 BLAKE2B f2d4765789d03d5d26c9de7e1283ce6e4086ca640d95a36649f8fdfe96533ad768b2a8ba56726e0462ba4fcd8f332fc455307987e0b7c79a5e96f2e75a641162 SHA512 2a4e34ab2bb692c3661db40ebc6d22f3dbcbc30c2f4d88e1a7f022f8522e943ffe2a1c9b92411c7e04941dc0156cb365e0de953fa45d8710e39b660ee9028741
32 -DIST qliveplayer-lib.tar.gz 35875 BLAKE2B 67c321f1515a891e131876e189fa54199222b1f6eaafaf68b2b4901eee85b5efaa3c459208bc6cc93b1ec8b8bc650ae8257720e84c1a986a0060f40a6a8f2729 SHA512 4330f869d325117f59b11300c50cbf69af31173ffe9c909cb7fb8bc752c23a5a49cb402fd95097540ec091f68382c1d34aa406c3a231774d348cb339a1dc1939
33 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
34 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
35 DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e
36
37 diff --git a/media-video/qliveplayer/qliveplayer-4.0.1-r1.ebuild b/media-video/qliveplayer/qliveplayer-4.0.1-r1.ebuild
38 index a80d7451f..a133c15ce 100644
39 --- a/media-video/qliveplayer/qliveplayer-4.0.1-r1.ebuild
40 +++ b/media-video/qliveplayer/qliveplayer-4.0.1-r1.ebuild
41 @@ -168,14 +168,15 @@ CARGO_OPTIONAL=1
42
43 inherit cargo cmake readme.gentoo-r1 xdg
44
45 -QLIVEPLAYER_LIB_COMMIT="03d3c7b0bf010986710182ba4ab9a887b4c3b42d"
46 +LIB_COMMIT="03d3c7b0bf010986710182ba4ab9a887b4c3b42d"
47 +LIB_P="QLivePlayer-Lib-${LIB_COMMIT}"
48 MY_P="QLivePlayer-${PV}"
49
50 DESCRIPTION="A player and recorder for live streams and videos with danmaku support"
51 HOMEPAGE="https://github.com/IsoaSFlus/QLivePlayer"
52 SRC_URI="
53 https://github.com/IsoaSFlus/QLivePlayer/archive/refs/tags/${PV}.tar.gz -> ${MY_P}.tar.gz
54 - https://github.com/IsoaSFlus/QLivePlayer-Lib/archive/${QLIVEPLAYER_LIB_COMMIT}.tar.gz -> qliveplayer-lib.tar.gz
55 + https://github.com/IsoaSFlus/QLivePlayer-Lib/archive/${LIB_COMMIT}.tar.gz -> ${LIB_P}.tar.gz
56 $(cargo_crate_uris ${CRATES})
57 "
58 PATCHES=(
59 @@ -215,36 +216,9 @@ BDEPEND="
60 "
61
62 src_unpack() {
63 - mkdir -p "${ECARGO_VENDOR}" || die
64 -
65 - local archive shasum pkg
66 -
67 - unpack "${MY_P}.tar.gz"
68 -
69 - unpack qliveplayer-lib.tar.gz
70 - rmdir "${MY_P}/src/QLivePlayer-Lib" || die
71 - mv "QLivePlayer-Lib-${QLIVEPLAYER_LIB_COMMIT}" "${MY_P}/src/QLivePlayer-Lib" || die
72 -
73 - for archive in ${A}; do
74 - case "${archive}" in
75 - *.crate)
76 - ebegin "Loading ${archive} into Cargo registry"
77 - tar -xf "${DISTDIR}"/${archive} -C "${ECARGO_VENDOR}/" || die
78 - # generate sha256sum of the crate itself as cargo needs this
79 - shasum=$(sha256sum "${DISTDIR}"/${archive} | cut -d ' ' -f 1)
80 - pkg=$(basename ${archive} .crate)
81 - cat <<- EOF > ${ECARGO_VENDOR}/${pkg}/.cargo-checksum.json
82 - {
83 - "package": "${shasum}",
84 - "files": {}
85 - }
86 - EOF
87 - eend $?
88 - ;;
89 - esac
90 - done
91 -
92 - cargo_gen_config
93 + cargo_src_unpack
94 + rm -rf "${LIB_P}" || die
95 + tar -C "${MY_P}"/src/QLivePlayer-Lib --strip-components=1 -xzf "${DISTDIR}/${LIB_P}.tar.gz" || die
96 }
97
98 src_prepare() {