From eaf71f67cf13f8420cbee9a9cf76915835ea74be Mon Sep 17 00:00:00 2001 From: Owen-sz Date: Sat, 7 Sep 2024 13:33:21 -0500 Subject: [PATCH 01/23] initial package for stardust-server --- anda/misc/stardust-server/anda.hcl | 5 +++ .../misc/stardust-server/stardust-server.spec | 32 +++++++++++++++++++ anda/misc/stardust-server/update.rhai | 1 + 3 files changed, 38 insertions(+) create mode 100644 anda/misc/stardust-server/anda.hcl create mode 100644 anda/misc/stardust-server/stardust-server.spec create mode 100644 anda/misc/stardust-server/update.rhai diff --git a/anda/misc/stardust-server/anda.hcl b/anda/misc/stardust-server/anda.hcl new file mode 100644 index 0000000000..2ed71949d7 --- /dev/null +++ b/anda/misc/stardust-server/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "stardust-server.spec" + } +} diff --git a/anda/misc/stardust-server/stardust-server.spec b/anda/misc/stardust-server/stardust-server.spec new file mode 100644 index 0000000000..e99999e332 --- /dev/null +++ b/anda/misc/stardust-server/stardust-server.spec @@ -0,0 +1,32 @@ +Name: stardust-server +Version: 0.44.1 +Release: 1%?dist +Summary: Usable Linux display server that reinvents human-computer interaction for all kinds of XR. +URL: https://github.com/StardustXR/server +Source0: %url/archive/refs/tags/0.44.1.tar.gz +License: GPLv2 +BuildRequires: cargo cmake anda-srpm-macros rust-srpm-macros +Requires: libxkbcommon libstdc++ openxr-libs libX11 libXfixes libglvnd-egl mesa-libgbm fontconfig libgcc glibc jsoncpp libxcb libglvnd libwayland-server libdrm expat libxcb freetype libxml2 libXau libXau libffi zlib-ng-compat bzip2-libs libpng harfbuzz libbrotli xz-libs glib2 graphite2 libbrotli pcre2 +Packager: Owen Zimmerman + +%description +Usable Linux display server that reinvents human-computer interaction for all kinds of XR, from putting 2D/XR apps into various 3D shells for varying uses to SDF-based interaction. + +%prep +%autosetup -n server-%version +%cargo_prep_online + +%build +%cargo_build + +%install +%cargo_install + +%files +/usr/bin/stardust-xr-server +%license LICENSE +%doc README.md + +%changelog +* Sat Sep 7 2024 Owen-sz +- Package StardustXR Server diff --git a/anda/misc/stardust-server/update.rhai b/anda/misc/stardust-server/update.rhai new file mode 100644 index 0000000000..89a05318d8 --- /dev/null +++ b/anda/misc/stardust-server/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("StardustXR/server")); From 1be9bd5b05717d3c5ab59d63dd90da1b40a5900b Mon Sep 17 00:00:00 2001 From: june-fish Date: Sat, 7 Sep 2024 15:42:54 -0500 Subject: [PATCH 02/23] add missing build deps --- anda/misc/stardust-server/stardust-server.spec | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/anda/misc/stardust-server/stardust-server.spec b/anda/misc/stardust-server/stardust-server.spec index e99999e332..9222846839 100644 --- a/anda/misc/stardust-server/stardust-server.spec +++ b/anda/misc/stardust-server/stardust-server.spec @@ -5,8 +5,19 @@ Summary: Usable Linux display server that reinvents human-computer intera URL: https://github.com/StardustXR/server Source0: %url/archive/refs/tags/0.44.1.tar.gz License: GPLv2 -BuildRequires: cargo cmake anda-srpm-macros rust-srpm-macros -Requires: libxkbcommon libstdc++ openxr-libs libX11 libXfixes libglvnd-egl mesa-libgbm fontconfig libgcc glibc jsoncpp libxcb libglvnd libwayland-server libdrm expat libxcb freetype libxml2 libXau libXau libffi zlib-ng-compat bzip2-libs libpng harfbuzz libbrotli xz-libs glib2 graphite2 libbrotli pcre2 + +BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold g++ +BuildRequires: glx-utils fontconfig-devel glibc libxcb-devel wayland-devel +BuildRequires: openxr-devel libglvnd-devel libglvnd-gles mesa-libgbm-devel +BuildRequires: libwayland-egl libX11-devel libXfixes-devel lld clang +BuildRequires: mesa-libEGL-devel libxkbcommon-devel + +Requires: libxkbcommon libstdc++ openxr-libs libX11 libXfixes +Requires: libglvnd-egl mesa-libgbm fontconfig libgcc glibc jsoncpp libxcb libglvnd +Requires: libwayland-server libdrm expat libxcb freetype libxml2 libXau libXau +Requires: libffi zlib-ng-compat bzip2-libs libpng harfbuzz libbrotli xz-libs +Requires: glib2 graphite2 libbrotli pcre2 + Packager: Owen Zimmerman %description @@ -28,5 +39,8 @@ Usable Linux display server that reinvents human-computer interaction for all ki %doc README.md %changelog +* Sat Sep 7 2024 june-fish +- Add missing build dependencies + * Sat Sep 7 2024 Owen-sz - Package StardustXR Server From b7a6644ecf776786ca1084af91ffd5185cd98c92 Mon Sep 17 00:00:00 2001 From: june-fish Date: Sat, 7 Sep 2024 16:11:11 -0500 Subject: [PATCH 03/23] move to stardust folder --- anda/{misc/stardust-server => stardust/server}/anda.hcl | 0 .../stardust-server => stardust/server}/stardust-server.spec | 0 anda/{misc/stardust-server => stardust/server}/update.rhai | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename anda/{misc/stardust-server => stardust/server}/anda.hcl (100%) rename anda/{misc/stardust-server => stardust/server}/stardust-server.spec (100%) rename anda/{misc/stardust-server => stardust/server}/update.rhai (100%) diff --git a/anda/misc/stardust-server/anda.hcl b/anda/stardust/server/anda.hcl similarity index 100% rename from anda/misc/stardust-server/anda.hcl rename to anda/stardust/server/anda.hcl diff --git a/anda/misc/stardust-server/stardust-server.spec b/anda/stardust/server/stardust-server.spec similarity index 100% rename from anda/misc/stardust-server/stardust-server.spec rename to anda/stardust/server/stardust-server.spec diff --git a/anda/misc/stardust-server/update.rhai b/anda/stardust/server/update.rhai similarity index 100% rename from anda/misc/stardust-server/update.rhai rename to anda/stardust/server/update.rhai From b3b817ddecc971591bb8924866d3c7897136a8d8 Mon Sep 17 00:00:00 2001 From: Owen Date: Sat, 7 Sep 2024 20:29:28 -0500 Subject: [PATCH 04/23] inisital package for stardust-black-hole --- anda/stardust/black-hole/anda.hcl | 8 ++++ .../black-hole/stardust-black-hole.spec | 40 ++++++++++++++++ anda/stardust/black-hole/update.rhai | 7 +++ anda/stardust/server/anda.hcl | 5 -- anda/stardust/server/stardust-server.spec | 46 ------------------- anda/stardust/server/update.rhai | 1 - 6 files changed, 55 insertions(+), 52 deletions(-) create mode 100644 anda/stardust/black-hole/anda.hcl create mode 100644 anda/stardust/black-hole/stardust-black-hole.spec create mode 100644 anda/stardust/black-hole/update.rhai delete mode 100644 anda/stardust/server/anda.hcl delete mode 100644 anda/stardust/server/stardust-server.spec delete mode 100644 anda/stardust/server/update.rhai diff --git a/anda/stardust/black-hole/anda.hcl b/anda/stardust/black-hole/anda.hcl new file mode 100644 index 0000000000..f14c2dc669 --- /dev/null +++ b/anda/stardust/black-hole/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "stardust-black-hole.spec" + } + labels { + nightly = 1 + } +} \ No newline at end of file diff --git a/anda/stardust/black-hole/stardust-black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec new file mode 100644 index 0000000000..0cb2e9763f --- /dev/null +++ b/anda/stardust/black-hole/stardust-black-hole.spec @@ -0,0 +1,40 @@ +%global commit 0b847b6ddc383bfcc1e133a2238a37ce8202fe95 +%global commit_date 20240824 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global debug_package %{nil} +%define __os_install_post %{nil} + +Name: stardust-black-hole +Version: %commit_date.%shortcommit +Release: 1%?dist +Summary: Spatial storage for stardust xr. +URL: https://github.com/StardustXR/black-hole +Source0: https://github.com/StardustXR/black-hole/archive/%commit/black-hole-%commit.tar.gz +License: MIT +BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold +Requires: libgcc glibc glibm + +Provides: black-hole +Conflicts: black-hole + +%description +Spatial storage for stardust xr + +%prep +%autosetup -n black-hole-%commit +%cargo_prep_online + +%build +%cargo_build + +%install +%cargo_install + +%files +%_bindir/black-hole +%license LICENSE +%doc README.md + +%changelog +* Sat Sep 7 2024 Owen-sz +- Package StardustXR black-hole \ No newline at end of file diff --git a/anda/stardust/black-hole/update.rhai b/anda/stardust/black-hole/update.rhai new file mode 100644 index 0000000000..f2705a6be1 --- /dev/null +++ b/anda/stardust/black-hole/update.rhai @@ -0,0 +1,7 @@ +if filters.contains("nightly") { + rpm.global("commit", gh_commit("StardustXR/black-hole")); + if rpm.changed() { + rpm.release(); + rpm.global("commit_date", date()); + } + } \ No newline at end of file diff --git a/anda/stardust/server/anda.hcl b/anda/stardust/server/anda.hcl deleted file mode 100644 index 2ed71949d7..0000000000 --- a/anda/stardust/server/anda.hcl +++ /dev/null @@ -1,5 +0,0 @@ -project pkg { - rpm { - spec = "stardust-server.spec" - } -} diff --git a/anda/stardust/server/stardust-server.spec b/anda/stardust/server/stardust-server.spec deleted file mode 100644 index 9222846839..0000000000 --- a/anda/stardust/server/stardust-server.spec +++ /dev/null @@ -1,46 +0,0 @@ -Name: stardust-server -Version: 0.44.1 -Release: 1%?dist -Summary: Usable Linux display server that reinvents human-computer interaction for all kinds of XR. -URL: https://github.com/StardustXR/server -Source0: %url/archive/refs/tags/0.44.1.tar.gz -License: GPLv2 - -BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold g++ -BuildRequires: glx-utils fontconfig-devel glibc libxcb-devel wayland-devel -BuildRequires: openxr-devel libglvnd-devel libglvnd-gles mesa-libgbm-devel -BuildRequires: libwayland-egl libX11-devel libXfixes-devel lld clang -BuildRequires: mesa-libEGL-devel libxkbcommon-devel - -Requires: libxkbcommon libstdc++ openxr-libs libX11 libXfixes -Requires: libglvnd-egl mesa-libgbm fontconfig libgcc glibc jsoncpp libxcb libglvnd -Requires: libwayland-server libdrm expat libxcb freetype libxml2 libXau libXau -Requires: libffi zlib-ng-compat bzip2-libs libpng harfbuzz libbrotli xz-libs -Requires: glib2 graphite2 libbrotli pcre2 - -Packager: Owen Zimmerman - -%description -Usable Linux display server that reinvents human-computer interaction for all kinds of XR, from putting 2D/XR apps into various 3D shells for varying uses to SDF-based interaction. - -%prep -%autosetup -n server-%version -%cargo_prep_online - -%build -%cargo_build - -%install -%cargo_install - -%files -/usr/bin/stardust-xr-server -%license LICENSE -%doc README.md - -%changelog -* Sat Sep 7 2024 june-fish -- Add missing build dependencies - -* Sat Sep 7 2024 Owen-sz -- Package StardustXR Server diff --git a/anda/stardust/server/update.rhai b/anda/stardust/server/update.rhai deleted file mode 100644 index 89a05318d8..0000000000 --- a/anda/stardust/server/update.rhai +++ /dev/null @@ -1 +0,0 @@ -rpm.version(gh("StardustXR/server")); From 2062a8db1328cd6cdc7daed6a0624c6f436c4a97 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sun, 8 Sep 2024 02:44:54 -0500 Subject: [PATCH 05/23] RPM bug workaround stardust-black-hole.spec Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/stardust-black-hole.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/stardust/black-hole/stardust-black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec index 0cb2e9763f..b077f0c308 100644 --- a/anda/stardust/black-hole/stardust-black-hole.spec +++ b/anda/stardust/black-hole/stardust-black-hole.spec @@ -1,8 +1,8 @@ %global commit 0b847b6ddc383bfcc1e133a2238a37ce8202fe95 %global commit_date 20240824 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global debug_package %{nil} -%define __os_install_post %{nil} +# Exclude input files from mangling +%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ Name: stardust-black-hole Version: %commit_date.%shortcommit @@ -37,4 +37,4 @@ Spatial storage for stardust xr %changelog * Sat Sep 7 2024 Owen-sz -- Package StardustXR black-hole \ No newline at end of file +- Package StardustXR black-hole From 41108c9a221efac24321d988bb955bc232b8ac2c Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sun, 8 Sep 2024 03:09:51 -0500 Subject: [PATCH 06/23] Remove conflicts Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/stardust-black-hole.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/anda/stardust/black-hole/stardust-black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec index b077f0c308..78c94a0140 100644 --- a/anda/stardust/black-hole/stardust-black-hole.spec +++ b/anda/stardust/black-hole/stardust-black-hole.spec @@ -15,7 +15,6 @@ BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold Requires: libgcc glibc glibm Provides: black-hole -Conflicts: black-hole %description Spatial storage for stardust xr From 228d09066ce2d55310f0187614df5205913fc279 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:51:27 -0500 Subject: [PATCH 07/23] Update anda/stardust/black-hole/update.rhai Co-authored-by: madomado Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/update.rhai | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anda/stardust/black-hole/update.rhai b/anda/stardust/black-hole/update.rhai index f2705a6be1..6e2bb0d010 100644 --- a/anda/stardust/black-hole/update.rhai +++ b/anda/stardust/black-hole/update.rhai @@ -4,4 +4,5 @@ if filters.contains("nightly") { rpm.release(); rpm.global("commit_date", date()); } - } \ No newline at end of file + } +} \ No newline at end of file From a5d2fb6b191a903bf6d2ce7de9b707341aeef50a Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:56:59 -0500 Subject: [PATCH 08/23] Update anda/stardust/black-hole/stardust-black-hole.spec Co-authored-by: madomado Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/stardust-black-hole.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/stardust/black-hole/stardust-black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec index 78c94a0140..116de003d6 100644 --- a/anda/stardust/black-hole/stardust-black-hole.spec +++ b/anda/stardust/black-hole/stardust-black-hole.spec @@ -9,7 +9,7 @@ Version: %commit_date.%shortcommit Release: 1%?dist Summary: Spatial storage for stardust xr. URL: https://github.com/StardustXR/black-hole -Source0: https://github.com/StardustXR/black-hole/archive/%commit/black-hole-%commit.tar.gz +Source0: %url/archive/%commit/black-hole-%commit.tar.gz License: MIT BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold Requires: libgcc glibc glibm From b856915efd338ab10b6f4bbaeb8b2f51ff282d10 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:57:18 -0500 Subject: [PATCH 09/23] Update anda/stardust/black-hole/stardust-black-hole.spec Co-authored-by: madomado Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/stardust-black-hole.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/anda/stardust/black-hole/stardust-black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec index 116de003d6..bdf4de6771 100644 --- a/anda/stardust/black-hole/stardust-black-hole.spec +++ b/anda/stardust/black-hole/stardust-black-hole.spec @@ -12,7 +12,6 @@ URL: https://github.com/StardustXR/black-hole Source0: %url/archive/%commit/black-hole-%commit.tar.gz License: MIT BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold -Requires: libgcc glibc glibm Provides: black-hole From bf015aae376df99dabab1742413f6e7382a97ba8 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:58:01 -0500 Subject: [PATCH 10/23] Update anda/stardust/black-hole/stardust-black-hole.spec Co-authored-by: madomado Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/stardust-black-hole.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/anda/stardust/black-hole/stardust-black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec index bdf4de6771..3af616b751 100644 --- a/anda/stardust/black-hole/stardust-black-hole.spec +++ b/anda/stardust/black-hole/stardust-black-hole.spec @@ -23,7 +23,6 @@ Spatial storage for stardust xr %cargo_prep_online %build -%cargo_build %install %cargo_install From b84c4c8d5e8e7d432703b5d3bdf89aa08f65dc79 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Mon, 9 Sep 2024 15:42:31 -0500 Subject: [PATCH 11/23] Update stardust-black-hole.spec Add packager Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/stardust-black-hole.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/stardust/black-hole/stardust-black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec index 3af616b751..2ca0259981 100644 --- a/anda/stardust/black-hole/stardust-black-hole.spec +++ b/anda/stardust/black-hole/stardust-black-hole.spec @@ -14,6 +14,7 @@ License: MIT BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold Provides: black-hole +Packager: Owen Zimmerman %description Spatial storage for stardust xr From 22bdb72a504a0ee977011c930d35a956b34e13bd Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Tue, 10 Sep 2024 13:53:36 -0500 Subject: [PATCH 12/23] Update anda.hcl Fix name Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/anda.hcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/stardust/black-hole/anda.hcl b/anda/stardust/black-hole/anda.hcl index f14c2dc669..2da1dd957b 100644 --- a/anda/stardust/black-hole/anda.hcl +++ b/anda/stardust/black-hole/anda.hcl @@ -1,8 +1,8 @@ project pkg { rpm { - spec = "stardust-black-hole.spec" + spec = "stardust-server.spec" } labels { nightly = 1 } -} \ No newline at end of file +} From 2c650278437ed5a5de33535137bede66591d4831 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Tue, 10 Sep 2024 13:55:18 -0500 Subject: [PATCH 13/23] Update stardust-black-hole.spec Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- .../black-hole/stardust-black-hole.spec | 33 ++++++++----------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/anda/stardust/black-hole/stardust-black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec index 2ca0259981..fd8eff96e8 100644 --- a/anda/stardust/black-hole/stardust-black-hole.spec +++ b/anda/stardust/black-hole/stardust-black-hole.spec @@ -1,26 +1,19 @@ -%global commit 0b847b6ddc383bfcc1e133a2238a37ce8202fe95 -%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-black-hole -Version: %commit_date.%shortcommit +Name: stardust-server +Version: 0.44.1 Release: 1%?dist -Summary: Spatial storage for stardust xr. -URL: https://github.com/StardustXR/black-hole -Source0: %url/archive/%commit/black-hole-%commit.tar.gz -License: MIT -BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold - -Provides: black-hole +Summary: Usable Linux display server that reinvents human-computer interaction for all kinds of XR. +URL: https://github.com/StardustXR/server +Source0: %url/archive/refs/tags/0.44.1.tar.gz +License: GPLv2 +BuildRequires: cargo cmake anda-srpm-macros rust-srpm-macros +Requires: libxkbcommon libstdc++ openxr-libs libX11 libXfixes libglvnd-egl mesa-libgbm fontconfig libgcc glibc jsoncpp libxcb libglvnd libwayland-server libdrm expat libxcb freetype libxml2 libXau libXau libffi zlib-ng-compat bzip2-libs libpng harfbuzz libbrotli xz-libs glib2 graphite2 libbrotli pcre2 Packager: Owen Zimmerman %description -Spatial storage for stardust xr +Usable Linux display server that reinvents human-computer interaction for all kinds of XR, from putting 2D/XR apps into various 3D shells for varying uses to SDF-based interaction. %prep -%autosetup -n black-hole-%commit +%autosetup -n server-%version %cargo_prep_online %build @@ -29,10 +22,10 @@ Spatial storage for stardust xr %cargo_install %files -%_bindir/black-hole +/usr/bin/stardust-xr-server %license LICENSE %doc README.md %changelog -* Sat Sep 7 2024 Owen-sz -- Package StardustXR black-hole +* Tue Sep 10 2024 Owen-sz +- Package StardustXR Server From 7632cc6d5d3d246f186a09c10462f546b7779b36 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Tue, 10 Sep 2024 13:55:35 -0500 Subject: [PATCH 14/23] Update update.rhai Fix name Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/update.rhai | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/stardust/black-hole/update.rhai b/anda/stardust/black-hole/update.rhai index 6e2bb0d010..4fbfac3e70 100644 --- a/anda/stardust/black-hole/update.rhai +++ b/anda/stardust/black-hole/update.rhai @@ -1,8 +1,8 @@ if filters.contains("nightly") { - rpm.global("commit", gh_commit("StardustXR/black-hole")); + rpm.global("commit", gh_commit("StardustXR/server")); if rpm.changed() { rpm.release(); rpm.global("commit_date", date()); } } -} \ No newline at end of file +} From 86caf0b8e256905b0f36c6ae23c99cdc0f8f2e42 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Tue, 10 Sep 2024 13:58:54 -0500 Subject: [PATCH 15/23] Update stardust-black-hole.spec fix deps Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/stardust-black-hole.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/anda/stardust/black-hole/stardust-black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec index fd8eff96e8..e3d6234d38 100644 --- a/anda/stardust/black-hole/stardust-black-hole.spec +++ b/anda/stardust/black-hole/stardust-black-hole.spec @@ -5,8 +5,19 @@ Summary: Usable Linux display server that reinvents human-computer intera URL: https://github.com/StardustXR/server Source0: %url/archive/refs/tags/0.44.1.tar.gz License: GPLv2 -BuildRequires: cargo cmake anda-srpm-macros rust-srpm-macros -Requires: libxkbcommon libstdc++ openxr-libs libX11 libXfixes libglvnd-egl mesa-libgbm fontconfig libgcc glibc jsoncpp libxcb libglvnd libwayland-server libdrm expat libxcb freetype libxml2 libXau libXau libffi zlib-ng-compat bzip2-libs libpng harfbuzz libbrotli xz-libs glib2 graphite2 libbrotli pcre2 + +BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold g++ +BuildRequires: glx-utils fontconfig-devel glibc libxcb-devel wayland-devel +BuildRequires: openxr-devel libglvnd-devel libglvnd-gles mesa-libgbm-devel +BuildRequires: libwayland-egl libX11-devel libXfixes-devel lld clang +BuildRequires: mesa-libEGL-devel libxkbcommon-devel + +Requires: libxkbcommon libstdc++ openxr-libs libX11 libXfixes +Requires: libglvnd-egl mesa-libgbm fontconfig libgcc glibc jsoncpp libxcb libglvnd +Requires: libwayland-server libdrm expat libxcb freetype libxml2 libXau libXau +Requires: libffi zlib-ng-compat bzip2-libs libpng harfbuzz libbrotli xz-libs +Requires: glib2 graphite2 libbrotli pcre2 + Packager: Owen Zimmerman %description From bc5791dc2f83dc08b045fb7130837f217a1d59fc Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Tue, 10 Sep 2024 14:06:41 -0500 Subject: [PATCH 16/23] Update stardust-black-hole.spec Fix files Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/stardust-black-hole.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/stardust/black-hole/stardust-black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec index e3d6234d38..fb801c2237 100644 --- a/anda/stardust/black-hole/stardust-black-hole.spec +++ b/anda/stardust/black-hole/stardust-black-hole.spec @@ -33,7 +33,7 @@ Usable Linux display server that reinvents human-computer interaction for all ki %cargo_install %files -/usr/bin/stardust-xr-server +/usr/bin/stardust-server %license LICENSE %doc README.md From bc6784bbd1e4b56356fea45a376c2eeb1596e403 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Tue, 10 Sep 2024 14:18:26 -0500 Subject: [PATCH 17/23] Update update.rhai Remove if statement from Rhai Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/update.rhai | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/anda/stardust/black-hole/update.rhai b/anda/stardust/black-hole/update.rhai index 4fbfac3e70..81597375cd 100644 --- a/anda/stardust/black-hole/update.rhai +++ b/anda/stardust/black-hole/update.rhai @@ -1,8 +1 @@ -if filters.contains("nightly") { - rpm.global("commit", gh_commit("StardustXR/server")); - if rpm.changed() { - rpm.release(); - rpm.global("commit_date", date()); - } - } -} +rpm.global("commit", gh_commit("StardustXR/server")); From 919fa9c0bf619b9071a51164185e0206a290ab98 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Tue, 10 Sep 2024 23:39:35 -0500 Subject: [PATCH 18/23] Update anda/stardust/black-hole/update.rhai Co-authored-by: madomado Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/black-hole/update.rhai | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/anda/stardust/black-hole/update.rhai b/anda/stardust/black-hole/update.rhai index 81597375cd..16db710969 100644 --- a/anda/stardust/black-hole/update.rhai +++ b/anda/stardust/black-hole/update.rhai @@ -1 +1,5 @@ rpm.global("commit", gh_commit("StardustXR/server")); +if rpm.changed() { + rpm.release(); + rpm.global("commit_date", date()); +} From c4a0bae0b42ee9cea5626cd701c7f0ae9c8c9a84 Mon Sep 17 00:00:00 2001 From: Owen Date: Tue, 10 Sep 2024 23:45:35 -0500 Subject: [PATCH 19/23] fix directories issue --- anda/stardust/server/anda.hcl | 8 +++++ anda/stardust/server/stardust-server.spec | 42 +++++++++++++++++++++++ anda/stardust/server/update.rhai | 5 +++ 3 files changed, 55 insertions(+) create mode 100644 anda/stardust/server/anda.hcl create mode 100644 anda/stardust/server/stardust-server.spec create mode 100644 anda/stardust/server/update.rhai diff --git a/anda/stardust/server/anda.hcl b/anda/stardust/server/anda.hcl new file mode 100644 index 0000000000..2da1dd957b --- /dev/null +++ b/anda/stardust/server/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "stardust-server.spec" + } + labels { + nightly = 1 + } +} diff --git a/anda/stardust/server/stardust-server.spec b/anda/stardust/server/stardust-server.spec new file mode 100644 index 0000000000..fb801c2237 --- /dev/null +++ b/anda/stardust/server/stardust-server.spec @@ -0,0 +1,42 @@ +Name: stardust-server +Version: 0.44.1 +Release: 1%?dist +Summary: Usable Linux display server that reinvents human-computer interaction for all kinds of XR. +URL: https://github.com/StardustXR/server +Source0: %url/archive/refs/tags/0.44.1.tar.gz +License: GPLv2 + +BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold g++ +BuildRequires: glx-utils fontconfig-devel glibc libxcb-devel wayland-devel +BuildRequires: openxr-devel libglvnd-devel libglvnd-gles mesa-libgbm-devel +BuildRequires: libwayland-egl libX11-devel libXfixes-devel lld clang +BuildRequires: mesa-libEGL-devel libxkbcommon-devel + +Requires: libxkbcommon libstdc++ openxr-libs libX11 libXfixes +Requires: libglvnd-egl mesa-libgbm fontconfig libgcc glibc jsoncpp libxcb libglvnd +Requires: libwayland-server libdrm expat libxcb freetype libxml2 libXau libXau +Requires: libffi zlib-ng-compat bzip2-libs libpng harfbuzz libbrotli xz-libs +Requires: glib2 graphite2 libbrotli pcre2 + +Packager: Owen Zimmerman + +%description +Usable Linux display server that reinvents human-computer interaction for all kinds of XR, from putting 2D/XR apps into various 3D shells for varying uses to SDF-based interaction. + +%prep +%autosetup -n server-%version +%cargo_prep_online + +%build + +%install +%cargo_install + +%files +/usr/bin/stardust-server +%license LICENSE +%doc README.md + +%changelog +* Tue Sep 10 2024 Owen-sz +- Package StardustXR Server diff --git a/anda/stardust/server/update.rhai b/anda/stardust/server/update.rhai new file mode 100644 index 0000000000..16db710969 --- /dev/null +++ b/anda/stardust/server/update.rhai @@ -0,0 +1,5 @@ +rpm.global("commit", gh_commit("StardustXR/server")); +if rpm.changed() { + rpm.release(); + rpm.global("commit_date", date()); +} From acbaea5e24410969c363d4732a4dca1635cf2ce3 Mon Sep 17 00:00:00 2001 From: Owen Date: Tue, 10 Sep 2024 23:47:35 -0500 Subject: [PATCH 20/23] actually fix directories error --- anda/stardust/black-hole/anda.hcl | 8 ---- .../black-hole/stardust-black-hole.spec | 42 ------------------- anda/stardust/black-hole/update.rhai | 5 --- 3 files changed, 55 deletions(-) delete mode 100644 anda/stardust/black-hole/anda.hcl delete mode 100644 anda/stardust/black-hole/stardust-black-hole.spec delete mode 100644 anda/stardust/black-hole/update.rhai diff --git a/anda/stardust/black-hole/anda.hcl b/anda/stardust/black-hole/anda.hcl deleted file mode 100644 index 2da1dd957b..0000000000 --- a/anda/stardust/black-hole/anda.hcl +++ /dev/null @@ -1,8 +0,0 @@ -project pkg { - rpm { - spec = "stardust-server.spec" - } - labels { - nightly = 1 - } -} diff --git a/anda/stardust/black-hole/stardust-black-hole.spec b/anda/stardust/black-hole/stardust-black-hole.spec deleted file mode 100644 index fb801c2237..0000000000 --- a/anda/stardust/black-hole/stardust-black-hole.spec +++ /dev/null @@ -1,42 +0,0 @@ -Name: stardust-server -Version: 0.44.1 -Release: 1%?dist -Summary: Usable Linux display server that reinvents human-computer interaction for all kinds of XR. -URL: https://github.com/StardustXR/server -Source0: %url/archive/refs/tags/0.44.1.tar.gz -License: GPLv2 - -BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold g++ -BuildRequires: glx-utils fontconfig-devel glibc libxcb-devel wayland-devel -BuildRequires: openxr-devel libglvnd-devel libglvnd-gles mesa-libgbm-devel -BuildRequires: libwayland-egl libX11-devel libXfixes-devel lld clang -BuildRequires: mesa-libEGL-devel libxkbcommon-devel - -Requires: libxkbcommon libstdc++ openxr-libs libX11 libXfixes -Requires: libglvnd-egl mesa-libgbm fontconfig libgcc glibc jsoncpp libxcb libglvnd -Requires: libwayland-server libdrm expat libxcb freetype libxml2 libXau libXau -Requires: libffi zlib-ng-compat bzip2-libs libpng harfbuzz libbrotli xz-libs -Requires: glib2 graphite2 libbrotli pcre2 - -Packager: Owen Zimmerman - -%description -Usable Linux display server that reinvents human-computer interaction for all kinds of XR, from putting 2D/XR apps into various 3D shells for varying uses to SDF-based interaction. - -%prep -%autosetup -n server-%version -%cargo_prep_online - -%build - -%install -%cargo_install - -%files -/usr/bin/stardust-server -%license LICENSE -%doc README.md - -%changelog -* Tue Sep 10 2024 Owen-sz -- Package StardustXR Server diff --git a/anda/stardust/black-hole/update.rhai b/anda/stardust/black-hole/update.rhai deleted file mode 100644 index 16db710969..0000000000 --- a/anda/stardust/black-hole/update.rhai +++ /dev/null @@ -1,5 +0,0 @@ -rpm.global("commit", gh_commit("StardustXR/server")); -if rpm.changed() { - rpm.release(); - rpm.global("commit_date", date()); -} From 10e007349d3774a047b95e56b849d9df7cb69f22 Mon Sep 17 00:00:00 2001 From: Owen Date: Wed, 11 Sep 2024 00:40:25 -0500 Subject: [PATCH 21/23] Initial package for stardust-atmosphere --- anda/stardust/atmosphere/anda.hcl | 8 ++++ .../atmosphere/stardust-atmosphere.spec | 38 +++++++++++++++++ .../{server => atmosphere}/update.rhai | 4 +- anda/stardust/server/anda.hcl | 8 ---- anda/stardust/server/stardust-server.spec | 42 ------------------- 5 files changed, 48 insertions(+), 52 deletions(-) create mode 100644 anda/stardust/atmosphere/anda.hcl create mode 100644 anda/stardust/atmosphere/stardust-atmosphere.spec rename anda/stardust/{server => atmosphere}/update.rhai (55%) delete mode 100644 anda/stardust/server/anda.hcl delete mode 100644 anda/stardust/server/stardust-server.spec diff --git a/anda/stardust/atmosphere/anda.hcl b/anda/stardust/atmosphere/anda.hcl new file mode 100644 index 0000000000..5a82bc12e7 --- /dev/null +++ b/anda/stardust/atmosphere/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "stardust-atmosphere.spec" + } + labels { + nightly = 1 + } +} \ No newline at end of file diff --git a/anda/stardust/atmosphere/stardust-atmosphere.spec b/anda/stardust/atmosphere/stardust-atmosphere.spec new file mode 100644 index 0000000000..c3f6e8f14b --- /dev/null +++ b/anda/stardust/atmosphere/stardust-atmosphere.spec @@ -0,0 +1,38 @@ +%global commit 0c8bfb91e8ca32a4895f858067334ed265517309 +%global commit_date 20242224 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +# Exclude input files from mangling +%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ + +Name: stardust-atmosphere +Version: %commit_date.%shortcommit +Release: 1%?dist +Summary: Environment, homespace, and setup client for Stardust XR. +URL: https://github.com/StardustXR/atmosphere +Source0: %url/archive/%commit/atmosphere-%commit.tar.gz +License: MIT +BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold libudev-devel g++ libinput-devel libxkbcommon-x11-devel + +Provides: atmosphere +Packager: Owen Zimmerman + +%description +%summary + +%prep +%autosetup -n atmosphere-%commit +%cargo_prep_online + +%build + +%install +%cargo_install + +%files +%_bindir/atmosphere +%license LICENSE +%doc README.md + +%changelog +* Tue Sep 10 2024 Owen-sz +- Package StardustXR atmosphere diff --git a/anda/stardust/server/update.rhai b/anda/stardust/atmosphere/update.rhai similarity index 55% rename from anda/stardust/server/update.rhai rename to anda/stardust/atmosphere/update.rhai index 16db710969..a375acf6ce 100644 --- a/anda/stardust/server/update.rhai +++ b/anda/stardust/atmosphere/update.rhai @@ -1,5 +1,5 @@ -rpm.global("commit", gh_commit("StardustXR/server")); +rpm.global("commit", gh_commit("StardustXR/atmosphere")); if rpm.changed() { rpm.release(); rpm.global("commit_date", date()); -} +} \ No newline at end of file diff --git a/anda/stardust/server/anda.hcl b/anda/stardust/server/anda.hcl deleted file mode 100644 index 2da1dd957b..0000000000 --- a/anda/stardust/server/anda.hcl +++ /dev/null @@ -1,8 +0,0 @@ -project pkg { - rpm { - spec = "stardust-server.spec" - } - labels { - nightly = 1 - } -} diff --git a/anda/stardust/server/stardust-server.spec b/anda/stardust/server/stardust-server.spec deleted file mode 100644 index fb801c2237..0000000000 --- a/anda/stardust/server/stardust-server.spec +++ /dev/null @@ -1,42 +0,0 @@ -Name: stardust-server -Version: 0.44.1 -Release: 1%?dist -Summary: Usable Linux display server that reinvents human-computer interaction for all kinds of XR. -URL: https://github.com/StardustXR/server -Source0: %url/archive/refs/tags/0.44.1.tar.gz -License: GPLv2 - -BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold g++ -BuildRequires: glx-utils fontconfig-devel glibc libxcb-devel wayland-devel -BuildRequires: openxr-devel libglvnd-devel libglvnd-gles mesa-libgbm-devel -BuildRequires: libwayland-egl libX11-devel libXfixes-devel lld clang -BuildRequires: mesa-libEGL-devel libxkbcommon-devel - -Requires: libxkbcommon libstdc++ openxr-libs libX11 libXfixes -Requires: libglvnd-egl mesa-libgbm fontconfig libgcc glibc jsoncpp libxcb libglvnd -Requires: libwayland-server libdrm expat libxcb freetype libxml2 libXau libXau -Requires: libffi zlib-ng-compat bzip2-libs libpng harfbuzz libbrotli xz-libs -Requires: glib2 graphite2 libbrotli pcre2 - -Packager: Owen Zimmerman - -%description -Usable Linux display server that reinvents human-computer interaction for all kinds of XR, from putting 2D/XR apps into various 3D shells for varying uses to SDF-based interaction. - -%prep -%autosetup -n server-%version -%cargo_prep_online - -%build - -%install -%cargo_install - -%files -/usr/bin/stardust-server -%license LICENSE -%doc README.md - -%changelog -* Tue Sep 10 2024 Owen-sz -- Package StardustXR Server From a43d4b12d4c8b925ede8a30ccce2e2e8091b0639 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Thu, 12 Sep 2024 12:47:04 -0500 Subject: [PATCH 22/23] Update stardust-atmosphere.spec Lock cargo install Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/atmosphere/stardust-atmosphere.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/stardust/atmosphere/stardust-atmosphere.spec b/anda/stardust/atmosphere/stardust-atmosphere.spec index c3f6e8f14b..d57f120fab 100644 --- a/anda/stardust/atmosphere/stardust-atmosphere.spec +++ b/anda/stardust/atmosphere/stardust-atmosphere.spec @@ -26,6 +26,7 @@ Packager: Owen Zimmerman %build %install +%define __cargo_common_opts %{?_smp_mflags} -Z avoid-dev-deps --locked %cargo_install %files From f7dc7e3069ad361216d541c677d26411c7695ca0 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sat, 14 Sep 2024 19:04:10 -0500 Subject: [PATCH 23/23] Update stardust-atmosphere.spec Fix commit_date Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/atmosphere/stardust-atmosphere.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/stardust/atmosphere/stardust-atmosphere.spec b/anda/stardust/atmosphere/stardust-atmosphere.spec index d57f120fab..e892959abd 100644 --- a/anda/stardust/atmosphere/stardust-atmosphere.spec +++ b/anda/stardust/atmosphere/stardust-atmosphere.spec @@ -1,5 +1,5 @@ %global commit 0c8bfb91e8ca32a4895f858067334ed265517309 -%global commit_date 20242224 +%global commit_date 20240822 %global shortcommit %(c=%{commit}; echo ${c:0:7}) # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$