From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ED091158046 for ; Thu, 10 Oct 2024 17:00:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22F3FE2A16; Thu, 10 Oct 2024 17:00:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0ACA2E2A16 for ; Thu, 10 Oct 2024 17:00:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3ED0B342FAF for ; Thu, 10 Oct 2024 17:00:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D07C1116A for ; Thu, 10 Oct 2024 16:59:59 +0000 (UTC) From: "Patrick Nicolas" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick Nicolas" Message-ID: <1728579577.679bfbf3fdaf3d60bd4b1ef18924722cd1bcda93.patricknicolas@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: media-libs/wivrn/ X-VCS-Repository: repo/proj/guru X-VCS-Files: media-libs/wivrn/Manifest media-libs/wivrn/wivrn-9999.ebuild X-VCS-Directories: media-libs/wivrn/ X-VCS-Committer: patricknicolas X-VCS-Committer-Name: Patrick Nicolas X-VCS-Revision: 679bfbf3fdaf3d60bd4b1ef18924722cd1bcda93 X-VCS-Branch: dev Date: Thu, 10 Oct 2024 16:59:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0d839b7d-6470-4009-8dba-1a6b3e77cfd7 X-Archives-Hash: 11ce7ace0e6ee89c2e1c3fee271f5563 commit: 679bfbf3fdaf3d60bd4b1ef18924722cd1bcda93 Author: Patrick Nicolas laposte net> AuthorDate: Thu Oct 10 16:59:04 2024 +0000 Commit: Patrick Nicolas laposte net> CommitDate: Thu Oct 10 16:59:37 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=679bfbf3 media-libs/wivrn: fix SRC_URI Signed-off-by: Patrick Nicolas laposte.net> media-libs/wivrn/Manifest | 2 -- media-libs/wivrn/wivrn-9999.ebuild | 15 ++++----------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/media-libs/wivrn/Manifest b/media-libs/wivrn/Manifest index 08975db34..c596a50aa 100644 --- a/media-libs/wivrn/Manifest +++ b/media-libs/wivrn/Manifest @@ -1,5 +1,3 @@ -DIST boostpfr_2.2.0.tar.gz 76432 BLAKE2B 70d76a5dd0034f93ff1749b1994bcd9cd8a9b09674598958da5a8f7e1b040c62e970db4e3d221173549a19d0dd15b0810f5d12f69843ed8ac35be6697bab09e0 SHA512 86a745a44e8a6e4638b9eb9045b08de9cbf27f6d20d365eabd41587d6e1171f980a65f42a31291008c421da6cc3f436b7bf07e109aff6ab5690b19e1fb621b3d -DIST monado-01806a3ffa62a2440da83d94e7a9297645d9d95a.tar.bz2 4171078 BLAKE2B eea92d3a2c81a49449f4a8283c950b2a66024ff1466c5a8d190b21366e5da98dc144f0d87380c1d11cef86454c3c2da3cc19132ef625e6d7c05a0daa2c65df23 SHA512 8cdfb7f43e4fdd5ce6e3e8edf566d5c28c08183944af4636a843c2a5e16ccf4ff00ba1f48029539f72aaa958b71be5bc00b8264bd35d4f37f5e1c8f27085d574 DIST wivrn-0.18-server-build-deps.tar.xz 18478712 BLAKE2B 04f60048fc64194786602f27d3abe4587bf962356d44b66c3a40bc9f597ef974d6ab8937e5959ca76160df300b9a40807fd3fd0ce542fe42203e31048ef212ed SHA512 e86e4e626f895b66facf99127023a911552799f66cc6ea7df67d583e3af0ff5b052d7f2565c1bc510dff3ddfe77b7f8cb0341b908436aa37bf841cb54788b9d5 DIST wivrn-0.18.tar.gz 11238428 BLAKE2B 3b44679d8f3c34906ba39e27aff09c8cdb1e8fa1240c9e07a96782971b5f7b54181fb9e4544729b5abd41603d17f1c834ab4d697d9c6ad78c69ad57b34b817cc SHA512 7e65edf3968c4142bae294ec62950a8bfde86da0797078f716de3b9a57f032b7a74293d18e0ecbbe2fcd11da45968a6c07ebbaefea9106b5e11bb17024181852 DIST wivrn-0.19-server-build-deps.tar.xz 21027752 BLAKE2B 8de78f1f356747e7ffa64a14c1d4d3888f9df658ddb1bc5556788873dfcae48612a586bc176f20c54466ad8895bddfac05423195d8f1d070a8a12178eaf9340a SHA512 4c75aa3b1b64df1ea2e1cd258c5ad602230c1a4cc3dbbbbd3c6e41ae562719996e983fd2f95c1da0a8d4f53017cf108cebd6177e7439ac1bc050a10c7339480b diff --git a/media-libs/wivrn/wivrn-9999.ebuild b/media-libs/wivrn/wivrn-9999.ebuild index 048ee1731..79b65c4cb 100644 --- a/media-libs/wivrn/wivrn-9999.ebuild +++ b/media-libs/wivrn/wivrn-9999.ebuild @@ -16,12 +16,7 @@ REQUIRED_USE="|| ( nvenc vaapi x264 )" if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/WiVRn/WiVRn.git" - - MONADO_V=01806a3ffa62a2440da83d94e7a9297645d9d95a - PFR_V=2.2.0 - SRC_URI=" - https://github.com/boostorg/pfr/archive/refs/tags/${PFR_V}.tar.gz -> boostpfr_${PFR_V}.tar.gz - https://gitlab.freedesktop.org/monado/monado/-/archive/${MONADO_V}/monado-${MONADO_V}.tar.bz2" + MONADO_REPO_URI="https://gitlab.freedesktop.org/monado/monado.git" else SRC_URI=" https://github.com/WiVRn/WiVRn/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz @@ -70,12 +65,10 @@ if [[ ${PV} == 9999 ]]; then src_unpack() { git-r3_src_unpack default_src_unpack - cd "${WORKDIR}" - mv "monado-${MONADO_V}" "monado-src" - mv "pfr-${PFR_V}" "boostpfr-src" - local THEIR_MONADO=$(grep "GIT_TAG" "${P}/CMakeLists.txt" | awk '{print $2}') - [ "${THEIR_MONADO}" == "${MONADO_V}" ] || die "Mismatched monado version: ${THEIR_MONADO} (upstream) ${MONADO_V} (ebuild)" + local MONADO_COMMIT=$(grep "GIT_TAG" "${P}/CMakeLists.txt" | awk '{print $2}') + git-r3_fetch "${MONADO_REPO_URI}" "${MONADO_COMIT}" + git-r3_checkout "${MONADO_REPO_URI}" "${WORKDIR}/monado-src" } src_prepare() {