commit: f3c6525fe9b1197d83601b8d1c940314598a3c9a Author: Anna (navi) Figueiredo Gomes <navi <AT> vlhl <DOT> dev> AuthorDate: Thu Apr 11 16:50:42 2024 +0000 Commit: Anna Figueiredo Gomes <anna-cli <AT> tutanota <DOT> com> CommitDate: Thu Apr 11 16:51:24 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f3c6525f
media-gfx/vpuppr: Fix extension install path, drop 9999 Signed-off-by: Anna (navi) Figueiredo Gomes <navi <AT> vlhl.dev> media-gfx/vpuppr/Manifest | 2 - ...{vpuppr-0.9.0.ebuild => vpuppr-0.9.0-r1.ebuild} | 14 ++-- media-gfx/vpuppr/vpuppr-9999.ebuild | 82 ---------------------- 3 files changed, 7 insertions(+), 91 deletions(-) diff --git a/media-gfx/vpuppr/Manifest b/media-gfx/vpuppr/Manifest index e87aea7c94..fdb28e49af 100644 --- a/media-gfx/vpuppr/Manifest +++ b/media-gfx/vpuppr/Manifest @@ -1,7 +1,5 @@ DIST OpenSeeFace_latest.tar.gz 163501644 BLAKE2B b06ed2fb413a7543ad06fe4887e43c46687e91479e6385de37205653eed9c64407c84675cfd7832f57442bb02f6bcedf7241f570c1118fe0bc0fc13463c179d1 SHA512 b4ad37fa276dd3b5652cc906b04b8a2e540452419239882ac11a83bcab37366d10e45702cb34fac8c607d94248a5d1e18af16bc07ac5f8fa38be273e50407bca DIST godot-vpuppr-headless-vpuppr-0.9.0.tar.gz 43377634 BLAKE2B 7b2f6dec9c1cad78b769d3b4977aacfcd9494956f2cdcc0d0fae99f17aea44cf3ce596ff478b6f159f34e948f0b171e465c04e425527a3ef6ec23d42ae449f2b SHA512 efe18f0db409b4d3d50a23c60bedd1c83ccffd27750e26f008dd58916e36779341593306e67c8edeccce7a2979aaa35ce2f2525323a4ce98e9f93b49f024535e -DIST godot-vpuppr-headless.tar.gz 44288060 BLAKE2B 433f50f2bf53e34ef11aea4ef347e7cf91a678f1c75e27e0746abcf7ace009069260775d416b5ea5e2571cfdff5a5ee6ecacd48a3d10e89a5b01d037f0e9dee0 SHA512 1108b9d5f642f3d06eb8c59f69b217e3f79bfba46456858c8b19012c5aa696465f27290274cc82118cbe15de0a8a0c6caad98c653d07c1d3c43953869ee138a5 -DIST godot-vpuppr-release-profile.tar.gz 17108352 BLAKE2B e2e424feadcf51c15a21247804e1b75ec39c8e0c5947e9820d36fe9b73f2b69dd358858fe03dd2c52eb2d33b926c756cefa91194493e5ffbcd160af8c37ebb95 SHA512 f34c2992fa86beaaa47d6d6e851e2a446cf6d5b39349ebcabb62564ac1445ced7999ea7f6f7261559f96fe2dbc40bd29d25a27d36d7caff1d35b4102def82fa7 DIST godot-vpuppr-release-profile.vpuppr-0.9.0.tar.gz 17118160 BLAKE2B 4ca404b0f2a93449addc4ba8228c74f60a1057247874680b9b3653b6e0c991fa70eded1a0c22c1339487d77e0596dadd737e5a0458584ae0742358e9b4f4d221 SHA512 e7b36f1658caf481863fd107719d919534d8935a15f76436a67ea5983fec3732353291169a77728bcb21c8a2d0c956d7f258d536f9a56b93807f07696d0f5213 DIST ifacialmocap-tracker-8095807804b138a3236d9ce21e800e02fe44e53a.tar.gz 9364 BLAKE2B c663a6fd0b787664787ee6842708c5cf575ddb9e97d7db25063c7debbe81ad3d993a5f17235e64a47fcea6bfcb9437aecbd271a3f5af1e80da8807398fdaed7c SHA512 800d141b31bd918517ed821567701c695f6a27613ca4b467bd4f322353863d41cf373b4e4ede9a22551f87e836ca1fb9b70df4ecc64709e3a15cb2c19803a206 DIST meowface-tracker-790e4c7a5913184f71076e1c8606236b02ff1de8.tar.gz 7720 BLAKE2B c56b72d17548a42182f77a62d55236c6ff685f86e70728262a8d5e4d9010d9aaf093ed3bf38f5420006892cbc388d2d77d119b739a691bc9897e5fc92ecc49a9 SHA512 6be6a619a104227102ff6d0d9a269da65126b56b4ef6eb0be18ab0d48e6a9037b3f24ce7788c45df65d00e3ae1fd133a5ccd68f36f41694e02dc55a7084d3870 diff --git a/media-gfx/vpuppr/vpuppr-0.9.0.ebuild b/media-gfx/vpuppr/vpuppr-0.9.0-r1.ebuild similarity index 90% rename from media-gfx/vpuppr/vpuppr-0.9.0.ebuild rename to media-gfx/vpuppr/vpuppr-0.9.0-r1.ebuild index 4c1a93482d..d44f22bb54 100644 --- a/media-gfx/vpuppr/vpuppr-0.9.0.ebuild +++ b/media-gfx/vpuppr/vpuppr-0.9.0-r1.ebuild @@ -5,8 +5,8 @@ HOMEPAGE="https://github.com/virtual-puppet-project/vpuppr" RESTRICT="strip" -PYTHON_COMPAT=( python3_{10..11} ) -inherit desktop python-single-r1 +PYTHON_COMPAT=( python3_{10..12} ) +inherit desktop xdg python-single-r1 IUSE="+osf-tracker ifm-tracker mouse-tracker vts-tracker meowface-tracker remote-control" REQUIRED_USE="osf-tracker? ( ${PYTHON_REQUIRED_USE} )" @@ -60,7 +60,7 @@ export EDITOR="${WORKDIR}/Godot_v3.x-stable_linux_headless.64" src_prepare() { if use osf-tracker; then - mv "${WORKDIR}"/openseeface-tracker-${OPENSEEFACE_COMMIT} \ + mv -T "${WORKDIR}"/openseeface-tracker-${OPENSEEFACE_COMMIT} \ resources/extensions/openseeface-tracker || die mv "${WORKDIR}"/OpenSeeFace \ resources/extensions/openseeface-tracker/ || die @@ -68,22 +68,22 @@ src_prepare() { fi if use ifm-tracker; then - mv "${WORKDIR}"/ifacialmocap-tracker-${IFACIALMOCAP_COMMIT} \ + mv -T "${WORKDIR}"/ifacialmocap-tracker-${IFACIALMOCAP_COMMIT} \ resources/extensions/ifacialmocap-tracker || die fi if use vts-tracker; then - mv "${WORKDIR}"/vtube-studio-tracker-${VTUBE_STUDIO_COMMIT} \ + mv -T "${WORKDIR}"/vtube-studio-tracker-${VTUBE_STUDIO_COMMIT} \ resources/extensions/vtube-studio-tracker || die fi if use meowface-tracker; then - mv "${WORKDIR}"/meowface-tracker-${MEOWFACE_COMMIT} \ + mv -T "${WORKDIR}"/meowface-tracker-${MEOWFACE_COMMIT} \ resources/extensions/meowface-tracker || die fi if use remote-control; then - mv "${WORKDIR}"/remote-control-server-${RC_SERVER_COMMIT} \ + mv -T "${WORKDIR}"/remote-control-server-${RC_SERVER_COMMIT} \ resources/extensions/remote-control-server || die fi diff --git a/media-gfx/vpuppr/vpuppr-9999.ebuild b/media-gfx/vpuppr/vpuppr-9999.ebuild deleted file mode 100644 index 07862d59b7..0000000000 --- a/media-gfx/vpuppr/vpuppr-9999.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -EAPI=7 - -DESCRIPTION="VTuber application made with Godot 3.4" -HOMEPAGE="https://github.com/virtual-puppet-project/vpuppr" - -RESTRICT="strip" - -PYTHON_COMPAT=( python3_{10..11} ) -inherit desktop python-single-r1 - -IUSE="+osf-tracker ifm-tracker mouse-tracker vts-tracker meowface-tracker remote-control" -REQUIRED_USE="osf-tracker? ( ${PYTHON_REQUIRED_USE} )" - -inherit git-r3 -EGIT_REPO_URI="https://github.com/virtual-puppet-project/vpuppr.git" -EGIT_SUBMODULES=() -SRC_URI=" - https://github.com/virtual-puppet-project/godot-builds/releases/download/latest/Godot_v3.x-stable_linux_headless.64.tar.gz - -> godot-vpuppr-headless.tar.gz - https://github.com/virtual-puppet-project/godot-builds/releases/download/latest/Godot_v3.x-stable_linux_release.64.tar.gz - -> godot-vpuppr-release-profile.tar.gz - osf-tracker? ( - https://github.com/you-win/OpenSeeFace/releases/download/latest/OpenSeeFace_latest_linux.tar.gz - -> OpenSeeFace_latest.tar.gz - ) -" - -LICENSE="MIT" -SLOT="0" -RDEPEND=" - osf-tracker? ( ${PYTHON_DEPS} ) -" -BDEPEND=" - mouse-tracker? ( virtual/rust ) -" - -export EDITOR="${WORKDIR}/Godot_v3.x-stable_linux_headless.64" - -src_unpack() { - EGIT_SUBMODULES+=( - $(usex remote-control '*remote-control-server'"") - $(usex osf-tracker '*openseeface-tracker'"") - $(usex ifm-tracker '*ifacialmocap-tracker'"") - $(usex meowface-tracker '*meowface-tracker'"") - $(usex vts-tracker '*vtube-studio-tracker'"") - ) - default - git-r3_src_unpack -} - -src_prepare() { - use osf-tracker && { - mv "${WORKDIR}"/OpenSeeFace resources/extensions/openseeface-tracker/ || die - touch resources/extensions/openseeface-tracker/OpenSeeFace/.gdignore || die - } - - mkdir -p release_templates/ || die - - cp "${WORKDIR}"/Godot_v3.x-stable_linux_release.64 release_templates/ || die - - echo "resource_path = '/usr/share/vpuppr'" >> release_config.toml - echo "version = '$(date '+%Y-%m-%d_%H-%M-%S')'" >> release_config.toml - - default -} - -src_compile() { - "${WORKDIR}"/Godot_v3.x-stable_linux_headless.64 --verbose --export linux "export/${PN}" -} - -src_install() { - local size - dobin export/${PN} - insinto usr/share/vpuppr - doins -r resources/* - make_desktop_entry vpuppr "Virtual Puppet Project" "vpuppr"\ - "Application" "Comment=Live VTuber model renderer, written in Godot" - - for size in 16 24 48 64 128 256; do - newicon -s ${size} assets/icons/com.github.youwin.VPupPr-${size}.png vpuppr.png - done -}