commit: c7fb4c7c881c0cc8f0ad5bd627466a722f76ba56
Author: Patrick Nicolas <patricknicolas <AT> laposte <DOT> net>
AuthorDate: Tue Sep 3 08:08:51 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Tue Sep 3 08:09:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c7fb4c7c
media-libs/wivrn: fix fetchcontent download and patch
Signed-off-by: Patrick Nicolas <patricknicolas <AT> laposte.net>
media-libs/wivrn/Manifest | 2 +-
media-libs/wivrn/wivrn-9999.ebuild | 13 +++++++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/media-libs/wivrn/Manifest b/media-libs/wivrn/Manifest
index c1e3ab106..108ca90a9 100644
--- a/media-libs/wivrn/Manifest
+++ b/media-libs/wivrn/Manifest
@@ -1,5 +1,5 @@
DIST boostpfr_2.2.0.tar.gz 76432 BLAKE2B
70d76a5dd0034f93ff1749b1994bcd9cd8a9b09674598958da5a8f7e1b040c62e970db4e3d221173549a19d0dd15b0810f5d12f69843ed8ac35be6697bab09e0
SHA512
86a745a44e8a6e4638b9eb9045b08de9cbf27f6d20d365eabd41587d6e1171f980a65f42a31291008c421da6cc3f436b7bf07e109aff6ab5690b19e1fb621b3d
-DIST monado-dfc602288ab05131584a3f2be18031a13fccd061.tar.bz2 2903074 BLAKE2B
9ba2816c0d4352b3d51cc0be35a2d3f920e0628569562bf4f07ae3fbba64edc9d7bc78732b271cbdf994314975d7249be2a272452dbbb62f840426cf91ffd1a4
SHA512
e1644cfc84b70c6aa1aeeb51f3f48a06ceb772035a7e4ac2c3ad5110df66792975e4ca7aa92b78f8438ef0fa22d771562122444d04eb395618f1c1c261b696fe
+DIST monado-2d3978b1b0d0f1ce9fc20f435c7080a07124362a.tar.bz2 3798925 BLAKE2B
5839a5476bcd06091aa903c53811fc5d934b5a5ed1f16daca72a30ff1dc262d589d84c99c5fa74c097c3aec24ba2a3daf235a3bc14e1742a5d37c677d39c2624
SHA512
088711d19fca25b22dd3d6e085dd7692e57642dc2e8181c9cafbf7c48c2d30ffadf308cad0c09bf6faf53cce7ea544645f1537fe13621f736a89a3dfbcf46ad7
DIST wivrn-0.17-server-build-deps.tar.xz 17245096 BLAKE2B
b531e3abe3290454029c5ba33876db4d1374d101b44f568f3c07de3ecc31aeb3a09b0ff7221c6c2a62e14de96cbe7ea201b1b302a08a2c06f8be026253e27a3d
SHA512
86526a90cd029da4ff82996861ef7f7150eb81d5adee176cd36a6ce54704e15ff86c983702beff0985d2fc90178d8daddb3d81acdb6a5796506f916ba9ffafea
DIST wivrn-0.17.tar.gz 11785455 BLAKE2B
e3894aea4cc660a74a09c4e6eb3bf2bcc70508625d36574be6b7d9186b4f464e2acdbb282eb1adb1b445fbaf6b6e0ead32828cdb5dcb029042e0454a0f70d795
SHA512
7f6b5348b5d5a07831120e951f95c1759ea25d16d56216760be7f6640ccfa0c121f5978761e3f397a67be636c38f8bbe99e65992cd06132d643728958af489a8
DIST wivrn-0.18-server-build-deps.tar.xz 18478712 BLAKE2B
04f60048fc64194786602f27d3abe4587bf962356d44b66c3a40bc9f597ef974d6ab8937e5959ca76160df300b9a40807fd3fd0ce542fe42203e31048ef212ed
SHA512
e86e4e626f895b66facf99127023a911552799f66cc6ea7df67d583e3af0ff5b052d7f2565c1bc510dff3ddfe77b7f8cb0341b908436aa37bf841cb54788b9d5
diff --git a/media-libs/wivrn/wivrn-9999.ebuild
b/media-libs/wivrn/wivrn-9999.ebuild
index 15d153a54..04a438583 100644
--- a/media-libs/wivrn/wivrn-9999.ebuild
+++ b/media-libs/wivrn/wivrn-9999.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/WiVRn/WiVRn.git";
- MONADO_V=dfc602288ab05131584a3f2be18031a13fccd061
+ MONADO_V=2d3978b1b0d0f1ce9fc20f435c7080a07124362a
PFR_V=2.2.0
SRC_URI="
https://github.com/boostorg/pfr/archive/refs/tags/${PFR_V}.tar.gz ->
boostpfr_${PFR_V}.tar.gz
@@ -68,6 +68,15 @@ if [[ ${PV} == 9999 ]]; then
cd "${WORKDIR}"
mv "monado-${MONADO_V}" "monado-src"
mv "pfr-${PFR_V}" "boostpfr-src"
+
+ local THEIR_MONADO=$(grep -A1
"https://gitlab.freedesktop.org/monado/monado"; "${P}/CMakeLists.txt" | tail -n1
| sed 's/.*GIT_TAG\s*//')
+ [ "${THEIR_MONADO}" == "${MONADO_V}" ] || die "Mismatched
monado version: ${THEIR_MONADO} (upstream) ${MONADO_V} (ebuild)"
+ }
+
+ src_prepare() {
+ default_src_prepare
+ eapply --directory="${WORKDIR}/monado-src"
"${WORKDIR}/${P}/patches/monado"/*
+ cmake_src_prepare
}
else
src_unpack() {
@@ -79,7 +88,7 @@ fi
src_configure() {
if [[ ${PV} == 9999 ]]; then
- GIT_DESC=$(git describe)
+ GIT_DESC=$(git describe --always)
else
GIT_DESC=${PV}
fi
