From d5b7291ace650cce25322aed52cd4cef9ce258b9 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Thu, 19 Sep 2024 09:27:00 -0500 Subject: [PATCH] add: stardust-non-spatial-input (#2053) * WIP * Update stardust-non-spatial-input.spec Add packager Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * fix %url * Update stardust-non-spatial-input.spec Fix RPM bug Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update stardust-non-spatial-input.spec Remove runtime requirements Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update update.rhai Remove if statement from Rhai Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update stardust-non-spatial-input.spec Fix build and install Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update update.rhai Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update update.rhai Fix indentation Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update stardust-non-spatial-input.spec Fix install directories Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update stardust-non-spatial-input.spec fix install Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update stardust-non-spatial-input.spec Actually fix install Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update stardust-non-spatial-input.spec test fix (delete wait in %install) Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update stardust-non-spatial-input.spec Fix files? Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * fix: cargo install in parallel * let's try --locked Signed-off-by: madomado * %{?_smp_mflags} -Z avoid-dev-deps Signed-off-by: madomado * Update stardust-non-spatial-input.spec Remove display * Update update.rhai fix typo Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update stardust-non-spatial-input.spec add %summary Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Update stardust-non-spatial-input.spec Unify Summaries Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --------- Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Signed-off-by: madomado Co-authored-by: madonuko (cherry picked from commit 5842080f3c0af8903896cb930ec9c68e8fdb7e6e) --- anda/stardust/non-spatial-input/anda.hcl | 8 ++++ .../stardust-non-spatial-input.spec | 47 +++++++++++++++++++ anda/stardust/non-spatial-input/update.rhai | 5 ++ 3 files changed, 60 insertions(+) create mode 100644 anda/stardust/non-spatial-input/anda.hcl create mode 100644 anda/stardust/non-spatial-input/stardust-non-spatial-input.spec create mode 100644 anda/stardust/non-spatial-input/update.rhai diff --git a/anda/stardust/non-spatial-input/anda.hcl b/anda/stardust/non-spatial-input/anda.hcl new file mode 100644 index 0000000000..4d5828157f --- /dev/null +++ b/anda/stardust/non-spatial-input/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "stardust-non-spatial-input.spec" + } + labels { + nightly = 1 + } +} diff --git a/anda/stardust/non-spatial-input/stardust-non-spatial-input.spec b/anda/stardust/non-spatial-input/stardust-non-spatial-input.spec new file mode 100644 index 0000000000..dbe9023c3e --- /dev/null +++ b/anda/stardust/non-spatial-input/stardust-non-spatial-input.spec @@ -0,0 +1,47 @@ +%global commit 5ac7f04f6876097aa8c3cf9af033d609a8a49944 +%global commit_date 20240824 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +# Exclude input files from mangling +%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ + +Name: stardust-non-spatial-input +Version: %commit_date.%shortcommit +Release: 1%?dist +Summary: Tools you can easily snap together to get non-spatial input into Stardust XR. +URL: https://github.com/StardustXR/non-spatial-input +Source0: %url/archive/%commit/non-spatial-input-%commit.tar.gz +License: MIT +BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold libudev-devel g++ libinput-devel libxkbcommon-x11-devel + +Provides: non-spatial-input +Packager: Owen Zimmerman + +%description +%summary + +%prep +%autosetup -n non-spatial-input-%commit +%cargo_prep_online + +%build + +%install +%define __cargo_common_opts %{?_smp_mflags} -Z avoid-dev-deps --locked +(cd azimuth && %cargo_install) & +(cd eclipse && %cargo_install) & +(cd manifold && %cargo_install) & +(cd simular && %cargo_install) & + +wait + +%files +%_bindir/azimuth +%_bindir/eclipse +%_bindir/manifold +%_bindir/simular +%license LICENSE +%doc README.md + +%changelog +* Mon Sep 9 2024 Owen-sz +- Package StardustXR non-spatial-input diff --git a/anda/stardust/non-spatial-input/update.rhai b/anda/stardust/non-spatial-input/update.rhai new file mode 100644 index 0000000000..2d8268c3d9 --- /dev/null +++ b/anda/stardust/non-spatial-input/update.rhai @@ -0,0 +1,5 @@ +rpm.global("commit", gh_commit("StardustXR/non-spatial-input")); +if rpm.changed() { + rpm.release(); + rpm.global("commit_date", date()); +}