Merge branch 'frawhide' into owen/amdctl-cleanup

this
Signed-off-by: Owen-sz <owen@fyralabs.com>
2026-06-16 16:40:38 +00:00 · 2026-06-16 16:27:21 +02:00 · 2026-06-16 16:24:59 +02:00 · 2026-06-16 16:24:31 +02:00 · 2026-06-16 22:22:09 +08:00 · 2026-06-16 16:02:55 +02:00
6 changed files with 120 additions and 47 deletions
@@ -0,0 +1,8 @@
+project pkg {
+  rpm {
+    spec = "noctalia-greeter.spec"
+  }
+  labels {
+    nightly = 1
+  }
+}
@@ -0,0 +1,72 @@
+%global ver 1.0.0
+
+%global commit          db60c06b5f6ff5da4d5f1126eff312b2a41ef614
+%global shortcommit     %(c=%{commit}; echo ${c:0:7})
+%global commitdate      20260609
+
+Name:   	noctalia-greeter
+Version:	%{ver}^%{commitdate}git.%{shortcommit}
+Release:	1%{?dist}
+Summary:	A minimal login greeter for greetd that matches the look and feel of Noctalia Shell.
+
+License:    shortcommit
+URL:        https://github.com/noctalia-dev/noctalia-greeter
+Source0:    https://github.com/noctalia-dev/noctalia-greeter/archive/%{commit}/noctalia-greeter-%{commit}.tar.gz
+
+BuildRequires:  cage
+BuildRequires:  dbus
+BuildRequires:  gcc-c++
+BuildRequires:  greetd
+BuildRequires:  just
+BuildRequires:  meson
+BuildRequires:  pkgconfig(cairo)
+BuildRequires:  pkgconfig(egl)
+BuildRequires:  pkgconfig(fontconfig)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(glesv2)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(librsvg-2.0)
+BuildRequires:  pkgconfig(libwebp)
+BuildRequires:  pkgconfig(pango)
+BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  pkgconfig(wayland-protocols)
+BuildRequires:  pkgconfig(xkbcommon)
+BuildRequires:  polkit
+BuildRequires:  wlr-randr
+
+Requires:       cage
+Requires:       dbus
+Requires:       greetd
+
+Packager:       Cypress Reed <cypress@fyralabs.com>
+
+%description
+Noctalia Greeter is the screen you see before your desktop session starts.
+It lets you pick a user, enter your password, choose a Wayland session, and pick a color scheme - with the same visual language as Noctalia Shell.
+
+%prep
+%autosetup -n noctalia-greeter-%{commit}
+
+%conf
+export LDFLAGS="%{__global_ldflags} -Wl,-z,notext"
+%meson
+
+%build
+%meson_build
+
+%install
+%meson_install
+
+%files
+%doc README.md
+%license LICENSE
+%{_bindir}/%{name}
+%{_bindir}/%{name}-apply-appearance
+%{_bindir}/%{name}-print-greetd-config
+%{_bindir}/%{name}-session
+%{_datadir}/%{name}/*
+%{_datadir}/polkit-1/actions/org.noctalia.greeter.apply-appearance.policy
+
+%changelog
+* Tue Jun 09 2026 Cypress Reed <cypress@fyralabs.com>
+- Port to terra from Fedora COPR lionheartp/Hyprland
@@ -0,0 +1,6 @@
+rpm.global("commit", get("https://api.github.com/repos/noctalia-dev/noctalia-greeter/commits/main").json().sha);
+if rpm.changed() {
+        rpm.global("ver", gh("noctalia-dev/noctalia-greeter"));
+        rpm.global("commit_date", date());
+        rpm.release();
+}
@@ -9,8 +9,8 @@
 # GLIBCXX_ASSERTIONS is known to break RPCS3
 %global build_cflags %(echo "%{__build_flags_lang_c}" | sed 's|-Wp,-D_GLIBCXX_ASSERTIONS ||g') %{?_distro_extra_cflags}
 %global build_cxxflags %(echo "%{__build_flags_lang_cxx}" | sed 's|-Wp,-D_GLIBCXX_ASSERTIONS ||g') %{?_distro_extra_cflags}
-%global commit 5c4be5dd3bf261e6ee2747508df85fd14d9eb194
-%global ver 0.0.41-19480
+%global commit e429f8cf05926852ed63949cad652bf1de5869a4
+%global ver 0.0.41-19488

 Name:           rpcs3
 Version:        %(echo %{ver} | sed 's/-/^/g')
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Paskal Sitepu <rmnscnce@ya.ru>
-Date: Sat, 4 Nov 2023 09:54:38 +0700
-Subject: [PATCH] (RPM) makefile: Remove unused Makefile variables
-
-Signed-off-by: Paskal Sitepu <rmnscnce@ya.ru>
---
- makefile | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/makefile b/makefile
-index 5ca6bab..0091429 100644
--- a/makefile
-+++ b/makefile
-@@ -1,5 +1,3 @@
-CC=gcc
-CFLAGS=-Wall -pedantic -Wextra -std=c99 -O2
- all: amdctl
- %.o: %.c
-        $(CC) -c -o $@ $< $(CFLAGS)
-- 
-2.41.0
@@ -1,34 +1,40 @@
-Name: amdctl
-Summary: Set P-State voltages and clock speeds on recent AMD CPUs on Linux
-License: GPLv3
-URL: https://github.com/kevinlekiller/%{name}
+Name:       amdctl
+Summary:    Set P-State voltages and clock speeds on recent AMD CPUs on Linux
+License:    GPL-3.0-or-later
+URL:        https://github.com/kevinlekiller/%{name}
+Version:    0.11
+Release:    2%{?dist}
+Source0:    https://github.com/kevinlekiller/%{name}/archive/refs/tags/v%{version}.tar.gz

-Version: 0.11
-Release: 2%{?dist}
-Source0: https://github.com/kevinlekiller/%{name}/archive/refs/tags/v%{version}.tar.gz
-# Remove hardcoded CFLAGS and CC
-Patch0: 0001-RPM-makefile-Remove-unused-Makefile-variables.patch
-
-# `msr` is a builtin kernel module
-Requires: kernel-core systemd-udev coreutils
-BuildRequires: make gcc kernel-headers glibc-headers
+BuildRequires: make
+BuildRequires: gcc
+BuildRequires: kernel-headers
+BuildRequires: glibc-headers
+BuildRequires: cmake-rpm-macros
+BuildRequires: cmake
+BuildRequires: gcc-c++
+BuildRequires: systemd-rpm-macros
+Requires: kernel-core
+Requires: systemd-udev
+Requires: coreutils

 %description
 Tool for changing voltages and clock speeds for AMD processors with
 control over every power state and CPU core.

 %prep
-%setup -qn %{name}-%{version}
-patch -p1 -i %{PATCH0}
+%autosetup
+
+%conf
+%cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5

 %build
-%set_build_flags
-%make_build
+%cmake_build

 %install
 # install the 'amdctl' binary
 mkdir -p %{buildroot}/%{_bindir}
-install -m 0755 ./%{name} %{buildroot}/%{_bindir}/
+install -m 0755 redhat-linux-build/%{name} %{buildroot}/%{_bindir}/

 # add modules.load.d entry
 mkdir -p %{buildroot}/%{_modulesloaddir}/
@@ -51,12 +57,15 @@ EOF
 %files
 %license LICENSE
 %doc README.md
-/%{_bindir}/%{name}
-/%{_libexecdir}/%{name}
-/%{_modulesloaddir}/%{name}.conf
-/%{_udevrulesdir}/99-%{name}.rules
+%{_bindir}/%{name}
+%{_libexecdir}/%{name}
+%{_modulesloaddir}/%{name}.conf
+%{_udevrulesdir}/99-%{name}.rules

 %changelog
+* Tue Jun 16 2026 Owen-sz <owen@fyralabs.com> - 0.11-2
+- Clean up spec
+
 * Sat Nov 4 2023 <rmnscnce@ya.ru> - 0.11-1
 - Track upstream to 0.11

@@ -76,4 +85,4 @@ EOF
 - Track upstream to 0.6.1

 * Mon May 24 2021 rmnscnce <rmnscnce@ya.ru> - 0.2-2.git+gb0ffbad
- Initial packaging
+- Initial packaging
Author	SHA1	Message	Date
Owen Zimmerman	5d9b897742	Merge branch 'frawhide' into owen/amdctl-cleanup	2026-06-16 16:27:21 +02:00
Owen-sz	ef51aff46e	this Signed-off-by: Owen-sz <owen@fyralabs.com>	2026-06-16 16:24:59 +02:00
Owen-sz	0603ec22c8	use cmake Signed-off-by: Owen-sz <owen@fyralabs.com>	2026-06-16 16:24:31 +02:00
Cypress Reed	f2891bce82	add: noctalia-greeter (#13019 ) * add noctalia-greeter * i forgot to update the commit * forgot to update repo name in the update script * move meson macro to conf section * break description into two lines	2026-06-16 22:22:09 +08:00
Owen-sz	86aff1beb4	probe Signed-off-by: Owen-sz <owen@fyralabs.com>	2026-06-16 16:02:55 +02:00
Owen-sz	3ed8d25fc8	chore (amdctl): cleanup spec Signed-off-by: Owen-sz <owen@fyralabs.com>	2026-06-16 15:59:54 +02:00
Raboneko	65affe82e8	bump: rpcs3	2026-06-16 12:28:28 +00:00