From 328a0b3361a9221d3fa0073c88ba233ea1e0cad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Garc=C3=ADa?= <4411661+GarciaLnk@users.noreply.github.com> Date: Fri, 21 Feb 2025 15:43:58 +0000 Subject: [PATCH 0001/2977] fix(kf6-kio): update spec file from upstream (#3484) --- anda/desktops/kde/kf6-kio/kf6-kio.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/anda/desktops/kde/kf6-kio/kf6-kio.spec b/anda/desktops/kde/kf6-kio/kf6-kio.spec index 124637f8b7..968b2e8422 100644 --- a/anda/desktops/kde/kf6-kio/kf6-kio.spec +++ b/anda/desktops/kde/kf6-kio/kf6-kio.spec @@ -5,7 +5,7 @@ Name: kf6-%{framework} Version: %{majmin_ver_kf6}.0 -Release: 1%{?dist}.switcheroo +Release: 2%{?dist}.switcheroo Summary: KDE Frameworks 6 Tier 3 solution for filesystem abstraction License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT @@ -187,6 +187,7 @@ Developer Documentation files for %{name} for use with KDevelop or QtCreator. %{_kf6_plugindir}/kio/ %{_kf6_plugindir}/kded/ %{_kf6_plugindir}/kiod/ +%{_kf6_plugindir}/kio_dnd/ %{_kf6_datadir}/kf6/searchproviders/*.desktop %{_kf6_datadir}/applications/*.desktop %{_datadir}/dbus-1/services/org.kde.*.service @@ -223,6 +224,9 @@ Developer Documentation files for %{name} for use with KDevelop or QtCreator. %{_qt6_docdir}/*.qch %changelog +* Fri Feb 07 2025 Marc Deop i Argemí - 6.11.0-1 +- 6.11.0 + * Fri Jan 17 2025 Fedora Release Engineering - 6.10.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 30cb8e5eaf4bb247c50bf8133bd1e5bb889fccab Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 21 Feb 2025 16:15:23 +0000 Subject: [PATCH 0002/2977] bump(branch): kf6-kio --- anda/desktops/kde/kf6-kio/kf6-kio.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/kde/kf6-kio/kf6-kio.spec b/anda/desktops/kde/kf6-kio/kf6-kio.spec index 968b2e8422..73b239487d 100644 --- a/anda/desktops/kde/kf6-kio/kf6-kio.spec +++ b/anda/desktops/kde/kf6-kio/kf6-kio.spec @@ -5,7 +5,7 @@ Name: kf6-%{framework} Version: %{majmin_ver_kf6}.0 -Release: 2%{?dist}.switcheroo +Release: 1%{?dist}.switcheroo Summary: KDE Frameworks 6 Tier 3 solution for filesystem abstraction License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT From 780a13c59147e45a84ea33d0c949e6807358e78b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 21 Feb 2025 18:47:42 +0000 Subject: [PATCH 0003/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 4b31c32c9f..2062c1de83 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.175.2-pre +%global ver 0.175.3-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From 54168cf91ed4646c3b03abe4e7cd4935ede8d256 Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 22 Feb 2025 02:58:47 +0800 Subject: [PATCH 0004/2977] add: astal (#3490) --- anda/lib/astal/astal/anda.hcl | 8 +++++ anda/lib/astal/astal/astal.spec | 62 ++++++++++++++++++++++++++++++++ anda/lib/astal/astal/update.rhai | 5 +++ andax/bump_extras.rhai | 13 +++++++ 4 files changed, 88 insertions(+) create mode 100644 anda/lib/astal/astal/anda.hcl create mode 100644 anda/lib/astal/astal/astal.spec create mode 100644 anda/lib/astal/astal/update.rhai diff --git a/anda/lib/astal/astal/anda.hcl b/anda/lib/astal/astal/anda.hcl new file mode 100644 index 0000000000..05e222653c --- /dev/null +++ b/anda/lib/astal/astal/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "astal.spec" + } + labels { + nightly = 1 + } +} diff --git a/anda/lib/astal/astal/astal.spec b/anda/lib/astal/astal/astal.spec new file mode 100644 index 0000000000..4cfb5a545c --- /dev/null +++ b/anda/lib/astal/astal/astal.spec @@ -0,0 +1,62 @@ + +%global commit 3620d51bc6c23ada1bd4b7c9cf1c458c138e68df +%global shortcommit %{sub %commit 1 7} +%global commit_date 20250222 + +Name: astal +Version: 0^%commit_date.%shortcommit +Release: 1%?dist +Summary: Building blocks for creating custom desktop shells +License: LGPL-2.1-only +URL: https://aylur.github.io/astal +Source0: https://github.com/Aylur/astal/archive/%commit.tar.gz +Provides: astal +Requires: %{name}-io-libs%{?_isa} = %{version}-%{release} +BuildRequires: meson gobject-introspection vala valadoc + +%description +The Linux Suite and Framework to Craft Desktop Shells and beautiful functional Wayland Widgets with GTK! + +%package io-libs +Summary: Shared libraries of libastal-io + +%description io-libs +%summary. (IO) + +This package contains shared libraries for astal-io. + +%package io-devel +Summary: Development libraries of libastal-io +Requires: %{name}-io-libs%{?_isa} = %{version}-%{release} + +%description io-devel +%summary. (IO) +This package contains development files and documentation for astal-io. + +%prep +%autosetup -n astal-%commit + +%build +cd lib/astal/io +%meson +%meson_build + +%install +cd lib/astal/io +%meson_install + +%files +%_bindir/astal + +%files io-libs +%license LICENSE +%_libdir/libastal-io.so.0 +%_libdir/libastal-io.so.0.1.0 + +%files io-devel +%_datadir/gir-1.0/AstalIO-0.1.gir +%_datadir/vala/vapi/astal-io-0.1.vapi +%_includedir/astal-io.h +%_libdir/girepository-1.0/AstalIO-0.1.typelib +%_libdir/libastal-io.so +%_libdir/pkgconfig/astal-io-0.1.pc diff --git a/anda/lib/astal/astal/update.rhai b/anda/lib/astal/astal/update.rhai new file mode 100644 index 0000000000..c68d29af82 --- /dev/null +++ b/anda/lib/astal/astal/update.rhai @@ -0,0 +1,5 @@ +rpm.global("commit", gh_commit("Aylur/astal")); +if rpm.changed() { + rpm.release(); + rpm.global("commit_date", date()); +} diff --git a/andax/bump_extras.rhai b/andax/bump_extras.rhai index 03c5dc388d..acc788ed10 100644 --- a/andax/bump_extras.rhai +++ b/andax/bump_extras.rhai @@ -44,3 +44,16 @@ fn follow_bodhi_vr(rpm, pkg, branch) { rpm.version(vr[1]); rpm.release(vr[2]); } + + +fn madoguchi_json(pkg, branch) { + let branch = labels.branch; + if branch.starts_with("f") { + branch.crop(1); + } + return get(`https://madoguchi.fyralabs.com/v4/terra${branch}/packages/${pkg}`).json(); +} + +fn madoguchi(pkg, branch) { + return madoguchi_json(pkg, branch).ver; +} From ca5f0fee9b4ba8ce09e8a6aff480fe8981a419b1 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 21 Feb 2025 22:23:02 +0000 Subject: [PATCH 0005/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 2ec49b1905..0a4411798c 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.02.20.193351 +Version: 2025.02.21.214000 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 2b0b27fac5380ea0a22101488549e83c30ffa86e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 22 Feb 2025 01:22:57 +0000 Subject: [PATCH 0006/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 5a22e56972..d20d91ea6b 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-02-21 +%global ver 2025-02-22 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 4cbe4fa5f86be3101366028ad2659226444b7f95 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 22 Feb 2025 01:26:45 +0000 Subject: [PATCH 0007/2977] bump(nightly): mpv owl nightly nightly spotx-bash --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/desktops/owl/owl.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 6 +++--- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/tools/spotx-bash/spotx-bash.spec | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index ea7f877bc6..d839eb6b9f 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit e32beaa0dba209dfd10cff7fdbdcd0dbde1f82b9 +%global commit 448abf1e3b3dfe44ead3bbbcc7e71fbcc359f105 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250221 +%global commit_date 20250222 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/desktops/owl/owl.spec b/anda/desktops/owl/owl.spec index 48da27c9e3..557685da3f 100644 --- a/anda/desktops/owl/owl.spec +++ b/anda/desktops/owl/owl.spec @@ -1,5 +1,5 @@ -%global commit 15c6a00e3ee85bce1bff812b69652b1e3211f637 -%global commit_date 20250221 +%global commit 43db6fd4c772c8d8260676e0410f811d51a50747 +%global commit_date 20250222 %global shortcommit %{sub %{commit} 1 7 } Name: owl diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 7b8462240d..c4f5dd3b2e 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,9 +1,9 @@ -%global commit 38908e01268298ced33b7b6835e49b8c6d437e12 +%global commit 870b74f4da75ef2baa1f430602c901cb1405802e %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-02-18 +%global fulldate 2025-02-22 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV -%global base_ver 1.1.2 +%global base_ver v1.1.2 %global dev_ver 1.1.3 %if 0%{?fedora} <= 40 %global cache_dir %{_builddir}/zig-cache diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index ffff81edb5..81331b2eb7 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit c31c638006ac8fc7d4fb75cc474741ac2597fe5b +%global commit ef53f7af221af05d9337868c931b2ce21fad23f5 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250221 +%global commit_date 20250222 %global ver 0.176.0 %bcond_with check diff --git a/anda/tools/spotx-bash/spotx-bash.spec b/anda/tools/spotx-bash/spotx-bash.spec index afd2beb673..f0c61ef0c6 100644 --- a/anda/tools/spotx-bash/spotx-bash.spec +++ b/anda/tools/spotx-bash/spotx-bash.spec @@ -1,5 +1,5 @@ -%global commit d38a66e98dfa1289b4c0752ef40488aac07c9484 -%global commit_date 20250210 +%global commit 5854f78c1f015c2cecc35517f12180001d510b3f +%global commit_date 20250222 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: spotx-bash From 763d377debf2af780bc89882f98d67fdf15cb6da Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 22 Feb 2025 11:25:02 +0800 Subject: [PATCH 0008/2977] add: astal-gtk (#3493) Close #3491 Requires #3490 --- anda/lib/astal/astal-gtk/anda.hcl | 8 ++ anda/lib/astal/astal-gtk/astal-gtk.spec | 109 ++++++++++++++++++++++++ anda/lib/astal/astal-gtk/update.rhai | 8 ++ 3 files changed, 125 insertions(+) create mode 100644 anda/lib/astal/astal-gtk/anda.hcl create mode 100644 anda/lib/astal/astal-gtk/astal-gtk.spec create mode 100644 anda/lib/astal/astal-gtk/update.rhai diff --git a/anda/lib/astal/astal-gtk/anda.hcl b/anda/lib/astal/astal-gtk/anda.hcl new file mode 100644 index 0000000000..3bcabbf812 --- /dev/null +++ b/anda/lib/astal/astal-gtk/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "astal-gtk.spec" + } + labels { + updbranch = 1 + } +} diff --git a/anda/lib/astal/astal-gtk/astal-gtk.spec b/anda/lib/astal/astal-gtk/astal-gtk.spec new file mode 100644 index 0000000000..3e18d66746 --- /dev/null +++ b/anda/lib/astal/astal-gtk/astal-gtk.spec @@ -0,0 +1,109 @@ +%global commit 3620d51bc6c23ada1bd4b7c9cf1c458c138e68df +%global shortcommit %{sub %commit 1 7} +%global commit_date 20250222 + +Name: astal +Version: 0^%commit_date.%shortcommit +Release: 1%?dist +Summary: Building blocks for creating custom desktop shells +License: LGPL-2.1-only +URL: https://aylur.github.io/astal +Source0: https://github.com/Aylur/astal/archive/%commit.tar.gz +Packager: madonuko +BuildRequires: meson gobject-introspection vala valadoc cmake +BuildRequires: pkgconfig(astal-io-0.1) + +%description +The Linux Suite and Framework to Craft Desktop Shells and beautiful functional Wayland Widgets with GTK! + + +%package gtk3-libs +Summary: GTK 3 shared libraries for astal +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gtk-layer-shell-0) +BuildRequires: pkgconfig(wayland-protocols) + +%description gtk3-libs +%summary. (GTK 3) + +This package contains shared libraries for astal-gtk3. + +%package gtk3-devel +Summary: GTK 3 development libraries for astal +Requires: %{name}-gtk3-libs%{?_isa} = %{version}-%{release} + +%description gtk3-devel +%summary. (GTK 3) + +This package contains development files and documentation for astal-gtk3. + + +%package gtk4-libs +Summary: GTK 4 shared libraries for astal +BuildRequires: pkgconfig(gtk4) +BuildRequires: pkgconfig(gtk4-layer-shell-0) + +%description gtk4-libs +%summary. (GTK 4) + +This package contains shared libraries for astal-gtk4. + +%package gtk4-devel +Summary: GTK 4 development libraries for astal +Requires: %{name}-gtk4-libs%{?_isa} = %{version}-%{release} + +%description gtk4-devel +%summary. (GTK 4) + +This package contains development files and documentation for astal-gtk4. + + +%prep +%autosetup -n astal-%commit + +%build +my_build() { + cd lib/astal/$1 + %meson + %meson_build +} +my_build gtk3 & +my_build gtk4 & +wait + +%install +my_install() { + cd lib/astal/$1 + %meson_install +} +my_install gtk3 & +my_install gtk4 & +wait + + +%files gtk3-libs +%license LICENSE +%_libdir/libastal.so.3 +%_libdir/libastal.so.3.0.0 + +%files gtk3-devel +%_datadir/gir-1.0/Astal-3.0.gir +%_datadir/vala/vapi/astal-3.0.vapi +%_includedir/astal.h +%_libdir/girepository-1.0/Astal-3.0.typelib +%_libdir/libastal.so +%_libdir/pkgconfig/astal-3.0.pc + + +%files gtk4-libs +%license LICENSE +%_libdir/libastal-4.so.4 +%_libdir/libastal-4.so.4.0.0 + +%files gtk4-devel +%_datadir/gir-1.0/Astal-4.0.gir +%_datadir/vala/vapi/astal-4-4.0.vapi +%_includedir/astal-4.h +%_libdir/girepository-1.0/Astal-4.0.typelib +%_libdir/libastal-4.so +%_libdir/pkgconfig/astal-4-4.0.pc diff --git a/anda/lib/astal/astal-gtk/update.rhai b/anda/lib/astal/astal-gtk/update.rhai new file mode 100644 index 0000000000..add3305056 --- /dev/null +++ b/anda/lib/astal/astal-gtk/update.rhai @@ -0,0 +1,8 @@ +import "andax/bump_extras.rhai" as bump; + +let mg = bump::madoguchi_json("astal", labels.branch); +rpm.global("commit_date", `0\^(\d+)\.([[:xdigit:]]+)`.find(mg.ver, 1)); +rpm.global("commit", `0\^(\d+)\.([[:xdigit:]]+)`.find(mg.ver, 2)); +if rpm.changed() { + rpm.release(`^(\d+)\.`.find(mg.rel, 1)); +} From 4c78bce9b74e8faba02cf2ffe424bd3b3a5c8e25 Mon Sep 17 00:00:00 2001 From: Gilver Date: Fri, 21 Feb 2025 21:27:08 -0600 Subject: [PATCH 0009/2977] fix(ghostty-nightly): update.rhai mistake (#3497) * Crop v in release version Signed-off-by: Gilver * Fix and bump Signed-off-by: Gilver * Make release reset Signed-off-by: Gilver * Didn't even touch that part so IDK where the semicolon went Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/update.rhai | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index c4f5dd3b2e..7695284c35 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -3,7 +3,7 @@ %global fulldate 2025-02-22 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV -%global base_ver v1.1.2 +%global base_ver 1.1.2 %global dev_ver 1.1.3 %if 0%{?fedora} <= 40 %global cache_dir %{_builddir}/zig-cache @@ -13,7 +13,7 @@ Name: ghostty-nightly Version: %{base_ver}~tip^%{commit_date}git%{shortcommit} -Release: 2%{?dist} +Release: 3%{?dist} %if 0%{?fedora} <= 41 Epoch: 1 %endif diff --git a/anda/devs/ghostty/nightly/update.rhai b/anda/devs/ghostty/nightly/update.rhai index b4ced68b77..aaf6f5bf11 100644 --- a/anda/devs/ghostty/nightly/update.rhai +++ b/anda/devs/ghostty/nightly/update.rhai @@ -7,7 +7,10 @@ if rpm.changed() { date.truncate(10); let html = get(`https://raw.githubusercontent.com/ghostty-org/ghostty/refs/heads/main/build.zig.zon`); let ver = find(".version = \"([\\d.]+)\"", html, 1); - rpm.global("base_ver", gh_tag("ghostty-org/ghostty")); + let base = gh_tag("ghostty-org/ghostty"); + base.crop(1); + rpm.global("base_ver", base); rpm.global("fulldate", date); - rpm.global("dev_ver", ver) + rpm.global("dev_ver", ver); + rpm.release(); } From ee4b5399adb4d8f1dae0607208f0721a44770bce Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 22 Feb 2025 11:47:27 +0000 Subject: [PATCH 0010/2977] bump: lazygit --- .../langs/go/lazygit/golang-github-jesseduffield-lazygit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/langs/go/lazygit/golang-github-jesseduffield-lazygit.spec b/anda/langs/go/lazygit/golang-github-jesseduffield-lazygit.spec index bd9db6e08b..02af6c1e79 100644 --- a/anda/langs/go/lazygit/golang-github-jesseduffield-lazygit.spec +++ b/anda/langs/go/lazygit/golang-github-jesseduffield-lazygit.spec @@ -2,7 +2,7 @@ # https://github.com/jesseduffield/lazygit %global goipath github.com/jesseduffield/lazygit -Version: 0.46.0 +Version: 0.47.1 %gometa -f @@ -13,7 +13,7 @@ Simple terminal UI for git commands.} %global godocs docs README.md VISION.md Name: golang-github-jesseduffield-lazygit -Release: 1%{?dist} +Release: 1%?dist Summary: Simple terminal UI for git commands License: MIT From 92f4424f011b6066185bcb28c18a19dd0238662c Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 22 Feb 2025 11:08:43 -0600 Subject: [PATCH 0011/2977] feat(ghostty-nightly): Use actual Tip version (#3508) * Dev ver changes Signed-off-by: Gilver * Yay shorter Rhai script Signed-off-by: Gilver * Technically a version bump so drop rel Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/devs/ghostty/nightly/ghostty-nightly.spec | 9 ++++----- anda/devs/ghostty/nightly/update.rhai | 5 +---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 7695284c35..bde1ef005b 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -3,8 +3,7 @@ %global fulldate 2025-02-22 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV -%global base_ver 1.1.2 -%global dev_ver 1.1.3 +%global ver 1.1.3 %if 0%{?fedora} <= 40 %global cache_dir %{_builddir}/zig-cache %else @@ -12,8 +11,8 @@ %endif Name: ghostty-nightly -Version: %{base_ver}~tip^%{commit_date}git%{shortcommit} -Release: 3%{?dist} +Version: %{ver}~tip^%{commit_date}git%{shortcommit} +Release: 1%{?dist} %if 0%{?fedora} <= 41 Epoch: 1 %endif @@ -142,7 +141,7 @@ zig build \ --prefix "%{_prefix}" --prefix-lib-dir "%{_libdir}" \ --prefix-exe-dir "%{_bindir}" --prefix-include-dir "%{_includedir}" \ --verbose \ - -Dversion-string="%{dev_ver}-dev+%{shortcommit}" \ + -Dversion-string="%{ver}-dev+%{shortcommit}" \ -Dcpu=baseline \ -Dstrip=false \ -Dpie=true \ diff --git a/anda/devs/ghostty/nightly/update.rhai b/anda/devs/ghostty/nightly/update.rhai index aaf6f5bf11..41a84906e2 100644 --- a/anda/devs/ghostty/nightly/update.rhai +++ b/anda/devs/ghostty/nightly/update.rhai @@ -7,10 +7,7 @@ if rpm.changed() { date.truncate(10); let html = get(`https://raw.githubusercontent.com/ghostty-org/ghostty/refs/heads/main/build.zig.zon`); let ver = find(".version = \"([\\d.]+)\"", html, 1); - let base = gh_tag("ghostty-org/ghostty"); - base.crop(1); - rpm.global("base_ver", base); rpm.global("fulldate", date); - rpm.global("dev_ver", ver); + rpm.global("ver", ver); rpm.release(); } From 945c225d35abdba174bb4ca2acd0c9c0fed6d8ab Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 22 Feb 2025 18:55:43 +0000 Subject: [PATCH 0012/2977] bump: sound --- .../desktops/mate/indicators/sound/ayatana-indicator-sound.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/mate/indicators/sound/ayatana-indicator-sound.spec b/anda/desktops/mate/indicators/sound/ayatana-indicator-sound.spec index 8e93b0d392..46730f6994 100644 --- a/anda/desktops/mate/indicators/sound/ayatana-indicator-sound.spec +++ b/anda/desktops/mate/indicators/sound/ayatana-indicator-sound.spec @@ -1,6 +1,6 @@ Name: ayatana-indicator-sound Summary: Ayatana Indicator Sound Applet -Version: 24.5.1 +Version: 24.5.2 Release: 1%?dist License: GPLv3 URL: https://github.com/AyatanaIndicators/ayatana-indicator-sound From 5633786fd6c041404f7cfd62c662735466db5c0e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 22 Feb 2025 22:21:24 +0000 Subject: [PATCH 0013/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 0a4411798c..5851c87022 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.02.21.214000 +Version: 2025.02.22.220103 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From f81000437f9454806819c895718d8739e49c8858 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 22 Feb 2025 23:28:51 +0000 Subject: [PATCH 0014/2977] bump: bun --- anda/devs/bun/bun-bin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/bun/bun-bin.spec b/anda/devs/bun/bun-bin.spec index 681b3c7d97..11f22b868d 100644 --- a/anda/devs/bun/bun-bin.spec +++ b/anda/devs/bun/bun-bin.spec @@ -6,7 +6,7 @@ %endif Name: bun-bin -Version: 1.2.2 +Version: 1.2.3 Release: 1%?dist Summary: Incredibly fast JavaScript runtime, bundler, test runner, and package manager – all in one License: MIT From 1d55f3a0a73c77d424b6cb3a2a372a2ec52571b9 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 23 Feb 2025 01:41:57 +0000 Subject: [PATCH 0015/2977] bump(nightly): mpv owl nightly nightly nim-nightly spotx-bash --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/desktops/owl/owl.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 6 +++--- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/tools/spotx-bash/spotx-bash.spec | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index d839eb6b9f..2c0e4f994e 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 448abf1e3b3dfe44ead3bbbcc7e71fbcc359f105 +%global commit deb27c091ac7c4c4327c5494b111bf5b7a52bac1 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250222 +%global commit_date 20250223 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/desktops/owl/owl.spec b/anda/desktops/owl/owl.spec index 557685da3f..b94c5dcccb 100644 --- a/anda/desktops/owl/owl.spec +++ b/anda/desktops/owl/owl.spec @@ -1,5 +1,5 @@ -%global commit 43db6fd4c772c8d8260676e0410f811d51a50747 -%global commit_date 20250222 +%global commit 32d65a3d418787bc76d1802949e7e88478ffae1f +%global commit_date 20250223 %global shortcommit %{sub %{commit} 1 7 } Name: owl diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index bde1ef005b..ad8e3d3bed 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 870b74f4da75ef2baa1f430602c901cb1405802e +%global commit bdf0f27d1a01322f7abb753658e79c60d39114a0 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-02-22 +%global fulldate 2025-02-23 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 @@ -12,7 +12,7 @@ Name: ghostty-nightly Version: %{ver}~tip^%{commit_date}git%{shortcommit} -Release: 1%{?dist} +Release: 1%?dist %if 0%{?fedora} <= 41 Epoch: 1 %endif diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 81331b2eb7..0b6c0cde75 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit ef53f7af221af05d9337868c931b2ce21fad23f5 +%global commit 918cba4cce84f9c76e8ebbc93e3f7392964f341a %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250222 +%global commit_date 20250223 %global ver 0.176.0 %bcond_with check diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 7878379fef..b9c1ed93c8 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 1af88a2d20add67e3c376f0bc7144f9a0a843183 +%global commit 1f8da3835f6e395d068c92f86787f0fa77fb6d08 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250220 +%global commit_date 20250223 %global debug_package %nil Name: nim-nightly diff --git a/anda/tools/spotx-bash/spotx-bash.spec b/anda/tools/spotx-bash/spotx-bash.spec index f0c61ef0c6..da6426783e 100644 --- a/anda/tools/spotx-bash/spotx-bash.spec +++ b/anda/tools/spotx-bash/spotx-bash.spec @@ -1,5 +1,5 @@ -%global commit 5854f78c1f015c2cecc35517f12180001d510b3f -%global commit_date 20250222 +%global commit 5ff940f0472708e18d83dc1169cbb6e1e4dee61e +%global commit_date 20250223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: spotx-bash From 0d234542807db308d34629e6ee5fb53a0b56a938 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 23 Feb 2025 01:56:32 +0000 Subject: [PATCH 0016/2977] bump: ruffle yt-dlp --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index d20d91ea6b..16463bb736 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-02-22 +%global ver 2025-02-23 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 5851c87022..6a8f1403e4 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.02.22.220103 +Version: 2025.02.23.004112 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 27619feafd9caeda59d97b76c59f816e42fc0d05 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sun, 23 Feb 2025 00:17:15 -0600 Subject: [PATCH 0017/2977] fix: v4l2loopback (#3509) * Let's see if this works Signed-off-by: Gilver * Oops Signed-off-by: Gilver * Remove release requirement Signed-off-by: Gilver * Bump release Signed-off-by: Gilver * Create post.rhai Signed-off-by: Gilver * Release is actually safe for `akmod` Signed-off-by: Gilver * Delete anda/system/v4l2loopback/post.rhai Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/system/v4l2loopback/v4l2loopback.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/anda/system/v4l2loopback/v4l2loopback.spec b/anda/system/v4l2loopback/v4l2loopback.spec index 9bfe51ec06..a8f6b59a5a 100644 --- a/anda/system/v4l2loopback/v4l2loopback.spec +++ b/anda/system/v4l2loopback/v4l2loopback.spec @@ -5,16 +5,13 @@ %global commitdate 20230503 %global shortcommit %(c=%{commit}; echo ${c:0:7}) - -%global prjname v4l2loopback - -Name: %{prjname} +Name: v4l2loopback Summary: Utils for V4L2 loopback devices Version: 0.13.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://github.com/umlaeute/v4l2loopback -Source0: %{url}/archive/v%{version}/%{prjname}-%{version}.tar.gz +Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: modprobe-d-98-v4l2loopback.conf Source2: modules-load-d-v4l2loopback.conf @@ -24,7 +21,7 @@ BuildRequires: help2man BuildRequires: systemd-rpm-macros BuildRequires: kmodtool BuildRequires: systemd-rpm-macros -Requires: kmod-v4l2loopback = %{version}-%{release} +Requires: akmod-%{name} = %{version}-%{release} Provides: %{name}-kmod-common = %{version}-%{release} # Required for akmod-v4l2loopback Requires: help2man From a524259275c06ab2f5eb061eb5125e78e8449062 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 23 Feb 2025 06:29:57 +0000 Subject: [PATCH 0018/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 6a8f1403e4..7b8eb02f0c 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.02.23.004112 +Version: 2025.02.23.062109 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From eb80daa197d0db2612039fb6d65ee9ae18797957 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 23 Feb 2025 07:15:09 +0000 Subject: [PATCH 0019/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 7b8eb02f0c..0ea8e8fb6b 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.02.23.062109 +Version: 2025.02.23.065329 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 9761f23cced75778479fd0ca5ce212ad03685ae7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 23 Feb 2025 08:27:53 +0000 Subject: [PATCH 0020/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 0ea8e8fb6b..d4e3e5bd1f 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.02.23.065329 +Version: 2025.02.23.081620 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 31145641db4184a4e2cab5c993de948db47078cb Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 23 Feb 2025 08:41:33 +0000 Subject: [PATCH 0021/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index d4e3e5bd1f..c2bfe238c7 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.02.23.081620 +Version: 2025.02.23.083118 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From e67e07c28b5f7f8c5c0814fbe851e0672ca5d739 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 23 Feb 2025 08:55:35 +0000 Subject: [PATCH 0022/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index c2bfe238c7..236baca99d 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.02.23.083118 +Version: 2025.02.23.084444 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From b76e3cf8b87e10c1f05b1011f20d8e7296df0eb5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 23 Feb 2025 09:16:55 +0000 Subject: [PATCH 0023/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 236baca99d..25b0e18446 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.02.23.084444 +Version: 2025.02.23.085743 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 66004982e7ff63909d09ed101fc99e7b7c0c540a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 23 Feb 2025 09:30:44 +0000 Subject: [PATCH 0024/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 25b0e18446..54282f970d 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.02.23.085743 +Version: 2025.02.23.091920 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 88ad2de5f79bf186f72ceeb9517b858c2dfb5118 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 23 Feb 2025 09:45:32 +0000 Subject: [PATCH 0025/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 54282f970d..27f0cfde8e 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.02.23.091920 +Version: 2025.02.23.092602 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 275c8999359f78e305936581316bfb917e664cf3 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 23 Feb 2025 10:17:30 +0000 Subject: [PATCH 0026/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 27f0cfde8e..a9cd3c14f8 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.02.23.092602 +Version: 2025.02.23.095705 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 39c3ee7a978e7766cec9426b58cc2420e54a4e6f Mon Sep 17 00:00:00 2001 From: sadlerm4 Date: Sun, 23 Feb 2025 21:43:21 +1100 Subject: [PATCH 0027/2977] add: curl-impersonate-chrome (#3515) * add: curl-impersonate-chrome * fill in missing subpackage info * specify /usr/lib directory * so filename is libcurl-impersonate-chrome * libs subpackage name * split .so files into -devel subpackage + packager tag --- anda/tools/curl-impersonate/anda.hcl | 5 ++ .../curl-impersonate-chrome.spec | 81 +++++++++++++++++++ .../install-sh-scripts-to-buildroot.patch | 13 +++ .../remove-werror-in-boringssl-build.patch | 18 +++++ 4 files changed, 117 insertions(+) create mode 100644 anda/tools/curl-impersonate/anda.hcl create mode 100644 anda/tools/curl-impersonate/curl-impersonate-chrome.spec create mode 100644 anda/tools/curl-impersonate/install-sh-scripts-to-buildroot.patch create mode 100644 anda/tools/curl-impersonate/remove-werror-in-boringssl-build.patch diff --git a/anda/tools/curl-impersonate/anda.hcl b/anda/tools/curl-impersonate/anda.hcl new file mode 100644 index 0000000000..4d333371fb --- /dev/null +++ b/anda/tools/curl-impersonate/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "curl-impersonate-chrome.spec" + } +} diff --git a/anda/tools/curl-impersonate/curl-impersonate-chrome.spec b/anda/tools/curl-impersonate/curl-impersonate-chrome.spec new file mode 100644 index 0000000000..981d34621b --- /dev/null +++ b/anda/tools/curl-impersonate/curl-impersonate-chrome.spec @@ -0,0 +1,81 @@ +%global build_cxxflags %(echo "%{__build_flags_lang_cxx} %{?_distro_extra_cxxflags}" | sed 's@-Werror=format-security@@') + +Name: curl-impersonate-chrome +Version: 0.7.0 +Release: 1%{?dist} +Summary: A series of patches that make curl requests look like Chrome + +License: MIT +URL: https://github.com/lexiforest/curl-impersonate +Source0: %{url}/archive/v%{version}.tar.gz +Patch0: remove-werror-in-boringssl-build.patch +Patch1: install-sh-scripts-to-buildroot.patch + +Packager: sadlerm + +BuildRequires: autoconf automake make cmake ninja-build +BuildRequires: gcc gcc-c++ libtool +BuildRequires: golang +BuildRequires: unzip +BuildRequires: zlib-ng-compat-devel +BuildRequires: zstd libzstd-devel + +%global _description %{expand: +A special build of curl that can impersonate Chrome, Edge and Safari. curl-impersonate is able to perform TLS and HTTP handshakes that are identical to that of a real browser. + +curl-impersonate can be used either as a command line tool, similar to the regular curl, or as a library that can be integrated instead of the regular libcurl.} + +%description %_description + + +%package libs +Summary: Shared libraries for %{name} +Provides: libcurl-impersonate-chrome = %{version}-%{release} + +%description libs +%_description + +This package provides the libcurl-impersonate-chrome shared object file, which is libcurl compiled with the same changes as the curl-impersonate binary. + +%package devel +Summary: Development files for %{name} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description devel +%_description + +This package contains the object files necessary to develop %{name}. + + +%prep +%autosetup -n curl-impersonate-%{version} -p1 + +%build +%configure +%{__make} chrome-build + +%check +%{__make} chrome-checkbuild + +%install +%{__make} DESTDIR=%{buildroot} chrome-install + +%files +%license LICENSE +%doc README.md docs/ +%{_bindir}/%{name} +%{_bindir}/%{name}-config +%{_bindir}/curl_* + +%files libs +%license LICENSE +%{_prefix}/lib/libcurl-impersonate-chrome.so.4 +%{_prefix}/lib/libcurl-impersonate-chrome.so.4.[0-9].[0-9] + +%files devel +%{_prefix}/lib/libcurl-impersonate-chrome.a +%{_prefix}/lib/libcurl-impersonate-chrome.so + +%changelog +* Sun Feb 23 2025 sadlerm +- Initial package diff --git a/anda/tools/curl-impersonate/install-sh-scripts-to-buildroot.patch b/anda/tools/curl-impersonate/install-sh-scripts-to-buildroot.patch new file mode 100644 index 0000000000..c8caf6151e --- /dev/null +++ b/anda/tools/curl-impersonate/install-sh-scripts-to-buildroot.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index 41d7324..56a029e 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -83,7 +83,7 @@ chrome-install: ## Install the Chrome version of curl-impersonate after build + cd $(CURL_VERSION) + $(MAKE) install-exec MAKEFLAGS= + # Wrapper scripts for the Chrome version (e.g. 'curl_chrome99') +- install $(srcdir)/chrome/curl_* @bindir@ ++ install $(srcdir)/chrome/curl_* $(DESTDIR)@bindir@ + .PHONY: chrome-install + + chrome-install-strip: ## Like 'chrome-install', but strip binaries for smaller size diff --git a/anda/tools/curl-impersonate/remove-werror-in-boringssl-build.patch b/anda/tools/curl-impersonate/remove-werror-in-boringssl-build.patch new file mode 100644 index 0000000000..094143afe0 --- /dev/null +++ b/anda/tools/curl-impersonate/remove-werror-in-boringssl-build.patch @@ -0,0 +1,18 @@ +diff --git a/chrome/patches/boringssl.patch b/chrome/patches/boringssl.patch +index d3adf2d..a7cf3a6 100644 +--- a/chrome/patches/boringssl.patch ++++ b/chrome/patches/boringssl.patch +@@ -8,6 +8,13 @@ index 000000000..678d1ca41 + + + +git diff d24a382 > boringssl.patch + +mv boringssl.patch ../curl-impersonate/chrome/patches/boringssl.patch ++diff --git a/CMakeLists.txt b/CMakeLists.txt ++index ee5cc0466..32d1c8cca 100644 ++--- a/CMakeLists.txt +++++ b/CMakeLists.txt ++@@ -143 +143 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CLANG) ++- set(C_CXX_FLAGS "-Werror -Wformat=2 -Wsign-compare -Wwrite-strings -Wvla -Wshadow -Wtype-limits") +++ set(C_CXX_FLAGS "-Wformat=2 -Wsign-compare -Wwrite-strings -Wvla -Wshadow -Wtype-limits") + diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h + index e500dd76e..e75bca26b 100644 + --- a/include/openssl/ssl.h From 986231f48ef31eef71f01c5cdf72a13ead14ba99 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sun, 23 Feb 2025 08:14:15 -0600 Subject: [PATCH 0028/2977] Fix (ghostty-nightly): New build dependency (#3523) Signed-off-by: Gilver --- anda/devs/ghostty/nightly/ghostty-nightly.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index ad8e3d3bed..6f2a098a6f 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,4 +1,4 @@ -%global commit bdf0f27d1a01322f7abb753658e79c60d39114a0 +%global commit eaeb6a620f3f2ad6cf3d936efd5c0acd84413e6b %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global fulldate 2025-02-23 %global commit_date %(echo %{fulldate} | sed 's/-//g') @@ -29,6 +29,7 @@ BuildRequires: ncurses BuildRequires: ncurses-devel BuildRequires: pandoc-cli BuildRequires: zig +BuildRequires: pkgconfig(blueprint-compiler) BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(fontconfig) From 3204f09459c8e340d28263864b57c7d529f71e38 Mon Sep 17 00:00:00 2001 From: sadlerm4 Date: Mon, 24 Feb 2025 05:15:14 +1100 Subject: [PATCH 0029/2977] add: micro-nightly (#3524) * add: micro-nightly * spec cleanup * install dirs * remove redundant docs and license * don't shallow clone repo * impl changes from code review --- anda/devs/micro/anda.hcl | 8 ++ anda/devs/micro/micro-nightly.spec | 116 +++++++++++++++++++++++++++++ anda/devs/micro/update.rhai | 5 ++ 3 files changed, 129 insertions(+) create mode 100644 anda/devs/micro/anda.hcl create mode 100644 anda/devs/micro/micro-nightly.spec create mode 100644 anda/devs/micro/update.rhai diff --git a/anda/devs/micro/anda.hcl b/anda/devs/micro/anda.hcl new file mode 100644 index 0000000000..beefa6bf82 --- /dev/null +++ b/anda/devs/micro/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "micro-nightly.spec" + } + labels { + nightly = 1 + } +} diff --git a/anda/devs/micro/micro-nightly.spec b/anda/devs/micro/micro-nightly.spec new file mode 100644 index 0000000000..bda62c22f0 --- /dev/null +++ b/anda/devs/micro/micro-nightly.spec @@ -0,0 +1,116 @@ +# Generated by go2rpm 1.15.0 +%bcond check 0 +%bcond bootstrap 0 + +%if %{with bootstrap} +%global debug_package %{nil} +%endif + +%if %{with bootstrap} +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^golang\\(.*\\)$ +%endif + +# Naming variable as something other than "commit" is necessary +# to stop %%gometa from putting commit hash in release +%global commit_hash 5a62a8ead4af741e4fc5f850fcb846974859c5a0 +%global commit_date 20250209 +%global shortcommit %{sub %{commit_hash} 1 7} +%global ver 2.0.14 + +# https://github.com/zyedidia/micro +%global goipath github.com/zyedidia/micro +Version: %{ver}^%{commit_date}git.%{shortcommit} + +%gometa -f + +%global common_description %{expand: +micro is a terminal-based text editor that aims to be easy to use and intuitive, while also taking advantage of the capabilities of modern terminals. It strives to be enjoyable as a full-time editor for people who prefer to work in a terminal, or those who regularly edit files over SSH.} + +%global golicenses LICENSE LICENSE-THIRD-PARTY +%global godocs README.md runtime/help/colors.md runtime/help/commands.md\\\ + runtime/help/copypaste.md runtime/help/defaultkeys.md\\\ + runtime/help/help.md runtime/help/keybindings.md\\\ + runtime/help/options.md runtime/help/plugins.md\\\ + runtime/help/tutorial.md + +Name: micro.nightly +Release: 1%{?dist} +Summary: A modern and intuitive terminal-based text editor + +License: MIT +URL: %{gourl} +Packager: sadlerm + +BuildRequires: anda-srpm-macros + +Provides: micro-nightly = %{version}-%{release} +Provides: micro +Conflicts: micro + +%description %{common_description} + +%gopkg + +%prep +git clone --recurse-submodules -q -j$(nproc) %{gourl} -b master && cd micro +if ! [ %{shortcommit} = $(git rev-parse --short=7 HEAD) ]; then + printf "Commit mismatch, exiting..." >&2 + exit 1 +fi + +%go_prep_online + +%build +cd micro +%if %{without bootstrap} +go generate ./runtime + +MICRO_VERSION=$(go run ./tools/build-version.go) +MICRO_DATE=$(date --date=%{commit_date} +"%%B %%d, %%Y") + +go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${GO_BUILDTAGS-${BUILDTAGS-}}" -a -x \ + -ldflags "-X internal/util.version=${MICRO_VERSION} \ + -X internal/util.hash=%{shortcommit} \ + -X 'internal/util.date=${MICRO_DATE}' \ + -B 0x$(echo "%{name}-%{version}-%{release}-${SOURCE_DATE_EPOCH:-}" | sha1sum | cut -d ' ' -f1) \ + -compressdwarf=false -linkmode=external \ + -extldflags '-Wl,-z,relro -Wl,--as-needed -Wl,-z,pack-relative-relocs -Wl,-z,now \ + -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 \ + -Wl,--build-id=sha1'" \ + -o ./micro ./cmd/micro/ +%endif + +%install +%if %{without bootstrap} +install -m 0755 -vd %{buildroot}%{_bindir} \ + %{buildroot}%{_mandir}/man1 \ + %{buildroot}%{_datadir}/applications + +install -m 0755 -vp ./micro/micro %{buildroot}%{_bindir}/ +install -m 0644 -vp ./micro/assets/packaging/micro.1 %{buildroot}%{_mandir}/man1/ +install -m 0644 -vp ./micro/assets/packaging/micro.desktop %{buildroot}%{_datadir}/applications/ + +# for %%doc packaging +mkdir -v ./micro/help +mv -v ./micro/runtime/help/* ./micro/help/ +%endif + +%if %{without bootstrap} +%if %{with check} +%check +cd micro +%gotest ./internal/... ./cmd/micro/... +%endif +%endif + +%if %{without bootstrap} +%files +%license micro/LICENSE micro/LICENSE-THIRD-PARTY +%doc micro/README.md micro/help +%{_bindir}/micro +%{_mandir}/man1/micro.1.gz +%{_datadir}/applications/micro.desktop +%endif + +%changelog +%autochangelog diff --git a/anda/devs/micro/update.rhai b/anda/devs/micro/update.rhai new file mode 100644 index 0000000000..0fc1845fe8 --- /dev/null +++ b/anda/devs/micro/update.rhai @@ -0,0 +1,5 @@ +rpm.global("commit_hash", gh_commit("zyedidia/micro")); +if rpm.changed() { + rpm.global("commit_date", date()); + rpm.global("ver", gh("zyedidia/micro")); +} From 755fa635620dcde2c1f1450d70f474a0b50cdf68 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 23 Feb 2025 18:21:11 +0000 Subject: [PATCH 0030/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index a9cd3c14f8..ac37d58670 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.02.23.095705 +Version: 2025.02.23.175939 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 3f63ed78b35ee388f39b5c3ae71ae04e90dc3fa5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 23 Feb 2025 18:40:49 +0000 Subject: [PATCH 0031/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index ac37d58670..62386ea96e 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.02.23.175939 +Version: 2025.02.23.182505 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 2fd4676a56dcce474baf449701bfd5deec46135c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 23 Feb 2025 19:25:47 +0000 Subject: [PATCH 0032/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 62386ea96e..021a1ad17c 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.02.23.182505 +Version: 2025.02.23.191621 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From f787f14e1364d42ac7d3ada49f50274e93636555 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 23 Feb 2025 22:22:22 +0000 Subject: [PATCH 0033/2977] bump: inputplumber --- anda/games/inputplumber/inputplumber.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index 875ea52eef..0595871c06 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,5 +1,5 @@ Name: inputplumber -Version: 0.47.3 +Version: 0.48.0 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later From 7d450a05656748864ca3073c0876cccc7f204cea Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 24 Feb 2025 01:39:31 +0000 Subject: [PATCH 0034/2977] bump(nightly): envision mpv owl nightly nightly openbangla-keyboard --- anda/apps/envision/envision.spec | 4 ++-- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/desktops/owl/owl.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 2 +- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- .../misc/openbangla-keyboard/openbangla-keyboard-nightly.spec | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/anda/apps/envision/envision.spec b/anda/apps/envision/envision.spec index 30c8212f9e..9e47382eaa 100644 --- a/anda/apps/envision/envision.spec +++ b/anda/apps/envision/envision.spec @@ -1,5 +1,5 @@ -%global commit 33db18bd62d59a2d22550a7f42e15de8ab5c79d5 -%global commit_date 20250216 +%global commit 9c6bfe110a50f7f96cd5204205397a9ccd2548d4 +%global commit_date 20250224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: envision-nightly diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 2c0e4f994e..0ae14b488e 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit deb27c091ac7c4c4327c5494b111bf5b7a52bac1 +%global commit 1bcc76d7f108bd2aaf71400d96f1769ff3f8fea3 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250223 +%global commit_date 20250224 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/desktops/owl/owl.spec b/anda/desktops/owl/owl.spec index b94c5dcccb..3820b7fa3a 100644 --- a/anda/desktops/owl/owl.spec +++ b/anda/desktops/owl/owl.spec @@ -1,5 +1,5 @@ -%global commit 32d65a3d418787bc76d1802949e7e88478ffae1f -%global commit_date 20250223 +%global commit 978bf4c32d65ae6b8d0ec352c727b6b9a17cc509 +%global commit_date 20250224 %global shortcommit %{sub %{commit} 1 7 } Name: owl diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 6f2a098a6f..6832844ad7 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,4 +1,4 @@ -%global commit eaeb6a620f3f2ad6cf3d936efd5c0acd84413e6b +%global commit 61f41e5c0103ba18b8aae87e3d4b4e4f74419ce2 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global fulldate 2025-02-23 %global commit_date %(echo %{fulldate} | sed 's/-//g') diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 0b6c0cde75..f27608603e 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 918cba4cce84f9c76e8ebbc93e3f7392964f341a +%global commit ee280b0d058af3fc5705133d6531f8860c73498a %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250223 +%global commit_date 20250224 %global ver 0.176.0 %bcond_with check diff --git a/anda/misc/openbangla-keyboard/openbangla-keyboard-nightly.spec b/anda/misc/openbangla-keyboard/openbangla-keyboard-nightly.spec index a8e9afac27..831dfbe766 100644 --- a/anda/misc/openbangla-keyboard/openbangla-keyboard-nightly.spec +++ b/anda/misc/openbangla-keyboard/openbangla-keyboard-nightly.spec @@ -1,6 +1,6 @@ %global ver 2.0.0 -%global commit c036b843513ead56c37463c7fde5875271751f22 -%global commit_date 20240817 +%global commit 92c5a0a19173bff062cc77272739ac6f8d424347 +%global commit_date 20250224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: openbangla-keyboard-nightly From f204af7731f19217f824fed4af88db25105e2b58 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 24 Feb 2025 01:53:42 +0000 Subject: [PATCH 0035/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 16463bb736..70ccd413b8 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-02-23 +%global ver 2025-02-24 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 9dbd1ad7579ec2a0e369fb2fbdd821c56bbd974f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 24 Feb 2025 02:52:23 +0000 Subject: [PATCH 0036/2977] bump: neovide --- anda/devs/neovide/neovide.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/neovide/neovide.spec b/anda/devs/neovide/neovide.spec index 259d2b6d51..434ceedd95 100644 --- a/anda/devs/neovide/neovide.spec +++ b/anda/devs/neovide/neovide.spec @@ -2,8 +2,8 @@ %global raw_forgeurl https://raw.githubusercontent.com/%{crate}/%{crate} Name: rust-neovide -Version: 0.14.0 -Release: 2%?dist +Version: 0.14.1 +Release: 1%?dist Summary: No Nonsense Neovim Client in Rust License: MIT From 10634551f16642c03e43c0a3eda7699f48f75855 Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 24 Feb 2025 17:44:42 +0800 Subject: [PATCH 0037/2977] fix(andax/bump_extras): funny error (#3532) --- andax/bump_extras.rhai | 1 - 1 file changed, 1 deletion(-) diff --git a/andax/bump_extras.rhai b/andax/bump_extras.rhai index acc788ed10..3da0cb1c17 100644 --- a/andax/bump_extras.rhai +++ b/andax/bump_extras.rhai @@ -47,7 +47,6 @@ fn follow_bodhi_vr(rpm, pkg, branch) { fn madoguchi_json(pkg, branch) { - let branch = labels.branch; if branch.starts_with("f") { branch.crop(1); } From c7648e6dd9b66d1f2c24de253790628c163c892e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 24 Feb 2025 10:14:26 +0000 Subject: [PATCH 0038/2977] bump(branch): astal-gtk --- anda/lib/astal/astal-gtk/astal-gtk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/astal/astal-gtk/astal-gtk.spec b/anda/lib/astal/astal-gtk/astal-gtk.spec index 3e18d66746..cecded7285 100644 --- a/anda/lib/astal/astal-gtk/astal-gtk.spec +++ b/anda/lib/astal/astal-gtk/astal-gtk.spec @@ -1,4 +1,4 @@ -%global commit 3620d51bc6c23ada1bd4b7c9cf1c458c138e68df +%global commit 3620d51 %global shortcommit %{sub %commit 1 7} %global commit_date 20250222 From 6c8e362a8006fceb548f583cd07b07f35a02664d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 24 Feb 2025 16:32:10 +0000 Subject: [PATCH 0039/2977] bump: arduino-cli --- anda/tools/arduino-cli/arduino-cli.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/arduino-cli/arduino-cli.spec b/anda/tools/arduino-cli/arduino-cli.spec index 58efdb8b9b..30bdf58c74 100644 --- a/anda/tools/arduino-cli/arduino-cli.spec +++ b/anda/tools/arduino-cli/arduino-cli.spec @@ -2,7 +2,7 @@ %define debug_package %nil Name: arduino-cli -Version: 1.1.1 +Version: 1.2.0 Release: 1%?dist Summary: Arduino command line tool. License: GPLv3 From 9f7551c6d20c8c7720bc97eede8fb657f58541c9 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 24 Feb 2025 19:14:00 +0000 Subject: [PATCH 0040/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 0185af5830..af0d7f8f32 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.594 +Version: 0.0.595 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 8ac9c7b7b8..de610ac24b 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.594 +Version: 0.0.595 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 1fd9e13aaa68eb2ce56071e02ea8c2c27b642caf Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 24 Feb 2025 20:59:16 +0000 Subject: [PATCH 0041/2977] bump: discord-openasar discord --- anda/apps/discord-openasar/discord-openasar.spec | 2 +- anda/apps/discord/discord.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-openasar/discord-openasar.spec b/anda/apps/discord-openasar/discord-openasar.spec index 163ae0d6b8..93ae38c32d 100644 --- a/anda/apps/discord-openasar/discord-openasar.spec +++ b/anda/apps/discord-openasar/discord-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-openasar -Version: 0.0.86 +Version: 0.0.87 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord/discord.spec b/anda/apps/discord/discord.spec index 6a6e9eafb1..5ff5c3f9db 100644 --- a/anda/apps/discord/discord.spec +++ b/anda/apps/discord/discord.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord -Version: 0.0.86 +Version: 0.0.87 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: https://discord.com From be0f7b017ad8fc8ca1fa976f7b2783b69f09dc9b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 24 Feb 2025 23:17:23 +0000 Subject: [PATCH 0042/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index af0d7f8f32..9966b85574 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.595 +Version: 0.0.596 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index de610ac24b..79dd2e5043 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.595 +Version: 0.0.596 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From f73db40503b3bc6fd37f3b89f5ec863b5efc21fe Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Feb 2025 01:39:18 +0000 Subject: [PATCH 0043/2977] bump(nightly): mpv nightly micro nightly --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/micro/micro-nightly.spec | 6 +++--- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 0ae14b488e..6e6c8f72cc 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 1bcc76d7f108bd2aaf71400d96f1769ff3f8fea3 +%global commit 80c9d7d8dffe7e0c2d132feaf01e83eac9ea572b %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250224 +%global commit_date 20250225 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 6832844ad7..0d2f6dba75 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 61f41e5c0103ba18b8aae87e3d4b4e4f74419ce2 +%global commit 92340f8fb0595d4f54cfa4f14c30fc3d3f6054b5 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-02-23 +%global fulldate 2025-02-24 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 diff --git a/anda/devs/micro/micro-nightly.spec b/anda/devs/micro/micro-nightly.spec index bda62c22f0..46030534cf 100644 --- a/anda/devs/micro/micro-nightly.spec +++ b/anda/devs/micro/micro-nightly.spec @@ -12,10 +12,10 @@ # Naming variable as something other than "commit" is necessary # to stop %%gometa from putting commit hash in release -%global commit_hash 5a62a8ead4af741e4fc5f850fcb846974859c5a0 -%global commit_date 20250209 +%global commit_hash c93747926d2e5ead9adf0039f6bf34f48ba3263d +%global commit_date 20250225 %global shortcommit %{sub %{commit_hash} 1 7} -%global ver 2.0.14 +%global ver v2.0.14 # https://github.com/zyedidia/micro %global goipath github.com/zyedidia/micro diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index f27608603e..dbbf5ee9cf 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit ee280b0d058af3fc5705133d6531f8860c73498a +%global commit 52f73e0c2dc0093a213fdf9a235517d757ce98d4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250224 +%global commit_date 20250225 %global ver 0.176.0 %bcond_with check From 6d3459a13c5e0bb18d3edb75654afddb6a371dab Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Feb 2025 01:52:51 +0000 Subject: [PATCH 0044/2977] bump: ruffle sass --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- anda/misc/sass/sass.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 70ccd413b8..035f3967e2 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-02-24 +%global ver 2025-02-25 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/misc/sass/sass.spec b/anda/misc/sass/sass.spec index e161124de4..490ec80e80 100644 --- a/anda/misc/sass/sass.spec +++ b/anda/misc/sass/sass.spec @@ -4,7 +4,7 @@ %define _build_id_links none Name: sass -Version: 1.85.0 +Version: 1.85.1 Release: 1%?dist Summary: The reference implementation of Sass, written in Dart License: MIT From 1b5f50e3b2708693a10c985fce12e7cf3c105f42 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Feb 2025 02:51:47 +0000 Subject: [PATCH 0045/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index 63eef919cb..07c788570e 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.2.7 +Version: 2025.2.8 Release: 1%?dist Summary: Front-end to your dev env From b32e86b73a2b05ea97eccb848fa3dbf4f9bab713 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Feb 2025 03:24:25 +0000 Subject: [PATCH 0046/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 9966b85574..10feb6672d 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.596 +Version: 0.0.597 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 79dd2e5043..643a801ad1 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.596 +Version: 0.0.597 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 8ab3404e3e5e841e90d06ef2b065291b7e154931 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Feb 2025 05:34:34 +0000 Subject: [PATCH 0047/2977] bump: preview stable --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 2062c1de83..6e6de0db0e 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.175.3-pre +%global ver 0.175.4-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index cd70b27011..13554f1942 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.174.6 +Version: 0.174.7 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From 7becff05dc4f2c24cea0e44daf43ea522818fed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Garc=C3=ADa?= <4411661+GarciaLnk@users.noreply.github.com> Date: Tue, 25 Feb 2025 06:20:10 +0000 Subject: [PATCH 0048/2977] feat(nerd-fonts): add missing patched fonts (#3541) --- anda/fonts/nerd-fonts/nerd-fonts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/fonts/nerd-fonts/nerd-fonts.spec b/anda/fonts/nerd-fonts/nerd-fonts.spec index ab7211591f..2040d9aaa0 100644 --- a/anda/fonts/nerd-fonts/nerd-fonts.spec +++ b/anda/fonts/nerd-fonts/nerd-fonts.spec @@ -1,4 +1,4 @@ -%global flist 3270 Agave AnonymousPro Arimo AurulentSansMono BigBlueTerminal BitstreamVeraSansMono CascadiaCode CodeNewRoman Cousine DaddyTimeMono DejaVuSansMono DroidSansMono FantasqueSansMono FiraCode FiraMono Go-Mono Gohu Hack Hasklig HeavyData Hermit IBMPlexMono Inconsolata InconsolataGo InconsolataLGC Iosevka JetBrainsMono Lekton LiberationMono Lilex MPlus Meslo Monofur Monoid Mononoki NerdFontsSymbolsOnly Noto OpenDyslexic Overpass ProFont ProggyClean RobotoMono ShareTechMono SourceCodePro SpaceMono Terminus Tinos Ubuntu UbuntuMono VictorMono iA-Writer +%global flist 0xProto 3270 Agave AnonymousPro Arimo AurulentSansMono BigBlueTerminal BitstreamVeraSansMono CascadiaCode CascadiaMono CodeNewRoman ComicShannsMono CommitMono Cousine D2Coding DaddyTimeMono DejaVuSansMono DepartureMono DroidSansMono EnvyCodeR FantasqueSansMono FiraCode FiraMono GeistMono Go-Mono Gohu Hack Hasklig HeavyData Hermit iA-Writer IBMPlexMono Inconsolata InconsolataGo InconsolataLGC IntelOneMono Iosevka IosevkaTerm IosevkaTermSlab JetBrainsMono Lekton LiberationMono Lilex MartianMono Meslo Monaspace Monofur Monoid Mononoki MPlus NerdFontsSymbolsOnly Noto OpenDyslexic Overpass ProFont ProggyClean Recursive RobotoMono ShareTechMono SourceCodePro SpaceMono Terminus Tinos Ubuntu UbuntuMono UbuntuSans VictorMono ZedMono %global desc %{expand: Nerd Fonts is a project that patches developer targeted fonts with a high number of glyphs (icons).} From b9cd5f5c3d71bd2d2b13bf0912c4778230e58438 Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 25 Feb 2025 00:25:17 -0600 Subject: [PATCH 0049/2977] Add: MS-Core Fonts (#3540) * Add MS fonts * Remove old changelogs to prevent error reporting to Fusion * More of the same * Cleanup and removal of unused macros * What happened there?? Signed-off-by: Gilver * Decimate LPF and completelely rewrite almost everything * Actually nuke LPF * Fix weird typo? * %foundry does...WEIRD things * Something didn't save? * LMAO Signed-off-by: Gilver * I swear Signed-off-by: Gilver * Oops Signed-off-by: Gilver * I see --------- Signed-off-by: Gilver --- .../fonts/cleartype/61-cleartype-calibri.conf | 16 ++ .../fonts/cleartype/61-cleartype-cambria.conf | 16 ++ .../fonts/cleartype/61-cleartype-candara.conf | 16 ++ .../cleartype/61-cleartype-consolas.conf | 16 ++ .../cleartype/61-cleartype-constantia.conf | 16 ++ anda/fonts/cleartype/61-cleartype-corbel.conf | 16 ++ anda/fonts/cleartype/anda.hcl | 6 + anda/fonts/cleartype/cleartype-fonts.spec | 146 +++++++++++ .../ms-core-tahoma/61-ms-core-tahoma.conf | 16 ++ anda/fonts/ms-core-tahoma/anda.hcl | 6 + .../ms-core-tahoma/ms-core-tahoma-fonts.spec | 66 +++++ anda/fonts/ms-core-tahoma/post.rhai | 2 + anda/fonts/ms-core/61-ms-core-andale.conf | 16 ++ anda/fonts/ms-core/61-ms-core-arial.conf | 16 ++ anda/fonts/ms-core/61-ms-core-comic.conf | 16 ++ anda/fonts/ms-core/61-ms-core-courier.conf | 16 ++ anda/fonts/ms-core/61-ms-core-georgia.conf | 16 ++ anda/fonts/ms-core/61-ms-core-impact.conf | 16 ++ anda/fonts/ms-core/61-ms-core-times.conf | 16 ++ anda/fonts/ms-core/61-ms-core-trebuchet.conf | 16 ++ anda/fonts/ms-core/61-ms-core-verdana.conf | 16 ++ anda/fonts/ms-core/61-ms-core-webdings.conf | 16 ++ anda/fonts/ms-core/anda.hcl | 6 + anda/fonts/ms-core/ms-core-fonts.spec | 229 ++++++++++++++++++ 24 files changed, 733 insertions(+) create mode 100644 anda/fonts/cleartype/61-cleartype-calibri.conf create mode 100644 anda/fonts/cleartype/61-cleartype-cambria.conf create mode 100644 anda/fonts/cleartype/61-cleartype-candara.conf create mode 100644 anda/fonts/cleartype/61-cleartype-consolas.conf create mode 100644 anda/fonts/cleartype/61-cleartype-constantia.conf create mode 100644 anda/fonts/cleartype/61-cleartype-corbel.conf create mode 100644 anda/fonts/cleartype/anda.hcl create mode 100644 anda/fonts/cleartype/cleartype-fonts.spec create mode 100644 anda/fonts/ms-core-tahoma/61-ms-core-tahoma.conf create mode 100644 anda/fonts/ms-core-tahoma/anda.hcl create mode 100644 anda/fonts/ms-core-tahoma/ms-core-tahoma-fonts.spec create mode 100644 anda/fonts/ms-core-tahoma/post.rhai create mode 100644 anda/fonts/ms-core/61-ms-core-andale.conf create mode 100644 anda/fonts/ms-core/61-ms-core-arial.conf create mode 100644 anda/fonts/ms-core/61-ms-core-comic.conf create mode 100644 anda/fonts/ms-core/61-ms-core-courier.conf create mode 100644 anda/fonts/ms-core/61-ms-core-georgia.conf create mode 100644 anda/fonts/ms-core/61-ms-core-impact.conf create mode 100644 anda/fonts/ms-core/61-ms-core-times.conf create mode 100644 anda/fonts/ms-core/61-ms-core-trebuchet.conf create mode 100644 anda/fonts/ms-core/61-ms-core-verdana.conf create mode 100644 anda/fonts/ms-core/61-ms-core-webdings.conf create mode 100644 anda/fonts/ms-core/anda.hcl create mode 100644 anda/fonts/ms-core/ms-core-fonts.spec diff --git a/anda/fonts/cleartype/61-cleartype-calibri.conf b/anda/fonts/cleartype/61-cleartype-calibri.conf new file mode 100644 index 0000000000..b274e35648 --- /dev/null +++ b/anda/fonts/cleartype/61-cleartype-calibri.conf @@ -0,0 +1,16 @@ + + + + + sans-serif + + Calibri + + + + Calibri + + sans-serif + + + diff --git a/anda/fonts/cleartype/61-cleartype-cambria.conf b/anda/fonts/cleartype/61-cleartype-cambria.conf new file mode 100644 index 0000000000..9366092911 --- /dev/null +++ b/anda/fonts/cleartype/61-cleartype-cambria.conf @@ -0,0 +1,16 @@ + + + + + serif + + Cambria + + + + Cambria + + serif + + + diff --git a/anda/fonts/cleartype/61-cleartype-candara.conf b/anda/fonts/cleartype/61-cleartype-candara.conf new file mode 100644 index 0000000000..9b847903aa --- /dev/null +++ b/anda/fonts/cleartype/61-cleartype-candara.conf @@ -0,0 +1,16 @@ + + + + + serif + + Candara + + + + Candara + + serif + + + diff --git a/anda/fonts/cleartype/61-cleartype-consolas.conf b/anda/fonts/cleartype/61-cleartype-consolas.conf new file mode 100644 index 0000000000..53f50c8bac --- /dev/null +++ b/anda/fonts/cleartype/61-cleartype-consolas.conf @@ -0,0 +1,16 @@ + + + + + monospace + + Consolas + + + + Consolas + + monospace + + + diff --git a/anda/fonts/cleartype/61-cleartype-constantia.conf b/anda/fonts/cleartype/61-cleartype-constantia.conf new file mode 100644 index 0000000000..02007bf125 --- /dev/null +++ b/anda/fonts/cleartype/61-cleartype-constantia.conf @@ -0,0 +1,16 @@ + + + + + serif + + Constantia + + + + Constantia + + serif + + + diff --git a/anda/fonts/cleartype/61-cleartype-corbel.conf b/anda/fonts/cleartype/61-cleartype-corbel.conf new file mode 100644 index 0000000000..56ad63b0bf --- /dev/null +++ b/anda/fonts/cleartype/61-cleartype-corbel.conf @@ -0,0 +1,16 @@ + + + + + sans-serif + + Corbel + + + + Corbel + + sans-serif + + + diff --git a/anda/fonts/cleartype/anda.hcl b/anda/fonts/cleartype/anda.hcl new file mode 100644 index 0000000000..6807fb64d1 --- /dev/null +++ b/anda/fonts/cleartype/anda.hcl @@ -0,0 +1,6 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "cleartype-fonts.spec" + } +} diff --git a/anda/fonts/cleartype/cleartype-fonts.spec b/anda/fonts/cleartype/cleartype-fonts.spec new file mode 100644 index 0000000000..a4232b41ab --- /dev/null +++ b/anda/fonts/cleartype/cleartype-fonts.spec @@ -0,0 +1,146 @@ +%global debug_package %{nil} +%global fontname cleartype +%global fontlicense Microsoft EULA +%global fontlicenses EULA eula.txt + +%global fontfamily1 ClearType Calibri +%global fontsummary1 ClearType Calibri TTF font +%global fontpkgheader1 %{expand: +Obsoletes: %{name}-common < 1.0-5 +} + +%global fonts1 CALIBR*.TTF +%global fontconfs1 %{SOURCE1} +%global fontdescription1 %{expand: +%{common_description} +Microsoft Calibri font, part of the ClearType collection made available +in the PowerPointViewer package, still available on the Microsoft website. +} + +%global fontfamily2 ClearType Cambria +%global fontsummary2 ClearType Cambria TTF font +%global fontpkgheader2 %{expand: +Obsoletes: %{name}-common < 1.0-5 +} + +%global fonts2 CAMBRI*.TTF +%global fontconfs2 %{SOURCE2} +%global fontdescription2 %{expand: +%{common_description} +Microsoft Cambria font, part of the ClearType collection made available +in the PowerPointViewer package, still available on the Microsoft website. +} + +%global fontfamily3 ClearType Candara +%global fontsummary3 ClearType Candara TTF font +%global fontpkgheader3 %{expand: +Obsoletes: %{name}-common < 1.0-5 +} + +%global fonts3 CANDAR*.TTF +%global fontconfs3 %{SOURCE3} +%global fontdescription3 %{expand: +%{common_description} +Microsoft Candara font, part of the ClearType collection made available +in the PowerPointViewer package, still available on the Microsoft website. +} + +%global fontfamily4 ClearType Consolas +%global fontsummary4 ClearType Consolas TTF font +%global fontpkgheader4 %{expand: +Obsoletes: %{name}-common < 1.0-5 +} + +%global fonts4 CONSOL*.TTF +%global fontconfs4 %{SOURCE4} +%global fontdescription4 %{expand: +%{common_description} +Microsoft Consolas font, part of the ClearType collection made available +in the PowerPointViewer package, still available on the Microsoft website. +} + +%global fontfamily5 ClearType Constantia +%global fontsummary5 ClearType Constantia TTF font +%global fontpkgheader5 %{expand: +Obsoletes: %{name}-common < 1.0-5 +} + +%global fonts5 CONSTAN*.TTF +%global fontconfs5 %{SOURCE5} +%global fontdescription5 %{expand: +%{common_description} +Microsoft Constantia font, part of the ClearType collection made available +in the PowerPointViewer package, still available on the Microsoft website. +} + +%global fontfamily6 ClearType Corbel +%global fontsummary6 ClearType Corbel TTF font +%global fontpkgheader6 %{expand: +Obsoletes: %{name}-common < 1.0-5 +} + +%global fonts6 CORBEL*.TTF +%global fontconfs6 %{SOURCE6} +%global fontdescription6 %{expand: +%{common_description} +Microsoft Corbel font, part of the ClearType collection made available +in the PowerPointViewer package, still available on the Microsoft website. +} + +Name: %{fontname}-fonts +Version: 1.0 +Release: 1%{?dist} +Summary: Package containing ClearType fonts. +License: LicenseRef-MS-Core-Fonts +URL: http://mscorefonts2.sourceforge.net +Group: User Interface/X +Source0: http://sourceforge.net/projects/mscorefonts2/files/cabs/PowerPointViewer.exe +Source1: 61-%{fontname}-calibri.conf +Source2: 61-%{fontname}-cambria.conf +Source3: 61-%{fontname}-candara.conf +Source4: 61-%{fontname}-consolas.conf +Source5: 61-%{fontname}-constantia.conf +Source6: 61-%{fontname}-corbel.conf +BuildRequires: cabextract +BuildRequires: fontpackages-devel +Requires: xorg-x11-font-utils +Requires: fontconfig +Requires: %{fontname}-calibri-fonts +Requires: %{fontname}-cambria-fonts +Requires: %{fontname}-candara-fonts +Requires: %{fontname}-consolas-fonts +Requires: %{fontname}-constantia-fonts +Requires: %{fontname}-corbel-fonts +Requires(post): fontconfig +BuildArch: noarch +Packager: ShinyGil + +%fontpkg -a + +%description +ClearType fonts made available to the public in the PowerPoint Viewer package in 2006. + +%prep +%setup -cT +cabextract %{SOURCE0} +cabextract ppviewer.cab +%forgesetup -a + +%build +%fontbuild -a + +%install +%fontinstall -a + +%check +%fontcheck -a +%fontfiles -a + +%post +/usr/bin/fc-cache + +%files + +%changelog +* Mon Feb 24 2025 ShinyGil +- Initial package diff --git a/anda/fonts/ms-core-tahoma/61-ms-core-tahoma.conf b/anda/fonts/ms-core-tahoma/61-ms-core-tahoma.conf new file mode 100644 index 0000000000..f95f9a8b5a --- /dev/null +++ b/anda/fonts/ms-core-tahoma/61-ms-core-tahoma.conf @@ -0,0 +1,16 @@ + + + + + sans-serif + + Tahoma + + + + Tahoma + + sans-serif + + + diff --git a/anda/fonts/ms-core-tahoma/anda.hcl b/anda/fonts/ms-core-tahoma/anda.hcl new file mode 100644 index 0000000000..4fca01acee --- /dev/null +++ b/anda/fonts/ms-core-tahoma/anda.hcl @@ -0,0 +1,6 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "ms-core-tahoma-fonts.spec" + } +} diff --git a/anda/fonts/ms-core-tahoma/ms-core-tahoma-fonts.spec b/anda/fonts/ms-core-tahoma/ms-core-tahoma-fonts.spec new file mode 100644 index 0000000000..ed6a678987 --- /dev/null +++ b/anda/fonts/ms-core-tahoma/ms-core-tahoma-fonts.spec @@ -0,0 +1,66 @@ +%global fontlicense Microsoft EULA +%global fontlicenses License.txt + +%global fontfamily1 MS Core Tahoma +%global fontsummary1 Tahoma TTF font +%global fontpkgheader1 %{expand: +Obsoletes: %{name}-common < 1.0-5 +} + +%global fonts1 tahoma.ttf +%global fontconfs1 %{SOURCE1} +%global fontdescription1 %{expand: +%{common_description} +TTF Tahoma fonts that were made available to the public in the Word Reader +package. +} + +### Different name because of font package and setup macro weirdness +Name: mscore-tahoma-fonts +Version: 1.0 +Release: 1%{?dist} +Summary: Microsoft core Tahoma fonts for better Windows compatibility +License: LicenseRef-MS-Core-Fonts +URL: https://github.com/leamas/lpf +Group: User Interface/X +Source0: http://downloads.sourceforge.net/corefonts/the%%20fonts/final/wd97vwr32.exe +Source1: 61-ms-core-tahoma.conf +BuildRequires: cabextract +BuildRequires: fontpackages-devel +Requires: xorg-x11-font-utils +Requires: fontconfig +BuildArch: noarch +Packager: ShinyGil + +%fontpkg -a + +%description +TTF Tahoma fonts that were made available to the public in the Word Reader package. + +Improves the look of Windows documents. + + +%prep +%setup -cT +cabextract %{SOURCE0} +cabextract Viewer1.cab +%forgesetup -a + +%build +%fontbuild -a + +%install +%fontinstall -a + +%check +%fontcheck -a +%fontfiles -a + +%post +/usr/bin/fc-cache + +%files + +%changelog +* Mon Feb 24 2025 ShinyGil +- Initial package diff --git a/anda/fonts/ms-core-tahoma/post.rhai b/anda/fonts/ms-core-tahoma/post.rhai new file mode 100644 index 0000000000..4a8b4d90a3 --- /dev/null +++ b/anda/fonts/ms-core-tahoma/post.rhai @@ -0,0 +1,2 @@ +// Remove empty build package +sh("rm anda-build/rpm/rpms/mscore-*.rpm", #{}); diff --git a/anda/fonts/ms-core/61-ms-core-andale.conf b/anda/fonts/ms-core/61-ms-core-andale.conf new file mode 100644 index 0000000000..bc5ed9a1e3 --- /dev/null +++ b/anda/fonts/ms-core/61-ms-core-andale.conf @@ -0,0 +1,16 @@ + + + + + monospace + + Andale Mono + + + + Andale Mono + + monospace + + + diff --git a/anda/fonts/ms-core/61-ms-core-arial.conf b/anda/fonts/ms-core/61-ms-core-arial.conf new file mode 100644 index 0000000000..9b17e5e225 --- /dev/null +++ b/anda/fonts/ms-core/61-ms-core-arial.conf @@ -0,0 +1,16 @@ + + + + + sans-serif + + Arial + + + + Arial + + sans-serif + + + diff --git a/anda/fonts/ms-core/61-ms-core-comic.conf b/anda/fonts/ms-core/61-ms-core-comic.conf new file mode 100644 index 0000000000..99c9c8d6d6 --- /dev/null +++ b/anda/fonts/ms-core/61-ms-core-comic.conf @@ -0,0 +1,16 @@ + + + + + cursive + + Comic Sans MS + + + + Comic Sans MS + + cursive + + + diff --git a/anda/fonts/ms-core/61-ms-core-courier.conf b/anda/fonts/ms-core/61-ms-core-courier.conf new file mode 100644 index 0000000000..8b79a00fe6 --- /dev/null +++ b/anda/fonts/ms-core/61-ms-core-courier.conf @@ -0,0 +1,16 @@ + + + + + monospace + + Courier New + + + + Courier New + + monospace + + + diff --git a/anda/fonts/ms-core/61-ms-core-georgia.conf b/anda/fonts/ms-core/61-ms-core-georgia.conf new file mode 100644 index 0000000000..334f3e9d8a --- /dev/null +++ b/anda/fonts/ms-core/61-ms-core-georgia.conf @@ -0,0 +1,16 @@ + + + + + serif + + Georgia + + + + Georgia + + serif + + + diff --git a/anda/fonts/ms-core/61-ms-core-impact.conf b/anda/fonts/ms-core/61-ms-core-impact.conf new file mode 100644 index 0000000000..0b7c1f1370 --- /dev/null +++ b/anda/fonts/ms-core/61-ms-core-impact.conf @@ -0,0 +1,16 @@ + + + + + sans-serif + + Impact + + + + Impact + + sans-serif + + + diff --git a/anda/fonts/ms-core/61-ms-core-times.conf b/anda/fonts/ms-core/61-ms-core-times.conf new file mode 100644 index 0000000000..8e988d820c --- /dev/null +++ b/anda/fonts/ms-core/61-ms-core-times.conf @@ -0,0 +1,16 @@ + + + + + serif + + Times New Roman + + + + Times New Roman + + serif + + + diff --git a/anda/fonts/ms-core/61-ms-core-trebuchet.conf b/anda/fonts/ms-core/61-ms-core-trebuchet.conf new file mode 100644 index 0000000000..db15919b85 --- /dev/null +++ b/anda/fonts/ms-core/61-ms-core-trebuchet.conf @@ -0,0 +1,16 @@ + + + + + sans-serif + + Trebuchet MS + + + + Trebuchet MS + + sans-serif + + + diff --git a/anda/fonts/ms-core/61-ms-core-verdana.conf b/anda/fonts/ms-core/61-ms-core-verdana.conf new file mode 100644 index 0000000000..e13e2a1f37 --- /dev/null +++ b/anda/fonts/ms-core/61-ms-core-verdana.conf @@ -0,0 +1,16 @@ + + + + + sans-serif + + Verdana + + + + Verdana + + sans-serif + + + diff --git a/anda/fonts/ms-core/61-ms-core-webdings.conf b/anda/fonts/ms-core/61-ms-core-webdings.conf new file mode 100644 index 0000000000..fc76c0a298 --- /dev/null +++ b/anda/fonts/ms-core/61-ms-core-webdings.conf @@ -0,0 +1,16 @@ + + + + + dingbats + + Webdings + + + + Webdings + + dingbats + + + diff --git a/anda/fonts/ms-core/anda.hcl b/anda/fonts/ms-core/anda.hcl new file mode 100644 index 0000000000..14df81c230 --- /dev/null +++ b/anda/fonts/ms-core/anda.hcl @@ -0,0 +1,6 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "ms-core-fonts.spec" + } +} diff --git a/anda/fonts/ms-core/ms-core-fonts.spec b/anda/fonts/ms-core/ms-core-fonts.spec new file mode 100644 index 0000000000..b0ed4229c6 --- /dev/null +++ b/anda/fonts/ms-core/ms-core-fonts.spec @@ -0,0 +1,229 @@ +%global fontname ms-core +%global sf_corefonts http://downloads.sourceforge.net/corefonts/the%20fonts/final +%global fontlicense Microsoft EULA +%global fontlicenses Licen.TXT + +%global fontfamily1 MS Core Andale +%global fontsummary1 Microsoft Andale Mono TTF font +%global fontpkgheader1 %{expand: +Obsoletes: %{name}-common <= 2.2-4 +} + +%global fonts1 AndaleMo.TTF +%global fontconfs1 %{SOURCE8} +%global fontdescription1 %{expand: +%{common_description} +Andale Mono font for the web that prior to 2002 was available from +http://www.microsoft.com/typography/fontpack. +} + +%global fontfamily2 MS Core Arial +%global fontsummary2 Microsoft Arial TTF font +%global fontpkgheader2 %{expand: +Obsoletes: %{name}-common <= 2.2-4 +} + +%global fonts2 Arial*.ttf AriBlk.TTF +%global fontconfs2 %{SOURCE9} +%global fontdescription2 %{expand: +%{common_description} +Microsoft Arial font for the web that prior to 2002 was available from +http://www.microsoft.com/typography/fontpack/, updated in the European +Union Expansion Update circa May 2007, still available on the Microsoft +website. +} + +%global fontfamily3 MS Core Comic +%global fontsummary3 Microsoft Comic Sans TTF font +%global fontpkgheader3 %{expand: +Obsoletes: %{name}-common <= 2.2-4 +} + +%global fonts3 Comic*.TTF +%global fontconfs3 %{SOURCE10} +%global fontdescription3 %{expand: +%{common_description} +Comic Sans bold and regular font for the web that prior to 2002 was available +from http://www.microsoft.com/typography/fontpack. +} + +%global fontfamily4 MS Core Courier +%global fontsummary4 Microsoft Courier New TTF font +%global fontpkgheader4 %{expand: +Obsoletes: %{name}-common <= 2.2-4 +} + +%global fonts4 cour*ttf +%global fontconfs4 %{SOURCE11} +%global fontdescription4 %{expand: +%{common_description} +Courier New bold, bold italic, italic and regular font for the web that prior +to 2002 was available from http://www.microsoft.com/typography/fontpack. +} + +%global fontfamily5 MS Core Georgia +%global fontsummary5 Microsoft Georgia TTF font +%global fontpkgheader5 %{expand: +Obsoletes: %{name}-common <= 2.2-4 +} + +%global fonts5 Georgi*TTF +%global fontconfs5 %{SOURCE12} +%global fontdescription5 %{expand: +%{common_description} +Georgia font for the web that prior to 2002 was available from +http://www.microsoft.com/typography/fontpack. +} + +%global fontfamily6 MS Core Impact +%global fontsummary6 Microsoft Impact TTF font +%global fontpkgheader6 %{expand: +Obsoletes: %{name}-common <= 2.2-4 +} + +%global fonts6 Impact.TTF +%global fontconfs6 %{SOURCE13} +%global fontdescription6 %{expand: +%{common_description} +Impact font for the web that prior to 2002 was available from +http://www.microsoft.com/typography/fontpack. +} + +%global fontfamily7 MS Core Times +%global fontsummary7 Microsoft Times New Roman TTF font +%global fontpkgheader7 %{expand: +Obsoletes: %{name}-common <= 2.2-4 +} + +%global fonts7 Times*.ttf +%global fontconfs7 %{SOURCE14} +%global fontdescription7 %{expand: +%{common_description} +Microsoft Times New Roman font for the web that prior to 2002 was available from +http://www.microsoft.com/typography/fontpack/, updated in the European +Union Expansion Update circa May 2007, still available on the Microsoft +website. +} + +%global fontfamily8 MS Core Trebuchet +%global fontsummary8 Microsoft Trebuchet TTF font +%global fontpkgheader8 %{expand: +Obsoletes: %{name}-common <= 2.2-4 +} + +%global fonts8 trebuc*.ttf +%global fontconfs8 %{SOURCE15} +%global fontdescription8 %{expand: +%{common_description} +Microsoft Trebuchet font for the web that prior to 2002 was available +from http://www.microsoft.com/typography/fontpack, updated +in the European Union Expansion Update circa May 2007, still available +on the Microsoft website. +} + +%global fontfamily9 MS Core Verdana +%global fontsummary9 Microsoft Verdana TTF font +%global fontpkgheader9 %{expand: +Obsoletes: %{name}-common <= 2.2-4 +} + +%global fonts9 Verdana*.ttf +%global fontconfs9 %{SOURCE16} +%global fontdescription9 %{expand: +%{common_description} +Microsoft Verdana font for the web that prior to 2002 was available from +http://www.microsoft.com/typography/fontpack/, updated in the European +Union Expansion Update circa May 2007, still available on the Microsoft +website. +} + +%global fontfamily10 MS Core Webdings +%global fontsummary10 Microsoft Verdana TTF font +%global fontpkgheader10 %{expand: +Obsoletes: %{name}-common <= 2.2-4 +} + +%global fonts10 Webdings.TTF +%global fontconfs10 %{SOURCE17} +%global fontdescription10 %{expand: +%{common_description} +Webdings font for the web that prior to 2002 was available from +http://www.microsoft.com/typography/fontpack. +} + +Name: ms-core-fonts +Version: 2.2 +Release: 1%{?dist} +Summary: Microsoft core fonts +License: LicenseRef-MS-Core-Fonts +URL: http://mscorefonts2.sourceforge.net +Group: User Interface/X +Source0: http://sourceforge.net/projects/mscorefonts2/files/cabs/EUupdate.EXE +Source1: %{sf_corefonts}/andale32.exe +Source2: %{sf_corefonts}/arialb32.exe +Source3: %{sf_corefonts}/comic32.exe +Source4: %{sf_corefonts}/courie32.exe +Source5: %{sf_corefonts}/georgi32.exe +Source6: %{sf_corefonts}/impact32.exe +Source7: %{sf_corefonts}/webdin32.exe +Source8: 61-ms-core-andale.conf +Source9: 61-ms-core-arial.conf +Source10: 61-ms-core-comic.conf +Source11: 61-ms-core-courier.conf +Source12: 61-ms-core-georgia.conf +Source13: 61-ms-core-impact.conf +Source14: 61-ms-core-times.conf +Source15: 61-ms-core-trebuchet.conf +Source16: 61-ms-core-verdana.conf +Source17: 61-ms-core-webdings.conf +BuildRequires: cabextract +BuildRequires: fontpackages-devel +Requires: fontconfig +Requires: %{fontname}-andale-fonts +Requires: %{fontname}-arial-fonts +Requires: %{fontname}-comic-fonts +Requires: %{fontname}-courier-fonts +Requires: %{fontname}-georgia-fonts +Requires: %{fontname}-impact-fonts +Requires: %{fontname}-times-fonts +Requires: %{fontname}-trebuchet-fonts +Requires: %{fontname}-verdana-fonts +Requires: %{fontname}-webdings-fonts +Requires: xorg-x11-font-utils +Requires(post): fontconfig +BuildArch: noarch +Packager: ShinyGil + +%fontpkg -a + +%description +TrueType core fonts that prior to 2002 were available from http://www.microsoft.com/typography/fontpack/ + +Updated in the European Union Expansion Update circa May 2007. + +Still available on the Microsoft website. + +%prep +%setup -cT +cabextract %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \ + %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} +%forgesetup -a + +%build +%fontbuild -a + +%install +%fontinstall -a + +%check +%fontcheck -a +%fontfiles -a + +%post +/usr/bin/fc-cache + +%files + +%changelog +* Mon Feb 24 2025 ShinyGil +- Initial package From 28855b8faaa457e686becb618a3872cfc06492a7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Feb 2025 07:59:56 +0000 Subject: [PATCH 0050/2977] bump: sccache --- anda/tools/buildsys/sccache/rust-sccache.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/sccache/rust-sccache.spec b/anda/tools/buildsys/sccache/rust-sccache.spec index dbe756c5a2..9702154dbf 100644 --- a/anda/tools/buildsys/sccache/rust-sccache.spec +++ b/anda/tools/buildsys/sccache/rust-sccache.spec @@ -13,7 +13,7 @@ %global crate sccache Name: rust-sccache -Version: 0.9.1 +Version: 0.10.0 Release: 1%?dist Summary: Ccache-like tool From 2e918bd9f11e7b3cd0face20f7151535c823d018 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Feb 2025 10:26:46 +0000 Subject: [PATCH 0051/2977] bump: gradle --- anda/tools/buildsys/gradle/gradle.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/gradle/gradle.spec b/anda/tools/buildsys/gradle/gradle.spec index 272ee03f0f..da16ccc2a7 100644 --- a/anda/tools/buildsys/gradle/gradle.spec +++ b/anda/tools/buildsys/gradle/gradle.spec @@ -1,5 +1,5 @@ Name: gradle -Version: 8.12.1 +Version: 8.13.0 Release: 1%?dist Summary: Powerful build system for the JVM URL: https://gradle.org/ From 54442f61dc0fe81553e9d5526662c874ada72504 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Feb 2025 11:39:01 +0000 Subject: [PATCH 0052/2977] bump: lazygit --- anda/langs/go/lazygit/golang-github-jesseduffield-lazygit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/go/lazygit/golang-github-jesseduffield-lazygit.spec b/anda/langs/go/lazygit/golang-github-jesseduffield-lazygit.spec index 02af6c1e79..08138aab21 100644 --- a/anda/langs/go/lazygit/golang-github-jesseduffield-lazygit.spec +++ b/anda/langs/go/lazygit/golang-github-jesseduffield-lazygit.spec @@ -2,7 +2,7 @@ # https://github.com/jesseduffield/lazygit %global goipath github.com/jesseduffield/lazygit -Version: 0.47.1 +Version: 0.47.2 %gometa -f From b5e3776aa899a57ab77691c3c548a0588dd6fe65 Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 25 Feb 2025 21:54:19 +0800 Subject: [PATCH 0053/2977] feat(kf6-kio,gnome-shell): comply with new tag policies (#3533) --- .../gnome/gnome-shell/gnome-shell.spec | 11 ++++++----- anda/desktops/kde/kf6-kio/kf6-kio.spec | 18 ++++++++++++++---- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/anda/desktops/gnome/gnome-shell/gnome-shell.spec b/anda/desktops/gnome/gnome-shell/gnome-shell.spec index 452fa5094f..ed28232cfd 100644 --- a/anda/desktops/gnome/gnome-shell/gnome-shell.spec +++ b/anda/desktops/gnome/gnome-shell/gnome-shell.spec @@ -8,14 +8,15 @@ %global portal_helper 1 %endif -Name: gnome-shell +Name: gnome-shell.switcheroo Version: %{major_version}.%{minor_version} Release: 1%{?dist}.switcheroo Summary: Window management and application launching for GNOME +Provides: gnome-shell = %version-%release License: GPL-2.0-or-later URL: https://wiki.gnome.org/Projects/GnomeShell -Source0: https://download.gnome.org/sources/gnome-shell/%{major_version}/%{name}-%{tarball_version}.tar.xz +Source0: https://download.gnome.org/sources/gnome-shell/%{major_version}/gnome-shell-%{tarball_version}.tar.xz # Replace Epiphany with Firefox in the default favourite apps list Patch: gnome-shell-favourite-apps-firefox.patch @@ -178,7 +179,7 @@ innovative user interface concepts to provide a visually attractive and easy to use experience. %prep -%autosetup -S git -n %{name}-%{tarball_version} +%autosetup -S git -n gnome-shell-%{tarball_version} %build %meson \ @@ -198,7 +199,7 @@ easy to use experience. mkdir -p %{buildroot}%{_datadir}/gnome-shell/extensions mkdir -p %{buildroot}%{_datadir}/gnome-shell/search-providers -%find_lang %{name} +%find_lang gnome-shell %check desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.desktop @@ -208,7 +209,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.Exten desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.PortalHelper.desktop %endif -%files -f %{name}.lang +%files -f gnome-shell.lang %license COPYING %doc NEWS README.md %{_bindir}/gnome-shell diff --git a/anda/desktops/kde/kf6-kio/kf6-kio.spec b/anda/desktops/kde/kf6-kio/kf6-kio.spec index 73b239487d..0a05df6b4d 100644 --- a/anda/desktops/kde/kf6-kio/kf6-kio.spec +++ b/anda/desktops/kde/kf6-kio/kf6-kio.spec @@ -3,9 +3,9 @@ %global stable_kf6 stable %global majmin_ver_kf6 6.11 -Name: kf6-%{framework} +Name: kf6-%{framework}.switcheroo Version: %{majmin_ver_kf6}.0 -Release: 1%{?dist}.switcheroo +Release: 1%{?dist} Summary: KDE Frameworks 6 Tier 3 solution for filesystem abstraction License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT @@ -28,6 +28,7 @@ Patch101: kio-no-help-protocol.patch # https://invent.kde.org/frameworks/kio/-/merge_requests/1556 Patch201: 1556.patch +Provides: kf6-%{framework} BuildRequires: extra-cmake-modules BuildRequires: gcc-c++ BuildRequires: kf6-rpm-macros @@ -98,6 +99,7 @@ Requires: cmake(KF6Solid) Requires: cmake(KF6XmlGui) Requires: cmake(KF6WindowSystem) Requires: qt6-qtbase-devel +Provides: kf6-kio-devel = %version-%release %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. @@ -106,6 +108,7 @@ developing applications that use %{name}. Summary: Documentation files for %{name} Requires: %{name}-core = %{version}-%{release} BuildArch: noarch +Provides: kf6-kio-doc = %version-%release %description doc Documentation for %{name}. @@ -116,12 +119,14 @@ Requires: %{name}-core-libs%{?_isa} = %{version}-%{release} Requires: %{name}-doc = %{version}-%{release} Requires: kf6-filesystem Recommends: switcheroo-control +Provides: kf6-kio-core = %version-%release %description core KIOCore library provides core non-GUI components for working with KIO. %package core-libs Summary: Runtime libraries for KIO Core Requires: %{name}-core%{?_isa} = %{version}-%{release} +Provides: kf6-kio-core-libs = %version-%release %description core-libs %{summary}. @@ -131,6 +136,7 @@ Summary: Widgets for KIO Framework ## included here for completeness, even those -core already has a dependency. %{?kf6_kinit_requires} Requires: %{name}-core%{?_isa} = %{version}-%{release} +Provides: kf6-kio-widgets = %version-%release %description widgets KIOWidgets contains classes that provide generic job control, progress reporting, etc. @@ -138,12 +144,14 @@ reporting, etc. %package widgets-libs Summary: Runtime libraries for KIO Widgets library Requires: %{name}-widgets%{?_isa} = %{version}-%{release} +Provides: kf6-kio-widgets-libs = %version-%release %description widgets-libs %{summary}. %package file-widgets Summary: Widgets for file-handling for KIO Framework Requires: %{name}-widgets%{?_isa} = %{version}-%{release} +Provides: kf6-kio-file-widgets = %version-%release %description file-widgets The KIOFileWidgets library provides the file selection dialog and its components. @@ -151,12 +159,14 @@ its components. %package gui Summary: Gui components for the KIO Framework Requires: %{name}-core%{?_isa} = %{version}-%{release} +Provides: kf6-kio-gui = %version-%release %description gui %{summary}. %package qch-doc Summary: Developer Documentation files for %{name} BuildArch: noarch +Provides: kf6-kio-qch-doc = %version-%release %description qch-doc Developer Documentation files for %{name} for use with KDevelop or QtCreator. @@ -172,7 +182,7 @@ Developer Documentation files for %{name} for use with KDevelop or QtCreator. %install %cmake_install -%find_lang %{name} --all-name --with-man --with-html +%find_lang kf6-kio --all-name --with-man --with-html %files %license LICENSES/*.txt @@ -196,7 +206,7 @@ Developer Documentation files for %{name} for use with KDevelop or QtCreator. %files core-libs %{_kf6_libdir}/libKF6KIOCore.so.* -%files doc -f %{name}.lang +%files doc -f kf6-kio.lang %files gui %{_kf6_libdir}/libKF6KIOGui.so.* From 94844e57e292ffb7600909f7cd449c93e21cf96e Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 25 Feb 2025 21:54:52 +0800 Subject: [PATCH 0054/2977] add: kanata (#3534) --- anda/tools/kanata/anda.hcl | 5 + .../kanata/kanata-fix-metadata-auto.diff | 128 ++++++++ anda/tools/kanata/rust-kanata.spec | 276 ++++++++++++++++++ anda/tools/kanata/update.rhai | 1 + 4 files changed, 410 insertions(+) create mode 100644 anda/tools/kanata/anda.hcl create mode 100644 anda/tools/kanata/kanata-fix-metadata-auto.diff create mode 100644 anda/tools/kanata/rust-kanata.spec create mode 100644 anda/tools/kanata/update.rhai diff --git a/anda/tools/kanata/anda.hcl b/anda/tools/kanata/anda.hcl new file mode 100644 index 0000000000..7bcdfdbbaa --- /dev/null +++ b/anda/tools/kanata/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "rust-kanata.spec" + } +} diff --git a/anda/tools/kanata/kanata-fix-metadata-auto.diff b/anda/tools/kanata/kanata-fix-metadata-auto.diff new file mode 100644 index 0000000000..6dad0fb43f --- /dev/null +++ b/anda/tools/kanata/kanata-fix-metadata-auto.diff @@ -0,0 +1,128 @@ +--- kanata-1.8.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ kanata-1.8.0/Cargo.toml 2025-02-24T02:18:17.384667+00:00 +@@ -124,23 +124,9 @@ + "kanata-parser/gui", + "win_sendinput_send_scancodes", + "win_llhook_read_scancodes", +- "muldiv", +- "strip-ansi-escapes", + "open", +- "dep:windows-sys", +- "winapi/processthreadsapi", +- "native-windows-gui/tray-notification", +- "native-windows-gui/message-window", +- "native-windows-gui/menu", +- "native-windows-gui/cursor", +- "native-windows-gui/high-dpi", +- "native-windows-gui/embed-resource", +- "native-windows-gui/image-decoder", +- "native-windows-gui/notice", +- "native-windows-gui/animation-timer", + ] + interception_driver = [ +- "kanata-interception", + "kanata-parser/interception_driver", + ] + passthru_ahk = [ +@@ -154,9 +140,7 @@ + wasm = ["instant/wasm-bindgen"] + win_llhook_read_scancodes = ["kanata-parser/win_llhook_read_scancodes"] + win_manifest = [ +- "embed-resource", + "indoc", +- "regex", + ] + win_sendinput_send_scancodes = ["kanata-parser/win_sendinput_send_scancodes"] + zippychord = ["kanata-parser/zippychord"] +@@ -189,91 +173,3 @@ + [target.'cfg(target_os = "linux")'.dependencies.signal-hook] + version = "0.3.14" + +-[target.'cfg(target_os = "macos")'.dependencies.core-graphics] +-version = "0.24.0" +- +-[target.'cfg(target_os = "macos")'.dependencies.karabiner-driverkit] +-version = "0.1.4" +- +-[target.'cfg(target_os = "macos")'.dependencies.libc] +-version = "0.2" +- +-[target.'cfg(target_os = "macos")'.dependencies.objc] +-version = "0.2.7" +- +-[target.'cfg(target_os = "macos")'.dependencies.open] +-version = "5" +-optional = true +- +-[target.'cfg(target_os = "macos")'.dependencies.os_pipe] +-version = "1.2.1" +- +-[target.'cfg(target_os = "windows")'.dependencies.encode_unicode] +-version = "0.3.6" +- +-[target.'cfg(target_os = "windows")'.dependencies.kanata-interception] +-version = "0.3.0" +-optional = true +- +-[target.'cfg(target_os = "windows")'.dependencies.muldiv] +-version = "1.0.1" +-optional = true +- +-[target.'cfg(target_os = "windows")'.dependencies.native-windows-gui] +-version = "1.0.13" +-default-features = false +- +-[target.'cfg(target_os = "windows")'.dependencies.open] +-version = "5" +-features = ["shellexecute-on-windows"] +-optional = true +- +-[target.'cfg(target_os = "windows")'.dependencies.regex] +-version = "1.10.4" +-optional = true +- +-[target.'cfg(target_os = "windows")'.dependencies.strip-ansi-escapes] +-version = "0.2.0" +-optional = true +- +-[target.'cfg(target_os = "windows")'.dependencies.winapi] +-version = "0.3.9" +-features = [ +- "wincon", +- "timeapi", +- "mmsystem", +-] +- +-[target.'cfg(target_os = "windows")'.dependencies.windows-sys] +-version = "0.52.0" +-features = [ +- "Win32_Devices_DeviceAndDriverInstallation", +- "Win32_Devices_Usb", +- "Win32_Foundation", +- "Win32_Graphics_Gdi", +- "Win32_Security", +- "Win32_System_Diagnostics_Debug", +- "Win32_System_Registry", +- "Win32_System_Threading", +- "Win32_UI_Controls", +- "Win32_UI_Shell", +- "Win32_UI_HiDpi", +- "Win32_UI_WindowsAndMessaging", +- "Win32_System_SystemInformation", +- "Wdk", +- "Wdk_System", +- "Wdk_System_SystemServices", +-] +-optional = true +- +-[target.'cfg(target_os = "windows")'.build-dependencies.embed-resource] +-version = "2.4.2" +-optional = true +- +-[target.'cfg(target_os = "windows")'.build-dependencies.indoc] +-version = "2.0.4" +-optional = true +- +-[target.'cfg(target_os = "windows")'.build-dependencies.regex] +-version = "1.10.4" +-optional = true diff --git a/anda/tools/kanata/rust-kanata.spec b/anda/tools/kanata/rust-kanata.spec new file mode 100644 index 0000000000..509066965c --- /dev/null +++ b/anda/tools/kanata/rust-kanata.spec @@ -0,0 +1,276 @@ +# Generated by rust2rpm 27 +%bcond check 1 + +%global crate kanata + +Name: rust-kanata +Version: 1.8.0 +Release: %autorelease +Summary: Multi-layer keyboard customization + +License: LGPL-3.0-only +URL: https://crates.io/crates/kanata +Source: %{crates_source} +# Automatically generated patch to strip dependencies and normalize metadata +Patch: kanata-fix-metadata-auto.diff +Packager: madonuko + +BuildRequires: anda-srpm-macros cargo-rpm-macros >= 24 + +%global _description %{expand: +Multi-layer keyboard customization.} + +%description %{_description} + +%package -n %{crate} +Summary: %{summary} +License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-3-Clause AND BSL-1.0 AND ISC AND LGPL-3.0-only AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) +# LICENSE.dependencies contains a full license breakdown + +%description -n %{crate} %{_description} + +%files -n %{crate} +%license LICENSE +%license cfg_samples/tray-icon/license_icons.txt +%license src/gui/win_nwg_ext/license-MIT +%license src/gui/win_nwg_ext/license-nwg-MIT +%license LICENSE.dependencies +%doc README.md +%{_bindir}/kanata + +%package devel +Summary: %{summary} +BuildArch: noarch + +%description devel %{_description} + +This package contains library source intended for building other packages which +use the "%{crate}" crate. + +%files devel +%license %{crate_instdir}/LICENSE +%license %{crate_instdir}/cfg_samples/tray-icon/license_icons.txt +%license %{crate_instdir}/src/gui/win_nwg_ext/license-MIT +%license %{crate_instdir}/src/gui/win_nwg_ext/license-nwg-MIT +%doc %{crate_instdir}/README.md +%{crate_instdir}/ + +%package -n %{name}+default-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+default-devel %{_description} + +This package contains library source intended for building other packages which +use the "default" feature of the "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+cmd-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+cmd-devel %{_description} + +This package contains library source intended for building other packages which +use the "cmd" feature of the "%{crate}" crate. + +%files -n %{name}+cmd-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+gui-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+gui-devel %{_description} + +This package contains library source intended for building other packages which +use the "gui" feature of the "%{crate}" crate. + +%files -n %{name}+gui-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+indoc-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+indoc-devel %{_description} + +This package contains library source intended for building other packages which +use the "indoc" feature of the "%{crate}" crate. + +%files -n %{name}+indoc-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+interception_driver-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+interception_driver-devel %{_description} + +This package contains library source intended for building other packages which +use the "interception_driver" feature of the "%{crate}" crate. + +%files -n %{name}+interception_driver-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+open-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+open-devel %{_description} + +This package contains library source intended for building other packages which +use the "open" feature of the "%{crate}" crate. + +%files -n %{name}+open-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+passthru_ahk-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+passthru_ahk-devel %{_description} + +This package contains library source intended for building other packages which +use the "passthru_ahk" feature of the "%{crate}" crate. + +%files -n %{name}+passthru_ahk-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+perf_logging-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+perf_logging-devel %{_description} + +This package contains library source intended for building other packages which +use the "perf_logging" feature of the "%{crate}" crate. + +%files -n %{name}+perf_logging-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+serde_json-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+serde_json-devel %{_description} + +This package contains library source intended for building other packages which +use the "serde_json" feature of the "%{crate}" crate. + +%files -n %{name}+serde_json-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+simulated_input-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+simulated_input-devel %{_description} + +This package contains library source intended for building other packages which +use the "simulated_input" feature of the "%{crate}" crate. + +%files -n %{name}+simulated_input-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+simulated_output-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+simulated_output-devel %{_description} + +This package contains library source intended for building other packages which +use the "simulated_output" feature of the "%{crate}" crate. + +%files -n %{name}+simulated_output-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+tcp_server-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+tcp_server-devel %{_description} + +This package contains library source intended for building other packages which +use the "tcp_server" feature of the "%{crate}" crate. + +%files -n %{name}+tcp_server-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+wasm-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+wasm-devel %{_description} + +This package contains library source intended for building other packages which +use the "wasm" feature of the "%{crate}" crate. + +%files -n %{name}+wasm-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+win_llhook_read_scancodes-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+win_llhook_read_scancodes-devel %{_description} + +This package contains library source intended for building other packages which +use the "win_llhook_read_scancodes" feature of the "%{crate}" crate. + +%files -n %{name}+win_llhook_read_scancodes-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+win_manifest-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+win_manifest-devel %{_description} + +This package contains library source intended for building other packages which +use the "win_manifest" feature of the "%{crate}" crate. + +%files -n %{name}+win_manifest-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+win_sendinput_send_scancodes-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+win_sendinput_send_scancodes-devel %{_description} + +This package contains library source intended for building other packages which +use the "win_sendinput_send_scancodes" feature of the "%{crate}" crate. + +%files -n %{name}+win_sendinput_send_scancodes-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+zippychord-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+zippychord-devel %{_description} + +This package contains library source intended for building other packages which +use the "zippychord" feature of the "%{crate}" crate. + +%files -n %{name}+zippychord-devel +%ghost %{crate_instdir}/Cargo.toml + +%prep +%autosetup -n %{crate}-%{version} -p1 +%cargo_prep_online + +%build +%{cargo_license_summary_online} +%{cargo_license_online} > LICENSE.dependencies + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif diff --git a/anda/tools/kanata/update.rhai b/anda/tools/kanata/update.rhai new file mode 100644 index 0000000000..610de31c42 --- /dev/null +++ b/anda/tools/kanata/update.rhai @@ -0,0 +1 @@ +rpm.version(crates("kanata")); From 2bf17b868d53422046311927d55e6b70bfe37eb8 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Feb 2025 13:56:32 +0000 Subject: [PATCH 0055/2977] bump: osu-lazer --- anda/games/osu-lazer/osu-lazer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index d9e81d7316..dabe5409f3 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -3,7 +3,7 @@ %define __strip /bin/true Name: osu-lazer -Version: 2025.221.0 +Version: 2025.225.0 Release: 1%?dist Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew. ExclusiveArch: x86_64 From baaf4a30a77d152da6f0ac70f20bb61b967a346b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Feb 2025 14:12:51 +0000 Subject: [PATCH 0056/2977] bump(branch): kf6-kio --- anda/desktops/kde/kf6-kio/kf6-kio.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/kde/kf6-kio/kf6-kio.spec b/anda/desktops/kde/kf6-kio/kf6-kio.spec index 0a05df6b4d..909c2d59c0 100644 --- a/anda/desktops/kde/kf6-kio/kf6-kio.spec +++ b/anda/desktops/kde/kf6-kio/kf6-kio.spec @@ -5,7 +5,7 @@ Name: kf6-%{framework}.switcheroo Version: %{majmin_ver_kf6}.0 -Release: 1%{?dist} +Release: 1%{?dist}.switcheroo Summary: KDE Frameworks 6 Tier 3 solution for filesystem abstraction License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT From d88d404d3f1a92e1b194bec7d6c7d04bfd81705d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Feb 2025 17:25:51 +0000 Subject: [PATCH 0057/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 10feb6672d..c14cdecd58 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.597 +Version: 0.0.598 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 643a801ad1..98cd54cc84 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.597 +Version: 0.0.598 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 072edacdd0139acfb03a6ddccbfe52d650feb918 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Feb 2025 18:45:20 +0000 Subject: [PATCH 0058/2977] bump: swayfx --- anda/desktops/swayfx/swayfx.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/desktops/swayfx/swayfx.spec b/anda/desktops/swayfx/swayfx.spec index 933234d262..abbf3a1ebf 100644 --- a/anda/desktops/swayfx/swayfx.spec +++ b/anda/desktops/swayfx/swayfx.spec @@ -1,8 +1,8 @@ %global swayVersion 1.9 Name: swayfx -Version: 0.4 -Release: 2%{?dist} +Version: 0.5 +Release: 1%?dist Summary: SwayFX: Sway, but with eye candy! URL: https://github.com/WillPower3309/swayfx From 0e898543f67f1ca1dea212d679327aab1a70baf2 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Feb 2025 19:14:36 +0000 Subject: [PATCH 0059/2977] bump: limine --- anda/system/limine/limine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/limine/limine.spec b/anda/system/limine/limine.spec index 2b045d4df7..107c6af847 100644 --- a/anda/system/limine/limine.spec +++ b/anda/system/limine/limine.spec @@ -1,5 +1,5 @@ Name: limine -Version: 9.0.0 +Version: 9.0.1 Release: 1%?dist Summary: Modern, advanced, portable, multiprotocol bootloader License: BSD-2-Clause From 052e6a14923422db5f4f0a0c767bc590ecd04c94 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Feb 2025 20:38:41 +0000 Subject: [PATCH 0060/2977] bump: preview stable --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 6e6de0db0e..0ef3bfb949 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.175.4-pre +%global ver 0.175.5-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 13554f1942..ad821dd0ea 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.174.7 +Version: 0.174.8 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From c61443e8dd981c7fe551c8169bd9b49717469b32 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Feb 2025 01:38:16 +0000 Subject: [PATCH 0061/2977] bump(nightly): mpv nightly nightly nim-nightly spotx-bash --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/tools/spotx-bash/spotx-bash.spec | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 6e6c8f72cc..1b7bbfa28d 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 80c9d7d8dffe7e0c2d132feaf01e83eac9ea572b +%global commit 5ae0e0ff9a6974453c1aba41ddc8442d12ac9264 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250225 +%global commit_date 20250226 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 0d2f6dba75..4e56c3b060 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 92340f8fb0595d4f54cfa4f14c30fc3d3f6054b5 +%global commit 4e5e4a7c2fe7ba148566dfb84cf546dfc26980d2 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-02-24 +%global fulldate 2025-02-25 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index dbbf5ee9cf..a9ab203fa0 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 52f73e0c2dc0093a213fdf9a235517d757ce98d4 +%global commit a5698a430d1a99fdfa5278b013401dc0429c64c6 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250225 +%global commit_date 20250226 %global ver 0.176.0 %bcond_with check diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index b9c1ed93c8..18d8c3a70a 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 1f8da3835f6e395d068c92f86787f0fa77fb6d08 +%global commit a7a8e364ea466223cb212dcefd5ff401266f5250 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250223 +%global commit_date 20250226 %global debug_package %nil Name: nim-nightly diff --git a/anda/tools/spotx-bash/spotx-bash.spec b/anda/tools/spotx-bash/spotx-bash.spec index da6426783e..e722a6e237 100644 --- a/anda/tools/spotx-bash/spotx-bash.spec +++ b/anda/tools/spotx-bash/spotx-bash.spec @@ -1,5 +1,5 @@ -%global commit 5ff940f0472708e18d83dc1169cbb6e1e4dee61e -%global commit_date 20250223 +%global commit 176fc61d6d96cfc22ca844e25c94e5419965b329 +%global commit_date 20250226 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: spotx-bash From e40b13ff5ee06c476951477192ab17e31e5ca609 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Feb 2025 01:52:52 +0000 Subject: [PATCH 0062/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 035f3967e2..750ed95d22 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-02-25 +%global ver 2025-02-26 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From cb36b249a658057fc59d614dbd31c06e9202d6c7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Feb 2025 03:23:27 +0000 Subject: [PATCH 0063/2977] bump: fluent-icon-theme --- anda/themes/fluent-icon-theme/fluent-icon-theme.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/themes/fluent-icon-theme/fluent-icon-theme.spec b/anda/themes/fluent-icon-theme/fluent-icon-theme.spec index 881cdb1e27..4f654bc29c 100644 --- a/anda/themes/fluent-icon-theme/fluent-icon-theme.spec +++ b/anda/themes/fluent-icon-theme/fluent-icon-theme.spec @@ -1,7 +1,7 @@ -%global tag 2025-02-10 +%global tag 2025-02-26 Name: fluent-icon-theme -Version: 20250210 +Version: 20250226 Release: 1%?dist Summary: Fluent icon theme for linux desktops From 0833f7914cce82362d8aa5bfea6f782702c5118f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Feb 2025 03:44:32 +0000 Subject: [PATCH 0064/2977] bump: tela-icon-theme --- anda/themes/tela-icon-theme/tela-icon-theme.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/themes/tela-icon-theme/tela-icon-theme.spec b/anda/themes/tela-icon-theme/tela-icon-theme.spec index df2202b402..561910809c 100644 --- a/anda/themes/tela-icon-theme/tela-icon-theme.spec +++ b/anda/themes/tela-icon-theme/tela-icon-theme.spec @@ -1,5 +1,5 @@ -%global commit fea810d948a663f336060b97db556274af3fc7c7 -%global commit_date 20250210 +%global commit 6a9055d8b238eee6e2134f5f00a83e0c4707f677 +%global commit_date 20250226 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: tela-icon-theme From a8af0be7164c84c3146a468c6b7829d9bddf81ea Mon Sep 17 00:00:00 2001 From: madomado Date: Wed, 26 Feb 2025 12:37:41 +0800 Subject: [PATCH 0065/2977] add: ags (#3506) * add: ags * Update anda/lib/astal/ags/ags.spec Co-authored-by: sadlerm4 Signed-off-by: madomado * anda-srpm-macros Co-authored-by: sadlerm4 Signed-off-by: madomado * Update anda/lib/astal/ags/ags.spec Co-authored-by: sadlerm4 Signed-off-by: madomado * disable checks Signed-off-by: madomado * bye gopkgfiles Signed-off-by: madomado --------- Signed-off-by: madomado Co-authored-by: sadlerm4 --- anda/lib/astal/ags/ags.spec | 84 ++++++++++++++++++++++++++++++++++ anda/lib/astal/ags/anda.hcl | 5 ++ anda/lib/astal/ags/update.rhai | 1 + 3 files changed, 90 insertions(+) create mode 100644 anda/lib/astal/ags/ags.spec create mode 100644 anda/lib/astal/ags/anda.hcl create mode 100644 anda/lib/astal/ags/update.rhai diff --git a/anda/lib/astal/ags/ags.spec b/anda/lib/astal/ags/ags.spec new file mode 100644 index 0000000000..33dd2d9e69 --- /dev/null +++ b/anda/lib/astal/ags/ags.spec @@ -0,0 +1,84 @@ +# Generated by go2rpm 1.15.0 +%bcond check 0 +%bcond bootstrap 0 + +%if %{with bootstrap} +%global debug_package %{nil} +%endif + +%if %{with bootstrap} +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^golang\\(.*\\)$ +%endif + +# https://github.com/Aylur/ags +%global goipath github.com/Aylur/ags +Version: 2.3.0 + +%gometa -f + +%global common_description %{expand: +Scaffolding CLI for Astal+TypeScript.} + +%global golicenses LICENSE +%global godocs docs README.md + +Name: ags +Release: %autorelease +Summary: Scaffolding CLI for Astal+TypeScript + +License: GPL-3.0-only +URL: %{gourl} +Source: %{gosource} +Provides: golang-github-aylur-ags = %version-%release +Packager: madonuko + +BuildRequires: anda-srpm-macros +%description %{common_description} + +%gopkg + +%prep +%goprep # -A +#autopatch -p1 +%go_prep_online + +%build +%dnl for cmd in cmd/* ; do +%dnl go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${GO_BUILDTAGS-${BUILDTAGS-}}" -a -x \ +%dnl -ldflags "-X main.version=%{version} \ +%dnl -B 0x$(echo "%{name}-%{version}-%{release}-${SOURCE_DATE_EPOCH:-}" | sha1sum | cut -d ' ' -f1) \ +%dnl -compressdwarf=false -linkmode=external \ +%dnl -extldflags '-Wl,-z,relro -Wl,--as-needed -Wl,-z,pack-relative-relocs -Wl,-z,now \ +%dnl -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 \ +%dnl -Wl,--build-id=sha1'" \ +%dnl -o %{gobuilddir}/bin/$(basename $cmd) $cmd +%dnl done +go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${GO_BUILDTAGS-${BUILDTAGS-}}" -a -x \ + -ldflags "-X main.version=%{version} \ + -B 0x$(echo "%{name}-%{version}-%{release}-${SOURCE_DATE_EPOCH:-}" | sha1sum | cut -d ' ' -f1) \ + -compressdwarf=false -linkmode=external \ + -extldflags '-Wl,-z,relro -Wl,--as-needed -Wl,-z,pack-relative-relocs -Wl,-z,now \ + -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 \ + -Wl,--build-id=sha1'" \ + -o %{gobuilddir}/bin/ags . + +%install +install -m 0755 -vd %{buildroot}%{_bindir} +install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ + +%if %{without bootstrap} +%if %{with check} +%check +%gocheck +%endif +%endif + +%if %{without bootstrap} +%files +%license LICENSE +%doc docs README.md +%{_bindir}/ags +%endif + +%changelog +%autochangelog diff --git a/anda/lib/astal/ags/anda.hcl b/anda/lib/astal/ags/anda.hcl new file mode 100644 index 0000000000..036bed8deb --- /dev/null +++ b/anda/lib/astal/ags/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "ags.spec" + } +} diff --git a/anda/lib/astal/ags/update.rhai b/anda/lib/astal/ags/update.rhai new file mode 100644 index 0000000000..a520ca2506 --- /dev/null +++ b/anda/lib/astal/ags/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("Aylur/ags")); From a44cecb30dbe672e9a936bcfc07c410c4cded886 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Feb 2025 15:55:38 +0000 Subject: [PATCH 0066/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index 07c788570e..cadb5fbaa6 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.2.8 +Version: 2025.2.9 Release: 1%?dist Summary: Front-end to your dev env From c29f8692de69bec44892c315b9dd9bc5c00349a1 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Feb 2025 16:45:45 +0000 Subject: [PATCH 0067/2977] bump: dart --- anda/langs/dart/dart.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/dart/dart.spec b/anda/langs/dart/dart.spec index 2db7819fa1..683b80f1b2 100644 --- a/anda/langs/dart/dart.spec +++ b/anda/langs/dart/dart.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: dart -Version: 3.7.0 +Version: 3.7.1 Release: 1%?dist Summary: The Dart Language License: BSD-3-Clause From 798057fef3330be654dd5b8d638b954ce4ac739f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Feb 2025 18:55:26 +0000 Subject: [PATCH 0068/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 021a1ad17c..23fd605704 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.02.23.191621 +Version: 2025.02.26.184027 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From fcbe9ec7e98052126109a2280193d71f9b55346b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Feb 2025 19:13:50 +0000 Subject: [PATCH 0069/2977] bump: preview stable --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 0ef3bfb949..b193b2ccc5 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.175.5-pre +%global ver 0.175.5 # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index ad821dd0ea..8c58dc0950 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.174.8 +Version: 0.175.5 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From f337fee9f05261b6df86991b6dba3e2f163f8928 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Feb 2025 20:38:37 +0000 Subject: [PATCH 0070/2977] bump: glow --- anda/langs/go/glow/golang-github-charmbracelet-glow.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/go/glow/golang-github-charmbracelet-glow.spec b/anda/langs/go/glow/golang-github-charmbracelet-glow.spec index 26213a4ed1..f841edabe6 100644 --- a/anda/langs/go/glow/golang-github-charmbracelet-glow.spec +++ b/anda/langs/go/glow/golang-github-charmbracelet-glow.spec @@ -3,7 +3,7 @@ # https://github.com/charmbracelet/glow %global goipath github.com/charmbracelet/glow -Version: 2.0.0 +Version: 2.1.0 %gometa -f From 9475f1323f883bb7e9c8e9a52896b681ec614b39 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Feb 2025 20:48:58 +0000 Subject: [PATCH 0071/2977] bump: electron --- anda/tools/electron/electron.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/electron/electron.spec b/anda/tools/electron/electron.spec index 28673a59e2..43ae9f9705 100644 --- a/anda/tools/electron/electron.spec +++ b/anda/tools/electron/electron.spec @@ -12,7 +12,7 @@ %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so Name: electron -Version: 34.2.0 +Version: 34.3.0 Release: 1%?dist Summary: Build cross platform desktop apps with web technologies License: MIT From bc62bbe17aa19e3f1a620dc92a68fbf62d8bb192 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Feb 2025 22:35:30 +0000 Subject: [PATCH 0072/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index c14cdecd58..af502a55a8 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.598 +Version: 0.0.599 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 98cd54cc84..1a7d0fdda5 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.598 +Version: 0.0.599 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From d9fa5eb61429224fdf60b198f70de20ab76c9496 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Feb 2025 23:55:28 +0000 Subject: [PATCH 0073/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index b193b2ccc5..5606eab78b 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.175.5 +%global ver 0.176.0-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From b9b557f829f331f29681279171bd0080d0ab7fc4 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 27 Feb 2025 01:20:05 +0000 Subject: [PATCH 0074/2977] bump: bun inputplumber --- anda/devs/bun/bun-bin.spec | 2 +- anda/games/inputplumber/inputplumber.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/bun/bun-bin.spec b/anda/devs/bun/bun-bin.spec index 11f22b868d..ab2d6c88ea 100644 --- a/anda/devs/bun/bun-bin.spec +++ b/anda/devs/bun/bun-bin.spec @@ -6,7 +6,7 @@ %endif Name: bun-bin -Version: 1.2.3 +Version: 1.2.4 Release: 1%?dist Summary: Incredibly fast JavaScript runtime, bundler, test runner, and package manager – all in one License: MIT diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index 0595871c06..2b264ce92a 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,5 +1,5 @@ Name: inputplumber -Version: 0.48.0 +Version: 0.49.0 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later From 0b9ff8ca8e354015097fdaa4a735307720a735df Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 27 Feb 2025 01:38:46 +0000 Subject: [PATCH 0075/2977] bump(nightly): mpv nightly nightly nim-nightly astal nvidia-patch --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 6 +++--- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/lib/astal/astal/astal.spec | 4 ++-- anda/system/nvidia-patch/nvidia-patch.spec | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 1b7bbfa28d..76235c297d 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 5ae0e0ff9a6974453c1aba41ddc8442d12ac9264 +%global commit 5338f4ba70903e7517bbfc7881e10ff13a912ffc %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250226 +%global commit_date 20250227 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 4e56c3b060..94c9dbb027 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 4e5e4a7c2fe7ba148566dfb84cf546dfc26980d2 +%global commit d85ed8275ec529734e9c352e5ff24f0918da5cf8 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-02-25 +%global fulldate 2025-02-26 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index a9ab203fa0..9f1a66747f 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,7 +1,7 @@ -%global commit a5698a430d1a99fdfa5278b013401dc0429c64c6 +%global commit 84ded96cb2778eec63cabac4cdbc59a3447da994 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250226 -%global ver 0.176.0 +%global commit_date 20250227 +%global ver 0.177.0 %bcond_with check diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 18d8c3a70a..1cd314ce1f 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit a7a8e364ea466223cb212dcefd5ff401266f5250 +%global commit a18dcca744dff3d7dcdcf51737ae2a1b05728150 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250226 +%global commit_date 20250227 %global debug_package %nil Name: nim-nightly diff --git a/anda/lib/astal/astal/astal.spec b/anda/lib/astal/astal/astal.spec index 4cfb5a545c..b84bc96a0c 100644 --- a/anda/lib/astal/astal/astal.spec +++ b/anda/lib/astal/astal/astal.spec @@ -1,7 +1,7 @@ -%global commit 3620d51bc6c23ada1bd4b7c9cf1c458c138e68df +%global commit b7f10b99bc810e7ad6a949d6670cb440d33045a0 %global shortcommit %{sub %commit 1 7} -%global commit_date 20250222 +%global commit_date 20250227 Name: astal Version: 0^%commit_date.%shortcommit diff --git a/anda/system/nvidia-patch/nvidia-patch.spec b/anda/system/nvidia-patch/nvidia-patch.spec index 64353127ce..e2657b762c 100644 --- a/anda/system/nvidia-patch/nvidia-patch.spec +++ b/anda/system/nvidia-patch/nvidia-patch.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} -%global commit ab88d5ec996e841255e3c5215a360b7de306f375 +%global commit ecbc5c6d5619314c9dc835f470844536c5201fd0 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250212 +%global commit_date 20250227 %global patches %{_datadir}/src/nvidia-patch From 0678ae660a4d0ef05dcd2267fc1c595254b055a2 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 27 Feb 2025 02:37:21 +0000 Subject: [PATCH 0076/2977] bump(branch): astal-gtk --- anda/lib/astal/astal-gtk/astal-gtk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/astal/astal-gtk/astal-gtk.spec b/anda/lib/astal/astal-gtk/astal-gtk.spec index cecded7285..95ae7682e1 100644 --- a/anda/lib/astal/astal-gtk/astal-gtk.spec +++ b/anda/lib/astal/astal-gtk/astal-gtk.spec @@ -1,6 +1,6 @@ -%global commit 3620d51 +%global commit b7f10b9 %global shortcommit %{sub %commit 1 7} -%global commit_date 20250222 +%global commit_date 20250227 Name: astal Version: 0^%commit_date.%shortcommit From 9eac4020d920fb7d93dc9d3e6b649045256dca84 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 27 Feb 2025 04:28:22 +0000 Subject: [PATCH 0077/2977] bump: srpm-macros --- anda/terra/srpm-macros/anda-srpm-macros.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/terra/srpm-macros/anda-srpm-macros.spec b/anda/terra/srpm-macros/anda-srpm-macros.spec index c3c7168965..27c1c3b108 100644 --- a/anda/terra/srpm-macros/anda-srpm-macros.spec +++ b/anda/terra/srpm-macros/anda-srpm-macros.spec @@ -1,5 +1,5 @@ Name: anda-srpm-macros -Version: 0.2.6 +Version: 0.2.7 Release: 1%?dist Summary: SRPM macros for extra Fedora packages From 5b25d489ca0d2dc650c8722ccc9e6827953aa470 Mon Sep 17 00:00:00 2001 From: sadlerm4 Date: Thu, 27 Feb 2025 16:47:42 +1100 Subject: [PATCH 0078/2977] fix: arduino (#3562) * fix(arduino-cli): follow terra and fedora go packaging guidelines * fix(arduino-create-agent): follow terra and fedora go packaging guidelines * oops * time for me to nap * uhh what * fix(arduino-{fwuploader,language-server,lint}): follow terra and fedora go packaging guidelines * fix: sources path * install source dir --- anda/tools/arduino-cli/arduino-cli.spec | 52 ++++++++++++------- .../arduino-create-agent.spec | 49 +++++++++++------ .../arduino-fwuploader.spec | 47 +++++++++++------ .../arduino-language-server.spec | 46 ++++++++++------ anda/tools/arduino-lint/arduino-lint.spec | 50 ++++++++++++------ 5 files changed, 158 insertions(+), 86 deletions(-) diff --git a/anda/tools/arduino-cli/arduino-cli.spec b/anda/tools/arduino-cli/arduino-cli.spec index 30bdf58c74..be72c5e1cb 100644 --- a/anda/tools/arduino-cli/arduino-cli.spec +++ b/anda/tools/arduino-cli/arduino-cli.spec @@ -1,35 +1,47 @@ -%define _build_shell /bin/bash -%define debug_package %nil +# https://github.com/arduino/arduino-cli +%global goipath github.com/arduino/arduino-cli +Version: 1.2.0 -Name: arduino-cli -Version: 1.2.0 -Release: 1%?dist -Summary: Arduino command line tool. -License: GPLv3 -Packager: Owen Zimmerman -Url: https://github.com/arduino/arduino-cli -Source0: %url/archive/refs/tags/v%version.tar.gz -BuildRequires: golang git go-rpm-macros anda-srpm-macros +%gometa -f -%description -%summary + +%global common_description %{expand: +Arduino CLI is an all-in-one solution that provides Boards/Library Managers, sketch builder, board detection, uploader, and many other tools needed to use any Arduino compatible board and platform from command line or machine interfaces.} + +%global golicenses LICENSE.txt +%global godocs README.md + +Name: arduino-cli +Release: 2%?dist +Summary: Arduino command line tool +License: GPL-3.0 +Packager: Owen Zimmerman + +URL: %{gourl} +Source: %{gosource} +BuildRequires: anda-srpm-macros + +%description %{common_description} + +%gopkg %prep -%autosetup -n arduino-cli-%version +%goprep +%go_prep_online %build -mkdir -p bin -%go_build_online +%define gomodulesmode GO111MODULE=on +%gobuild -o %{gobuilddir}/bin/arduino-cli %{goipath} %install -mkdir -p %{buildroot}%{_bindir} -install -Dm 755 build/bin/arduino-cli %buildroot%{_bindir}/arduino-cli +install -Dm755 %{gobuilddir}/bin/arduino-cli -t %buildroot%{_bindir} %files %license LICENSE.txt -%doc README.md +%doc README.md %{_bindir}/arduino-cli %changelog * Thu Dec 5 2024 Owen Zimmerman -- Package arduino-cli \ No newline at end of file +- Package arduino-cli + diff --git a/anda/tools/arduino-create-agent/arduino-create-agent.spec b/anda/tools/arduino-create-agent/arduino-create-agent.spec index e3a1683154..553bca4a4d 100644 --- a/anda/tools/arduino-create-agent/arduino-create-agent.spec +++ b/anda/tools/arduino-create-agent/arduino-create-agent.spec @@ -1,29 +1,43 @@ -%define debug_package %nil +# https://github.com/arduino/arduino-create-agent +%global goipath github.com/arduino/arduino-create-agent +Version: 1.6.1 -Name: arduino-create-agent -Version: 1.6.1 -Release: 1%?dist -Summary: Arduino Cloud Agent. -License: AGPLv3 -Packager: Owen Zimmerman -Url: https://github.com/arduino/arduino-create-agent -Source0: %url/archive/refs/tags/%version.tar.gz -Patch0: update.patch -BuildRequires: golang git go-rpm-macros anda-srpm-macros +%gometa -f -%description + +%global common_description %{expand: The Arduino Cloud Agent is a single binary that will sit on the traybar and work in the background. -It allows you to use the Arduino Cloud to seamlessly upload code to any USB connected Arduino board (or Yún in LAN) directly from the browser. +It allows you to use the Arduino Cloud to seamlessly upload code to any USB connected Arduino board (or Yún in LAN) directly from the browser.} + +%global golicenses LICENSE.txt +%global godocs README.md + +Name: arduino-create-agent +Release: 2%?dist +Summary: Arduino Cloud Agent +License: AGPL-3.0 +Packager: Owen Zimmerman + +URL: %{gourl} +Source: %{url}/archive/%{version}.tar.gz +Patch0: update.patch +BuildRequires: anda-srpm-macros + +%description %{common_description} + +%gopkg %prep -%autosetup -n arduino-create-agent-%version -p1 +%goprep +%autopatch -p1 +%go_prep_online %build -%go_build_online +%define gomodulesmode GO111MODULE=on +%gobuild -o %{gobuilddir}/bin/arduino-create-agent %{goipath} %install -mkdir -p %{buildroot}%{_bindir} -install -Dm 755 build/bin/arduino-create-agent %buildroot%{_bindir}/arduino-create-agent +install -Dm755 %{gobuilddir}/bin/arduino-create-agent -t %buildroot%{_bindir} %files %license LICENSE.txt @@ -33,3 +47,4 @@ install -Dm 755 build/bin/arduino-create-agent %buildroot%{_bindir}/arduino-crea %changelog * Sat Jan 25 2025 Owen Zimmerman - Package arduino-create-agent + diff --git a/anda/tools/arduino-fwuploader/arduino-fwuploader.spec b/anda/tools/arduino-fwuploader/arduino-fwuploader.spec index 397dcb0e0b..b2c156bfde 100644 --- a/anda/tools/arduino-fwuploader/arduino-fwuploader.spec +++ b/anda/tools/arduino-fwuploader/arduino-fwuploader.spec @@ -1,28 +1,41 @@ -%define debug_package %nil +# https://github.com/arduino/arduino-fwuploader +%global goipath github.com/arduino/arduino-fwuploader +Version: 2.4.1 -Name: arduino-fwuploader -Version: 2.4.1 -Release: 1%?dist -Summary: A Command Line Tool made to update the firmware and/or add SSL certificates for any Arduino board equipped with WINC or NINA Wi-Fi module. -License: AGPLv3 -Packager: Owen Zimmerman -Url: https://github.com/arduino/arduino-fwuploader -Source0: %url/archive/refs/tags/%version.tar.gz -BuildRequires: golang git go-rpm-macros anda-srpm-macros python3 go-task +%gometa -f + + +%global common_description %{expand: +The Arduino Firmware Uploader is a tool made to update the firmware and/or add SSL certificates for any Arduino board equipped with ESP32-S3 or NINA Wi-Fi module.} + +%global golicenses LICENSE.txt +%global godocs README.md + +Name: arduino-fwuploader +Release: 2%?dist +Summary: Update the firmware and/or add SSL certificates for any Arduino board equipped with WINC or NINA Wi-Fi module +License: AGPL-3.0 +Packager: Owen Zimmerman + +URL: %{gourl} +Source: %{url}/archive/%{version}.tar.gz +BuildRequires: anda-srpm-macros python3-devel go-task %description -%summary +%{common_description} + +%gopkg %prep -%autosetup -n arduino-fwuploader-%version +%goprep +%go_prep_online %build -mkdir -p bin -%go_build_online +%define gomodulesmode GO111MODULE=on +%gobuild -o %{gobuilddir}/bin/arduino-fwuploader %{goipath} %install -mkdir -p %{buildroot}%{_bindir} -install -Dm 755 build/bin/arduino-fwuploader %buildroot%{_bindir}/arduino-fwuploader +install -Dm755 %{gobuilddir}/bin/arduino-fwuploader -t %buildroot%{_bindir} %files %license LICENSE.txt @@ -31,4 +44,4 @@ install -Dm 755 build/bin/arduino-fwuploader %buildroot%{_bindir}/arduino-fwuplo %changelog * Sat Dec 28 2024 Owen Zimmerman -- Package arduino-fwuploader \ No newline at end of file +- Package arduino-fwuploader diff --git a/anda/tools/arduino-language-server/arduino-language-server.spec b/anda/tools/arduino-language-server/arduino-language-server.spec index 382edf2333..101cd852ad 100644 --- a/anda/tools/arduino-language-server/arduino-language-server.spec +++ b/anda/tools/arduino-language-server/arduino-language-server.spec @@ -1,28 +1,41 @@ -%define debug_package %nil +# https://github.com/arduino/arduino-language-server +%global goipath github.com/arduino/arduino-language-server +Version: 0.7.6 -Name: arduino-language-server -Version: 0.7.6 -Release: 1%?dist -Summary: Arduino command line tool. -License: AGPLv3 -Packager: Owen Zimmerman -Url: https://github.com/arduino/arduino-language-server -Source0: %url/archive/refs/tags/%version.tar.gz -BuildRequires: golang git go-rpm-macros anda-srpm-macros clang arduino-cli +%gometa -f + + +%global common_description %{expand: +The Arduino Language Server is the tool that powers the autocompletion of the new Arduino IDE 2. It implements the standard Language Server Protocol so it can be used with other IDEs as well.} + +%global golicenses LICENSE.txt +%global godocs README.md + +Name: arduino-language-server +Release: 2%?dist +Summary: An Arduino Language Server based on Clangd for Arduino code autocompletion +License: AGPL-3.0 +Packager: Owen Zimmerman + +URL: %{gourl} +Source: %{url}/archive/%{version}.tar.gz +BuildRequires: anda-srpm-macros clang %description -%summary +%{common_description} + +%gopkg %prep -%autosetup -n arduino-language-server-%version +%goprep +%go_prep_online %build -mkdir -p bin -%go_build_online +%define gomodulesmode GO111MODULE=on +%gobuild -o %{gobuilddir}/bin/arduino-language-server %{goipath} %install -mkdir -p %{buildroot}%{_bindir} -install -Dm 755 build/bin/arduino-language-server %buildroot%{_bindir}/arduino-language-server +install -Dm755 %{gobuilddir}/bin/arduino-language-server -t %buildroot%{_bindir} %files %license LICENSE.txt @@ -32,3 +45,4 @@ install -Dm 755 build/bin/arduino-language-server %buildroot%{_bindir}/arduino-l %changelog * Fri Dec 27 2024 Owen Zimmerman - Package arduino-language-server + diff --git a/anda/tools/arduino-lint/arduino-lint.spec b/anda/tools/arduino-lint/arduino-lint.spec index a4329920cf..46bdd1e7c0 100644 --- a/anda/tools/arduino-lint/arduino-lint.spec +++ b/anda/tools/arduino-lint/arduino-lint.spec @@ -1,27 +1,44 @@ -%define debug_package %nil +# https://github.com/arduino/arduino-lint +%global goipath github.com/arduino/arduino-lint +Version: 1.3.0 -Name: arduino-lint -Version: 1.3.0 -Release: 1%?dist -Summary: Tool to check for problems with Arduino projects. -License: GPLv3 -Packager: Owen Zimmerman -Url: https://github.com/arduino/arduino-lint -Source0: %url/archive/refs/tags/%version.tar.gz -BuildRequires: golang git go-rpm-macros anda-srpm-macros +%gometa -f + + +%global common_description %{expand: +Arduino Lint is a command line tool that checks for common problems in Arduino projects: + Sketches + Libraries + Boards platforms} + +%global golicenses LICENSE.txt +%global godocs README.md + +Name: arduino-lint +Release: 2%?dist +Summary: Tool to check for problems with Arduino projects +License: GPL-3.0 +Packager: Owen Zimmerman + +URL: %{gourl} +Source: %{url}/archive/%{version}.tar.gz +BuildRequires: anda-srpm-macros %description -%summary +%{common_description} + +%gopkg %prep -%autosetup -n arduino-lint-%version +%goprep +%go_prep_online %build -go build +%define gomodulesmode GO111MODULE=on +%gobuild -o %{gobuilddir}/bin/arduino-lint %{goipath} %install -mkdir -p %{buildroot}%{_bindir} -install -Dm 755 arduino-lint %buildroot%{_bindir}/arduino-lint +install -Dm755 %{gobuilddir}/bin/arduino-lint -t %buildroot%{_bindir} %files %license LICENSE.txt @@ -30,4 +47,5 @@ install -Dm 755 arduino-lint %buildroot%{_bindir}/arduino-lint %changelog * Thu Dec 5 2024 Owen Zimmerman -- Package arduino-lint \ No newline at end of file +- Package arduino-lint + From 53c6d06ebc17a91a2acc82fba8b87f33b4787884 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 27 Feb 2025 08:30:48 +0000 Subject: [PATCH 0079/2977] bump: lomiri-system-settings --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index a85c39e1ef..138ec3bcc2 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit 41b59dcc15bcd9ad237ec65d178e410e2ab239ee +%global commit 1b3d0ee6c1142d928a2b08a929723dbc41dc7fea %forgemeta Name: lomiri-system-settings From 28c06c98ee6e6c8dad88789d4158786d3684d2e0 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 27 Feb 2025 16:32:06 +0000 Subject: [PATCH 0080/2977] bump: compat-nvidia-repo nvidia-driver nvidia-kmod-common nvidia-kmod nvidia-modprobe nvidia-persistenced nvidia-settings nvidia-xconfig --- anda/lib/nvidia/compat-nvidia-repo/compat-nvidia-repo.spec | 2 +- anda/system/nvidia/nvidia-driver/nvidia-driver.spec | 2 +- anda/system/nvidia/nvidia-kmod-common/nvidia-kmod-common.spec | 2 +- anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec | 2 +- anda/system/nvidia/nvidia-modprobe/nvidia-modprobe.spec | 2 +- anda/system/nvidia/nvidia-persistenced/nvidia-persistenced.spec | 2 +- anda/system/nvidia/nvidia-settings/nvidia-settings.spec | 2 +- anda/system/nvidia/nvidia-xconfig/nvidia-xconfig.spec | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/anda/lib/nvidia/compat-nvidia-repo/compat-nvidia-repo.spec b/anda/lib/nvidia/compat-nvidia-repo/compat-nvidia-repo.spec index b68ef885b8..227d553864 100644 --- a/anda/lib/nvidia/compat-nvidia-repo/compat-nvidia-repo.spec +++ b/anda/lib/nvidia/compat-nvidia-repo/compat-nvidia-repo.spec @@ -1,5 +1,5 @@ Name: compat-nvidia-repo -Version: 570.86.16 +Version: 570.124.04 Epoch: 3 Release: 1%?dist Summary: Compatibility package required by official CUDA packages diff --git a/anda/system/nvidia/nvidia-driver/nvidia-driver.spec b/anda/system/nvidia/nvidia-driver/nvidia-driver.spec index e74d6f8f12..83de8eb256 100644 --- a/anda/system/nvidia/nvidia-driver/nvidia-driver.spec +++ b/anda/system/nvidia/nvidia-driver/nvidia-driver.spec @@ -9,7 +9,7 @@ %endif Name: nvidia-driver -Version: 570.86.16 +Version: 570.124.04 Release: 1%?dist Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Epoch: 3 diff --git a/anda/system/nvidia/nvidia-kmod-common/nvidia-kmod-common.spec b/anda/system/nvidia/nvidia-kmod-common/nvidia-kmod-common.spec index 7a9402c72b..f0e3f8768c 100644 --- a/anda/system/nvidia/nvidia-kmod-common/nvidia-kmod-common.spec +++ b/anda/system/nvidia/nvidia-kmod-common/nvidia-kmod-common.spec @@ -7,7 +7,7 @@ %global __strip /bin/true Name: nvidia-kmod-common -Version: 570.86.16 +Version: 570.124.04 Release: 1%?dist Summary: Common file for NVIDIA's proprietary driver kernel modules Epoch: 3 diff --git a/anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec b/anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec index 45b40d045e..27c5f3e36d 100644 --- a/anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec +++ b/anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec @@ -4,7 +4,7 @@ %global debug_package %{nil} Name: nvidia-kmod -Version: 570.86.16 +Version: 570.124.04 Release: 1%?dist Summary: NVIDIA display driver kernel module Epoch: 3 diff --git a/anda/system/nvidia/nvidia-modprobe/nvidia-modprobe.spec b/anda/system/nvidia/nvidia-modprobe/nvidia-modprobe.spec index 145b12d3c5..582b8edf32 100644 --- a/anda/system/nvidia/nvidia-modprobe/nvidia-modprobe.spec +++ b/anda/system/nvidia/nvidia-modprobe/nvidia-modprobe.spec @@ -1,5 +1,5 @@ Name: nvidia-modprobe -Version: 570.86.16 +Version: 570.124.04 Release: 1%?dist Summary: NVIDIA kernel module loader Epoch: 3 diff --git a/anda/system/nvidia/nvidia-persistenced/nvidia-persistenced.spec b/anda/system/nvidia/nvidia-persistenced/nvidia-persistenced.spec index c2ed246fbc..5c6ac60fb9 100644 --- a/anda/system/nvidia/nvidia-persistenced/nvidia-persistenced.spec +++ b/anda/system/nvidia/nvidia-persistenced/nvidia-persistenced.spec @@ -1,5 +1,5 @@ Name: nvidia-persistenced -Version: 570.86.16 +Version: 570.124.04 Release: 1%?dist Summary: A daemon to maintain persistent software state in the NVIDIA driver Epoch: 3 diff --git a/anda/system/nvidia/nvidia-settings/nvidia-settings.spec b/anda/system/nvidia/nvidia-settings/nvidia-settings.spec index b1c66fbd66..1f80fc5669 100644 --- a/anda/system/nvidia/nvidia-settings/nvidia-settings.spec +++ b/anda/system/nvidia/nvidia-settings/nvidia-settings.spec @@ -1,5 +1,5 @@ Name: nvidia-settings -Version: 570.86.16 +Version: 570.124.04 Release: 1%?dist Summary: Configure the NVIDIA graphics driver Epoch: 3 diff --git a/anda/system/nvidia/nvidia-xconfig/nvidia-xconfig.spec b/anda/system/nvidia/nvidia-xconfig/nvidia-xconfig.spec index e0132daca5..a963802bcb 100644 --- a/anda/system/nvidia/nvidia-xconfig/nvidia-xconfig.spec +++ b/anda/system/nvidia/nvidia-xconfig/nvidia-xconfig.spec @@ -1,5 +1,5 @@ Name: nvidia-xconfig -Version: 570.86.16 +Version: 570.124.04 Release: 1%?dist Summary: NVIDIA X configuration file editor Epoch: 3 From 7862ad84f31276d730861fc4b0b64c24283726d3 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 27 Feb 2025 21:22:52 +0000 Subject: [PATCH 0081/2977] bump: preview stable --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 5606eab78b..1a036c967d 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.176.0-pre +%global ver 0.176.1-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 8c58dc0950..fcf0196c94 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.175.5 +Version: 0.175.6 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From a176e271a71c2ce6bcc5a5da4b2f2bc282cb99ff Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 27 Feb 2025 23:57:05 +0000 Subject: [PATCH 0082/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index af502a55a8..1985223e4b 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.599 +Version: 0.0.600 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 1a7d0fdda5..8d6ecd2a7b 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.599 +Version: 0.0.600 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From d65532a006f13124e2c24e64e8a3dc94671864fe Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 28 Feb 2025 01:39:04 +0000 Subject: [PATCH 0083/2977] bump(nightly): owl nightly micro nightly nim-nightly telescope --- anda/desktops/owl/owl.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/micro/micro-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/stardust/telescope/stardust-telescope.spec | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/anda/desktops/owl/owl.spec b/anda/desktops/owl/owl.spec index 3820b7fa3a..7f9138856e 100644 --- a/anda/desktops/owl/owl.spec +++ b/anda/desktops/owl/owl.spec @@ -1,5 +1,5 @@ -%global commit 978bf4c32d65ae6b8d0ec352c727b6b9a17cc509 -%global commit_date 20250224 +%global commit 0b926c4d3e2a719e1b3e2b79265e99c3bf698b2d +%global commit_date 20250228 %global shortcommit %{sub %{commit} 1 7 } Name: owl diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 94c9dbb027..8b4e22cfd5 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit d85ed8275ec529734e9c352e5ff24f0918da5cf8 +%global commit ef88d1cba9f3c6f00cc2bd4908df866a23e4faf8 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-02-26 +%global fulldate 2025-02-27 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 diff --git a/anda/devs/micro/micro-nightly.spec b/anda/devs/micro/micro-nightly.spec index 46030534cf..a1219dc328 100644 --- a/anda/devs/micro/micro-nightly.spec +++ b/anda/devs/micro/micro-nightly.spec @@ -12,8 +12,8 @@ # Naming variable as something other than "commit" is necessary # to stop %%gometa from putting commit hash in release -%global commit_hash c93747926d2e5ead9adf0039f6bf34f48ba3263d -%global commit_date 20250225 +%global commit_hash 272a308275f3b543647c6171e86dc521ce2822a0 +%global commit_date 20250228 %global shortcommit %{sub %{commit_hash} 1 7} %global ver v2.0.14 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 9f1a66747f..f61f749477 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 84ded96cb2778eec63cabac4cdbc59a3447da994 +%global commit 212c8f4c31ef10caf7974631463c3881bdab2def %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250227 +%global commit_date 20250228 %global ver 0.177.0 %bcond_with check diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 1cd314ce1f..2f3858ae3b 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit a18dcca744dff3d7dcdcf51737ae2a1b05728150 +%global commit 7e8a650729e9434574c46350aece7609e5465253 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250227 +%global commit_date 20250228 %global debug_package %nil Name: nim-nightly diff --git a/anda/stardust/telescope/stardust-telescope.spec b/anda/stardust/telescope/stardust-telescope.spec index 6e2fcc55a5..fcdd4a82ff 100644 --- a/anda/stardust/telescope/stardust-telescope.spec +++ b/anda/stardust/telescope/stardust-telescope.spec @@ -1,7 +1,7 @@ %define debug_package %nil -%global commit 31aaa1d6a3c1cbf1795981432c9ec2cbcc142ba9 -%global commit_date 20250121 +%global commit 29362efdde07b0869a824cd6402501778c081b0e +%global commit_date 20250228 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: stardust-xr-telescope From 2592c9727ba60ed6f1add61589c8c6b6e76fcb31 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 28 Feb 2025 01:41:29 +0000 Subject: [PATCH 0084/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 750ed95d22..9c5a2fdcc8 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-02-26 +%global ver 2025-02-28 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From b8028dffa7e988536aa60654d5e6dc8aac61c374 Mon Sep 17 00:00:00 2001 From: sadlerm4 Date: Fri, 28 Feb 2025 14:31:06 +1100 Subject: [PATCH 0085/2977] add: flashprog (#3565) * add: flashprog * add packager --- anda/tools/flashprog/anda.hcl | 5 ++ anda/tools/flashprog/flashprog.spec | 71 +++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 anda/tools/flashprog/anda.hcl create mode 100644 anda/tools/flashprog/flashprog.spec diff --git a/anda/tools/flashprog/anda.hcl b/anda/tools/flashprog/anda.hcl new file mode 100644 index 0000000000..71eb48d79e --- /dev/null +++ b/anda/tools/flashprog/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "flashprog.spec" + } +} diff --git a/anda/tools/flashprog/flashprog.spec b/anda/tools/flashprog/flashprog.spec new file mode 100644 index 0000000000..82f60de9df --- /dev/null +++ b/anda/tools/flashprog/flashprog.spec @@ -0,0 +1,71 @@ +%global common_description %{expand: +flashprog is a utility for detecting, reading, writing, verifying and erasing flash chips. It is often used to flash BIOS/EFI/coreboot/firmware images in-system using a supported mainboard, but it also supports flashing of network cards (NICs), SATA controller cards, and other external devices which can program flash chips. + +It supports a wide range of flash chips (most commonly found in SOIC8, DIP8, SOIC16, WSON8, PLCC32, DIP32, TSOP32, and TSOP40 packages), which use various protocols such as LPC, FWH, parallel flash, or SPI.} + +Name: flashprog +Version: 1.3 +Release: 1%{?dist} +Summary: Utility for detecting, reading, writing, verifying and erasing flash chips + +License: GPL-2.0 +URL: https://review.sourcearcade.org/flashprog + +Packager: sadlerm + +BuildRequires: anda-srpm-macros +BuildRequires: make +BuildRequires: gcc +BuildRequires: doxygen +BuildRequires: pciutils-devel +BuildRequires: libusb1-devel +BuildRequires: libftdi-devel +BuildRequires: libjaylink-devel +BuildRequires: libgpiod-devel +BuildRequires: systemd-devel + +%description +%{common_description} + + +%package libs-static +Summary: Shared static library for flashprog + +%description libs-static +%{common_description} + +%package devel +Summary: Development headers for flashprog + +%description devel +%{common_description} + + +%prep +%git_clone %{url} v%{version} + +%build +%make_build PREFIX=%{_prefix} + +%install +%__make DESTDIR=%{buildroot} PREFIX=%{_prefix} install libinstall + +%files +%license COPYING +%doc README.md +%{_bindir}/flashprog +%{_mandir}/man8/flashprog.8.gz +%{_mandir}/man8/flashprog-config.8.gz +%{_mandir}/man8/flashprog-write-protect.8.gz + +%files libs-static +%license COPYING +%{_prefix}/lib/libflashprog.a + +%files devel +%{_includedir}/libflashprog.h + +%changelog +* Thu Feb 27 2025 sadlerm +- Initial package + From 5a9ce7a02a06cc5d0785c208386d27f9d3fb2bd2 Mon Sep 17 00:00:00 2001 From: Gilver Date: Thu, 27 Feb 2025 21:31:43 -0600 Subject: [PATCH 0086/2977] Fix: NVIDIA Driver and NVIDIA Persistenced (#3571) * sbin and the `%_{sbindir}` macro are obsolete Signed-off-by: Gilver * Drop X11 for (RH)EL 10+, add missing file Signed-off-by: Gilver * Oh my God REL YOU IDIOT Signed-off-by: Gilver * Update nvidia-driver.spec Signed-off-by: Gilver * Rel... Signed-off-by: Gilver * Unsure what happened but Signed-off-by: Gilver * How did I mess up this bad Signed-off-by: Gilver * Update nvidia-driver.spec Signed-off-by: Gilver --------- Signed-off-by: Gilver --- .../nvidia/nvidia-driver/nvidia-driver.spec | 232 +-------------- .../nvidia-persistenced.spec | 273 +----------------- 2 files changed, 20 insertions(+), 485 deletions(-) diff --git a/anda/system/nvidia/nvidia-driver/nvidia-driver.spec b/anda/system/nvidia/nvidia-driver/nvidia-driver.spec index 83de8eb256..7cdcbb8b22 100644 --- a/anda/system/nvidia/nvidia-driver/nvidia-driver.spec +++ b/anda/system/nvidia/nvidia-driver/nvidia-driver.spec @@ -10,7 +10,7 @@ Name: nvidia-driver Version: 570.124.04 -Release: 1%?dist +Release: 2%?dist Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Epoch: 3 License: NVIDIA License @@ -148,6 +148,7 @@ Conflicts: xorg-x11-drv-nvidia-470xx-cuda %description cuda This package provides the CUDA integration components for %{name}. +%if 0%{?fedora} || 0%{?rhel} < 10 %package -n xorg-x11-nvidia Summary: X.org X11 NVIDIA driver and extensions Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version} @@ -159,6 +160,7 @@ Conflicts: xorg-x11-drv-nvidia-470xx %description -n xorg-x11-nvidia The NVIDIA X.org X11 driver and associated components. +%endif %endif @@ -268,10 +270,12 @@ install -p -m 0755 nvidia-{debugdump,smi,cuda-mps-control,cuda-mps-server,bug-re mkdir -p %{buildroot}%{_mandir}/man1/ install -p -m 0644 nvidia-{smi,cuda-mps-control}*.gz %{buildroot}%{_mandir}/man1/ +%if 0%{?fedora} || 0%{?rhel} < 10 # X stuff install -p -m 0644 -D %{SOURCE10} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/10-nvidia.conf install -p -m 0755 -D nvidia_drv.so %{buildroot}%{_libdir}/xorg/modules/drivers/nvidia_drv.so install -p -m 0755 -D libglxserver_nvidia.so.%{version} %{buildroot}%{_libdir}/xorg/modules/extensions/libglxserver_nvidia.so +%endif # NVIDIA specific configuration files mkdir -p %{buildroot}%{_datadir}/nvidia/ @@ -332,18 +336,21 @@ appstream-util validate --nonet %{buildroot}%{_metainfodir}/com.nvidia.driver.me %systemd_post nvidia-powerd.service %systemd_post nvidia-resume.service %systemd_post nvidia-suspend.service +%systemd_post nvidia-suspend-then-hibernate.service %preun %systemd_preun nvidia-hibernate.service %systemd_preun nvidia-powerd.service %systemd_preun nvidia-resume.service %systemd_preun nvidia-suspend.service +%systemd_post nvidia-suspend-then-hibernate.service %postun %systemd_postun nvidia-hibernate.service %systemd_postun nvidia-powerd.service %systemd_postun nvidia-resume.service %systemd_postun nvidia-suspend.service +%systemd_post nvidia-suspend-then-hibernate.service %endif @@ -370,15 +377,18 @@ appstream-util validate --nonet %{buildroot}%{_metainfodir}/com.nvidia.driver.me %{_unitdir}/nvidia-powerd.service %{_unitdir}/nvidia-resume.service %{_unitdir}/nvidia-suspend.service +%{_unitdir}/nvidia-suspend-then-hibernate.service %if 0%{?fedora} >= 41 %{_unitdir}/systemd-suspend.service.d/10-nvidia.conf %{_unitdir}/systemd-homed.service.d/10-nvidia.conf %endif +%if 0%{?fedora} || 0%{?rhel} < 10 %files -n xorg-x11-nvidia %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/10-nvidia.conf %{_libdir}/xorg/modules/extensions/libglxserver_nvidia.so %{_libdir}/xorg/modules/drivers/nvidia_drv.so +%endif %files -n libnvidia-cfg %{_libdir}/libnvidia-cfg.so.1 @@ -482,222 +492,4 @@ appstream-util validate --nonet %{buildroot}%{_metainfodir}/com.nvidia.driver.me %{_libdir}/libnvidia-ml.so.%{version} %changelog -* Thu Dec 05 2024 Simone Caronni - 3:565.77-1 -- Update to 565.77. - -* Mon Nov 25 2024 Simone Caronni - 3:565.57.01-5 -- Switch back to local icon. - -* Fri Nov 15 2024 Simone Caronni - 3:565.57.01-4 -- Do not manipulate appstream metadata using libappstream-glib. - -* Sat Nov 09 2024 Simone Caronni - 3:565.57.01-3 -- Switch to remote icon for Appstream metadata. "appstremcli validate", instead - of "appstream-util validate", prints out that local is not a valid icon type, - even if the documentation says so. - -* Sun Oct 27 2024 Simone Caronni - 3:565.57.01-2 -- Add workaround for system sleep on systemd 256+. - -* Wed Oct 23 2024 Simone Caronni - 3:565.57.01-1 -- Update to 565.57.01. - -* Thu Oct 10 2024 Simone Caronni - 3:560.35.03-4 -- Enable nvidia-persistenced by default if installed through a systemd preset. - -* Wed Sep 04 2024 Simone Caronni - 3:560.35.03-3 -- Unbundle nvidia-egl-platform-base. - -* Fri Aug 30 2024 Simone Caronni - 3:560.35.03-2 -- Split out X.org components. - -* Wed Aug 21 2024 Simone Caronni - 3:560.35.03-1 -- Update to 560.35.03. - -* Tue Aug 06 2024 Simone Caronni - 3:560.31.02-1 -- Update to 560.31.02. -- Update EGL requirements. - -* Mon Aug 05 2024 Simone Caronni - 3:560.28.03-1 -- Update to 560.28.03. -- Add Vulkan Safety Critical library and offline Pipeline Cache Compiler. -- Temporarily add new EGL libraries. - -* Mon Jul 15 2024 Simone Caronni - 3:555.58.02-3 -- Provider of cuda-nvml still needs _isa. - -* Sat Jul 13 2024 Simone Caronni - 3:555.58.02-2 -- Remove isa Provides/Requires. - -* Tue Jul 02 2024 Simone Caronni - 3:555.58.02-1 -- Update to 555.58.02. -- Reorganize some libraries that get dynamically opened by other components. - -* Sat Jun 29 2024 Simone Caronni - 3:555.58-4 -- Adjust Appstream icon path. - -* Fri Jun 28 2024 Simone Caronni - 3:555.58-3 -- Switch to local icon for Appstream metadata before madness takes over. - -* Fri Jun 28 2024 Simone Caronni - 3:555.58-2 -- Make sure there are no redirects in the Appstream metadata URLs. - -* Thu Jun 27 2024 Simone Caronni - 3:555.58-1 -- Update to 555.58. - -* Wed Jun 26 2024 Simone Caronni - 3:555.52.04-2 -- Update AppData metadata, add new custom key entry: - https://gitlab.gnome.org/GNOME/gnome-software/-/merge_requests/2034 - -* Thu Jun 06 2024 Simone Caronni -- Update to 555.52.04. - -* Fri May 31 2024 Simone Caronni - 3:555.42.02-3 -- Fix file format specification for Vulkan layers. - -* Mon May 27 2024 Simone Caronni - 3:555.42.02-2 -- Add GBM loader library symlink also for i686 libraries (#156). -- Also own the %%_libdir/gbm directory. - -* Wed May 22 2024 Simone Caronni - 3:555.42.02-1 -- Update to 555.42.02. - -* Fri Apr 26 2024 Simone Caronni - 3:550.78-1 -- Update to 550.78. - -* Fri Apr 26 2024 Simone Caronni - 3:550.76-2 -- Install Vulkan loader in a more similar way to Mesa packages. - -* Thu Apr 18 2024 Simone Caronni - 3:550.76-1 -- Update to 550.76. - -* Mon Apr 15 2024 Simone Caronni - 3:550.67-2 -- Fix egl requirements. - -* Sun Mar 24 2024 Simone Caronni - 3:550.67-1 -- Update to 550.67. - -* Thu Mar 14 2024 Simone Caronni - 3:550.54.14-3 -- Clean up SPEC file. - -* Fri Mar 08 2024 Simone Caronni - 3:550.54.14-2 -- Add support for aarch64. -- Clean up SPEC file. - -* Sun Mar 03 2024 Simone Caronni - 3:550.54.14-1 -- Update to 550.54.14. - -* Thu Feb 22 2024 Simone Caronni - 3:550.40.07-1 -- Update to 550.40.07. - -* Fri Feb 16 2024 Simone Caronni - 3:545.29.06-3 -- Re-add explicit egl-wayland dependency (reverts - cd6f2b9044d90f71f94fa91be1cc0cad343a1560). - -* Mon Dec 18 2023 Simone Caronni - 3:545.29.06-2 -- Do not mark nvidia-powerd unit as failed if the binary exits. - -* Fri Dec 01 2023 Simone Caronni - 3:545.29.06-1 -- Update to 545.29.06. - -* Mon Nov 13 2023 Simone Caronni - 3:545.29.02-2 -- Create kernel module tarball with proprietary and open source modules. - -* Tue Oct 31 2023 Simone Caronni - 3:545.29.02-1 -- Update to 545.29.02. - -* Wed Oct 18 2023 Simone Caronni - 3:545.23.06-1 -- Update to 545.23.06. - -* Fri Sep 22 2023 Simone Caronni - 3:535.113.01-1 -- Update to 535.113.01. - -* Thu Aug 24 2023 Simone Caronni - 3:535.104.05-1 -- Update to 535.104.05. - -* Wed Aug 09 2023 Simone Caronni - 3:535.98-1 -- Update to 535.98. - -* Wed Jul 19 2023 Simone Caronni - 3:535.86.05-1 -- Update to 535.86.05. - -* Thu Jun 15 2023 Simone Caronni - 3:535.54.03-1 -- Update to 535.54.03. - -* Tue Jun 13 2023 Simone Caronni - 3:535.43.02-1 -- Update to 535.43.02. - -* Fri Mar 24 2023 Simone Caronni - 3:530.41.03-1 -- Update to 530.41.03. - -* Wed Mar 08 2023 Simone Caronni - 3:530.30.02-1 -- Update to 530.30.02. - -* Fri Feb 10 2023 Simone Caronni - 3:525.89.02-1 -- Update to 525.89.02. - -* Fri Jan 20 2023 Simone Caronni - 3:525.85.05-1 -- Update to 525.85.05. - -* Mon Jan 09 2023 Simone Caronni - 3:525.78.01-1 -- Update to 525.78.01. - -* Tue Dec 13 2022 Simone Caronni - 3:525.60.11-2 -- Drop nvidia-driver-devel subpackage. -- Trim changelog. - -* Tue Nov 29 2022 Simone Caronni - 3:525.60.11-1 -- Update to 525.60.11. - -* Thu Oct 13 2022 Simone Caronni - 3:520.56.06-1 -- Update to 520.56.06. - -* Wed Sep 21 2022 Simone Caronni - 3:515.76-1 -- Update to 515.76. - -* Mon Aug 08 2022 Simone Caronni - 3:515.65.01-1 -- Update to 515.65.01. - -* Wed Jun 29 2022 Simone Caronni - 3:515.57-1 -- Update to 515.57. - -* Wed Jun 01 2022 Simone Caronni - 3:515.48.07-1 -- Update to 515.48.07. - -* Sun May 15 2022 Simone Caronni - 3:515.43.04-2 -- Rename libnvidia-vulkan-producer.so versioned library (#128). - -* Thu May 12 2022 Simone Caronni - 3:515.43.04-1 -- Update to 515.43.04. - -* Mon May 02 2022 Simone Caronni - 3:510.68.02-1 -- Update to 510.68.02. - -* Mon Mar 28 2022 Simone Caronni - 3:510.60.02-1 -- Update to 510.60.02. - -* Thu Mar 03 2022 Simone Caronni - 3:510.54-3 -- nvidia-resume is no longer triggered by nvidia-sleep.sh. - -* Fri Feb 25 2022 Simone Caronni - 3:510.54-2 -- nvidia-smi dlopens NVML, add explicit dependency to cuda subpackage. - -* Mon Feb 14 2022 Simone Caronni - 3:510.54-1 -- Update to 510.54. - -* Sat Feb 12 2022 Simone Caronni - 3:510.47.03-4 -- Drop libva-vdpau-driver hard dependency. - -* Mon Feb 07 2022 Simone Caronni - 3:510.47.03-3 -- Fix GBM condition. - -* Sat Feb 05 2022 Simone Caronni - 3:510.47.03-2 -- Drop explicit dependency on egl-wayland, it's auto generated and not needed on - i686 libs. Minimum version 1.1.7 required. - -* Wed Feb 02 2022 Simone Caronni - 3:510.47.03-1 -- Update to 510.47.03. -- Use external GBM library. -- Install GBM only on CentOS/RHEL 9+ and Fedora 35. It's also supported in - CentOS Stream 8 (8.6+/Mesa 21.2), but there's no easy way to check for Stream - in the SPEC file. +%autochangelog diff --git a/anda/system/nvidia/nvidia-persistenced/nvidia-persistenced.spec b/anda/system/nvidia/nvidia-persistenced/nvidia-persistenced.spec index 5c6ac60fb9..f20353016f 100644 --- a/anda/system/nvidia/nvidia-persistenced/nvidia-persistenced.spec +++ b/anda/system/nvidia/nvidia-persistenced/nvidia-persistenced.spec @@ -1,6 +1,6 @@ Name: nvidia-persistenced Version: 570.124.04 -Release: 1%?dist +Release: 2%?dist Summary: A daemon to maintain persistent software state in the NVIDIA driver Epoch: 3 License: GPLv2+ @@ -47,7 +47,9 @@ make %{?_smp_mflags} \ PREFIX=%{_prefix} \ STRIP_CMD=true +%if 0%{?fedora} < 42 mv %{buildroot}%{_bindir} %{buildroot}%{_sbindir} +%endif mkdir -p %{buildroot}%{_sharedstatedir}/%{name} # Systemd unit files @@ -65,272 +67,13 @@ install -p -m 644 -D %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service %files %license COPYING %{_mandir}/man1/%{name}.1.* +%if 0%{?fedora} < 42 %{_sbindir}/%{name} +%else +%{_bindir}/%{name} +%endif %{_unitdir}/%{name}.service %{_sharedstatedir}/%{name} %changelog -* Thu Dec 05 2024 Simone Caronni - 3:565.77-1 -- Update to 565.77. - -* Wed Oct 23 2024 Simone Caronni - 3:565.57.01-1 -- Update to 565.57.01. - -* Wed Aug 21 2024 Simone Caronni - 3:560.35.03-1 -- Update to 560.35.03. - -* Tue Aug 06 2024 Simone Caronni - 3:560.31.02-1 -- Update to 560.31.02. - -* Mon Aug 05 2024 Simone Caronni - 3:560.28.03-1 -- Update to 560.28.03. - -* Tue Jul 02 2024 Simone Caronni - 3:555.58.02-1 -- Update to 555.58.02. -- Require dynamically loaded library libnvidia-cfg. - -* Thu Jun 27 2024 Simone Caronni - 3:555.58-1 -- Update to 555.58. - -* Thu Jun 06 2024 Simone Caronni - 3:555.52.04-1 -- Update to 555.52.04. - -* Wed May 22 2024 Simone Caronni - 3:555.42.02-1 -- Update to 555.42.02. - -* Tue Apr 30 2024 Simone Caronni - 3:550.78-2 -- Switch to Nvidia provided tarball. - -* Fri Apr 26 2024 Simone Caronni - 3:550.78-1 -- Update to 550.78. - -* Thu Apr 18 2024 Simone Caronni - 3:550.76-1 -- Update to 550.76. - -* Sun Mar 24 2024 Simone Caronni - 3:550.67-1 -- Update to 550.67. - -* Mon Mar 18 2024 Simone Caronni - 3:550.54.14-4 -- Clean up build requirements. - -* Sat Mar 09 2024 Simone Caronni - 3:550.54.14-3 -- Enable aarch64. - -* Thu Mar 07 2024 Simone Caronni - 3:550.54.14-2 -- Run nvidia-persistenced as root as Nvidia does. - -* Sun Mar 03 2024 Simone Caronni - 3:550.54.14-1 -- Update to 550.54.14. - -* Tue Feb 06 2024 Simone Caronni - 3:550.40.07-1 -- Update to 550.40.07. - -* Fri Dec 01 2023 Simone Caronni - 3:545.29.06-1 -- Update to 545.29.06. - -* Tue Oct 31 2023 Simone Caronni - 3:545.29.02-1 -- Update to 545.29.02. - -* Wed Oct 18 2023 Simone Caronni - 3:545.23.06-1 -- Update to 545.23.06. - -* Fri Sep 22 2023 Simone Caronni - 3:535.113.01-1 -- Update to 535.113.01. - -* Thu Aug 24 2023 Simone Caronni - 3:535.104.05-1 -- Update to 535.104.05. - -* Wed Aug 09 2023 Simone Caronni - 3:535.98-1 -- Update to 535.98. - -* Wed Jul 19 2023 Simone Caronni - 3:535.86.05-1 -- Update to 535.86.05. - -* Thu Jun 15 2023 Simone Caronni - 3:535.54.03-1 -- Update to 535.54.03. - -* Tue Jun 13 2023 Simone Caronni - 3:535.43.02-1 -- Update to 535.43.02. - -* Fri Mar 24 2023 Simone Caronni - 3:530.41.03-1 -- Update to 530.41.03. - -* Wed Mar 08 2023 Simone Caronni - 3:530.30.02-1 -- Update to 530.30.02. - -* Fri Feb 10 2023 Simone Caronni - 3:525.89.02-1 -- Update to 525.89.02. - -* Fri Jan 20 2023 Simone Caronni - 3:525.85.05-1 -- Update to 525.85.05. - -* Mon Jan 09 2023 Simone Caronni - 3:525.78.01-1 -- Update to 525.78.01. - -* Tue Nov 29 2022 Simone Caronni - 3:525.60.11-1 -- Update to 525.60.11. - -* Thu Oct 13 2022 Simone Caronni - 3:520.56.06-1 -- Update to 520.56.06. - -* Wed Sep 21 2022 Simone Caronni - 3:515.76-1 -- Update to 515.76. - -* Mon Aug 08 2022 Simone Caronni - 3:515.65.01-1 -- Update to 515.65.01. - -* Wed Jun 29 2022 Simone Caronni - 3:515.57-1 -- Update to 515.57. - -* Wed Jun 01 2022 Simone Caronni - 3:515.48.07-1 -- Update to 515.48.07. - -* Thu May 12 2022 Simone Caronni - 3:515.43.04-1 -- Update to 515.43.04. - -* Mon May 02 2022 Simone Caronni - 3:510.68.02-1 -- Update to 510.68.02. - -* Mon Mar 28 2022 Simone Caronni - 3:510.60.02-1 -- Update to 510.60.02. - -* Mon Feb 14 2022 Simone Caronni - 3:510.54-1 -- Update to 510.54. - -* Wed Feb 02 2022 Simone Caronni - 3:510.47.03-1 -- Update to 510.47.03. - -* Tue Dec 14 2021 Simone Caronni - 3:495.46-1 -- Update to 495.46. - -* Tue Nov 02 2021 Simone Caronni - 3:495.44-1 -- Update to 495.44. - -* Tue Nov 02 2021 Simone Caronni - 3:470.82.00-1 -- Update to 470.82.00. - -* Tue Sep 21 2021 Simone Caronni - 3:470.74-1 -- Update to 470.74. - -* Wed Aug 11 2021 Simone Caronni - 3:470.63.01-1 -- Update to 470.63.01. - -* Tue Jul 20 2021 Simone Caronni - 3:470.57.02-1 -- Update to 470.57.02. - -* Wed Jun 30 2021 Simone Caronni - 3:470.42.01-1 -- Update to 470.42.01. - -* Wed May 26 2021 Simone Caronni - 3:465.31-1 -- Update to 465.31. - -* Sat May 01 2021 Simone Caronni - 3:465.27-1 -- Update to 465.27. - -* Sun Apr 18 2021 Simone Caronni - 3:465.24.02-1 -- Update to 465.24.02. -- Switch to github sources. - -* Fri Apr 09 2021 Simone Caronni - 3:465.19.01-1 -- Update to 465.19.01. - -* Fri Mar 19 2021 Simone Caronni - 3:460.67-1 -- Update to 460.67. - -* Mon Mar 01 2021 Simone Caronni - 3:460.56-1 -- Update to 460.56. - -* Wed Jan 27 2021 Simone Caronni - 3:460.39-1 -- Update to 460.39. - -* Thu Jan 7 2021 Simone Caronni - 3:460.32.03-1 -- Update to 460.32.03. - -* Sun Dec 20 2020 Simone Caronni - 3:460.27.04-1 -- Update to 460.27.04. -- Trim changelog. - -* Mon Dec 07 2020 Simone Caronni - 3:455.45.01-2 -- Remove RHEL/CentOS 6 support. - -* Wed Nov 18 2020 Simone Caronni - 3:455.45.01-1 -- Update to 455.45.01. - -* Mon Nov 02 2020 Simone Caronni - 3:455.38-1 -- Update to 455.38. - -* Mon Oct 12 2020 Simone Caronni - 3:455.28-1 -- Update to 455.28. - -* Tue Oct 06 2020 Simone Caronni - 3:450.80.02-1 -- Update to 450.80.02. - -* Thu Aug 20 2020 Simone Caronni - 3:450.66-1 -- Update to 450.66. - -* Fri Jul 10 2020 Simone Caronni - 3:450.57-1 -- Update to 450.57. - -* Thu Jun 25 2020 Simone Caronni - 3:440.100-1 -- Update to 440.100. - -* Tue Apr 14 2020 Simone Caronni - 3:440.82-2 -- Update requirements according to package guidelines. - -* Thu Apr 09 2020 Simone Caronni - 3:440.82-1 -- Update to 440.82. - -* Fri Feb 28 2020 Simone Caronni - 3:440.64-1 -- Update to 440.64. - -* Tue Feb 04 2020 Simone Caronni - 3:440.59-1 -- Update to 440.59. - -* Sat Dec 14 2019 Simone Caronni - 3:440.44-1 -- Update to 440.44. - -* Sat Nov 30 2019 Simone Caronni - 3:440.36-1 -- Update to 440.36. - -* Sat Nov 09 2019 Simone Caronni - 3:440.31-1 -- Update to 440.31. - -* Thu Oct 17 2019 Simone Caronni - 3:440.26-1 -- Update to 440.26. - -* Mon Sep 02 2019 Simone Caronni - 3:435.21-1 -- Update to 435.21. - -* Thu Aug 22 2019 Simone Caronni - 3:435.17-1 -- Update to 435.17. - -* Wed Jul 31 2019 Simone Caronni - 3:430.40-1 -- Update to 430.40. - -* Fri Jul 12 2019 Simone Caronni - 3:430.34-1 -- Update to 430.34. - -* Wed Jun 12 2019 Simone Caronni - 3:430.26-1 -- Update to 430.26. - -* Sat May 18 2019 Simone Caronni - 3:430.14-1 -- Update to 430.14. - -* Thu May 09 2019 Simone Caronni - 3:418.74-1 -- Update to 418.74. - -* Sun Mar 24 2019 Simone Caronni - 3:418.56-1 -- Update to 418.56. - -* Fri Feb 22 2019 Simone Caronni - 3:418.43-1 -- Update to 418.43. -- Trim changelog. - -* Wed Feb 06 2019 Simone Caronni - 3:418.30-1 -- Update to 418.30. - -* Sun Feb 03 2019 Simone Caronni - 3:415.27-2 -- Do not require nvidia-kmod-common, already required by nvidia-driver-cuda. - -* Thu Jan 17 2019 Simone Caronni - 3:415.27-1 -- Update to 415.27. +%autochangelog From 861103b50c81b45f4478bf90a865ebd5fdc240ef Mon Sep 17 00:00:00 2001 From: sadlerm4 Date: Fri, 28 Feb 2025 14:32:04 +1100 Subject: [PATCH 0087/2977] fix: owl/mwc (#3564) * fix(owl): use meson and add scenefx dep * fix(mwc): rename old package name * avoid famine due to failed crop --- anda/desktops/{owl => mwc}/anda.hcl | 2 +- anda/desktops/{owl/owl.spec => mwc/mwc.spec} | 30 ++++++++++++-------- anda/desktops/mwc/update.rhai | 9 ++++++ anda/desktops/owl/update.rhai | 6 ---- 4 files changed, 28 insertions(+), 19 deletions(-) rename anda/desktops/{owl => mwc}/anda.hcl (72%) rename anda/desktops/{owl/owl.spec => mwc/mwc.spec} (64%) create mode 100644 anda/desktops/mwc/update.rhai delete mode 100644 anda/desktops/owl/update.rhai diff --git a/anda/desktops/owl/anda.hcl b/anda/desktops/mwc/anda.hcl similarity index 72% rename from anda/desktops/owl/anda.hcl rename to anda/desktops/mwc/anda.hcl index a1210fb60c..25f863cc82 100644 --- a/anda/desktops/owl/anda.hcl +++ b/anda/desktops/mwc/anda.hcl @@ -1,6 +1,6 @@ project pkg { rpm { - spec = "owl.spec" + spec = "mwc.spec" } labels { nightly = 1 diff --git a/anda/desktops/owl/owl.spec b/anda/desktops/mwc/mwc.spec similarity index 64% rename from anda/desktops/owl/owl.spec rename to anda/desktops/mwc/mwc.spec index 7f9138856e..02e1fec5dd 100644 --- a/anda/desktops/owl/owl.spec +++ b/anda/desktops/mwc/mwc.spec @@ -1,22 +1,25 @@ %global commit 0b926c4d3e2a719e1b3e2b79265e99c3bf698b2d %global commit_date 20250228 %global shortcommit %{sub %{commit} 1 7 } +%global ver 0.1.1 -Name: owl -Version: 0^%{commit_date}.%{shortcommit} +Name: mwc +Version: %{ver}^%{commit_date}git.%{shortcommit} Release: 1%{?dist} -Summary: Tiling Wayland compositor based on wlroots +Summary: Tiling Wayland compositor based on wlroots and scenefx License: MIT -URL: https://github.com/dqrk0jeste/owl +URL: https://github.com/dqrk0jeste/mwc Source0: %{url}/archive/%{commit}.tar.gz -BuildRequires: make gcc +BuildRequires: meson +BuildRequires: gcc BuildRequires: pkgconfig(libinput) +BuildRequires: pkgconfig(scenefx-0.2) +BuildRequires: pkgconfig(wlroots-0.18) BuildRequires: pkgconfig(wayland-protocols) BuildRequires: pkgconfig(xkbcommon) BuildRequires: wayland-devel -BuildRequires: wlroots-devel Requires: libdrm Requires: libinput @@ -30,6 +33,9 @@ Recommends: waybar kitty rofi-wayland Packager: sadlerm +Provides: owl = %{version}-%{release} +Obsoletes: owl < 0^20250124.9999999 + %description %{summary}. @@ -37,15 +43,12 @@ Packager: sadlerm %autosetup -n %{name}-%{commit} %build -%make_build all +%meson +%meson_build %install -install -Dm755 build/%{name} %{buildroot}%{_bindir}/%{name} -install -Dm755 build/%{name}-ipc %{buildroot}%{_bindir}/%{name}-ipc -install -Dm644 default.conf %{buildroot}%{_datadir}/%{name}/default.conf +%meson_install install -Dm644 examples/example.conf %{buildroot}%{_datadir}/%{name}/example.conf -install -Dm644 %{name}.desktop %{buildroot}%{_datadir}/wayland-sessions/%{name}.desktop -install -Dm644 %{name}-portals.conf %{buildroot}%{_datadir}/xdg-desktop-portal/%{name}-portals.conf %files %license LICENSE @@ -59,5 +62,8 @@ install -Dm644 %{name}-portals.conf %{buildroot}%{_datadir}/xdg-desktop-portal/% %changelog +* Thu Feb 27 2025 sadlerm +- New upstream name +- Package is now built with meson * Fri Jan 31 2025 sadlerm - Initial package diff --git a/anda/desktops/mwc/update.rhai b/anda/desktops/mwc/update.rhai new file mode 100644 index 0000000000..f8423343de --- /dev/null +++ b/anda/desktops/mwc/update.rhai @@ -0,0 +1,9 @@ +if filters.contains("nightly") { + rpm.global("commit", gh_commit("dqrk0jeste/mwc")); + let v = gh("dqrk0jeste/mwc"); + if rpm.changed() { + rpm.global("commit_date", date()); + v.crop(1); + rpm.global("ver", v); + } +} diff --git a/anda/desktops/owl/update.rhai b/anda/desktops/owl/update.rhai deleted file mode 100644 index 83e6cb9536..0000000000 --- a/anda/desktops/owl/update.rhai +++ /dev/null @@ -1,6 +0,0 @@ -if filters.contains("nightly") { - rpm.global("commit", gh_commit("dqrk0jeste/owl")); - if rpm.changed() { - rpm.global("commit_date", date()); - } -} From 54880438cbb2bfcd889d7976ce1f06db40b8e579 Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 28 Feb 2025 11:38:55 +0800 Subject: [PATCH 0088/2977] fix(astal-gtk): use %git_clone instead (#3566) Signed-off-by: madomado --- anda/lib/astal/astal-gtk/astal-gtk.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/anda/lib/astal/astal-gtk/astal-gtk.spec b/anda/lib/astal/astal-gtk/astal-gtk.spec index 95ae7682e1..4494a70315 100644 --- a/anda/lib/astal/astal-gtk/astal-gtk.spec +++ b/anda/lib/astal/astal-gtk/astal-gtk.spec @@ -1,14 +1,12 @@ %global commit b7f10b9 -%global shortcommit %{sub %commit 1 7} %global commit_date 20250227 Name: astal -Version: 0^%commit_date.%shortcommit +Version: 0^%commit_date.%commit Release: 1%?dist Summary: Building blocks for creating custom desktop shells License: LGPL-2.1-only URL: https://aylur.github.io/astal -Source0: https://github.com/Aylur/astal/archive/%commit.tar.gz Packager: madonuko BuildRequires: meson gobject-introspection vala valadoc cmake BuildRequires: pkgconfig(astal-io-0.1) @@ -59,7 +57,7 @@ This package contains development files and documentation for astal-gtk4. %prep -%autosetup -n astal-%commit +%git_clone https://github.com/Aylur/astal %build my_build() { From 6cc25e88463e608c82e23c8b4b303c86a5c45156 Mon Sep 17 00:00:00 2001 From: Gilver Date: Thu, 27 Feb 2025 21:49:29 -0600 Subject: [PATCH 0089/2977] add: XONE (#3510) * Add XONE files * Fix stray 0 * Move to subfolder Signed-off-by: Gilver * Move and fix kmod-common HCL Signed-off-by: Gilver * Update dkms-xone HCL Signed-off-by: Gilver * Add nightly to Akmod HCL Signed-off-by: Gilver * Update license * Change some macro weirdness, new update scripts * Better folder name * Switch firmware to LPF signed package * Remove stray file * Clean up LPF spec * Add HCL * What? Signed-off-by: Gilver * Probably better Signed-off-by: Gilver * Update license Signed-off-by: Gilver * ... * Revert "Add HCL" This reverts commit 1c9734891a74c57a90ecfa04790267ddaa0627d9. * Revert "Probably better" This reverts commit e8d4171b203506bbc243791ae446cf3d436d2dec. * Revert "What?" This reverts commit 6e184733f4c6dfa305609a2ad442cb458445c33e. * Revert "Clean up LPF spec" This reverts commit af0550411de769545347b569a63f0f28f63e4acb. * Revert "Remove stray file" This reverts commit 576887c17cd3df0412c376eca5f7e6752a874d7e. * Revert LPF commits * Revert "Switch firmware to LPF signed package" This reverts commit 532607ef37db6b227d5be37840d9f9c4911ccf89. * Remove weirdness from revert * Update xone-kmod.spec Signed-off-by: Gilver * Add copy of TOU for licensing, post scriptlet, and remove weirdness that made Akmod uninstallable? * Clean up files when done * Explanation for fetching? * Probably don't need to delete it afterwards * updbranch * Split firmware into subpackage for easier license distinction * Modules fixes/additions * shasum that thing because we LOVE security * Oops Signed-off-by: Gilver * Make conf file reflect source package better Signed-off-by: Gilver * Tentatively add myself as packager despite being very new to kmods...? * Laugh at this idiot, he forgot to macro Signed-off-by: Gilver * Inline modules file for better automated updates * Cleanup leftover comments I guess * Requires --------- Signed-off-by: Gilver --- anda/system/xone/akmod/anda.hcl | 10 +++ anda/system/xone/akmod/update.rhai | 3 + anda/system/xone/akmod/xone-kmod.spec | 63 +++++++++++++++ anda/system/xone/dkms/anda.hcl | 11 +++ .../xone/dkms/dkms-no-weak-modules.conf | 1 + anda/system/xone/dkms/dkms-xone.spec | 64 +++++++++++++++ anda/system/xone/dkms/update.rhai | 3 + anda/system/xone/kmod-common/anda.hcl | 10 +++ anda/system/xone/kmod-common/modules.conf | 1 + anda/system/xone/kmod-common/update.rhai | 8 ++ .../xone/kmod-common/xone-kmod-common.spec | 81 +++++++++++++++++++ 11 files changed, 255 insertions(+) create mode 100644 anda/system/xone/akmod/anda.hcl create mode 100644 anda/system/xone/akmod/update.rhai create mode 100644 anda/system/xone/akmod/xone-kmod.spec create mode 100644 anda/system/xone/dkms/anda.hcl create mode 100644 anda/system/xone/dkms/dkms-no-weak-modules.conf create mode 100644 anda/system/xone/dkms/dkms-xone.spec create mode 100644 anda/system/xone/dkms/update.rhai create mode 100644 anda/system/xone/kmod-common/anda.hcl create mode 100644 anda/system/xone/kmod-common/modules.conf create mode 100644 anda/system/xone/kmod-common/update.rhai create mode 100644 anda/system/xone/kmod-common/xone-kmod-common.spec diff --git a/anda/system/xone/akmod/anda.hcl b/anda/system/xone/akmod/anda.hcl new file mode 100644 index 0000000000..ae837ea524 --- /dev/null +++ b/anda/system/xone/akmod/anda.hcl @@ -0,0 +1,10 @@ +project pkg { + rpm { + spec = "xone-kmod.spec" + } + labels { + mock = 1 + nightly = 1 + updbranch = 1 + } +} diff --git a/anda/system/xone/akmod/update.rhai b/anda/system/xone/akmod/update.rhai new file mode 100644 index 0000000000..72dee90d6d --- /dev/null +++ b/anda/system/xone/akmod/update.rhai @@ -0,0 +1,3 @@ +import "andax/bump_extras.rhai" as bump; + +rpm.version(bump::madoguchi("xone-kmod-common", labels.branch)); diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec new file mode 100644 index 0000000000..368a30b254 --- /dev/null +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -0,0 +1,63 @@ +%global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 +%global date 20241223 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global ver 0.3 +%define buildforkernels akmod +%global debug_package %{nil} +%global real_name xone + +Name: %{real_name}-kmod +Version: %{ver}^%{date}git.%{shortcommit} +Release: 1%{?dist} +Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories +License: GPL-2.0-or-later +URL: https://github.com/dlundqvist/xone +Source0: %{url}/archive/%{commit}.tar.gz#/xone-%{shortcommit}.tar.gz +BuildRequires: kmodtool +BuildRequires: systemd-rpm-macros +Requires: %{real_name}-kmod-common = %{?epoch:%{epoch}:}%{version} +Packager: ShinyGil + +%{expand:%(kmodtool --target %{_target_cpu} --repo terra --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } + +%description +Linux kernel driver for Xbox One and Xbox Series X|S accessories. + +%prep +%{?kmodtool_check} +kmodtool --target %{_target_cpu} --repo terra --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null + +%autosetup -p1 -n %{real_name}-%{commit} + +/usr/bin/sed -nE '/^BUILT_MODULE_NAME/{s@^.+"(.+)"@\1@; s|-|_|g; p}' dkms.conf > %{real_name}.conf + +find . -type f -name '*.c' -exec sed -i "s/#VERSION#/%{version}/" {} \; + +for kernel_version in %{?kernel_versions}; do + mkdir _kmod_build_${kernel_version%%___*} + cp -fr auth bus driver transport Kbuild _kmod_build_${kernel_version%%___*} +done + +%build +for kernel_version in %{?kernel_versions}; do + pushd _kmod_build_${kernel_version%%___*}/ + %make_build -C "${kernel_version##*___}" M=$(pwd) VERSION="v%{version}" modules + popd +done + +%install +install -Dm644 %{real_name}.conf -t %{buildroot}%{_modulesloaddir} + +for kernel_version in %{?kernel_versions}; do + mkdir -p %{buildroot}/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ + install -p -m 0755 _kmod_build_${kernel_version%%___*}/*.ko \ + %{buildroot}/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ +done +%{?akmod_install} + +%files +%{_modulesloaddir}/%{real_name}.conf + +%changelog +* Thu Feb 27 2025 ShinyGil +- Initial package diff --git a/anda/system/xone/dkms/anda.hcl b/anda/system/xone/dkms/anda.hcl new file mode 100644 index 0000000000..b3aea8f58c --- /dev/null +++ b/anda/system/xone/dkms/anda.hcl @@ -0,0 +1,11 @@ +project pkg { + arches=["x86_64"] + rpm { + spec = "dkms-xone.spec" + } + labels { + mock = 1 + nightly = 1 + updbranch = 1 + } +} diff --git a/anda/system/xone/dkms/dkms-no-weak-modules.conf b/anda/system/xone/dkms/dkms-no-weak-modules.conf new file mode 100644 index 0000000000..24f6f95c96 --- /dev/null +++ b/anda/system/xone/dkms/dkms-no-weak-modules.conf @@ -0,0 +1 @@ +NO_WEAK_MODULES="yes" diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec new file mode 100644 index 0000000000..5ca1a5ca55 --- /dev/null +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -0,0 +1,64 @@ +%global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 +%global date 20241223 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global ver 0.3 +%global debug_package %{nil} +%global dkms_name xone + +Name: dkms-%{dkms_name} +Version: %{ver}^%{date}git.%{shortcommit} +Release: 1%{?dist} +Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories +License: GPL-2.0-or-later +URL: https://github.com/dlundqvist/xone +Source0: %{url}/archive/%{commit}.tar.gz#/%{dkms_name}-%{shortcommit}.tar.gz +Source1: dkms-no-weak-modules.conf +BuildRequires: sed +BuildRequires: systemd-rpm-macros +Requires: %{dkms_name}-kmod-common = %{?epoch:%{epoch}:}%{version} +Requires: dkms +BuildArch: noarch +Packager: ShinyGil + +%description +Linux kernel driver for Xbox One and Xbox Series X|S accessories. + +%prep +%autosetup -p1 -n %{dkms_name}-%{commit} + +sed -i \ + -e 's|#VERSION#|%{version}|g' \ + -e 's|kernel/drivers/input/joystick|extra|g' \ + dkms.conf + +find . -type f -name '*.c' -exec sed -i "s/#VERSION#/%{version}/" {} \; + +%install +# Create empty tree: +mkdir -p %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/ +cp -fr auth bus driver transport Kbuild dkms.conf %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/ + +%if 0%{?fedora} +# Do not enable weak modules support in Fedora (no kABI): +install -Dpm644 %{SOURCE1} %{buildroot}%{_sysconfdir}/dkms/%{dkms_name}.conf +%endif + +%post +dkms add -m %{dkms_name} -v %{version} -q --rpm_safe_upgrade || : +# Rebuild and make available for the currently running kernel: +dkms build -m %{dkms_name} -v %{version} -q || : +dkms install -m %{dkms_name} -v %{version} -q --force || : + +%preun +# Remove all versions from DKMS registry: +dkms remove -m %{dkms_name} -v %{version} -q --all --rpm_safe_upgrade || : + +%files +%{_usrsrc}/%{dkms_name}-%{version} +%if 0%{?fedora} +%{_sysconfdir}/dkms/%{dkms_name}.conf +%endif + +%changelog +* Thu Feb 27 2025 ShinyGil +- Initial package diff --git a/anda/system/xone/dkms/update.rhai b/anda/system/xone/dkms/update.rhai new file mode 100644 index 0000000000..72dee90d6d --- /dev/null +++ b/anda/system/xone/dkms/update.rhai @@ -0,0 +1,3 @@ +import "andax/bump_extras.rhai" as bump; + +rpm.version(bump::madoguchi("xone-kmod-common", labels.branch)); diff --git a/anda/system/xone/kmod-common/anda.hcl b/anda/system/xone/kmod-common/anda.hcl new file mode 100644 index 0000000000..78c3e2c23c --- /dev/null +++ b/anda/system/xone/kmod-common/anda.hcl @@ -0,0 +1,10 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "xone-kmod-common.spec" + } + labels { + mock = 1 + nightly = 1 + } +} diff --git a/anda/system/xone/kmod-common/modules.conf b/anda/system/xone/kmod-common/modules.conf new file mode 100644 index 0000000000..776e9eff4f --- /dev/null +++ b/anda/system/xone/kmod-common/modules.conf @@ -0,0 +1 @@ +add_drivers+=" snd-pcm snd-seq " diff --git a/anda/system/xone/kmod-common/update.rhai b/anda/system/xone/kmod-common/update.rhai new file mode 100644 index 0000000000..5059508641 --- /dev/null +++ b/anda/system/xone/kmod-common/update.rhai @@ -0,0 +1,8 @@ +rpm.global("commit", gh_commit("dlundqvist/xone")); +if rpm.changed() { + rpm.release(); + rpm.global("date", date()); + let ver = gh_tag("dlundqvist/xone"); + ver.crop(1); + rpm.global("ver", ver); +} diff --git a/anda/system/xone/kmod-common/xone-kmod-common.spec b/anda/system/xone/kmod-common/xone-kmod-common.spec new file mode 100644 index 0000000000..934a3b4945 --- /dev/null +++ b/anda/system/xone/kmod-common/xone-kmod-common.spec @@ -0,0 +1,81 @@ +%global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 +%global date 20241223 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global ver 0.3 +%global real_name xone +%global _dracutconfdir %{_prefix}/lib/dracut/dracut.conf.d +%global firmware_hash 48084d9fa53b9bb04358f3bb127b7495dc8f7bb0b3ca1437bd24ef2b6eabdf66 + +Name: %{real_name}-kmod-common +Version: %{ver}^%{date}git.%{shortcommit} +Release: 1%{?dist} +Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories common files +License: GPL-2.0-or-later +URL: https://github.com/dlundqvist/xone +Source0: %{url}/archive/%{commit}.tar.gz#/xone-%{shortcommit}.tar.gz +Source1: modules.conf +### Windows driver and firmware file: +Source2: http://download.windowsupdate.com/c/msdownload/update/driver/drvs/2017/07/1cd6a87c-623f-4407-a52d-c31be49e925c_e19f60808bdcbfbd3c3df6be3e71ffc52e43261e.cab +### Microsoft TOU copy: +Source3: https://www.microsoft.com/en-us/legal/terms-of-use +BuildRequires: cabextract +BuildRequires: systemd-rpm-macros +Requires: wireless-regdb +Requires: %{real_name}-firmware = 1.0.46.1 +Requires(post): dracut +Provides: %{real_name}-kmod-common = %{?epoch:%{epoch}:}%{version} +BuildArch: noarch +Packager: ShinyGil + +%description +Linux kernel driver for Xbox One and Xbox Series X|S accessories common files. + +%package -n %{real_name}-firmware +Version: 1.0.46.1 +Summary: Firmware for the XBox One controller dongle +License: Proprietary +Requires: wireless-regdb +BuildArch: noarch + +%description -n %{real_name}-firmware +Proprietary firmware for XBox controller dongles. + +%prep +%autosetup -p1 -n xone-%{commit} +/usr/bin/cp %{SOURCE3} . + +# Firmware: +cabextract -F FW_ACC_00U.bin %{SOURCE2} +echo %{firmware_hash} FW_ACC_00U.bin | sha256sum -c + +%install +# xone-gip-headset module should have the snd-pcm and snd-seq modules be preloaded or it will give errors on boot due to injecting late. +# It still loads afterwards, but this error is easily fixable by just loading the modules in the initramfs. +install -Dpm644 %{SOURCE1} %{buildroot}%{_dracutconfdir}/60-xone-snd.conf + +# Blacklist: +install -Dpm644 install/modprobe.conf %{buildroot}%{_modprobedir}/60-%{real_name}.conf + +# Firmware: +install -Dpm644 FW_ACC_00U.bin %{buildroot}%{_prefix}/lib/firmware/xow_dongle.bin + +%files +%license LICENSE +%doc README.md +%{_modprobedir}/60-%{real_name}.conf +%{_dracutconfdir}/60-%{real_name}-snd.conf + +%files -n xone-firmware +%license terms-of-use +%{_prefix}/lib/firmware/xow_dongle.bin + +%post +/usr/bin/dracut -f + +%post -n xone-firmware +echo "The firmware for the wireless dongle is subject to Microsoft's Terms of Use:" +echo 'https://www.microsoft.com/en-us/legal/terms-of-use' + +%changelog +* Thu Feb 27 2025 ShinyGil +- Initial package From 04f2947e77f74f82aa282f889d3624e18e5613ed Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 28 Feb 2025 04:16:10 +0000 Subject: [PATCH 0090/2977] bump(branch): akmod dkms --- anda/system/xone/akmod/xone-kmod.spec | 4 ++-- anda/system/xone/dkms/dkms-xone.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index 368a30b254..3376fe5ce2 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -7,8 +7,8 @@ %global real_name xone Name: %{real_name}-kmod -Version: %{ver}^%{date}git.%{shortcommit} -Release: 1%{?dist} +Version: 0.3^20241223git.6b9d59a +Release: 1%?dist Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories License: GPL-2.0-or-later URL: https://github.com/dlundqvist/xone diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index 5ca1a5ca55..c1c21abc87 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -6,8 +6,8 @@ %global dkms_name xone Name: dkms-%{dkms_name} -Version: %{ver}^%{date}git.%{shortcommit} -Release: 1%{?dist} +Version: 0.3^20241223git.6b9d59a +Release: 1%?dist Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories License: GPL-2.0-or-later URL: https://github.com/dlundqvist/xone From 8901949b5a16f5c1ba154b75f0b0d2be24d0531f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 28 Feb 2025 04:41:41 +0000 Subject: [PATCH 0091/2977] bump: groovy-docs groovy --- anda/langs/groovy/groovy-docs/groovy-docs.spec | 2 +- anda/langs/groovy/groovy.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/langs/groovy/groovy-docs/groovy-docs.spec b/anda/langs/groovy/groovy-docs/groovy-docs.spec index 602f5b1fc6..80ebbf2c65 100644 --- a/anda/langs/groovy/groovy-docs/groovy-docs.spec +++ b/anda/langs/groovy/groovy-docs/groovy-docs.spec @@ -1,5 +1,5 @@ Name: groovy-docs -Version: 4.0.25 +Version: 4.0.26 Release: 1%?dist Summary: Documentation for the Groovy programming language URL: https://groovy-lang.org/ diff --git a/anda/langs/groovy/groovy.spec b/anda/langs/groovy/groovy.spec index 06d0b3da0f..fbcbc0c2e4 100644 --- a/anda/langs/groovy/groovy.spec +++ b/anda/langs/groovy/groovy.spec @@ -1,5 +1,5 @@ Name: groovy -Version: 4.0.25 +Version: 4.0.26 Release: 1%?dist Summary: A multi-faceted language for the Java platform BuildArch: noarch From c6ab8da6206162d1f24cacba364d4b75b9c4c69e Mon Sep 17 00:00:00 2001 From: sadlerm4 Date: Fri, 28 Feb 2025 16:32:02 +1100 Subject: [PATCH 0092/2977] fix: micro-nightly (#3563) * fix: micro-nightly spec cleanup follow new terra go packaging guidelines use crop() in update.rhai * builddir is a sub * ohhh --- anda/devs/micro/micro-nightly.spec | 57 +++++++++++++----------------- anda/devs/micro/update.rhai | 4 ++- 2 files changed, 28 insertions(+), 33 deletions(-) diff --git a/anda/devs/micro/micro-nightly.spec b/anda/devs/micro/micro-nightly.spec index a1219dc328..12364ed847 100644 --- a/anda/devs/micro/micro-nightly.spec +++ b/anda/devs/micro/micro-nightly.spec @@ -15,7 +15,7 @@ %global commit_hash 272a308275f3b543647c6171e86dc521ce2822a0 %global commit_date 20250228 %global shortcommit %{sub %{commit_hash} 1 7} -%global ver v2.0.14 +%global ver 2.0.14 # https://github.com/zyedidia/micro %global goipath github.com/zyedidia/micro @@ -34,7 +34,7 @@ micro is a terminal-based text editor that aims to be easy to use and intuitive, runtime/help/tutorial.md Name: micro.nightly -Release: 1%{?dist} +Release: 2%{?dist} Summary: A modern and intuitive terminal-based text editor License: MIT @@ -43,6 +43,9 @@ Packager: sadlerm BuildRequires: anda-srpm-macros +Recommends: wl-clipboard +Recommends: (xclip or xsel) + Provides: micro-nightly = %{version}-%{release} Provides: micro Conflicts: micro @@ -51,65 +54,55 @@ Conflicts: micro %gopkg -%prep -git clone --recurse-submodules -q -j$(nproc) %{gourl} -b master && cd micro -if ! [ %{shortcommit} = $(git rev-parse --short=7 HEAD) ]; then - printf "Commit mismatch, exiting..." >&2 - exit 1 -fi +%global buildsubdir micro-%{version} +%prep +git clone --recurse-submodules -q %{gourl} micro-%{version} +cd %{builddir}/micro-%{version} && git checkout -q %{commit_hash} +%gomkdir %go_prep_online %build -cd micro %if %{without bootstrap} go generate ./runtime MICRO_VERSION=$(go run ./tools/build-version.go) MICRO_DATE=$(date --date=%{commit_date} +"%%B %%d, %%Y") -go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${GO_BUILDTAGS-${BUILDTAGS-}}" -a -x \ - -ldflags "-X internal/util.version=${MICRO_VERSION} \ - -X internal/util.hash=%{shortcommit} \ - -X 'internal/util.date=${MICRO_DATE}' \ - -B 0x$(echo "%{name}-%{version}-%{release}-${SOURCE_DATE_EPOCH:-}" | sha1sum | cut -d ' ' -f1) \ - -compressdwarf=false -linkmode=external \ - -extldflags '-Wl,-z,relro -Wl,--as-needed -Wl,-z,pack-relative-relocs -Wl,-z,now \ - -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 \ - -Wl,--build-id=sha1'" \ - -o ./micro ./cmd/micro/ +LDFLAGS="-X internal/util.version=${MICRO_VERSION} \ + -X internal/util.hash=%{shortcommit} \ + -X 'internal/util.date=${MICRO_DATE}'" + +%define gomodulesmode GO111MODULE=on +%gobuild -o %{gobuilddir}/bin/micro ./cmd/micro %endif %install %if %{without bootstrap} -install -m 0755 -vd %{buildroot}%{_bindir} \ - %{buildroot}%{_mandir}/man1 \ - %{buildroot}%{_datadir}/applications - -install -m 0755 -vp ./micro/micro %{buildroot}%{_bindir}/ -install -m 0644 -vp ./micro/assets/packaging/micro.1 %{buildroot}%{_mandir}/man1/ -install -m 0644 -vp ./micro/assets/packaging/micro.desktop %{buildroot}%{_datadir}/applications/ +install -Dm755 %{gobuilddir}/bin/micro -t %{buildroot}%{_bindir} +install -Dm644 assets/packaging/micro.1 -t %{buildroot}%{_mandir}/man1 +install -Dm644 assets/packaging/micro.desktop -t %{buildroot}%{_datadir}/applications +install -Dm644 assets/micro-logo-mark.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/micro.svg # for %%doc packaging -mkdir -v ./micro/help -mv -v ./micro/runtime/help/* ./micro/help/ +mv -v ./runtime/help . %endif %if %{without bootstrap} %if %{with check} %check -cd micro -%gotest ./internal/... ./cmd/micro/... +%gotest ./internal/... ./cmd/micro/... %endif %endif %if %{without bootstrap} %files -%license micro/LICENSE micro/LICENSE-THIRD-PARTY -%doc micro/README.md micro/help +%license LICENSE LICENSE-THIRD-PARTY +%doc README.md help %{_bindir}/micro %{_mandir}/man1/micro.1.gz %{_datadir}/applications/micro.desktop +%{_datadir}/icons/hicolor/scalable/apps/micro.svg %endif %changelog diff --git a/anda/devs/micro/update.rhai b/anda/devs/micro/update.rhai index 0fc1845fe8..f87863b9e7 100644 --- a/anda/devs/micro/update.rhai +++ b/anda/devs/micro/update.rhai @@ -1,5 +1,7 @@ rpm.global("commit_hash", gh_commit("zyedidia/micro")); +let v = gh("zyedidia/micro"); if rpm.changed() { rpm.global("commit_date", date()); - rpm.global("ver", gh("zyedidia/micro")); + v.crop(1); + rpm.global("ver", v); } From 749ef062f09ecaa5e6f5134f88cd6f7402d52e95 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 28 Feb 2025 06:46:29 +0000 Subject: [PATCH 0093/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 23fd605704..8e1da115b1 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.02.26.184027 +Version: 2025.02.28.063346 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 71b1b0d42f5c9db2e56d094a1fd0ccdf95996273 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 28 Feb 2025 09:55:39 +0000 Subject: [PATCH 0094/2977] bump: v4l2loopback --- anda/system/v4l2loopback/v4l2loopback.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/system/v4l2loopback/v4l2loopback.spec b/anda/system/v4l2loopback/v4l2loopback.spec index a8f6b59a5a..216989c074 100644 --- a/anda/system/v4l2loopback/v4l2loopback.spec +++ b/anda/system/v4l2loopback/v4l2loopback.spec @@ -7,8 +7,8 @@ Name: v4l2loopback Summary: Utils for V4L2 loopback devices -Version: 0.13.2 -Release: 3%{?dist} +Version: 0.14.0 +Release: 1%?dist License: GPLv2+ URL: https://github.com/umlaeute/v4l2loopback Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz From 9dad3276433aa152c6bf34fc45aa763657935256 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 28 Feb 2025 15:34:51 +0000 Subject: [PATCH 0095/2977] bump: youtube-music --- anda/apps/youtube-music/youtube-music.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/youtube-music/youtube-music.spec b/anda/apps/youtube-music/youtube-music.spec index 08ca29c985..66ac0826c1 100644 --- a/anda/apps/youtube-music/youtube-music.spec +++ b/anda/apps/youtube-music/youtube-music.spec @@ -12,7 +12,7 @@ %global vendor_pnpm 0 Name: youtube-music -Version: 3.7.4 +Version: 3.7.5 Release: 1%?dist Summary: YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader) Source1: youtube-music.desktop From 134b9bb8d2774e11f5080206ada301052cffd3bb Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 28 Feb 2025 17:55:42 +0000 Subject: [PATCH 0096/2977] bump: voicevox inputplumber --- anda/apps/voicevox/voicevox.spec | 2 +- anda/games/inputplumber/inputplumber.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/voicevox/voicevox.spec b/anda/apps/voicevox/voicevox.spec index 76d72e6f0b..0b9c2c27be 100644 --- a/anda/apps/voicevox/voicevox.spec +++ b/anda/apps/voicevox/voicevox.spec @@ -13,7 +13,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: voicevox -Version: 0.22.4 +Version: 0.23.0 Release: 1%?dist Summary: Free Japanese text-to-speech editor License: LGPL-3.0 diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index 2b264ce92a..536740dac3 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,5 +1,5 @@ Name: inputplumber -Version: 0.49.0 +Version: 0.49.1 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later From 1ac08ff985c385ce5ad5558ff1bd5b43c3f5425a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 28 Feb 2025 19:58:45 +0000 Subject: [PATCH 0097/2977] bump: lsp-dsp --- anda/lib/lsp-dsp/liblsp-dsp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/lsp-dsp/liblsp-dsp.spec b/anda/lib/lsp-dsp/liblsp-dsp.spec index 650779765c..adf9091c3f 100644 --- a/anda/lib/lsp-dsp/liblsp-dsp.spec +++ b/anda/lib/lsp-dsp/liblsp-dsp.spec @@ -3,7 +3,7 @@ #define _empty_manifest_terminate_build 0 Name: liblsp-dsp -Version: 1.0.28 +Version: 1.0.29 Release: 1%?dist Summary: DSP library for signal processing License: LGPL-3.0 From 5b2df79e57247e47632fd2afff855f16aed4cf0e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 28 Feb 2025 21:22:02 +0000 Subject: [PATCH 0098/2977] bump: libayatana-common --- anda/lib/libayatana-common/libayatana-common.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/libayatana-common/libayatana-common.spec b/anda/lib/libayatana-common/libayatana-common.spec index d323d61f4e..9933fbc044 100644 --- a/anda/lib/libayatana-common/libayatana-common.spec +++ b/anda/lib/libayatana-common/libayatana-common.spec @@ -1,7 +1,7 @@ Name: libayatana-common Summary: Common functions for Ayatana System Indicators -Version: 0.9.10 -Release: 2%{?dist} +Version: 0.9.11 +Release: 1%?dist License: GPL-3.0 URL: https://github.com/AyatanaIndicators/libayatana-common Source0: %{url}/archive/refs/tags/%{version}.tar.gz From 992cbd64b112a2d7a253f2387cd3783135c46985 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 1 Mar 2025 01:44:32 +0000 Subject: [PATCH 0099/2977] bump(nightly): mwc nightly nightly nim-nightly astal rpi-utils --- anda/desktops/mwc/mwc.spec | 6 +++--- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/lib/astal/astal/astal.spec | 4 ++-- anda/tools/rpi-utils/rpi-utils.spec | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/anda/desktops/mwc/mwc.spec b/anda/desktops/mwc/mwc.spec index 02e1fec5dd..9b7c23183d 100644 --- a/anda/desktops/mwc/mwc.spec +++ b/anda/desktops/mwc/mwc.spec @@ -1,7 +1,7 @@ -%global commit 0b926c4d3e2a719e1b3e2b79265e99c3bf698b2d -%global commit_date 20250228 +%global commit 9b9d4256be440b511e6c37165e01a6c2686e606f +%global commit_date 20250301 %global shortcommit %{sub %{commit} 1 7 } -%global ver 0.1.1 +%global ver 0.1.2 Name: mwc Version: %{ver}^%{commit_date}git.%{shortcommit} diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 8b4e22cfd5..6b7a4f5854 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit ef88d1cba9f3c6f00cc2bd4908df866a23e4faf8 +%global commit c6485b9fd5514992e9acf8f6986e7986195dc3fc %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-02-27 +%global fulldate 2025-02-28 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index f61f749477..977b5a92b8 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 212c8f4c31ef10caf7974631463c3881bdab2def +%global commit 694afd15c91fe56f7399bf1e35592a877ec002c4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250228 +%global commit_date 20250301 %global ver 0.177.0 %bcond_with check diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 2f3858ae3b..3f95b380a8 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 7e8a650729e9434574c46350aece7609e5465253 +%global commit e39d152b89c5635c27dd4d8fc71c48747c5fc20b %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250228 +%global commit_date 20250301 %global debug_package %nil Name: nim-nightly diff --git a/anda/lib/astal/astal/astal.spec b/anda/lib/astal/astal/astal.spec index b84bc96a0c..5618e1df46 100644 --- a/anda/lib/astal/astal/astal.spec +++ b/anda/lib/astal/astal/astal.spec @@ -1,7 +1,7 @@ -%global commit b7f10b99bc810e7ad6a949d6670cb440d33045a0 +%global commit dfd1f23c7562694e571d44c45aa74fcea9b1ba01 %global shortcommit %{sub %commit 1 7} -%global commit_date 20250227 +%global commit_date 20250301 Name: astal Version: 0^%commit_date.%shortcommit diff --git a/anda/tools/rpi-utils/rpi-utils.spec b/anda/tools/rpi-utils/rpi-utils.spec index 6148f0cc6d..5042fe4f81 100644 --- a/anda/tools/rpi-utils/rpi-utils.spec +++ b/anda/tools/rpi-utils/rpi-utils.spec @@ -1,5 +1,5 @@ -%global commit 6c3ace77f2299f9a2e442c2eb10d67ae73c949ba -%global commit_date 20250213 +%global commit 61e4becfd5338e3eb2bb8c54cdd0b9b96a8afbf8 +%global commit_date 20250301 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define _unpackaged_files_terminate_build 0 From d7a770d3302793ea2700f4c072735f41ad9d3808 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 1 Mar 2025 01:59:06 +0000 Subject: [PATCH 0100/2977] bump: discord-canary-openasar discord-canary ruffle inputplumber --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- anda/apps/ruffle/ruffle-nightly.spec | 2 +- anda/games/inputplumber/inputplumber.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 1985223e4b..539e21ae31 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.600 +Version: 0.0.601 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 8d6ecd2a7b..47fbb9e200 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.600 +Version: 0.0.601 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 9c5a2fdcc8..00db8d1e96 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-02-28 +%global ver 2025-03-01 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index 536740dac3..54c967f50a 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,5 +1,5 @@ Name: inputplumber -Version: 0.49.1 +Version: 0.49.2 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later From 792b3c0ff677b6ea9a480f46b082d58d5bc34539 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 1 Mar 2025 02:41:23 +0000 Subject: [PATCH 0101/2977] bump(branch): astal-gtk --- anda/lib/astal/astal-gtk/astal-gtk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/astal/astal-gtk/astal-gtk.spec b/anda/lib/astal/astal-gtk/astal-gtk.spec index 4494a70315..e4f5cf3fe2 100644 --- a/anda/lib/astal/astal-gtk/astal-gtk.spec +++ b/anda/lib/astal/astal-gtk/astal-gtk.spec @@ -1,5 +1,5 @@ -%global commit b7f10b9 -%global commit_date 20250227 +%global commit dfd1f23 +%global commit_date 20250301 Name: astal Version: 0^%commit_date.%commit From 0364c458766ec1fe646b29634f6e245e772c4f16 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 1 Mar 2025 03:00:50 +0000 Subject: [PATCH 0102/2977] bump: lazygit --- anda/langs/go/lazygit/golang-github-jesseduffield-lazygit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/go/lazygit/golang-github-jesseduffield-lazygit.spec b/anda/langs/go/lazygit/golang-github-jesseduffield-lazygit.spec index 08138aab21..32b6e87126 100644 --- a/anda/langs/go/lazygit/golang-github-jesseduffield-lazygit.spec +++ b/anda/langs/go/lazygit/golang-github-jesseduffield-lazygit.spec @@ -2,7 +2,7 @@ # https://github.com/jesseduffield/lazygit %global goipath github.com/jesseduffield/lazygit -Version: 0.47.2 +Version: 0.48.0 %gometa -f From d5b75da5e243dceecf46174d33afd97764ac3c1d Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 1 Mar 2025 00:38:03 -0600 Subject: [PATCH 0103/2977] Fix: inputplumber (#3592) Signed-off-by: Gilver --- anda/games/inputplumber/inputplumber.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index 54c967f50a..e6e39ac986 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,6 +1,8 @@ +%global __brp_mangle_shebangs %{nil} + Name: inputplumber Version: 0.49.2 -Release: 1%?dist +Release: 2%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later URL: https://github.com/ShadowBlip/InputPlumber From 7fe8398d3b9e75c7cc001f48652647c427b2f7a3 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 1 Mar 2025 00:39:47 -0600 Subject: [PATCH 0104/2977] Fix: libayatana-common (#3594) Signed-off-by: Gilver --- anda/lib/libayatana-common/libayatana-common.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/lib/libayatana-common/libayatana-common.spec b/anda/lib/libayatana-common/libayatana-common.spec index 9933fbc044..d649cd8f52 100644 --- a/anda/lib/libayatana-common/libayatana-common.spec +++ b/anda/lib/libayatana-common/libayatana-common.spec @@ -1,7 +1,7 @@ Name: libayatana-common Summary: Common functions for Ayatana System Indicators Version: 0.9.11 -Release: 1%?dist +Release: 2%?dist License: GPL-3.0 URL: https://github.com/AyatanaIndicators/libayatana-common Source0: %{url}/archive/refs/tags/%{version}.tar.gz @@ -48,12 +48,12 @@ This package contains the development header files for %{name}. %license COPYING %{_userunitdir}/ayatana-indicators.target %{_libdir}/libayatana-common.so.* -%{_libdir}/girepository-1.0/AyatanaCommon-0.0.typelib +%{_libdir}/girepository-1.0/AyatanaCommon-0.*.typelib %{_datadir}/glib-2.0/schemas/org.ayatana.common.gschema.xml %files devel %{_libdir}/libayatana-common.so -%{_datadir}/gir-1.0/AyatanaCommon-0.0.gir +%{_datadir}/gir-1.0/AyatanaCommon-0.*.gir %{_libdir}/pkgconfig/libayatana-common.pc %dir %{_includedir}/ayatana %dir %{_includedir}/ayatana/common From 930b7a723b76a5457b7d1507f624b9db8e5f8235 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 1 Mar 2025 00:40:49 -0600 Subject: [PATCH 0105/2977] Fix (wl-kmod): Patches for kernels 6.13 and 6.14 (#3591) * I don't think this is actually supposed to have an i686 build Signed-off-by: Gilver * Add: 6.14 and 6.13 patches, EL9 ifcond * Rel... Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/system/wl-kmod/anda.hcl | 2 +- .../wl-kmod-029_kernel_6.13_adaptation.patch | 30 ++++++++++++ .../wl-kmod-030_kernel_6.14_adaptation.patch | 46 +++++++++++++++++++ anda/system/wl-kmod/wl-kmod.spec | 6 ++- 4 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 anda/system/wl-kmod/wl-kmod-029_kernel_6.13_adaptation.patch create mode 100644 anda/system/wl-kmod/wl-kmod-030_kernel_6.14_adaptation.patch diff --git a/anda/system/wl-kmod/anda.hcl b/anda/system/wl-kmod/anda.hcl index 41761c4b5a..4cf6bbe5f9 100644 --- a/anda/system/wl-kmod/anda.hcl +++ b/anda/system/wl-kmod/anda.hcl @@ -1,5 +1,5 @@ project pkg { - arches = ["x86_64", "i386"] + arches = ["x86_64"] rpm { spec = "wl-kmod.spec" } diff --git a/anda/system/wl-kmod/wl-kmod-029_kernel_6.13_adaptation.patch b/anda/system/wl-kmod/wl-kmod-029_kernel_6.13_adaptation.patch new file mode 100644 index 0000000000..6aa3b46a61 --- /dev/null +++ b/anda/system/wl-kmod/wl-kmod-029_kernel_6.13_adaptation.patch @@ -0,0 +1,30 @@ +From d38877279728c4e5711ae4dd373486bf2148ee48 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Nicolas=20Vi=C3=A9ville?= +Date: Tue, 17 Dec 2024 20:19:49 +0100 +Subject: [PATCH] linuxver.h: net/lib80211.h dropped from includes for kernel + >= 6.13.x +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Nicolas Viéville +--- + src/include/linuxver.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/include/linuxver.h b/src/include/linuxver.h +index b05bc32..bbe1d3c 100644 +--- a/src/include/linuxver.h ++++ b/src/include/linuxver.h +@@ -147,7 +147,7 @@ typedef irqreturn_t(*FN_ISR) (int irq, void *dev_id, struct pt_regs *ptregs); + #include + #endif + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) && LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0) + #include + #endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) +-- +2.47.1 + diff --git a/anda/system/wl-kmod/wl-kmod-030_kernel_6.14_adaptation.patch b/anda/system/wl-kmod/wl-kmod-030_kernel_6.14_adaptation.patch new file mode 100644 index 0000000000..cd032e9b60 --- /dev/null +++ b/anda/system/wl-kmod/wl-kmod-030_kernel_6.14_adaptation.patch @@ -0,0 +1,46 @@ +From 5c323385615ec555d628fd0dd2ae532ec91a0556 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Nicolas=20Vi=C3=A9ville?= +Date: Fri, 7 Feb 2025 20:39:02 +0100 +Subject: [PATCH] wl_cfg80211_hybrid.c: new parameter for get_tx_power + introduced in "wifi: cfg80211: send MLO links tx power info in GET_INTERFACE" + for kernel >= 6.14.x +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Nicolas Viéville +--- + src/wl/sys/wl_cfg80211_hybrid.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c +index 5ffa0b3..5a7f0c4 100644 +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -101,7 +101,10 @@ static s32 wl_cfg80211_set_tx_power(struct wiphy *wiphy, + enum tx_power_setting type, s32 dbm); + #endif + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0) ++static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, ++ unsigned int link_id, s32 *dbm); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) + static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, s32 *dbm); + #else + static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm); +@@ -1225,7 +1228,10 @@ wl_cfg80211_set_tx_power(struct wiphy *wiphy, enum tx_power_setting type, s32 db + return err; + } + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0) ++static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, ++ unsigned int link_id, s32 *dbm) ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) + static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, s32 *dbm) + #else + static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm) +-- +2.48.1 + diff --git a/anda/system/wl-kmod/wl-kmod.spec b/anda/system/wl-kmod/wl-kmod.spec index cc977ee813..5fe855f427 100644 --- a/anda/system/wl-kmod/wl-kmod.spec +++ b/anda/system/wl-kmod/wl-kmod.spec @@ -10,7 +10,7 @@ Name: wl-kmod Version: 6.30.223.271 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Kernel module for Broadcom wireless devices Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -45,6 +45,8 @@ Patch23: wl-kmod-025_kernel_6.5_adaptation.patch Patch24: wl-kmod-026_kernel_6.10_fix_empty_body_in_if_warning.patch Patch25: wl-kmod-027_wpa_supplicant-2.11_add_max_scan_ie_len.patch Patch26: wl-kmod-028_kernel_6.12_adaptation.patch +Patch27: wl-kmod-029_kernel_6.13_adaptation.patch +Patch28: wl-kmod-030_kernel_6.14_adaptation.patch ExclusiveArch: i686 x86_64 BuildRequires: kmodtool BuildRequires: elfutils-libelf-devel @@ -120,6 +122,8 @@ pushd %{name}-%{version}-src %endif %if %{kvr} >= 427 %endif + %if %{kvr} >= 503 + %endif %endif %endif popd From 1316b4798c5e407cb4039691da0ab18fb15d9079 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 1 Mar 2025 00:41:55 -0600 Subject: [PATCH 0106/2977] Fix (YouTube Music): Vendor PNPM again (#3590) * Vendor PNPM again Signed-off-by: Gilver * Bump release Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/apps/youtube-music/youtube-music.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/youtube-music/youtube-music.spec b/anda/apps/youtube-music/youtube-music.spec index 66ac0826c1..6030a5dbaa 100644 --- a/anda/apps/youtube-music/youtube-music.spec +++ b/anda/apps/youtube-music/youtube-music.spec @@ -9,11 +9,11 @@ # Try to vendor PNPM directly from Fedora # but if this fails, you can try setting this to 1 to vendor PNPM directly from upstream -%global vendor_pnpm 0 +%global vendor_pnpm 1 Name: youtube-music Version: 3.7.5 -Release: 1%?dist +Release: 2%?dist Summary: YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader) Source1: youtube-music.desktop License: MIT From 9e2b7c842a252f0ea140b5c183dac600fb36b1b4 Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 1 Mar 2025 16:46:53 +0800 Subject: [PATCH 0107/2977] add: devpod (#2898) * add: devpod * Delete anda/langs/go/devpod/devpod.spec Signed-off-by: madomado * anda-srpm-macros Signed-off-by: madomado * bump Signed-off-by: madomado * rm go.sum? Signed-off-by: madomado --------- Signed-off-by: madomado --- anda/langs/go/devpod/anda.hcl | 5 + .../devpod/golang-github-loft-sh-devpod.spec | 91 +++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 anda/langs/go/devpod/anda.hcl create mode 100644 anda/langs/go/devpod/golang-github-loft-sh-devpod.spec diff --git a/anda/langs/go/devpod/anda.hcl b/anda/langs/go/devpod/anda.hcl new file mode 100644 index 0000000000..a108997db7 --- /dev/null +++ b/anda/langs/go/devpod/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "golang-github-loft-sh-devpod.spec" + } +} diff --git a/anda/langs/go/devpod/golang-github-loft-sh-devpod.spec b/anda/langs/go/devpod/golang-github-loft-sh-devpod.spec new file mode 100644 index 0000000000..44d3798b83 --- /dev/null +++ b/anda/langs/go/devpod/golang-github-loft-sh-devpod.spec @@ -0,0 +1,91 @@ +# Generated by go2rpm 1.15.0 +%bcond check 0 +%bcond bootstrap 0 + +%dnl %if %{with bootstrap} +%global debug_package %{nil} +%dnl %endif + +%if %{with bootstrap} +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^golang\\(.*\\)$ +%endif + +# https://github.com/loft-sh/devpod +%global goipath github.com/loft-sh/devpod +Version: 0.6.9 + +%gometa -f + +%global common_description %{expand: +Codespaces but open-source, client-only and unopinionated: Works with any IDE +and lets you use any cloud, kubernetes or just localhost docker.} + +%global golicenses LICENSE +%global godocs docs examples COMMUNITY.md CONTRIBUTING.md README.md\\\ + SECURITY.md desktop/README.md e2e/README.md\\\ + loadtest/README.md + +Name: devpod +Release: %autorelease +Summary: Codespaces but open-source, client-only and unopinionated: Works with any IDE and lets you use any cloud, kubernetes or just localhost docker +Provides: golang-github-loft-sh-devpod +BuildRequires: anda-srpm-macros + +License: MPL-2.0 +URL: https://devpod.sh +Source: %{gosource} + +%description %{common_description} + +#gopkg + +%prep +%autosetup -n %name-%version +rm go.sum +%go_prep_online + +%dnl %if %{without bootstrap} +%dnl %generate_buildrequires +%dnl %go_generate_buildrequires +%dnl %endif + +%if %{without bootstrap} +%build +%dnl for cmd in cmd/* ; do + %dnl out="%{gobuilddir}/bin/$(basename $cmd)" + %dnl %go_build_online "%{goipath}/$cmd" $out +%dnl done +%go_build_online +%dnl for cmd in hack/pro; do + %dnl out="%{gobuilddir}/bin/$(basename $cmd)" + %dnl %go_build_online "%{goipath}/$cmd" $out +%dnl done +%endif + +%install +#gopkginstall +%if %{without bootstrap} +install -m 0755 -vd %{buildroot}%{_bindir} +%dnl install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ +install -m 0755 -vp build/bin/* %{buildroot}%{_bindir}/ +%endif + +%if %{without bootstrap} +%if %{with check} +%check +%gocheck +%endif +%endif + +%if %{without bootstrap} +%files +%license LICENSE +%doc docs examples COMMUNITY.md CONTRIBUTING.md README.md SECURITY.md +%doc desktop/README.md e2e/README.md loadtest/README.md +%{_bindir}/devpod +%endif + +#gopkgfiles + +%changelog +%autochangelog From fb3e560d198c72242bb011afbf4d89a50ff4606e Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sat, 1 Mar 2025 02:50:22 -0600 Subject: [PATCH 0108/2977] Fix: stardust server (#3595) --- anda/stardust/server/stardust-server.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/stardust/server/stardust-server.spec b/anda/stardust/server/stardust-server.spec index 195de310b9..732835de42 100644 --- a/anda/stardust/server/stardust-server.spec +++ b/anda/stardust/server/stardust-server.spec @@ -5,11 +5,11 @@ %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ Name: stardust-xr-server -Version: 0.45.1 -Release: 1%?dist +Version: %commit_date.%shortcommit +Release: 2%?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/%version.tar.gz +Source0: %url/archive/%commit/server-%commit.tar.gz License: GPL-2.0-only BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros gcc-c++ mold @@ -24,7 +24,7 @@ Packager: Owen Zimmerman 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 +%autosetup -n server-%commit %cargo_prep_online %build From 17418a3b4cb830999866f4fd2e6425a4d858f399 Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 1 Mar 2025 17:35:09 +0800 Subject: [PATCH 0109/2977] fix(xone-dkms,xone-akmod): not nightly (#3620) * fix(xone-kmod,xone-akmod): not nightly Signed-off-by: madomado * Update anda.hcl Signed-off-by: madomado --------- Signed-off-by: madomado --- anda/system/xone/akmod/anda.hcl | 1 - anda/system/xone/dkms/anda.hcl | 1 - 2 files changed, 2 deletions(-) diff --git a/anda/system/xone/akmod/anda.hcl b/anda/system/xone/akmod/anda.hcl index ae837ea524..fdffbcf94e 100644 --- a/anda/system/xone/akmod/anda.hcl +++ b/anda/system/xone/akmod/anda.hcl @@ -4,7 +4,6 @@ project pkg { } labels { mock = 1 - nightly = 1 updbranch = 1 } } diff --git a/anda/system/xone/dkms/anda.hcl b/anda/system/xone/dkms/anda.hcl index b3aea8f58c..251e8b3edd 100644 --- a/anda/system/xone/dkms/anda.hcl +++ b/anda/system/xone/dkms/anda.hcl @@ -5,7 +5,6 @@ project pkg { } labels { mock = 1 - nightly = 1 updbranch = 1 } } From d0f9c68d732947c79158b907217b9a4544b67844 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 1 Mar 2025 03:44:04 -0600 Subject: [PATCH 0110/2977] add: pokemon-colorscripts, krabby (#3573) * Add: pokemon-colorscripts and Krabby * Fixup macros Signed-off-by: Gilver * Different install approach because `install` command is stupid Signed-off-by: Gilver * That was...not correct Signed-off-by: Gilver * Another `/` Signed-off-by: Gilver * Better summary Signed-off-by: Gilver * Remove `%cargo_build` Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/misc/krabby/anda.hcl | 5 ++ anda/misc/krabby/krabby.spec | 34 ++++++++++++++ anda/misc/krabby/update.rhai | 1 + anda/misc/pokemon-colorscripts/anda.hcl | 6 +++ .../pokemon-colorscripts.spec | 46 +++++++++++++++++++ anda/misc/pokemon-colorscripts/update.rhai | 5 ++ 6 files changed, 97 insertions(+) create mode 100644 anda/misc/krabby/anda.hcl create mode 100644 anda/misc/krabby/krabby.spec create mode 100644 anda/misc/krabby/update.rhai create mode 100644 anda/misc/pokemon-colorscripts/anda.hcl create mode 100644 anda/misc/pokemon-colorscripts/pokemon-colorscripts.spec create mode 100644 anda/misc/pokemon-colorscripts/update.rhai diff --git a/anda/misc/krabby/anda.hcl b/anda/misc/krabby/anda.hcl new file mode 100644 index 0000000000..cf0c2fe0b4 --- /dev/null +++ b/anda/misc/krabby/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "krabby.spec" + } +} diff --git a/anda/misc/krabby/krabby.spec b/anda/misc/krabby/krabby.spec new file mode 100644 index 0000000000..a036b80904 --- /dev/null +++ b/anda/misc/krabby/krabby.spec @@ -0,0 +1,34 @@ +Name: krabby +Version: 0.3.0 +Release: 1%{?dist} +SourceLicense: GPL-3.0-or-later +License: (MIT OR Apache-2.0) AND GPL-3.0-or-later AND MIT AND (Unlicense OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (Apache-2.0 OR BSL-1.0) AND MPL-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) +Summary: Print Pokémon sprites in your terminal +URL: https://github.com/yannjor/krabby +Source0: %{url}/archive/refs/tags/v%{version}.tar.gz +BuildRequires: anda-srpm-macros +BuildRequires: cargo-rpm-macros +BuildRequires: mold +Packager: ShinyGil + +%description +Krabby is mostly a Rust rewrite of phoney badger's pokemon-colorscripts with some extra features. + +%prep +%autosetup -n %{name}-%{version} +%cargo_prep_online + +%build + +%install +%cargo_install +%{cargo_license_online} > LICENSE.dependencies + +%files +%license LICENSE LICENSE.dependencies +%doc README.md +%{_bindir}/%{name} + +%changelog +* Thu Feb 27 2025 ShinyGil +- Initial package diff --git a/anda/misc/krabby/update.rhai b/anda/misc/krabby/update.rhai new file mode 100644 index 0000000000..1d7d6637c8 --- /dev/null +++ b/anda/misc/krabby/update.rhai @@ -0,0 +1 @@ +rpm.version(crates("krabby")); diff --git a/anda/misc/pokemon-colorscripts/anda.hcl b/anda/misc/pokemon-colorscripts/anda.hcl new file mode 100644 index 0000000000..15a80e2e12 --- /dev/null +++ b/anda/misc/pokemon-colorscripts/anda.hcl @@ -0,0 +1,6 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "pokemon-colorscripts.spec" + } +} diff --git a/anda/misc/pokemon-colorscripts/pokemon-colorscripts.spec b/anda/misc/pokemon-colorscripts/pokemon-colorscripts.spec new file mode 100644 index 0000000000..13f0c5b1fc --- /dev/null +++ b/anda/misc/pokemon-colorscripts/pokemon-colorscripts.spec @@ -0,0 +1,46 @@ +%global commit 5802ff67520be2ff6117a0abc78a08501f6252ad +%global commit_date 20241018 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + +Name: pokemon-colorscripts +Version: 0^%{commit_date}git.%{shortcommit} +Release: 1%{?dist} +License: MIT +Summary: CLI utility to print out images of Pokémon to the terminal +URL: https://gitlab.com/phoneybadger/%{name} +Source0: %{url}/-/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +BuildArch: noarch +Requires: python3 +Packager: ShinyGil + +%description +A utility that prints unicode sprites of images of Pokémon to the terminal. + +%prep +%autosetup -n %{name}-%{commit} + +%build + +%install +install -Dm644 colorscripts/small/regular/* -t "%{buildroot}%{_datadir}/%{name}/colorscripts/small/regular" +install -Dm644 colorscripts/small/shiny/* -t "%{buildroot}%{_datadir}/%{name}/colorscripts/small/shiny" +install -Dm644 colorscripts/large/regular/* -t "%{buildroot}%{_datadir}/%{name}/colorscripts/large/regular" +install -Dm644 colorscripts/large/shiny/* -t "%{buildroot}%{_datadir}/%{name}/colorscripts/large/shiny" +install -Dm644 pokemon.json "%{buildroot}%{_datadir}/%{name}/pokemon.json" +install -Dm755 pokemon-colorscripts.py "%{buildroot}%{_datadir}/%{name}/pokemon-colorscripts.py" +install -Dm644 pokemon-colorscripts.1 "%{buildroot}%{_mandir}/man1/pokemon-colorscripts.1" +# Make name executable +mkdir -p %{buildroot}%{_bindir} +ln -sf "%{_datadir}/%{name}/pokemon-colorscripts.py" "%{buildroot}%{_bindir}/pokemon-colorscripts" + +%files +%license LICENSE.txt +%doc README.md +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/* +%{_bindir}/pokemon-colorscripts +%{_mandir}/man1/pokemon-colorscripts.1.gz + +%changelog +* Thu Feb 27 2025 ShinyGil +- Initial package diff --git a/anda/misc/pokemon-colorscripts/update.rhai b/anda/misc/pokemon-colorscripts/update.rhai new file mode 100644 index 0000000000..1b9526ea94 --- /dev/null +++ b/anda/misc/pokemon-colorscripts/update.rhai @@ -0,0 +1,5 @@ +rpm.global("commit", gitlab_commit("gitlab.com", "28721344", "main")); +if rpm.changed() { + rpm.global("commit_date", date()); + rpm.release(); +} From e7076e1515e89ce0e43748b510f4fd2944033f05 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 1 Mar 2025 10:24:01 -0600 Subject: [PATCH 0111/2977] Change (openh264): Wildcard for sonames (#3629) Signed-off-by: Gilver --- anda/lib/openh264/openh264.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/anda/lib/openh264/openh264.spec b/anda/lib/openh264/openh264.spec index 0215a3e168..8ccf7e22b5 100644 --- a/anda/lib/openh264/openh264.spec +++ b/anda/lib/openh264/openh264.spec @@ -94,8 +94,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.a %files %license LICENSE %doc README.md -%{_libdir}/libopenh264.so.8 -%{_libdir}/libopenh264.so.%{version} +%{_libdir}/libopenh264.so.* %files devel %{_includedir}/wels/ From 259d0957b10b1ff236168c6a01983ace1a7f1efc Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 1 Mar 2025 10:30:58 -0600 Subject: [PATCH 0112/2977] feat: XPadNeo DKMS (#3539) * The great refactoring * Thanks Kate!! Didn't want to save that AT ALL * Make those nightly * Cleanup * Oh * ... * Better license format * updbranch * Fixing up modules and deps * Missed some deps * Remove redundant `mkdir`s Signed-off-by: Gilver * Move BuildArch, it bothered me Signed-off-by: Gilver * Add no weak modules config to Fedora just in case * LOL Signed-off-by: Gilver * Update xpadneo-kmod-common.spec Signed-off-by: Gilver * Inline modules file for better automated updates * Macro Signed-off-by: Gilver * Packager...? * Requires --------- Signed-off-by: Gilver --- anda/system/xpadneo/{ => akmod}/anda.hcl | 3 +- anda/system/xpadneo/akmod/update.rhai | 3 + anda/system/xpadneo/akmod/xpadneo-kmod.spec | 63 +++++++++++ anda/system/xpadneo/dkms/anda.hcl | 10 ++ anda/system/xpadneo/dkms/dkms-xpadneo.conf | 6 + anda/system/xpadneo/dkms/dkms-xpadneo.spec | 67 ++++++++++++ anda/system/xpadneo/dkms/no-weak-modules.conf | 1 + anda/system/xpadneo/dkms/update.rhai | 3 + anda/system/xpadneo/kmod-common/anda.hcl | 10 ++ .../io.github.xpadneo.metainfo.xml | 0 anda/system/xpadneo/kmod-common/update.rhai | 8 ++ .../kmod-common/xpadneo-kmod-common.spec | 45 ++++++++ .../xpadneo/modules-load-d-xpadneo.conf | 1 - anda/system/xpadneo/update.rhai | 1 - anda/system/xpadneo/xpadneo.spec | 103 ------------------ 15 files changed, 218 insertions(+), 106 deletions(-) rename anda/system/xpadneo/{ => akmod}/anda.hcl (52%) create mode 100644 anda/system/xpadneo/akmod/update.rhai create mode 100644 anda/system/xpadneo/akmod/xpadneo-kmod.spec create mode 100644 anda/system/xpadneo/dkms/anda.hcl create mode 100644 anda/system/xpadneo/dkms/dkms-xpadneo.conf create mode 100644 anda/system/xpadneo/dkms/dkms-xpadneo.spec create mode 100644 anda/system/xpadneo/dkms/no-weak-modules.conf create mode 100644 anda/system/xpadneo/dkms/update.rhai create mode 100644 anda/system/xpadneo/kmod-common/anda.hcl rename anda/system/xpadneo/{ => kmod-common}/io.github.xpadneo.metainfo.xml (100%) create mode 100644 anda/system/xpadneo/kmod-common/update.rhai create mode 100644 anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec delete mode 100644 anda/system/xpadneo/modules-load-d-xpadneo.conf delete mode 100644 anda/system/xpadneo/update.rhai delete mode 100644 anda/system/xpadneo/xpadneo.spec diff --git a/anda/system/xpadneo/anda.hcl b/anda/system/xpadneo/akmod/anda.hcl similarity index 52% rename from anda/system/xpadneo/anda.hcl rename to anda/system/xpadneo/akmod/anda.hcl index 522f0b2ff8..23ac0b839c 100644 --- a/anda/system/xpadneo/anda.hcl +++ b/anda/system/xpadneo/akmod/anda.hcl @@ -1,8 +1,9 @@ project pkg { rpm { - spec = "xpadneo.spec" + spec = "xpadneo-kmod.spec" } labels { mock = 1 + updbranch = 1 } } diff --git a/anda/system/xpadneo/akmod/update.rhai b/anda/system/xpadneo/akmod/update.rhai new file mode 100644 index 0000000000..e51de83ed3 --- /dev/null +++ b/anda/system/xpadneo/akmod/update.rhai @@ -0,0 +1,3 @@ +import "andax/bump_extras.rhai" as bump; + +rpm.version(bump::madoguchi("xpadneo-kmod-common", labels.branch)); diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec new file mode 100644 index 0000000000..ecee2ac7b9 --- /dev/null +++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec @@ -0,0 +1,63 @@ +%global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 +%global date 20241224 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global ver 0.9.7 +%define buildforkernels akmod +%global debug_package %{nil} +%global real_name xpadneo + +Name: %{real_name}-kmod +Version: %{ver}^%{date}git.%{shortcommit} +Release: 2%{?dist} +Summary: Advanced Linux Driver for Xbox One Wireless Gamepad +License: GPL-3.0 +URL: https://atar-axis.github.io/xpadneo +Source0: https://github.com/atar-axis/xpadneo/archive/%{commit}.tar.gz#/xpadneo-%{shortcommit}.tar.gz +BuildRequires: kmodtool +BuildRequires: systemd-rpm-macros +Requires: bluez +Requires: bluez-tools +Requires: %{real_name}-kmod-common = %{?epoch:%{epoch}:}%{version} +Packager: ShinyGil + +%{expand:%(kmodtool --target %{_target_cpu} --repo terra --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } + +%description +Advanced Linux Driver for Xbox One Wireless Gamepad. + +%prep +%{?kmodtool_check} +kmodtool --target %{_target_cpu} --repo terra --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null + +%autosetup -p1 -n %{real_name}-%{commit} + +/usr/bin/sed -nE '/^BUILT_MODULE_NAME/{s@^.+"(.+)"@\1@; s|-|_|g; p}' hid-%{real_name}/dkms.conf.in > %{real_name}.conf + +for kernel_version in %{?kernel_versions}; do + mkdir _kmod_build_${kernel_version%%___*} + cp -fr hid-xpadneo/src/* _kmod_build_${kernel_version%%___*} +done + +%build +for kernel_version in %{?kernel_versions}; do + pushd _kmod_build_${kernel_version%%___*}/ + %make_build -C "${kernel_version##*___}" M=$(pwd) VERSION="v%{version}" modules + popd +done + +%install +install -Dm644 %{real_name}.conf -t %{buildroot}%{_modulesloaddir} + +for kernel_version in %{?kernel_versions}; do + mkdir -p %{buildroot}/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ + install -p -m 0755 _kmod_build_${kernel_version%%___*}/*.ko \ + %{buildroot}/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ +done +%{?akmod_install} + +%files +%{_modulesloaddir}/%{real_name}.conf + +%changelog +* Thu Feb 27 2025 ShinyGil +- Package refactoring for alternative DKMS package compatibility diff --git a/anda/system/xpadneo/dkms/anda.hcl b/anda/system/xpadneo/dkms/anda.hcl new file mode 100644 index 0000000000..99098cb318 --- /dev/null +++ b/anda/system/xpadneo/dkms/anda.hcl @@ -0,0 +1,10 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "dkms-xpadneo.spec" + } + labels { + mock = 1 + updbranch = 1 + } +} diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.conf b/anda/system/xpadneo/dkms/dkms-xpadneo.conf new file mode 100644 index 0000000000..ecde0d0673 --- /dev/null +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.conf @@ -0,0 +1,6 @@ +PACKAGE_NAME="xpadneo" +PACKAGE_VERSION="__VERSION_STRING" +AUTOINSTALL="yes" + +BUILT_MODULE_NAME[0]="hid-xpadneo" +DEST_MODULE_LOCATION[0]="/extra" diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec new file mode 100644 index 0000000000..ebe5b99d24 --- /dev/null +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec @@ -0,0 +1,67 @@ +%global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 +%global date 20241224 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global ver 0.9.7 +%global debug_package %{nil} +%global dkms_name xpadneo + +Name: dkms-%{dkms_name} +Version: %{ver}^%{date}git.%{shortcommit} +Release: 1%{?dist} +Summary: Advanced Linux Driver for Xbox One Wireless Gamepad +License: GPL-3.0 +URL: https://atar-axis.github.io/%{dkms_name} +Source0: https://github.com/atar-axis/%{dkms_name}/archive/%{commit}.tar.gz#/%{dkms_name}-%{shortcommit}.tar.gz +Source1: %{name}.conf +Source2: no-weak-modules.conf +BuildRequires: sed +Requires: bluez +Requires: bluez-tools +Requires: %{dkms_name}-kmod-common = %{?epoch:%{epoch}:}%{version} +Requires: dkms +BuildArch: noarch +Packager: ShinyGil + +%description +Advanced Linux Driver for Xbox One Wireless Gamepad. + +%prep +%autosetup -p1 -n %{dkms_name}-%{commit} + + +cp -f %{SOURCE1} hid-xpadneo/src/dkms.conf + +sed -i -e 's/__VERSION_STRING/%{version}/g' hid-xpadneo/src/dkms.conf +sed -i -e 's/$(VERSION)/v%{version}/g' hid-xpadneo/src/Makefile + +%build + +%install +# Create empty tree: +mkdir -p %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/ +cp -fr hid-xpadneo/src/* %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/ + +%if 0%{?fedora} +# Do not enable weak modules support in Fedora (no kABI): +install -Dpm644 %{SOURCE2} %{buildroot}%{_sysconfdir}/dkms/%{dkms_name}.conf +%endif + +%post +dkms add -m %{dkms_name} -v %{version} -q --rpm_safe_upgrade || : +# Rebuild and make available for the currently running kernel: +dkms build -m %{dkms_name} -v %{version} -q || : +dkms install -m %{dkms_name} -v %{version} -q --force || : + +%preun +# Remove all versions from DKMS registry: +dkms remove -m %{dkms_name} -v %{version} -q --all --rpm_safe_upgrade || : + +%files +%{_usrsrc}/%{dkms_name}-%{version} +%if 0%{?fedora} +%{_sysconfdir}/dkms/%{dkms_name}.conf +%endif + +%changelog +* Thu Feb 27 2025 ShinyGil +- Initial package diff --git a/anda/system/xpadneo/dkms/no-weak-modules.conf b/anda/system/xpadneo/dkms/no-weak-modules.conf new file mode 100644 index 0000000000..24f6f95c96 --- /dev/null +++ b/anda/system/xpadneo/dkms/no-weak-modules.conf @@ -0,0 +1 @@ +NO_WEAK_MODULES="yes" diff --git a/anda/system/xpadneo/dkms/update.rhai b/anda/system/xpadneo/dkms/update.rhai new file mode 100644 index 0000000000..e51de83ed3 --- /dev/null +++ b/anda/system/xpadneo/dkms/update.rhai @@ -0,0 +1,3 @@ +import "andax/bump_extras.rhai" as bump; + +rpm.version(bump::madoguchi("xpadneo-kmod-common", labels.branch)); diff --git a/anda/system/xpadneo/kmod-common/anda.hcl b/anda/system/xpadneo/kmod-common/anda.hcl new file mode 100644 index 0000000000..353eb4917d --- /dev/null +++ b/anda/system/xpadneo/kmod-common/anda.hcl @@ -0,0 +1,10 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "xpadneo-kmod-common.spec" + } + labels { + mock = 1 + nightly = 1 + } +} diff --git a/anda/system/xpadneo/io.github.xpadneo.metainfo.xml b/anda/system/xpadneo/kmod-common/io.github.xpadneo.metainfo.xml similarity index 100% rename from anda/system/xpadneo/io.github.xpadneo.metainfo.xml rename to anda/system/xpadneo/kmod-common/io.github.xpadneo.metainfo.xml diff --git a/anda/system/xpadneo/kmod-common/update.rhai b/anda/system/xpadneo/kmod-common/update.rhai new file mode 100644 index 0000000000..19b1642b6c --- /dev/null +++ b/anda/system/xpadneo/kmod-common/update.rhai @@ -0,0 +1,8 @@ +rpm.global("commit", gh_commit("atar-axis/xpadneo")); +if rpm.changed() { + rpm.release(); + rpm.global("commit_date", date()); + let ver = gh("atar-axis/xpadneo"); + ver.crop(1); + rpm.global("ver", ver); +} diff --git a/anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec b/anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec new file mode 100644 index 0000000000..e6433b9593 --- /dev/null +++ b/anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec @@ -0,0 +1,45 @@ +%global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 +%global date 20241224 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global ver 0.9.7 +%global real_name xpadneo + +Name: %{real_name}-kmod-common +Version: %{ver}^%{date}git.%{shortcommit} +Release: 1%{?dist} +Summary: Advanced Linux Driver for Xbox One Wireless Gamepad common files +License: GPL-3.0 +URL: https://atar-axis.github.io/%{real_name} +Source0: https://github.com/atar-axis/%{real_name}/archive/%{commit}.tar.gz#/%{real_name}-%{shortcommit}.tar.gz +Source1: io.github.xpadneo.metainfo.xml +BuildRequires: systemd-rpm-macros +Provides: %{real_name}-kmod-common = %{?epoch:%{epoch}:}%{version} +BuildArch: noarch +Packager: ShinyGil + +%description +Advanced Linux Driver for Xbox One Wireless Gamepad common files. + +%prep +%autosetup -p1 -n %{real_name}-%{commit} + +%install +# Aliases: +install -Dpm644 hid-%{real_name}/etc-modprobe.d/%{real_name}.conf -t %{buildroot}%{_modprobedir} + +# UDev rules: +install -Dpm644 hid-%{real_name}/etc-udev-rules.d/*.rules -t %{buildroot}%{_udevrulesdir}/ + +# Metadata +install -Dm644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo/io.github.xpadneo.metainfo.xml + +%files +%license LICENSE +%doc docs/*.md +%{_modprobedir}/%{real_name}.conf +%{_udevrulesdir}/60-%{real_name}.rules +%{_udevrulesdir}/70-%{real_name}-disable-hidraw.rules +%{_datadir}/metainfo/io.github.xpadneo.metainfo.xml + +%changelog +%autochangelog diff --git a/anda/system/xpadneo/modules-load-d-xpadneo.conf b/anda/system/xpadneo/modules-load-d-xpadneo.conf deleted file mode 100644 index 9a5fd2d346..0000000000 --- a/anda/system/xpadneo/modules-load-d-xpadneo.conf +++ /dev/null @@ -1 +0,0 @@ -hid_xpadneo diff --git a/anda/system/xpadneo/update.rhai b/anda/system/xpadneo/update.rhai deleted file mode 100644 index 0a63919e92..0000000000 --- a/anda/system/xpadneo/update.rhai +++ /dev/null @@ -1 +0,0 @@ -rpm.version(gh("atar-axis/xpadneo")); diff --git a/anda/system/xpadneo/xpadneo.spec b/anda/system/xpadneo/xpadneo.spec deleted file mode 100644 index cb50fdef4b..0000000000 --- a/anda/system/xpadneo/xpadneo.spec +++ /dev/null @@ -1,103 +0,0 @@ -%if 0%{?fedora} -%global buildforkernels akmod -%global debug_package %{nil} -%endif - -Name: xpadneo -Version: 0.9.7 -Release: 1%?dist -Summary: Advanced Linux Driver for Xbox One Wireless Gamepad -Group: System Environment/Kernel -License: GPL-3.0 -URL: https://github.com/atar-axis/xpadneo -Source0: %url/archive/v%version/%name-%version.tar.gz -Source1: modules-load-d-xpadneo.conf -Source2: io.github.xpadneo.metainfo.xml - -%global srcname hid-%name - -BuildRequires: gcc -BuildRequires: make -BuildRequires: kmodtool -BuildRequires: systemd-rpm-macros - -Requires: bash -Requires: bluez bluez-tools - -Provides: %{name}-kmod-common = %{version}-%{release} -Requires: %{name}-kmod >= %{version} -Obsoletes: %{name} < 0.9.1-2 - -# kmodtool does its magic here -%{expand:%(kmodtool --target %{_target_cpu} --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } - -%description -Advanced Linux Driver for Xbox One Wireless Controller - -%package kmod -Summary: Kernel module (kmod) for %{name} -Requires: kernel-devel - -%description kmod -This is the first driver for the Xbox One Wireless Gamepad (which is shipped with the Xbox One S). - -%prep -# error out if there was something wrong with kmodtool -%{?kmodtool_check} - -# print kmodtool output for debugging purposes: -kmodtool --target %{_target_cpu} --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null - -%setup -q - -for kernel_version in %{?kernel_versions} ; do - cp -a hid-xpadneo/src _kmod_build_${kernel_version%%___*} -done - -%build -for kernel_version in %{?kernel_versions} ; do - make V=1 %{?_smp_mflags} -C ${kernel_version##*___} M=${PWD}/_kmod_build_${kernel_version%%___*} VERSION=v%{version} modules -done - -%install -for kernel_version in %{?kernel_versions}; do - mkdir -p %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ - install -D -m 755 _kmod_build_${kernel_version%%___*}/hid-xpadneo.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ - chmod a+x %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/*.ko -done -%{?akmod_install} - -install -Dm644 hid-xpadneo/etc-modprobe.d/xpadneo.conf %{buildroot}%{_modprobedir}/60-xpadneo.conf -install -Dm644 %{SOURCE1} %{buildroot}%{_modulesloaddir}/xpadneo.conf -install -Dm644 hid-xpadneo/etc-udev-rules.d/60-xpadneo.rules %{buildroot}%{_udevrulesdir}/60-xpadneo.rules -install -Dm644 %{SOURCE2} %{buildroot}%{_datadir}/metainfo/io.github.xpadneo.metainfo.xml - -%files -%doc NEWS.md docs/README.md docs/CONFIGURATION.md -%license LICENSE -%{_modprobedir}/60-xpadneo.conf -%{_modulesloaddir}/xpadneo.conf -%{_udevrulesdir}/60-xpadneo.rules -%{_datadir}/metainfo/io.github.xpadneo.metainfo.xml - -%changelog -* Wed Oct 12 2022 Jan Drögehoff - 0.9.5-1 -- Update to 0.9.5 - -* Mon Jul 04 2022 Jan Drögehoff - 0.9.4-1 -- Update to 0.9.4 - -* Sun May 29 2022 Jan Drögehoff - 0.9.2-1 -- Update to 0.9.2 - -* Thu Jun 17 2021 Jan Drögehoff - 0.9.1-2 -- Move from DKMS to Akmods - -* Fri May 21 2021 Jan Drögehoff - 0.9.1-1 -- Update to 0.9.1 - -* Mon Dec 28 21:58:05 CET 2020 Jan Drögehoff - 0.9-2 -- remove configure script - -* Mon Dec 28 21:01:47 CET 2020 Jan Drögehoff - 0.9-1 -- Initial Spec From 72f22827cbf62ce582e3a1dacaab58dea848b733 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 1 Mar 2025 16:39:30 +0000 Subject: [PATCH 0113/2977] bump(branch): akmod dkms --- anda/system/xpadneo/akmod/xpadneo-kmod.spec | 4 ++-- anda/system/xpadneo/dkms/dkms-xpadneo.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec index ecee2ac7b9..5558ba044c 100644 --- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec +++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec @@ -7,8 +7,8 @@ %global real_name xpadneo Name: %{real_name}-kmod -Version: %{ver}^%{date}git.%{shortcommit} -Release: 2%{?dist} +Version: 0.9.7^20241224git.8d20a23 +Release: 1%?dist Summary: Advanced Linux Driver for Xbox One Wireless Gamepad License: GPL-3.0 URL: https://atar-axis.github.io/xpadneo diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec index ebe5b99d24..2111a8f3e0 100644 --- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec @@ -6,8 +6,8 @@ %global dkms_name xpadneo Name: dkms-%{dkms_name} -Version: %{ver}^%{date}git.%{shortcommit} -Release: 1%{?dist} +Version: 0.9.7^20241224git.8d20a23 +Release: 1%?dist Summary: Advanced Linux Driver for Xbox One Wireless Gamepad License: GPL-3.0 URL: https://atar-axis.github.io/%{dkms_name} From 64527b2d4e14eedf9496684e30773b918450f1eb Mon Sep 17 00:00:00 2001 From: madomado Date: Sun, 2 Mar 2025 03:37:49 +0800 Subject: [PATCH 0114/2977] fix(klassy): 6.3.1 (#3557) Signed-off-by: madomado --- anda/themes/klassy/klassy.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/anda/themes/klassy/klassy.spec b/anda/themes/klassy/klassy.spec index ef58ebe8be..ce5bcb9218 100644 --- a/anda/themes/klassy/klassy.spec +++ b/anda/themes/klassy/klassy.spec @@ -2,16 +2,17 @@ Name: klassy %global forgeurl https://github.com/paulmcauley/%{name} %global tag 6.2.breeze6.2.1 -%global date 20241018 +%global date 20250226 %forgemeta Version: %{tag} -Release: 1%?dist +Release: 2%?dist Summary: Window Decoration, Application Style and Global Theme plugin for recent versions of the KDE Plasma desktop. License: GPL-2.0-or-later Group: System/GUI/KDE URL: %{forgeurl} Source: %{forgesource} +Patch0: https://github.com/paulmcauley/klassy/pull/178.patch Obsoletes: classikstyles <= %{version} Obsoletes: classik <= %{version} @@ -65,7 +66,7 @@ BuildRequires: cmake(KF6KirigamiPlatform) BuildRequires: cmake(KF6Package) BuildRequires: cmake(KF6WindowSystem) -BuildRequires: cmake(KDecoration2) +BuildRequires: cmake(KDecoration3) BuildRequires: cmake(Plasma) BuildRequires: cmake(Plasma5Support) @@ -99,8 +100,8 @@ Klassy (formerly ClassiK/ClassikStyles) is a highly customizable binary Window D %{_kf6_qtplugindir}/styles/klassy6.so %{_kf6_qtplugindir}/kstyle_config/klassystyleconfig.so -%{_kf6_qtplugindir}/org.kde.kdecoration2/org.kde.klassy.so -%{_kf6_qtplugindir}/org.kde.kdecoration2.kcm/kcm_klassydecoration.so +%{_kf6_qtplugindir}/org.kde.kdecoration3/org.kde.klassy.so +%{_kf6_qtplugindir}/org.kde.kdecoration3.kcm/kcm_klassydecoration.so %{_kf6_qtplugindir}/org.kde.kdecoration2.kcm/klassydecoration/presets/* %{_kf6_datadir}/applications/kcm_klassydecoration.desktop From d2c7404174245db363f5e604b2babb6855a21c6f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 1 Mar 2025 21:15:04 +0000 Subject: [PATCH 0115/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index cadb5fbaa6..bd3429052c 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.2.9 +Version: 2025.3.0 Release: 1%?dist Summary: Front-end to your dev env From c76bb10a042fdc0da3319ea62f63e7638891e2b1 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 2 Mar 2025 01:40:45 +0000 Subject: [PATCH 0116/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 00db8d1e96..9b9b179264 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-01 +%global ver 2025-03-02 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 475c86b3f81eba26ecb30db3ae73ce9addf2b954 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 2 Mar 2025 01:43:19 +0000 Subject: [PATCH 0117/2977] bump(nightly): envision mpv nightly micro nightly vala-nightly --- anda/apps/envision/envision.spec | 4 ++-- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/micro/micro-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/langs/vala/vala-nightly/vala-nightly.spec | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/anda/apps/envision/envision.spec b/anda/apps/envision/envision.spec index 9e47382eaa..7c6dce3fdc 100644 --- a/anda/apps/envision/envision.spec +++ b/anda/apps/envision/envision.spec @@ -1,5 +1,5 @@ -%global commit 9c6bfe110a50f7f96cd5204205397a9ccd2548d4 -%global commit_date 20250224 +%global commit 96717d193f5e39a829161fc1f2d6c13393eea186 +%global commit_date 20250302 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: envision-nightly diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 76235c297d..d501ca8a5d 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 5338f4ba70903e7517bbfc7881e10ff13a912ffc +%global commit ee07dcf4c704e64d3d9d95191129bccd98c2c37d %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250227 +%global commit_date 20250302 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 6b7a4f5854..42f133d066 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit c6485b9fd5514992e9acf8f6986e7986195dc3fc +%global commit e2b5584a8d12052c35e2c814f3648e0eba455b38 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-02-28 +%global fulldate 2025-03-01 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 diff --git a/anda/devs/micro/micro-nightly.spec b/anda/devs/micro/micro-nightly.spec index 12364ed847..5f941ca726 100644 --- a/anda/devs/micro/micro-nightly.spec +++ b/anda/devs/micro/micro-nightly.spec @@ -12,8 +12,8 @@ # Naming variable as something other than "commit" is necessary # to stop %%gometa from putting commit hash in release -%global commit_hash 272a308275f3b543647c6171e86dc521ce2822a0 -%global commit_date 20250228 +%global commit_hash 3c68655f334aa4c4d3f9825e8370d2e86ae6d261 +%global commit_date 20250302 %global shortcommit %{sub %{commit_hash} 1 7} %global ver 2.0.14 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 977b5a92b8..e826cf2557 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 694afd15c91fe56f7399bf1e35592a877ec002c4 +%global commit fec228bb236e690c4c629e4688b62c005298c503 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250301 +%global commit_date 20250302 %global ver 0.177.0 %bcond_with check diff --git a/anda/langs/vala/vala-nightly/vala-nightly.spec b/anda/langs/vala/vala-nightly/vala-nightly.spec index 2f7d15a61f..d87c6b1121 100644 --- a/anda/langs/vala/vala-nightly/vala-nightly.spec +++ b/anda/langs/vala/vala-nightly/vala-nightly.spec @@ -3,11 +3,11 @@ %global priority 90 %global real_name vala -%global commit 32fabbe78a06a9cc46f67305dd51d1babd58e6d4 +%global commit 933ab9c03ae06579e5fc334d7aa6e30ecc7c5f61 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global repo https://gitlab.gnome.org/GNOME/%{real_name}.git -%global commit_date 20250221 +%global commit_date 20250302 %global snapshot_info %{commit_date}.%{shortcommit} Name: vala-nightly From f36c38bc076943bb338c711ccd7bd197718377c1 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 1 Mar 2025 19:59:49 -0600 Subject: [PATCH 0118/2977] chore: bulk update RockGrub specs (#3646) --- .../devs/ghostty/nightly/ghostty-nightly.spec | 9 ++--- anda/devs/ghostty/stable/ghostty.spec | 8 ++-- anda/fonts/cleartype/cleartype-fonts.spec | 4 +- .../ms-core-tahoma/ms-core-tahoma-fonts.spec | 4 +- anda/fonts/ms-core/ms-core-fonts.spec | 4 +- .../heroic-games-launcher.spec | 4 +- anda/misc/krabby/krabby.spec | 4 +- anda/misc/pbcli/pbcli.spec | 39 ++++++++++--------- .../pokemon-colorscripts.spec | 4 +- anda/system/xone/akmod/xone-kmod.spec | 4 +- anda/system/xone/dkms/dkms-xone.spec | 4 +- .../xone/kmod-common/xone-kmod-common.spec | 4 +- anda/system/xpadneo/akmod/xpadneo-kmod.spec | 4 +- anda/system/xpadneo/dkms/dkms-xpadneo.spec | 4 +- .../kmod-common/xpadneo-kmod-common.spec | 2 +- anda/tools/java-binfmt/java-binfmt.spec | 4 +- 16 files changed, 54 insertions(+), 52 deletions(-) diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 42f133d066..06f3d62fbf 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -50,7 +50,7 @@ Provides: ghostty-tip = %{version}-%{release} Provides: %{name} = %{commit_date}.%{shortcommit} %endif Obsoletes: %{name} = 20250130.04d3636 -Packager: ShinyGil +Packager: Gilver E. %description 👻 Ghostty is a fast, feature-rich, and cross-platform terminal emulator that uses platform-native UI and GPU acceleration. @@ -206,16 +206,15 @@ zig build \ %_datadir/terminfo/ghostty.terminfo %changelog -* Fri Jan 31 2025 ShinyGil +* Fri Jan 31 2025 Gilver E. - Update to 1.1.1-1%{?dist}.20250131tipc5508e7 * Low GHSA-98wc-794w-gjx3: Ghostty leaked file descriptors allowing the shell and any of its child processes to impact other Ghostty terminal instances * Better Git versioning scheme * Ghostty terminfo source files are now a subpackage * Shell integration and completion and terminfo subpackages are now properly noarch -* Tue Dec 31 2024 ShinyGil +* Tue Dec 31 2024 Gilver E. - Update to 20241231.3f7c3af * High CVE-2003-0063: Allows execution of arbitrary commands * Medium CVE-2003-0070: Allows execution of arbitrary commands - -* Thu Dec 26 2024 ShinyGil +* Thu Dec 26 2024 Gilver E. - Initial package diff --git a/anda/devs/ghostty/stable/ghostty.spec b/anda/devs/ghostty/stable/ghostty.spec index ea25ae6186..d2f8e6696e 100644 --- a/anda/devs/ghostty/stable/ghostty.spec +++ b/anda/devs/ghostty/stable/ghostty.spec @@ -37,7 +37,7 @@ Requires: %{name}-shell-integration = %{version}-%{release} Requires: gtk4 Requires: libadwaita Conflicts: ghostty-nightly -Packager: ShinyGil +Packager: Gilver E. %description 👻 Ghostty is a fast, feature-rich, and cross-platform terminal emulator that uses platform-native UI and GPU acceleration. @@ -181,15 +181,15 @@ zig build \ %_datadir/terminfo/ghostty.terminfo %changelog -* Fri Jan 31 2025 ShinyGil +* Fri Jan 31 2025 Gilver E. - Update to 1.1.0-1%{?dist} * Low GHSA-98wc-794w-gjx3: Ghostty leaked file descriptors allowing the shell and any of its child processes to impact other Ghostty terminal instances * Ghostty terminfo source files are now a subpackage * Shell integration and completion and terminfo subpackages are now properly noarch -* Tue Dec 31 2024 ShinyGil +* Tue Dec 31 2024 Gilver E. - Update to 1.0.1 * High CVE-2003-0063: Allows execution of arbitrary commands * Medium CVE-2003-0070: Allows execution of arbitrary commands -* Thu Dec 26 2024 ShinyGil +* Thu Dec 26 2024 Gilver E. - Initial package diff --git a/anda/fonts/cleartype/cleartype-fonts.spec b/anda/fonts/cleartype/cleartype-fonts.spec index a4232b41ab..354394ebc4 100644 --- a/anda/fonts/cleartype/cleartype-fonts.spec +++ b/anda/fonts/cleartype/cleartype-fonts.spec @@ -113,7 +113,7 @@ Requires: %{fontname}-constantia-fonts Requires: %{fontname}-corbel-fonts Requires(post): fontconfig BuildArch: noarch -Packager: ShinyGil +Packager: Gilver E. %fontpkg -a @@ -142,5 +142,5 @@ cabextract ppviewer.cab %files %changelog -* Mon Feb 24 2025 ShinyGil +* Mon Feb 24 2025 Gilver E. - Initial package diff --git a/anda/fonts/ms-core-tahoma/ms-core-tahoma-fonts.spec b/anda/fonts/ms-core-tahoma/ms-core-tahoma-fonts.spec index ed6a678987..bb76bda8fb 100644 --- a/anda/fonts/ms-core-tahoma/ms-core-tahoma-fonts.spec +++ b/anda/fonts/ms-core-tahoma/ms-core-tahoma-fonts.spec @@ -30,7 +30,7 @@ BuildRequires: fontpackages-devel Requires: xorg-x11-font-utils Requires: fontconfig BuildArch: noarch -Packager: ShinyGil +Packager: Gilver E. %fontpkg -a @@ -62,5 +62,5 @@ cabextract Viewer1.cab %files %changelog -* Mon Feb 24 2025 ShinyGil +* Mon Feb 24 2025 Gilver E. - Initial package diff --git a/anda/fonts/ms-core/ms-core-fonts.spec b/anda/fonts/ms-core/ms-core-fonts.spec index b0ed4229c6..6868033631 100644 --- a/anda/fonts/ms-core/ms-core-fonts.spec +++ b/anda/fonts/ms-core/ms-core-fonts.spec @@ -192,7 +192,7 @@ Requires: %{fontname}-webdings-fonts Requires: xorg-x11-font-utils Requires(post): fontconfig BuildArch: noarch -Packager: ShinyGil +Packager: Gilver E. %fontpkg -a @@ -225,5 +225,5 @@ cabextract %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \ %files %changelog -* Mon Feb 24 2025 ShinyGil +* Mon Feb 24 2025 Gilver E. - Initial package diff --git a/anda/games/heroic-games-launcher/heroic-games-launcher.spec b/anda/games/heroic-games-launcher/heroic-games-launcher.spec index 10f86af09f..657e00e87f 100644 --- a/anda/games/heroic-games-launcher/heroic-games-launcher.spec +++ b/anda/games/heroic-games-launcher/heroic-games-launcher.spec @@ -34,7 +34,7 @@ Requires: which Recommends: gamemode Recommends: mangohud Recommends: umu-launcher -Packager: ShinyGil +Packager: Gilver E. %description Heroic is a Free and Open Source Epic, GOG, and Amazon Prime Games launcher for Linux, Windows, and macOS. @@ -87,6 +87,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/heroic.desktop %_iconsdir/hicolor/1024x1024/heroic.png %changelog -* Thu Jan 30 2025 ShinyGil +* Thu Jan 30 2025 Gilver E. - Initial package diff --git a/anda/misc/krabby/krabby.spec b/anda/misc/krabby/krabby.spec index a036b80904..3bb62f0f02 100644 --- a/anda/misc/krabby/krabby.spec +++ b/anda/misc/krabby/krabby.spec @@ -9,7 +9,7 @@ Source0: %{url}/archive/refs/tags/v%{version}.tar.gz BuildRequires: anda-srpm-macros BuildRequires: cargo-rpm-macros BuildRequires: mold -Packager: ShinyGil +Packager: Gilver E. %description Krabby is mostly a Rust rewrite of phoney badger's pokemon-colorscripts with some extra features. @@ -30,5 +30,5 @@ Krabby is mostly a Rust rewrite of phoney badger's pokemon-colorscripts with som %{_bindir}/%{name} %changelog -* Thu Feb 27 2025 ShinyGil +* Thu Feb 27 2025 Gilver E. - Initial package diff --git a/anda/misc/pbcli/pbcli.spec b/anda/misc/pbcli/pbcli.spec index cbdd127610..6284515f5e 100644 --- a/anda/misc/pbcli/pbcli.spec +++ b/anda/misc/pbcli/pbcli.spec @@ -1,6 +1,3 @@ -%global __brp_mangle_shebangs %{nil} -%bcond_without mold - %global _description %{expand: pbcli is a command line client which allows to upload and download pastes from privatebin directly from the command line.} @@ -9,25 +6,23 @@ Version: 2.8.0 Release: 1%?dist Summary: A PrivateBin commandline upload and download utility SourceLicense: Unlicense OR MIT -License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-3-Clause AND ISC AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) +License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR MIT) AND BSD-3-Clause) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-3-Clause AND ISC AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) URL: https://github.com/Mydayyy/pbcli -Source0: %url/archive/refs/tags/v%version.tar.gz +Source0: %{url}/archive/refs/tags/v%{version}.tar.gz +BuildRequires: anda-srpm-macros BuildRequires: cargo-rpm-macros >= 24 -BuildRequires: anda-srpm-macros mold -BuildRequires: perl-IPC-Cmd perl-ExtUtils-MM-Utils perl-FindBin perl-lib perl-File-Compare perl-File-Copy -BuildRequires: openssl-libs openssl-devel -Packager: ShinyGil +BuildRequires: mold +BuildRequires: perl-ExtUtils-MM-Utils +BuildRequires: perl-FindBin +BuildRequires: perl-File-Compare +BuildRequires: perl-File-Copy +BuildRequires: perl-IPC-Cmd +BuildRequires: perl-lib +BuildRequires: openssl-libs +Packager: Gilver E. %description %_description -%files -%doc README.md -%license LICENSE-MIT -%license LICENSE-UNLICENSE -%license LICENSE.dependencies -%_bindir/pbcli -%_libdir/libpbcli.so - %prep %autosetup -n pbcli-%version %cargo_prep_online @@ -40,6 +35,14 @@ Packager: ShinyGil install -Dm755 target/rpm/pbcli %{buildroot}%{_bindir}/pbcli install -Dm755 target/rpm/libpbcli.so %{buildroot}%{_libdir}/libpbcli.so +%files +%doc README.md +%license LICENSE-MIT +%license LICENSE-UNLICENSE +%license LICENSE.dependencies +%{_bindir}/pbcli +%{_libdir}/libpbcli.so + %changelog -* Sat Dec 21 2024 ShinyGil +* Sat Dec 21 2024 Gilver E. - Initial package diff --git a/anda/misc/pokemon-colorscripts/pokemon-colorscripts.spec b/anda/misc/pokemon-colorscripts/pokemon-colorscripts.spec index 13f0c5b1fc..be742e55d7 100644 --- a/anda/misc/pokemon-colorscripts/pokemon-colorscripts.spec +++ b/anda/misc/pokemon-colorscripts/pokemon-colorscripts.spec @@ -11,7 +11,7 @@ URL: https://gitlab.com/phoneybadger/%{name} Source0: %{url}/-/archive/%{commit}/%{name}-%{shortcommit}.tar.gz BuildArch: noarch Requires: python3 -Packager: ShinyGil +Packager: Gilver E. %description A utility that prints unicode sprites of images of Pokémon to the terminal. @@ -42,5 +42,5 @@ ln -sf "%{_datadir}/%{name}/pokemon-colorscripts.py" "%{buildroot}%{_bindir}/pok %{_mandir}/man1/pokemon-colorscripts.1.gz %changelog -* Thu Feb 27 2025 ShinyGil +* Thu Feb 27 2025 Gilver E. - Initial package diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index 3376fe5ce2..accc728403 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -16,7 +16,7 @@ Source0: %{url}/archive/%{commit}.tar.gz#/xone-%{shortcommit}.tar.gz BuildRequires: kmodtool BuildRequires: systemd-rpm-macros Requires: %{real_name}-kmod-common = %{?epoch:%{epoch}:}%{version} -Packager: ShinyGil +Packager: Gilver E. %{expand:%(kmodtool --target %{_target_cpu} --repo terra --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } @@ -59,5 +59,5 @@ done %{_modulesloaddir}/%{real_name}.conf %changelog -* Thu Feb 27 2025 ShinyGil +* Thu Feb 27 2025 Gilver E. - Initial package diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index c1c21abc87..f6587bf7ec 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -18,7 +18,7 @@ BuildRequires: systemd-rpm-macros Requires: %{dkms_name}-kmod-common = %{?epoch:%{epoch}:}%{version} Requires: dkms BuildArch: noarch -Packager: ShinyGil +Packager: Gilver E. %description Linux kernel driver for Xbox One and Xbox Series X|S accessories. @@ -60,5 +60,5 @@ dkms remove -m %{dkms_name} -v %{version} -q --all --rpm_safe_upgrade || : %endif %changelog -* Thu Feb 27 2025 ShinyGil +* Thu Feb 27 2025 Gilver E. - Initial package diff --git a/anda/system/xone/kmod-common/xone-kmod-common.spec b/anda/system/xone/kmod-common/xone-kmod-common.spec index 934a3b4945..76f33d3b5c 100644 --- a/anda/system/xone/kmod-common/xone-kmod-common.spec +++ b/anda/system/xone/kmod-common/xone-kmod-common.spec @@ -25,7 +25,7 @@ Requires: %{real_name}-firmware = 1.0.46.1 Requires(post): dracut Provides: %{real_name}-kmod-common = %{?epoch:%{epoch}:}%{version} BuildArch: noarch -Packager: ShinyGil +Packager: Gilver E. %description Linux kernel driver for Xbox One and Xbox Series X|S accessories common files. @@ -77,5 +77,5 @@ echo "The firmware for the wireless dongle is subject to Microsoft's Terms of Us echo 'https://www.microsoft.com/en-us/legal/terms-of-use' %changelog -* Thu Feb 27 2025 ShinyGil +* Thu Feb 27 2025 Gilver E. - Initial package diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec index 5558ba044c..4eaaf3300c 100644 --- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec +++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec @@ -18,7 +18,7 @@ BuildRequires: systemd-rpm-macros Requires: bluez Requires: bluez-tools Requires: %{real_name}-kmod-common = %{?epoch:%{epoch}:}%{version} -Packager: ShinyGil +Packager: Gilver E. %{expand:%(kmodtool --target %{_target_cpu} --repo terra --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } @@ -59,5 +59,5 @@ done %{_modulesloaddir}/%{real_name}.conf %changelog -* Thu Feb 27 2025 ShinyGil +* Thu Feb 27 2025 Gilver E. - Package refactoring for alternative DKMS package compatibility diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec index 2111a8f3e0..29cc322162 100644 --- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec @@ -20,7 +20,7 @@ Requires: bluez-tools Requires: %{dkms_name}-kmod-common = %{?epoch:%{epoch}:}%{version} Requires: dkms BuildArch: noarch -Packager: ShinyGil +Packager: Gilver E. %description Advanced Linux Driver for Xbox One Wireless Gamepad. @@ -63,5 +63,5 @@ dkms remove -m %{dkms_name} -v %{version} -q --all --rpm_safe_upgrade || : %endif %changelog -* Thu Feb 27 2025 ShinyGil +* Thu Feb 27 2025 Gilver E. - Initial package diff --git a/anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec b/anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec index e6433b9593..5c219583a9 100644 --- a/anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec +++ b/anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec @@ -15,7 +15,7 @@ Source1: io.github.xpadneo.metainfo.xml BuildRequires: systemd-rpm-macros Provides: %{real_name}-kmod-common = %{?epoch:%{epoch}:}%{version} BuildArch: noarch -Packager: ShinyGil +Packager: Gilver E. %description Advanced Linux Driver for Xbox One Wireless Gamepad common files. diff --git a/anda/tools/java-binfmt/java-binfmt.spec b/anda/tools/java-binfmt/java-binfmt.spec index 2f27561804..0ae12959e1 100644 --- a/anda/tools/java-binfmt/java-binfmt.spec +++ b/anda/tools/java-binfmt/java-binfmt.spec @@ -18,7 +18,7 @@ Source5: https://raw.githubusercontent.com/terrapkg/pkg-java-binfmt/%{com Source6: https://raw.githubusercontent.com/terrapkg/pkg-java-binfmt/%{commit}/Applet-lib64.conf BuildRequires: gcc BuildRequires: systemd-rpm-macros -Packager: ShinyGil +Packager: Gilver E. %description This package installs binfmt files for use with Java wrappers. @@ -109,5 +109,5 @@ install -Dpm644 %{SOURCE6} %{buildroot}%{_binfmtdir}/Applet-lib64.conf /bin/systemctl --system try-restart systemd-binfmt.service &>/dev/null || : %changelog -* Thu Jan 30 2025 ShinyGil +* Thu Jan 30 2025 Gilver E. - Initial package From b535009b6e569a967ff046a91da47ac380f94cad Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 1 Mar 2025 20:00:25 -0600 Subject: [PATCH 0119/2977] Fix: xpadneo and xone update scripts (#3641) * New update scripts * Add missing semicolons --- anda/system/xone/akmod/update.rhai | 14 ++++++++++++-- anda/system/xone/akmod/xone-kmod.spec | 2 +- anda/system/xone/dkms/dkms-xone.spec | 2 +- anda/system/xone/dkms/update.rhai | 14 ++++++++++++-- anda/system/xpadneo/akmod/update.rhai | 14 ++++++++++++-- anda/system/xpadneo/akmod/xpadneo-kmod.spec | 2 +- anda/system/xpadneo/dkms/dkms-xpadneo.spec | 2 +- anda/system/xpadneo/dkms/update.rhai | 14 ++++++++++++-- 8 files changed, 52 insertions(+), 12 deletions(-) diff --git a/anda/system/xone/akmod/update.rhai b/anda/system/xone/akmod/update.rhai index 72dee90d6d..9df561bc86 100644 --- a/anda/system/xone/akmod/update.rhai +++ b/anda/system/xone/akmod/update.rhai @@ -1,3 +1,13 @@ -import "andax/bump_extras.rhai" as bump; +let c = sh("cat anda/system/xone/kmod-common/xone-kmod-common.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +c.pop(); +rpm.global("commit", c); +if rpm.changed() { + rpm.release(); + let d = sh("cat anda/system/xone/kmod-common/xone-kmod-common.spec | grep '%global date' | sed -E 's/.+date //'", #{"stdout": "piped"}).ctx.stdout; + d.pop(); + rpm.global("date", d); + let v = sh("cat anda/system/xone/kmod-common/xone-kmod-common.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; + v.pop(); + rpm.global("ver", v); +} -rpm.version(bump::madoguchi("xone-kmod-common", labels.branch)); diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index accc728403..18f4f5bc77 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -7,7 +7,7 @@ %global real_name xone Name: %{real_name}-kmod -Version: 0.3^20241223git.6b9d59a +Version: %{ver}^%{date}git.%{shortcommit} Release: 1%?dist Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories License: GPL-2.0-or-later diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index f6587bf7ec..2fbb6b480e 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -6,7 +6,7 @@ %global dkms_name xone Name: dkms-%{dkms_name} -Version: 0.3^20241223git.6b9d59a +Version: %{ver}^%{date}git.%{shortcommit} Release: 1%?dist Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories License: GPL-2.0-or-later diff --git a/anda/system/xone/dkms/update.rhai b/anda/system/xone/dkms/update.rhai index 72dee90d6d..9df561bc86 100644 --- a/anda/system/xone/dkms/update.rhai +++ b/anda/system/xone/dkms/update.rhai @@ -1,3 +1,13 @@ -import "andax/bump_extras.rhai" as bump; +let c = sh("cat anda/system/xone/kmod-common/xone-kmod-common.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +c.pop(); +rpm.global("commit", c); +if rpm.changed() { + rpm.release(); + let d = sh("cat anda/system/xone/kmod-common/xone-kmod-common.spec | grep '%global date' | sed -E 's/.+date //'", #{"stdout": "piped"}).ctx.stdout; + d.pop(); + rpm.global("date", d); + let v = sh("cat anda/system/xone/kmod-common/xone-kmod-common.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; + v.pop(); + rpm.global("ver", v); +} -rpm.version(bump::madoguchi("xone-kmod-common", labels.branch)); diff --git a/anda/system/xpadneo/akmod/update.rhai b/anda/system/xpadneo/akmod/update.rhai index e51de83ed3..cd0af3f5e2 100644 --- a/anda/system/xpadneo/akmod/update.rhai +++ b/anda/system/xpadneo/akmod/update.rhai @@ -1,3 +1,13 @@ -import "andax/bump_extras.rhai" as bump; +let c = sh("cat anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +c.pop(); +rpm.global("commit", c); +if rpm.changed() { + rpm.release(); + let d = sh("cat anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec | grep '%global date' | sed -E 's/.+date //'", #{"stdout": "piped"}).ctx.stdout; + d.pop(); + rpm.global("date", d); + let v = sh("cat anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; + v.pop(); + rpm.global("ver", v); +} -rpm.version(bump::madoguchi("xpadneo-kmod-common", labels.branch)); diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec index 4eaaf3300c..6d3c26714e 100644 --- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec +++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec @@ -7,7 +7,7 @@ %global real_name xpadneo Name: %{real_name}-kmod -Version: 0.9.7^20241224git.8d20a23 +Version: %{ver}^%{date}git.%{shortcommit} Release: 1%?dist Summary: Advanced Linux Driver for Xbox One Wireless Gamepad License: GPL-3.0 diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec index 29cc322162..ae1fd9c52b 100644 --- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec @@ -6,7 +6,7 @@ %global dkms_name xpadneo Name: dkms-%{dkms_name} -Version: 0.9.7^20241224git.8d20a23 +Version: %{ver}^%{date}git.%{shortcommit} Release: 1%?dist Summary: Advanced Linux Driver for Xbox One Wireless Gamepad License: GPL-3.0 diff --git a/anda/system/xpadneo/dkms/update.rhai b/anda/system/xpadneo/dkms/update.rhai index e51de83ed3..cd0af3f5e2 100644 --- a/anda/system/xpadneo/dkms/update.rhai +++ b/anda/system/xpadneo/dkms/update.rhai @@ -1,3 +1,13 @@ -import "andax/bump_extras.rhai" as bump; +let c = sh("cat anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +c.pop(); +rpm.global("commit", c); +if rpm.changed() { + rpm.release(); + let d = sh("cat anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec | grep '%global date' | sed -E 's/.+date //'", #{"stdout": "piped"}).ctx.stdout; + d.pop(); + rpm.global("date", d); + let v = sh("cat anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; + v.pop(); + rpm.global("ver", v); +} -rpm.version(bump::madoguchi("xpadneo-kmod-common", labels.branch)); From c0f43d01778815b0f3063f3cf1bb21f6037bf73a Mon Sep 17 00:00:00 2001 From: Atmois Date: Sun, 2 Mar 2025 09:54:33 +0000 Subject: [PATCH 0120/2977] feat(swayfx): package changes (#3574) * Update packager email * Bump swayVersion * Update BuildRequires * Move %package wallpapers * Add patches * Bump release --- anda/desktops/swayfx/swayfx.spec | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/anda/desktops/swayfx/swayfx.spec b/anda/desktops/swayfx/swayfx.spec index abbf3a1ebf..ebfac78da7 100644 --- a/anda/desktops/swayfx/swayfx.spec +++ b/anda/desktops/swayfx/swayfx.spec @@ -1,8 +1,8 @@ -%global swayVersion 1.9 +%global swayVersion 1.10.1 Name: swayfx Version: 0.5 -Release: 1%?dist +Release: 2%?dist Summary: SwayFX: Sway, but with eye candy! URL: https://github.com/WillPower3309/swayfx @@ -21,7 +21,7 @@ BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(json-c) >= 0.13 BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libevdev) -BuildRequires: pkgconfig(libinput) >= 1.21.0 +BuildRequires: pkgconfig(libinput) >= 1.26.0 BuildRequires: pkgconfig(libpcre2-8) BuildRequires: pkgconfig(libsystemd) >= 239 BuildRequires: pkgconfig(libudev) @@ -33,8 +33,8 @@ BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-server) >= 1.21.0 BuildRequires: pkgconfig(wayland-protocols) >= 1.24 -BuildRequires: (pkgconfig(wlroots) >= 0.17.0 with pkgconfig(wlroots) < 0.18) -BuildRequires: (pkgconfig(scenefx) >= 0.1 with pkgconfig(scenefx) < 0.2) +BuildRequires: pkgconfig(scenefx-0.2) +BuildRequires: pkgconfig(wlroots-0.18) BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb-icccm) BuildRequires: pkgconfig(xkbcommon) >= 1.5.0 @@ -46,7 +46,7 @@ Conflicts: sway Provides: sway = %{swayVersion} -Packager: Atmois +Packager: Atmois %description %{summary} @@ -61,15 +61,6 @@ Provides: sway-config = %{version}-%{release} Conflicts: sway-config -%package wallpapers -Summary: Wallpapers for Sway -BuildArch: noarch -License: CC0 - -%description wallpapers -Wallpaper collection provided with Sway - - # Require the wallpaper referenced in the config. # Weak dependency here causes a swaynag warning during the configuration load Requires: sway-wallpapers @@ -106,10 +97,20 @@ Recommends: (qt6-qtwayland if qt6-qtbase-gui) Upstream configuration for Sway. Includes all important dependencies for a typical desktop system with minimal or no divergence from the upstream. +%package wallpapers +Summary: Wallpapers for Sway +BuildArch: noarch +License: CC0 + +%description wallpapers +Wallpaper collection provided with Sway + %prep %autosetup -N -n %{name}-%{version} +%autopatch -p1 -M99 + %build %meson \ -Dsd-bus-provider=libsystemd \ From 82cd8f0fea22a610f438450a3fb37b0410499f61 Mon Sep 17 00:00:00 2001 From: madomado Date: Sun, 2 Mar 2025 20:57:52 +0800 Subject: [PATCH 0121/2977] fix: mise (#3655) --- anda/tools/buildsys/mise/mise-fix-metadata-auto.diff | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/anda/tools/buildsys/mise/mise-fix-metadata-auto.diff b/anda/tools/buildsys/mise/mise-fix-metadata-auto.diff index 700f6e640d..7bb36cff90 100644 --- a/anda/tools/buildsys/mise/mise-fix-metadata-auto.diff +++ b/anda/tools/buildsys/mise/mise-fix-metadata-auto.diff @@ -1,6 +1,6 @@ ---- mise-2025.2.3/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ mise-2025.2.3/Cargo.toml 2025-02-09T16:23:06.178985+00:00 -@@ -476,18 +476,6 @@ +--- mise-2025.3.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ mise-2025.3.0/Cargo.toml 2025-03-02T07:08:39.544459+00:00 +@@ -469,18 +469,6 @@ optional = true default-features = false @@ -20,7 +20,7 @@ borrowed_box = "allow" @@ -495,3 +483,4 @@ - level = "warn" - priority = 0 - check-cfg = ["cfg(coverage,coverage_nightly)"] + [profile.serious] + lto = true + inherits = "release" + From c536a49de3922b3cb08dc8391477b418fbd309f5 Mon Sep 17 00:00:00 2001 From: madomado Date: Sun, 2 Mar 2025 21:54:50 +0800 Subject: [PATCH 0122/2977] add: xdvdfs (#3663) --- anda/langs/rust/xdvdfs/anda.hcl | 5 ++ anda/langs/rust/xdvdfs/rust-xdvdfs-cli.spec | 52 +++++++++++++++++++++ anda/langs/rust/xdvdfs/update.rhai | 1 + 3 files changed, 58 insertions(+) create mode 100644 anda/langs/rust/xdvdfs/anda.hcl create mode 100644 anda/langs/rust/xdvdfs/rust-xdvdfs-cli.spec create mode 100644 anda/langs/rust/xdvdfs/update.rhai diff --git a/anda/langs/rust/xdvdfs/anda.hcl b/anda/langs/rust/xdvdfs/anda.hcl new file mode 100644 index 0000000000..a0ae884d2b --- /dev/null +++ b/anda/langs/rust/xdvdfs/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "rust-xdvdfs-cli.spec" + } +} diff --git a/anda/langs/rust/xdvdfs/rust-xdvdfs-cli.spec b/anda/langs/rust/xdvdfs/rust-xdvdfs-cli.spec new file mode 100644 index 0000000000..a45f7c2070 --- /dev/null +++ b/anda/langs/rust/xdvdfs/rust-xdvdfs-cli.spec @@ -0,0 +1,52 @@ +# Generated by rust2rpm 27 +%bcond check 0 + +%global crate xdvdfs-cli + +Name: rust-xdvdfs-cli +Version: 0.8.3 +Release: %autorelease +Summary: Tool for interacting with XISO/XDVDFS images + +License: MIT +URL: https://crates.io/crates/xdvdfs-cli +Source: %{crates_source} +Source1: https://raw.githubusercontent.com/antangelo/xdvdfs/v%version/LICENSE +Packager: madonuko + +BuildRequires: anda-srpm-macros +BuildRequires: cargo-rpm-macros >= 24 + +%global _description %{expand: +Tool for interacting with XISO/XDVDFS images.} + +%description %{_description} + +%package -n xdvdfs +Summary: %{summary} +License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND (Apache-2.0 OR MIT) AND MIT AND (MIT AND BSD-3-Clause) AND (MIT OR Apache-2.0) AND (Unlicense OR MIT) AND Zlib + +%description -n xdvdfs %{_description} + +%files -n xdvdfs +%license LICENSE +%license LICENSE.dependencies +%doc README.md +%{_bindir}/xdvdfs + +%prep +%autosetup -n %{crate}-%{version} -p1 +cp %{S:1} LICENSE +%cargo_prep_online + +%build +%{cargo_license_summary_online} +%{cargo_license_online} > LICENSE.dependencies + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif diff --git a/anda/langs/rust/xdvdfs/update.rhai b/anda/langs/rust/xdvdfs/update.rhai new file mode 100644 index 0000000000..df3efee4b3 --- /dev/null +++ b/anda/langs/rust/xdvdfs/update.rhai @@ -0,0 +1 @@ +rpm.version(crates("xdvdfs-cli")); From f9541d6287addfdde5f7f4fbd84c41c2f5067af8 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 2 Mar 2025 13:56:53 +0000 Subject: [PATCH 0123/2977] bump: heroic-games-launcher --- anda/games/heroic-games-launcher/heroic-games-launcher.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/games/heroic-games-launcher/heroic-games-launcher.spec b/anda/games/heroic-games-launcher/heroic-games-launcher.spec index 657e00e87f..dfb28f2a40 100644 --- a/anda/games/heroic-games-launcher/heroic-games-launcher.spec +++ b/anda/games/heroic-games-launcher/heroic-games-launcher.spec @@ -6,8 +6,8 @@ %global git_name HeroicGamesLauncher Name: heroic-games-launcher -Version: 2.15.2 -Release: 1%{?dist} +Version: 2.16.0 +Release: 1%?dist Summary: A games launcher for GOG, Amazon, and Epic Games License: GPL-3.0-only AND MIT AND BSD-3-Clause URL: https://heroicgameslauncher.com From fd5c856ad5e6840c6c1c0329bd84c959077f234a Mon Sep 17 00:00:00 2001 From: madomado Date: Sun, 2 Mar 2025 22:37:34 +0800 Subject: [PATCH 0124/2977] add: chezmol (#3665) * add: chezmol * fix the update script --- anda/langs/go/chezmol/anda.hcl | 5 +++ anda/langs/go/chezmol/chezmol.spec | 65 ++++++++++++++++++++++++++++++ anda/langs/go/chezmol/update.rhai | 1 + 3 files changed, 71 insertions(+) create mode 100644 anda/langs/go/chezmol/anda.hcl create mode 100644 anda/langs/go/chezmol/chezmol.spec create mode 100644 anda/langs/go/chezmol/update.rhai diff --git a/anda/langs/go/chezmol/anda.hcl b/anda/langs/go/chezmol/anda.hcl new file mode 100644 index 0000000000..442a8c08a6 --- /dev/null +++ b/anda/langs/go/chezmol/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "chezmol.spec" + } +} diff --git a/anda/langs/go/chezmol/chezmol.spec b/anda/langs/go/chezmol/chezmol.spec new file mode 100644 index 0000000000..6834d2657c --- /dev/null +++ b/anda/langs/go/chezmol/chezmol.spec @@ -0,0 +1,65 @@ +# Generated by go2rpm 1.15.0 +%bcond check 0 +%bcond bootstrap 0 + +# https://github.com/twpayne/chezmoi +%global goipath github.com/twpayne/chezmoi +Version: 2.59.1 + +%gometa -f + +%global common_description %{expand: +Manage your dotfiles across multiple diverse machines, securely.} + +%global golicenses LICENSE assets/chezmoi.io/docs/license.md\\\ + assets/chezmoi.io/docs/reference/commands/license.md +%global godocs .markdownlint-cli2.yaml README.md docs\\\ + assets/chezmoi.io/snippets/config-format.md\\\ + assets/chezmoi.io/snippets/common-flags/exclude.md\\\ + assets/chezmoi.io/snippets/common-flags/format.md\\\ + assets/chezmoi.io/snippets/common-flags/include.md\\\ + assets/chezmoi.io/snippets/common-flags/init.md\\\ + assets/chezmoi.io/snippets/common-flags/nul-path-\\\ + separator.md assets/chezmoi.io/snippets/common-\\\ + flags/parent-dirs.md\\\ + assets/chezmoi.io/snippets/common-flags/path-style.md\\\ + assets/chezmoi.io/snippets/common-flags/recursive.md\\\ + assets/chezmoi.io/snippets/common-flags/tree.md + +Name: chezmoi +Release: 1%?dist +Summary: Manage your dotfiles across multiple diverse machines, securely + +License: MIT +URL: %{gourl} +Source: %{gosource} + +%description %{common_description} + +#gopkg + +%prep +%goprep + +%build +%define gomodulesmode GO111MODULE=on +%gobuild -o %{gobuilddir}/bin/chezmoi . + +%install +#gopkginstall +install -m 0755 -vd %{buildroot}%{_bindir} +install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ + +%if %{without bootstrap} +%if %{with check} +%check +%gocheck +%endif +%endif + +%files +%license LICENSE +%doc README.md +%{_bindir}/chezmoi + +#gopkgfiles diff --git a/anda/langs/go/chezmol/update.rhai b/anda/langs/go/chezmol/update.rhai new file mode 100644 index 0000000000..375ad36766 --- /dev/null +++ b/anda/langs/go/chezmol/update.rhai @@ -0,0 +1 @@ +rpm.version(`

The latest version of chezmoi is ([\d.]+)`.find(get("https://www.chezmoi.io"), 1)); From b9555021c0f233fcd402a272d27bf71b48e98997 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 2 Mar 2025 14:45:38 +0000 Subject: [PATCH 0125/2977] bump: chezmol --- anda/langs/go/chezmol/chezmol.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/go/chezmol/chezmol.spec b/anda/langs/go/chezmol/chezmol.spec index 6834d2657c..7b78a9d847 100644 --- a/anda/langs/go/chezmol/chezmol.spec +++ b/anda/langs/go/chezmol/chezmol.spec @@ -4,7 +4,7 @@ # https://github.com/twpayne/chezmoi %global goipath github.com/twpayne/chezmoi -Version: 2.59.1 +Version: 2.60.0 %gometa -f From e9b70bacbd2488f9de1de9061e1dfd3099aaeee8 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sun, 2 Mar 2025 10:12:44 -0600 Subject: [PATCH 0126/2977] Fix (xpadneo): Provides (#3678) * Provides: xpadneo Signed-off-by: Gilver * Bump release Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec b/anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec index 5c219583a9..6995cc5268 100644 --- a/anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec +++ b/anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec @@ -6,7 +6,7 @@ Name: %{real_name}-kmod-common Version: %{ver}^%{date}git.%{shortcommit} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Advanced Linux Driver for Xbox One Wireless Gamepad common files License: GPL-3.0 URL: https://atar-axis.github.io/%{real_name} @@ -14,6 +14,7 @@ Source0: https://github.com/atar-axis/%{real_name}/archive/%{commit}.tar. Source1: io.github.xpadneo.metainfo.xml BuildRequires: systemd-rpm-macros Provides: %{real_name}-kmod-common = %{?epoch:%{epoch}:}%{version} +Provides: %{real_name} = %{version}-%{release} BuildArch: noarch Packager: Gilver E. From 883e20398936936b22ec6c70697bb454bdc63839 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 2 Mar 2025 21:16:10 +0000 Subject: [PATCH 0127/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 539e21ae31..eeb2699d76 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.601 +Version: 0.0.602 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 47fbb9e200..fb8bda8b29 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.601 +Version: 0.0.602 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From c689a0db25df9f9a6e0e20b01a286420d090df07 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 2 Mar 2025 21:28:27 +0000 Subject: [PATCH 0128/2977] bump: komikku sarasa-gothic --- anda/apps/komikku/komikku.spec | 2 +- anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/komikku/komikku.spec b/anda/apps/komikku/komikku.spec index dc0ee38d4f..e561b816c5 100644 --- a/anda/apps/komikku/komikku.spec +++ b/anda/apps/komikku/komikku.spec @@ -5,7 +5,7 @@ %global pure_protobuf_version 2.0.0 Name: komikku -Version: 1.70.0 +Version: 1.71.0 %forgemeta Release: 1%?dist Summary: A manga reader for GNOME diff --git a/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec b/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec index 1be867c441..cc01019f5c 100644 --- a/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec +++ b/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec @@ -1,5 +1,5 @@ Name: sarasa-gothic-fonts -Version: 1.0.28 +Version: 1.0.29 Release: 1%?dist URL: https://github.com/be5invis/Sarasa-Gothic Source0: %url/releases/download/v%version/Sarasa-TTC-%version.7z From 141b3459fc910f3f81686145c2762cff94c101c1 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 2 Mar 2025 23:39:51 +0000 Subject: [PATCH 0129/2977] bump: icoextract-thumbnailer --- anda/misc/icoextract-thumbnailer/icoextract-thumbnailer.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/misc/icoextract-thumbnailer/icoextract-thumbnailer.spec b/anda/misc/icoextract-thumbnailer/icoextract-thumbnailer.spec index 72bd6402b5..55a826f6bd 100644 --- a/anda/misc/icoextract-thumbnailer/icoextract-thumbnailer.spec +++ b/anda/misc/icoextract-thumbnailer/icoextract-thumbnailer.spec @@ -1,6 +1,6 @@ Name: icoextract-thumbnailer -Version: 0.1.5 -Release: 1%{?dist} +Version: 0.1.6 +Release: 1%?dist Summary: XDG-compatible thumbnailer for Windows PE executables URL: https://github.com/jlu5/icoextract/ From 7a1df42146b3c3c3502d3692456feb4df8183589 Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 3 Mar 2025 08:19:43 +0800 Subject: [PATCH 0130/2977] chore(chezmoi): rename the spec file to the correct name (#3679) --- anda/langs/go/{chezmol => chezmoi}/anda.hcl | 2 +- anda/langs/go/{chezmol/chezmol.spec => chezmoi/chezmoi.spec} | 0 anda/langs/go/{chezmol => chezmoi}/update.rhai | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename anda/langs/go/{chezmol => chezmoi}/anda.hcl (52%) rename anda/langs/go/{chezmol/chezmol.spec => chezmoi/chezmoi.spec} (100%) rename anda/langs/go/{chezmol => chezmoi}/update.rhai (100%) diff --git a/anda/langs/go/chezmol/anda.hcl b/anda/langs/go/chezmoi/anda.hcl similarity index 52% rename from anda/langs/go/chezmol/anda.hcl rename to anda/langs/go/chezmoi/anda.hcl index 442a8c08a6..1b9cadbb43 100644 --- a/anda/langs/go/chezmol/anda.hcl +++ b/anda/langs/go/chezmoi/anda.hcl @@ -1,5 +1,5 @@ project pkg { rpm { - spec = "chezmol.spec" + spec = "chezmoi.spec" } } diff --git a/anda/langs/go/chezmol/chezmol.spec b/anda/langs/go/chezmoi/chezmoi.spec similarity index 100% rename from anda/langs/go/chezmol/chezmol.spec rename to anda/langs/go/chezmoi/chezmoi.spec diff --git a/anda/langs/go/chezmol/update.rhai b/anda/langs/go/chezmoi/update.rhai similarity index 100% rename from anda/langs/go/chezmol/update.rhai rename to anda/langs/go/chezmoi/update.rhai From 134aff7a880bb82d3e4816f57cbc81732c3bef68 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 3 Mar 2025 00:44:19 +0000 Subject: [PATCH 0131/2977] bump(weekly): libfreeaptx --- anda/lib/libfreeaptx/libfreeaptx.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/lib/libfreeaptx/libfreeaptx.spec b/anda/lib/libfreeaptx/libfreeaptx.spec index def9829ec8..572dd8b349 100644 --- a/anda/lib/libfreeaptx/libfreeaptx.spec +++ b/anda/lib/libfreeaptx/libfreeaptx.spec @@ -1,10 +1,10 @@ -%global commit c176b7de9c2017d0fc1877659cea3bb6c330aafa +%global commit ad6748ac8b2ebbfae7d0c5608434f60592d61edc %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20210809 +%global commit_date 20250303 Name: libfreeaptx Version: 0.1.1.%{commit_date}git%{shortcommit} -Release: 1%{?dist} +Release: 1%?dist Summary: Free implementation of Audio Processing Technology codec (aptX) License: LGPLv2+ URL: https://github.com/iamthehorker/libfreeaptx From 52b848275bc6eb2eb17023089a83b31b2bb6a16c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 3 Mar 2025 01:41:31 +0000 Subject: [PATCH 0132/2977] bump(nightly): envision mpv nightly nightly prismlauncher-nightly vala-nightly astal --- anda/apps/envision/envision.spec | 4 ++-- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/langs/vala/vala-nightly/vala-nightly.spec | 4 ++-- anda/lib/astal/astal/astal.spec | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/anda/apps/envision/envision.spec b/anda/apps/envision/envision.spec index 7c6dce3fdc..09c8920212 100644 --- a/anda/apps/envision/envision.spec +++ b/anda/apps/envision/envision.spec @@ -1,5 +1,5 @@ -%global commit 96717d193f5e39a829161fc1f2d6c13393eea186 -%global commit_date 20250302 +%global commit e117986715e1e9ef955009ad7f03ec110aa14940 +%global commit_date 20250303 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: envision-nightly diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index d501ca8a5d..f08767d433 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit ee07dcf4c704e64d3d9d95191129bccd98c2c37d +%global commit 630a036f64c4936e6236afa088b2fa7e62666451 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250302 +%global commit_date 20250303 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 06f3d62fbf..6697b761fc 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit e2b5584a8d12052c35e2c814f3648e0eba455b38 +%global commit ee8ae196ee0fad3824c7ae9eac947f2128b4ae4f %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-03-01 +%global fulldate 2025-03-02 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index e826cf2557..9fa92c7498 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit fec228bb236e690c4c629e4688b62c005298c503 +%global commit ae6d3503348fcff36831367f02ebd06d368f3e01 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250302 +%global commit_date 20250303 %global ver 0.177.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 7467ed8bec..e8111e1ef5 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 0af021fef2628e35ff9ebaa8340e080d0ddd6556 +%global commit 02b6afe3d522992e7ec265a1ecadf4bd14784dcc %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250220 +%global commit_date 20250303 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/vala/vala-nightly/vala-nightly.spec b/anda/langs/vala/vala-nightly/vala-nightly.spec index d87c6b1121..03d6085120 100644 --- a/anda/langs/vala/vala-nightly/vala-nightly.spec +++ b/anda/langs/vala/vala-nightly/vala-nightly.spec @@ -3,11 +3,11 @@ %global priority 90 %global real_name vala -%global commit 933ab9c03ae06579e5fc334d7aa6e30ecc7c5f61 +%global commit 843551ed85dcfcfdf803fa6961ccd5498a9cee8a %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global repo https://gitlab.gnome.org/GNOME/%{real_name}.git -%global commit_date 20250302 +%global commit_date 20250303 %global snapshot_info %{commit_date}.%{shortcommit} Name: vala-nightly diff --git a/anda/lib/astal/astal/astal.spec b/anda/lib/astal/astal/astal.spec index 5618e1df46..87f85016bf 100644 --- a/anda/lib/astal/astal/astal.spec +++ b/anda/lib/astal/astal/astal.spec @@ -1,7 +1,7 @@ -%global commit dfd1f23c7562694e571d44c45aa74fcea9b1ba01 +%global commit 4b283b0045c0752c36c6e8306fc137f2c9f244a4 %global shortcommit %{sub %commit 1 7} -%global commit_date 20250301 +%global commit_date 20250303 Name: astal Version: 0^%commit_date.%shortcommit From 1befd6e1984ea4a0ab0073ec590ee23c2116e923 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 3 Mar 2025 01:45:52 +0000 Subject: [PATCH 0133/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 9b9b179264..29bb1b42fc 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-02 +%global ver 2025-03-03 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From d4889d00a7cde059192d77cd3d647157d9f73aab Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 3 Mar 2025 02:39:33 +0000 Subject: [PATCH 0134/2977] bump(branch): astal-gtk --- anda/lib/astal/astal-gtk/astal-gtk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/astal/astal-gtk/astal-gtk.spec b/anda/lib/astal/astal-gtk/astal-gtk.spec index e4f5cf3fe2..78062d40c9 100644 --- a/anda/lib/astal/astal-gtk/astal-gtk.spec +++ b/anda/lib/astal/astal-gtk/astal-gtk.spec @@ -1,5 +1,5 @@ -%global commit dfd1f23 -%global commit_date 20250301 +%global commit 4b283b0 +%global commit_date 20250303 Name: astal Version: 0^%commit_date.%commit From c47f6a052c04fae9232f24268bcf4f76244fcf6b Mon Sep 17 00:00:00 2001 From: Gilver Date: Sun, 2 Mar 2025 22:03:10 -0600 Subject: [PATCH 0135/2977] Fix: libfreeaptx (#3694) * Funny update script Signed-off-by: Gilver * Fixies Signed-off-by: Gilver * Change ver source for now Signed-off-by: Gilver * Bump release Signed-off-by: Gilver * New devel file Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/lib/libfreeaptx/libfreeaptx.spec | 8 +++++--- anda/lib/libfreeaptx/update.rhai | 3 +++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/anda/lib/libfreeaptx/libfreeaptx.spec b/anda/lib/libfreeaptx/libfreeaptx.spec index 572dd8b349..c323871278 100644 --- a/anda/lib/libfreeaptx/libfreeaptx.spec +++ b/anda/lib/libfreeaptx/libfreeaptx.spec @@ -1,10 +1,11 @@ %global commit ad6748ac8b2ebbfae7d0c5608434f60592d61edc %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date 20250303 +%global ver 0.2.1 Name: libfreeaptx -Version: 0.1.1.%{commit_date}git%{shortcommit} -Release: 1%?dist +Version: %{ver}^%{commit_date}git.%{shortcommit} +Release: 2%?dist Summary: Free implementation of Audio Processing Technology codec (aptX) License: LGPLv2+ URL: https://github.com/iamthehorker/libfreeaptx @@ -43,10 +44,11 @@ The %{name}-tools package contains command line encoder and decoder utilities. %files %license COPYING %{_libdir}/%{name}.so.0 -%{_libdir}/%{name}.so.0.1.1 +%{_libdir}/%{name}.so.%{ver} %files devel %{_includedir}/freeaptx.h +%{_libdir}/%{name}.a %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc diff --git a/anda/lib/libfreeaptx/update.rhai b/anda/lib/libfreeaptx/update.rhai index c99fd2cdca..3a6f9bebd5 100644 --- a/anda/lib/libfreeaptx/update.rhai +++ b/anda/lib/libfreeaptx/update.rhai @@ -2,4 +2,7 @@ rpm.global("commit", gh_commit("iamthehorker/libfreeaptx")); if rpm.changed() { rpm.release(); rpm.global("commit_date", date()); + let v = gh_tag("pali/libopenaptx")); + v.crop(1); + rpm.global("ver", v); } From 60caf1e0b8f713fa8f9b8d2e382b3c81241afac7 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sun, 2 Mar 2025 22:05:21 -0600 Subject: [PATCH 0136/2977] Fix (heroic): Handle AutoReqProv Electron issues (#3685) * Hey RPM are you out of your mind Signed-off-by: Gilver * Add ExclusiveArch, RPM is making me mad Signed-off-by: Gilver * Bump release Signed-off-by: Gilver * I wonder if wildcards work here Signed-off-by: Gilver * Alright that's enough of that Signed-off-by: Gilver * Add bundled binaries Signed-off-by: Gilver --------- Signed-off-by: Gilver --- .../heroic-games-launcher.spec | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/anda/games/heroic-games-launcher/heroic-games-launcher.spec b/anda/games/heroic-games-launcher/heroic-games-launcher.spec index dfb28f2a40..fa8cb28cd4 100644 --- a/anda/games/heroic-games-launcher/heroic-games-launcher.spec +++ b/anda/games/heroic-games-launcher/heroic-games-launcher.spec @@ -1,13 +1,12 @@ %global debug_package %{nil} -%global __requires_exclude libffmpeg.so -%global __provides_exclude_from %{_datadir}/heroic/.*\\.so -%global __provides_exclude_from %{_datadir}/heroic/.*\\.so.1 +%global __provides_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$ +%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$ %define _build_id_links none %global git_name HeroicGamesLauncher Name: heroic-games-launcher Version: 2.16.0 -Release: 1%?dist +Release: 2%?dist Summary: A games launcher for GOG, Amazon, and Epic Games License: GPL-3.0-only AND MIT AND BSD-3-Clause URL: https://heroicgameslauncher.com @@ -26,14 +25,25 @@ BuildRequires: nodejs BuildRequires: pnpm BuildRequires: python3 Requires: alsa-lib +Requires: atk +Requires: at-spi2-core Requires: gtk3 Requires: hicolor-icon-theme +Requires: libXext +Requires: libXfixes Requires: nss Requires: python3 Requires: which Recommends: gamemode Recommends: mangohud Recommends: umu-launcher +# Woarkaround for GNOME issues with libei +Recommends: (extest if gnome-shell) +Provides: bundled(gogdl) +Provides: bundled(legendary) +Provides: bundled(nile) +ExclusiveArch: x86_64 +AutoReq: no Packager: Gilver E. %description @@ -89,4 +99,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/heroic.desktop %changelog * Thu Jan 30 2025 Gilver E. - Initial package +* Sun Mar 02 2025 Gilver E. +- Update to 2.16.0 +- Fix incorrect RPM dependencies From c742dea46b43edbc390c4084264781c162f22fd1 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 3 Mar 2025 04:42:51 +0000 Subject: [PATCH 0137/2977] bump: osu-lazer --- anda/games/osu-lazer/osu-lazer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index dabe5409f3..e52669e9c5 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -1,4 +1,4 @@ -%define osuresver 2025.217.0 +%define osuresver 2025.303.0 %global debug_package %{nil} %define __strip /bin/true From a6e306efb7d55e64ce0bac7a2edda366711feaf6 Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 3 Mar 2025 00:29:50 -0600 Subject: [PATCH 0138/2977] Fix (seto-fonts): URL (#3695) * New URL Signed-off-by: Gilver * Huh? Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/fonts/seto/seto-fonts.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/anda/fonts/seto/seto-fonts.spec b/anda/fonts/seto/seto-fonts.spec index 8f4f33653d..1f487fe20b 100644 --- a/anda/fonts/seto/seto-fonts.spec +++ b/anda/fonts/seto/seto-fonts.spec @@ -1,11 +1,11 @@ -Name: seto-fonts -Version: 6.20 -Release: 3%?dist -URL: https://setofont.osdn.jp/ -Source0: https://github.com/terrapkg/pkg-seto-fonts/archive/refs/tags/%version.tar.gz -License: OFL-1.1 -Summary: A handwritten font that contains kanji up to JIS 4th level and difficult kanji -BuildArch: noarch +Name: seto-fonts +Version: 6.20 +Release: 3%?dist +URL: https://ja.osdn.net/projects/setofont/ +Source0: https://github.com/terrapkg/pkg-seto-fonts/archive/refs/tags/%version.tar.gz +License: OFL-1.1 +Summary: A handwritten font that contains kanji up to JIS 4th level and difficult kanji +BuildArch: noarch %description From d1fbb1da32c31f304b30f16c28f73b1750bee77c Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 3 Mar 2025 00:29:58 -0600 Subject: [PATCH 0139/2977] Fix: Change corefonts URLs to HTTPS (#3689) * Change URLs to HTTPS * Spacing oops --- anda/fonts/cleartype/cleartype-fonts.spec | 4 ++-- .../ms-core-tahoma/ms-core-tahoma-fonts.spec | 4 ++-- anda/fonts/ms-core/ms-core-fonts.spec | 20 +++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/anda/fonts/cleartype/cleartype-fonts.spec b/anda/fonts/cleartype/cleartype-fonts.spec index 354394ebc4..33ac58305e 100644 --- a/anda/fonts/cleartype/cleartype-fonts.spec +++ b/anda/fonts/cleartype/cleartype-fonts.spec @@ -92,9 +92,9 @@ Version: 1.0 Release: 1%{?dist} Summary: Package containing ClearType fonts. License: LicenseRef-MS-Core-Fonts -URL: http://mscorefonts2.sourceforge.net +URL: https://mscorefonts2.sourceforge.net Group: User Interface/X -Source0: http://sourceforge.net/projects/mscorefonts2/files/cabs/PowerPointViewer.exe +Source0: https://sourceforge.net/projects/mscorefonts2/files/cabs/PowerPointViewer.exe Source1: 61-%{fontname}-calibri.conf Source2: 61-%{fontname}-cambria.conf Source3: 61-%{fontname}-candara.conf diff --git a/anda/fonts/ms-core-tahoma/ms-core-tahoma-fonts.spec b/anda/fonts/ms-core-tahoma/ms-core-tahoma-fonts.spec index bb76bda8fb..a48b4a7b70 100644 --- a/anda/fonts/ms-core-tahoma/ms-core-tahoma-fonts.spec +++ b/anda/fonts/ms-core-tahoma/ms-core-tahoma-fonts.spec @@ -21,9 +21,9 @@ Version: 1.0 Release: 1%{?dist} Summary: Microsoft core Tahoma fonts for better Windows compatibility License: LicenseRef-MS-Core-Fonts -URL: https://github.com/leamas/lpf +URL: https://mscorefonts2.sourceforge.net Group: User Interface/X -Source0: http://downloads.sourceforge.net/corefonts/the%%20fonts/final/wd97vwr32.exe +Source0: https://downloads.sourceforge.net/corefonts/the%%20fonts/final/wd97vwr32.exe Source1: 61-ms-core-tahoma.conf BuildRequires: cabextract BuildRequires: fontpackages-devel diff --git a/anda/fonts/ms-core/ms-core-fonts.spec b/anda/fonts/ms-core/ms-core-fonts.spec index 6868033631..8362b87c0d 100644 --- a/anda/fonts/ms-core/ms-core-fonts.spec +++ b/anda/fonts/ms-core/ms-core-fonts.spec @@ -1,5 +1,5 @@ %global fontname ms-core -%global sf_corefonts http://downloads.sourceforge.net/corefonts/the%20fonts/final +%global sf_url https://downloads.sourceforge.net/corefonts/the%20fonts/final %global fontlicense Microsoft EULA %global fontlicenses Licen.TXT @@ -156,16 +156,16 @@ Version: 2.2 Release: 1%{?dist} Summary: Microsoft core fonts License: LicenseRef-MS-Core-Fonts -URL: http://mscorefonts2.sourceforge.net +URL: https://mscorefonts2.sourceforge.net Group: User Interface/X -Source0: http://sourceforge.net/projects/mscorefonts2/files/cabs/EUupdate.EXE -Source1: %{sf_corefonts}/andale32.exe -Source2: %{sf_corefonts}/arialb32.exe -Source3: %{sf_corefonts}/comic32.exe -Source4: %{sf_corefonts}/courie32.exe -Source5: %{sf_corefonts}/georgi32.exe -Source6: %{sf_corefonts}/impact32.exe -Source7: %{sf_corefonts}/webdin32.exe +Source0: https://sourceforge.net/projects/mscorefonts2/files/cabs/EUupdate.EXE +Source1: %{sf_url}/andale32.exe +Source2: %{sf_url}/arialb32.exe +Source3: %{sf_url}/comic32.exe +Source4: %{sf_url}/courie32.exe +Source5: %{sf_url}/georgi32.exe +Source6: %{sf_url}/impact32.exe +Source7: %{sf_url}/webdin32.exe Source8: 61-ms-core-andale.conf Source9: 61-ms-core-arial.conf Source10: 61-ms-core-comic.conf From 1caffc26a551f5b96120c7052e5ade3b2471fb6d Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 3 Mar 2025 00:30:32 -0600 Subject: [PATCH 0140/2977] Fix (youtube-music): Handle AutoReqProv Electron issues (#3686) * Improve bundled libraries AutoProv exclusion Signed-off-by: Gilver * Bump release Signed-off-by: Gilver * Disable AutoReq and explicitly list deps Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/apps/youtube-music/youtube-music.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/anda/apps/youtube-music/youtube-music.spec b/anda/apps/youtube-music/youtube-music.spec index 6030a5dbaa..8ddcb2195c 100644 --- a/anda/apps/youtube-music/youtube-music.spec +++ b/anda/apps/youtube-music/youtube-music.spec @@ -1,8 +1,8 @@ %define debug_package %nil # Exclude private libraries since this is bundled with electron -%global __requires_exclude libffmpeg.so -%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so +%global __provides_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$ +%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$ # macro shorthand for calling pnpm %global pnpm npx pnpm@%{pnpm_version} @@ -13,7 +13,7 @@ Name: youtube-music Version: 3.7.5 -Release: 2%?dist +Release: 3%?dist Summary: YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader) Source1: youtube-music.desktop License: MIT @@ -32,6 +32,11 @@ BuildRequires: python3 gcc-c++ BuildRequires: pnpm nodejs20 %endif +Requires: nss +Requires: libXext +Requires: libXfixes +AutoReq: no + %description YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader) From 2da05c1c915ebcc074741cd4f18c55167b4b4d86 Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 3 Mar 2025 14:41:27 +0800 Subject: [PATCH 0141/2977] feat(devpod): include the desktop app (#3656) --- anda/devs/devpod/DevPod.desktop | 11 +++ anda/{langs/go => devs}/devpod/anda.hcl | 0 .../devpod/golang-github-loft-sh-devpod.spec | 97 +++++++++++++++++++ .../devpod/golang-github-loft-sh-devpod.spec | 91 ----------------- 4 files changed, 108 insertions(+), 91 deletions(-) create mode 100644 anda/devs/devpod/DevPod.desktop rename anda/{langs/go => devs}/devpod/anda.hcl (100%) create mode 100644 anda/devs/devpod/golang-github-loft-sh-devpod.spec delete mode 100644 anda/langs/go/devpod/golang-github-loft-sh-devpod.spec diff --git a/anda/devs/devpod/DevPod.desktop b/anda/devs/devpod/DevPod.desktop new file mode 100644 index 0000000000..eba6b7fc2a --- /dev/null +++ b/anda/devs/devpod/DevPod.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=DevPod +Comment=DevPod +Exec=/usr/bin/DevPod +Icon=devpod.png +Terminal=false +StartupNotify=false +Categories=Utility;TextEditor;Development;IDE; +MimeType=text/plain;application/x-zerosize; diff --git a/anda/langs/go/devpod/anda.hcl b/anda/devs/devpod/anda.hcl similarity index 100% rename from anda/langs/go/devpod/anda.hcl rename to anda/devs/devpod/anda.hcl diff --git a/anda/devs/devpod/golang-github-loft-sh-devpod.spec b/anda/devs/devpod/golang-github-loft-sh-devpod.spec new file mode 100644 index 0000000000..578ecc23c3 --- /dev/null +++ b/anda/devs/devpod/golang-github-loft-sh-devpod.spec @@ -0,0 +1,97 @@ +%bcond check 0 +%global __brp_mangle_shebangs %{nil} + +# https://github.com/loft-sh/devpod +%global goipath github.com/loft-sh/devpod +Version: 0.6.9 + +%gometa -f + +%global common_description %{expand: +Codespaces but open-source, client-only and unopinionated: Works with any IDE +and lets you use any cloud, kubernetes or just localhost docker.} + +%global golicenses LICENSE +%global godocs docs examples COMMUNITY.md CONTRIBUTING.md README.md\\\ + SECURITY.md desktop/README.md e2e/README.md\\\ + loadtest/README.md + +Name: devpod +Release: %autorelease +Summary: Codespaces but open-source, client-only and unopinionated: Works with any IDE and lets you use any cloud, kubernetes or just localhost docker +Provides: golang-github-loft-sh-devpod +BuildRequires: anda-srpm-macros mold +BuildRequires: yarnpkg rust-packaging +Recommends: devpod-desktop + +License: MPL-2.0 +URL: https://devpod.sh +Source: %{gosource} +# gendesk --pkgname=DevPod --name=DevPod --exec=/usr/bin/DevPod --icon=devpod.png --categories='Utility;TextEditor;Development;IDE' --mimetypes='text/plain;application/x-zerosize' -n +Source1: DevPod.desktop + +%description %{common_description} + +%package desktop +Summary: %summary +License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-2-Clause AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-3-Clause AND (BSD-3-Clause AND MIT) AND (BSD-3-Clause OR MIT) AND (BSD-3-Clause OR MIT OR Apache-2.0) AND BSL-1.0 AND CC0-1.0 AND (CC0-1.0 OR Apache-2.0) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND ISC AND MIT AND (MIT AND BSD-3-Clause) AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR NCSA) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(gdk-3.0) +BuildRequires: pkgconfig(javascriptcoregtk-4.1) +BuildRequires: pkgconfig(libsoup-3.0) +BuildRequires: pkgconfig(webkit2gtk-4.1) + +%description desktop %{common_description} + +%prep +#yarn set version 1.22.1 +%autosetup -n %name-%version +rm go.sum +cd desktop/src-tauri +%cargo_prep_online +sed -i '/"targets"/s@"all"@[]@' tauri.conf.json + +sed -i '/Comment=/s@DevPod@%summary@' %{S:1} + +%build +%define gomodulesmode GO111MODULE=on +# just remove -v -x for godsake +%define gobuild_baseflags %{gocompilerflags} -tags="rpm_crashtraceback ${GO_BUILDTAGS-${BUILDTAGS-}}" -a +%define gobuilddir %_builddir/%buildsubdir +# build cli +(%{gobuild -o %{gobuilddir}/bin/devpod .}) & + +pushd desktop +yarn install & +pushd src-tauri +# cargo licenses +%{cargo_license_summary_online} & +%{cargo_license_online} > %_builddir/%buildsubdir/LICENSE.dependencies & +wait +cp %{gobuilddir}/bin/devpod bin/devpod-cli-%_arch-unknown-linux-gnu +popd # src-tauri +# ≈ %%cargo_build +/usr/bin/env CARGO_HOME=.cargo RUSTC_BOOTSTRAP=1 RUSTFLAGS='%{build_rustflags}' \ + yarn run desktop:build -- -- %{__cargo_common_opts} --profile rpm +popd # desktop + + +%install +# go +install -m 0755 -vd %{buildroot}%{_bindir} +install -m 0755 -vp bin/devpod %{buildroot}%{_bindir}/ +# tauri +install -Dm755 desktop/src-tauri/target/rpm/DevPod -t %buildroot%_bindir +install -Dm644 %{S:1} -t %buildroot%_datadir/applications/ +install -Dm644 desktop/devpod.png -t %buildroot%_datadir/pixmaps/ + +%files +%license LICENSE +%doc README.md SECURITY.md +%{_bindir}/devpod + +%files desktop +%_bindir/DevPod +%_datadir/applications/DevPod.desktop +%_datadir/pixmaps/devpod.png diff --git a/anda/langs/go/devpod/golang-github-loft-sh-devpod.spec b/anda/langs/go/devpod/golang-github-loft-sh-devpod.spec deleted file mode 100644 index 44d3798b83..0000000000 --- a/anda/langs/go/devpod/golang-github-loft-sh-devpod.spec +++ /dev/null @@ -1,91 +0,0 @@ -# Generated by go2rpm 1.15.0 -%bcond check 0 -%bcond bootstrap 0 - -%dnl %if %{with bootstrap} -%global debug_package %{nil} -%dnl %endif - -%if %{with bootstrap} -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^golang\\(.*\\)$ -%endif - -# https://github.com/loft-sh/devpod -%global goipath github.com/loft-sh/devpod -Version: 0.6.9 - -%gometa -f - -%global common_description %{expand: -Codespaces but open-source, client-only and unopinionated: Works with any IDE -and lets you use any cloud, kubernetes or just localhost docker.} - -%global golicenses LICENSE -%global godocs docs examples COMMUNITY.md CONTRIBUTING.md README.md\\\ - SECURITY.md desktop/README.md e2e/README.md\\\ - loadtest/README.md - -Name: devpod -Release: %autorelease -Summary: Codespaces but open-source, client-only and unopinionated: Works with any IDE and lets you use any cloud, kubernetes or just localhost docker -Provides: golang-github-loft-sh-devpod -BuildRequires: anda-srpm-macros - -License: MPL-2.0 -URL: https://devpod.sh -Source: %{gosource} - -%description %{common_description} - -#gopkg - -%prep -%autosetup -n %name-%version -rm go.sum -%go_prep_online - -%dnl %if %{without bootstrap} -%dnl %generate_buildrequires -%dnl %go_generate_buildrequires -%dnl %endif - -%if %{without bootstrap} -%build -%dnl for cmd in cmd/* ; do - %dnl out="%{gobuilddir}/bin/$(basename $cmd)" - %dnl %go_build_online "%{goipath}/$cmd" $out -%dnl done -%go_build_online -%dnl for cmd in hack/pro; do - %dnl out="%{gobuilddir}/bin/$(basename $cmd)" - %dnl %go_build_online "%{goipath}/$cmd" $out -%dnl done -%endif - -%install -#gopkginstall -%if %{without bootstrap} -install -m 0755 -vd %{buildroot}%{_bindir} -%dnl install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ -install -m 0755 -vp build/bin/* %{buildroot}%{_bindir}/ -%endif - -%if %{without bootstrap} -%if %{with check} -%check -%gocheck -%endif -%endif - -%if %{without bootstrap} -%files -%license LICENSE -%doc docs examples COMMUNITY.md CONTRIBUTING.md README.md SECURITY.md -%doc desktop/README.md e2e/README.md loadtest/README.md -%{_bindir}/devpod -%endif - -#gopkgfiles - -%changelog -%autochangelog From 21afcbc6b851635ed0e569504979517b34bf40ff Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 3 Mar 2025 04:10:11 -0600 Subject: [PATCH 0142/2977] Add: pokeget-rs and pokeshell (#3647) * Add pokeget-rs and pokeshell * Checkout latest commit? Signed-off-by: Gilver * Wonder if this actually works Signed-off-by: Gilver * I genuinely have no idea what happened there I HATE MOBILE Signed-off-by: Gilver * Go back to checkout Signed-off-by: Gilver * Provides(bundled) Signed-off-by: Gilver * Did that wrong Signed-off-by: Gilver * Try sourcing instead Signed-off-by: Gilver * Try this convoluted mess Signed-off-by: Gilver * Update pokeget-rs.spec Signed-off-by: Gilver * Hate how confusing RPM is Signed-off-by: Gilver * Update pokeget-rs.spec Signed-off-by: Gilver * Update pokeget-rs.spec Signed-off-by: Gilver * Hmm Signed-off-by: Gilver * Hhhh Signed-off-by: Gilver * Update pokeget-rs.spec Signed-off-by: Gilver * Aaaaa Signed-off-by: Gilver * Update pokeget-rs.spec Signed-off-by: Gilver * Come on Signed-off-by: Gilver * ? Signed-off-by: Gilver * Why is RPM incomprehensible Signed-off-by: Gilver * Update pokeget-rs.spec Signed-off-by: Gilver * Update pokeget-rs.spec Signed-off-by: Gilver * Update pokeget-rs.spec Signed-off-by: Gilver * Enough Signed-off-by: Gilver * Cleanup Signed-off-by: Gilver * Fix directory tree Signed-off-by: Gilver * Just fully flesh out macros Signed-off-by: Gilver * Make macros consistent Signed-off-by: Gilver * Tar stupid moment Signed-off-by: Gilver * Update pokeget-rs.spec Signed-off-by: Gilver * I genuinely do not know what is going wrong at this point Signed-off-by: Gilver * Remove git dep I guess Signed-off-by: Gilver * Man Signed-off-by: Gilver * Update pokeget-rs.spec Signed-off-by: Gilver * Why is the pipe failing Signed-off-by: Gilver * Maybe? Signed-off-by: Gilver * Oops Signed-off-by: Gilver * Just not sure where to put this Signed-off-by: Gilver * Get rid of build log spam, track dep just in case * Okay FINALLY done --------- Signed-off-by: Gilver --- anda/misc/pokeget-rs/anda.hcl | 5 ++ anda/misc/pokeget-rs/pokeget-rs.spec | 47 ++++++++++++ anda/misc/pokeget-rs/update.rhai | 9 +++ anda/misc/pokeshell/HELPER_ALIASES | 11 +++ anda/misc/pokeshell/anda.hcl | 9 +++ anda/misc/pokeshell/pokeshell.spec | 102 +++++++++++++++++++++++++++ anda/misc/pokeshell/update.rhai | 8 +++ 7 files changed, 191 insertions(+) create mode 100644 anda/misc/pokeget-rs/anda.hcl create mode 100644 anda/misc/pokeget-rs/pokeget-rs.spec create mode 100644 anda/misc/pokeget-rs/update.rhai create mode 100644 anda/misc/pokeshell/HELPER_ALIASES create mode 100644 anda/misc/pokeshell/anda.hcl create mode 100644 anda/misc/pokeshell/pokeshell.spec create mode 100644 anda/misc/pokeshell/update.rhai diff --git a/anda/misc/pokeget-rs/anda.hcl b/anda/misc/pokeget-rs/anda.hcl new file mode 100644 index 0000000000..9a46c244e6 --- /dev/null +++ b/anda/misc/pokeget-rs/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "pokeget-rs.spec" + } +} diff --git a/anda/misc/pokeget-rs/pokeget-rs.spec b/anda/misc/pokeget-rs/pokeget-rs.spec new file mode 100644 index 0000000000..cde6f4768d --- /dev/null +++ b/anda/misc/pokeget-rs/pokeget-rs.spec @@ -0,0 +1,47 @@ +%global pname pokesprite +%global pcommit c5aaa610ff2acdf7fd8e2dccd181bca8be9fcb3e +%global pshortcommit %(c=%{pcommit}; echo ${c:0:7}) +%global pcommit_date 20220622 + +Name: pokeget-rs +Version: 1.6.3 +Release: 1%{?dist} +SourceLicense: MIT +License: MIT AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-2-Clause AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) +Summary: A better Rust version of pokeget. +URL: https://github.com/talwat/%{name} +Source0: %{url}/archive/refs/tags/%{version}.tar.gz +Source1: https://github.com/msikma/%{pname}/archive/%{pcommit}/%{pname}-%{pcommit}.tar.gz#/%{pname}-%{pshortcommit}.tar.gz +BuildRequires: anda-srpm-macros +BuildRequires: cargo-rpm-macros +BuildRequires: mold +Provides: pokeget = %{version}-%{release} +Provides: bundled(%{pname}) = 2.7.0^%{pcommit_date}.%{pshortcommit} +Packager: Gilver E. + +%description +Successor to pokeget, written in Rust. + +%prep +%autosetup -n %{name}-%{version} +mkdir -p data/%{pname} +pushd data/%{pname} +/usr/bin/gzip -dc '%{SOURCE1}' | /usr/bin/tar -xof - --strip-components=1 +popd +%cargo_prep_online + +%build +%cargo_build + +%install +install -Dpm755 target/rpm/pokeget %{buildroot}%{_bindir}/%{name} +%{cargo_license_online} > LICENSE.dependencies + +%files +%license LICENSE LICENSE.dependencies data/%{pname}/license.md +%doc README.md +%{_bindir}/%{name} + +%changelog +* Sat Mar 01 2025 Gilver E. +- Initial package diff --git a/anda/misc/pokeget-rs/update.rhai b/anda/misc/pokeget-rs/update.rhai new file mode 100644 index 0000000000..6e9adc7f26 --- /dev/null +++ b/anda/misc/pokeget-rs/update.rhai @@ -0,0 +1,9 @@ +rpm.version(crates("pokeget")); +// pokesprites has not received an update in years but let's keep the dep commit current just in case +if rpm.changed () { + let url = `https://api.github.com/repos/talwat/pokeget-rs/contents/data`; + let json = get(url).json(); + let c = json.2.sha; + rpm.global("pcommit", c); + rpm.global("pcommit_date", date()); // could potentially result in the wrong date, fix if it becomes a problem +} diff --git a/anda/misc/pokeshell/HELPER_ALIASES b/anda/misc/pokeshell/HELPER_ALIASES new file mode 100644 index 0000000000..c793b37ae8 --- /dev/null +++ b/anda/misc/pokeshell/HELPER_ALIASES @@ -0,0 +1,11 @@ +For ease of use, packaged helper scripts are aliased in /usr/bin. + +To use them, run: + +uv run create-pokemon-identifier + +OR: + +pokeget-timing + +to run the create_pokemon_identifier or timing scripts, respectively. diff --git a/anda/misc/pokeshell/anda.hcl b/anda/misc/pokeshell/anda.hcl new file mode 100644 index 0000000000..631d456eeb --- /dev/null +++ b/anda/misc/pokeshell/anda.hcl @@ -0,0 +1,9 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "pokeshell.spec" + } + labels { + nightly = 1 + } +} diff --git a/anda/misc/pokeshell/pokeshell.spec b/anda/misc/pokeshell/pokeshell.spec new file mode 100644 index 0000000000..4c7741fc10 --- /dev/null +++ b/anda/misc/pokeshell/pokeshell.spec @@ -0,0 +1,102 @@ +%global debug_package %{nil} +%global commit 6c9e2569843b08db14a964951f17a3943fd89fa2 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global date 20241124 +%global ver 1.0.0 + +Name: pokeshell +Version: %{ver}^%{date}git.%{shortcommit} +Release: 1%{?dist} +Summary: A shell program to show Pokémon sprites in the terminal. +License: GPL-3.0-or-later +URL: https://github.com/acxz/pokeshell +Source0: %{url}/archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz +Source1: HELPER_ALIASES +Requires: jq +Requires: ImageMagick +Requires: python3 +Requires: (timg or chafa) +BuildArch: noarch +Packager: Gilver E. + +%description +A featureful shell program to show Pokémon sprites in the terminal. + +%package helper-scripts +Summary: This package contains helper scripts for Pokéshell +Requires: %{name} +Requires: uv +Recommends: hyperfine +Recommends: pokeget-rs +Recommends: pokemon-colorscripts + +%description helper-scripts +Generates pokemon identifiers (such as localized names) using PokeAPI that the sprite backends do not support natively. + +See included README for what these scripts can do. + +%package bash-completion +Summary: Bash completion for Pokéshell +Requires: bash +Requires: %{name} +Supplements: (%{name} and bash) + +%description bash-completion +Pokéshell Bash completion. + +%package zsh-completion +Summary: Zsh completion for Pokéshell +Requires: %{name} +Requires: zsh +Supplements: (%{name} and zsh) + +%description zsh-completion +Basic Zsh completion support for Pokéshell. + +%prep +%autosetup -n %{name}-%{commit} +cp %{SOURCE1} . + +%build + +%install +install -Dm755 bin/pokeshell %{buildroot}%{_bindir}/%{name} +install -Dm755 bin/imageshell/imageshell.sh -t %{buildroot}%{_datadir}/%{name}/imageshell +install -Dm644 share/pokemon_identifiers.json -t %{buildroot}%{_datadir}/%{name} +install -Dm644 scripts/*.py -t %{buildroot}%{_datadir}/%{name}/scripts +install -Dm644 scripts/*.sh -t %{buildroot}%{_datadir}/%{name}/scripts +# Bash and Zsh completion share a single file, Zsh completion is pretty rudimentary +install -Dm644 share/bash-completion/completions/pokeshell -t %{buildroot}%{bash_completions_dir} +install -Dm644 share/bash-completion/completions/pokeshell %{buildroot}%{zsh_completions_dir}/_%{name} +# Keep actual directories out of /usr/bin +ln -sf %{_datadir}/%{name}/imageshell %{buildroot}%{_bindir}/imageshell +# Make helper scripts directly executable +ln -sf %{_datadir}/%{name}/scripts/create_pokemon_identifiers.py %{buildroot}%{_bindir}/create-pokemon-identifiers +ln -sf %{_datadir}/%{name}/scripts/timing.sh %{buildroot}%{_bindir}/pokeget-timing + +%files +%license LICENSE.md +%doc README.md +%{_bindir}/%{name} +%{_bindir}/imageshell +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/pokemon_identifiers.json +%dir %{_datadir}/%{name}/imageshell +%{_datadir}/%{name}/imageshell/imageshell.sh + +%files helper-scripts +%doc scripts/README.md HELPER_ALIASES +%dir %{_datadir}/%{name}/scripts +%{_datadir}/%{name}/scripts/* +%{_bindir}/create-pokemon-identifiers +%{_bindir}/pokeget-timing + +%files bash-completion +%{bash_completions_dir}/%{name} + +%files zsh-completion +%{zsh_completions_dir}/_%{name} + +%changelog +* Sat Mar 01 2025 Gilver E. +- Initial package diff --git a/anda/misc/pokeshell/update.rhai b/anda/misc/pokeshell/update.rhai new file mode 100644 index 0000000000..9fca409203 --- /dev/null +++ b/anda/misc/pokeshell/update.rhai @@ -0,0 +1,8 @@ +rpm.global("commit", gh_commit("acxz/pokeshell")); +if rpm.changed() { + rpm.release(); + rpm.global("date", date()); + let v = gh_tag("acxz/pokeshell"); + v.crop(1); + rpm.global("ver", v); +} From 7f0fc95b5a2434837184e1fa0e0f596a2a41a203 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 3 Mar 2025 19:14:29 +0000 Subject: [PATCH 0143/2977] bump: preview stable --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 1a036c967d..2277765920 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.176.1-pre +%global ver 0.176.1 # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index fcf0196c94..4b32e41730 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.175.6 +Version: 0.176.1 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From b1c31d6d6ec6b8ae4a6233d04331a0440ef84157 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 3 Mar 2025 19:26:22 +0000 Subject: [PATCH 0144/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 2277765920..ddd753bd25 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.176.1 +%global ver 0.177.0-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From 260578427b9c1fd12babd3b2cffba437b69ff446 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 3 Mar 2025 22:16:51 +0000 Subject: [PATCH 0145/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 8e1da115b1..67de8dd503 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.02.28.063346 +Version: 2025.03.03.215520 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 3cd39fd6cb8b07be1462af1db074b931a17fa700 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 3 Mar 2025 22:35:19 +0000 Subject: [PATCH 0146/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 67de8dd503..d5bd0321a2 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.03.215520 +Version: 2025.03.03.222548 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 0eb9e9ed33761f00fa0b05fa8ec4d8311102b47b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 3 Mar 2025 23:55:26 +0000 Subject: [PATCH 0147/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index d5bd0321a2..89b4c308a5 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.03.222548 +Version: 2025.03.03.234637 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From e47c4aa5337ad1c8cc266e48dd080f28b0840680 Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 3 Mar 2025 18:23:03 -0600 Subject: [PATCH 0148/2977] Fix: voicevox (#3593) Signed-off-by: Gilver --- anda/apps/voicevox/voicevox.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/apps/voicevox/voicevox.spec b/anda/apps/voicevox/voicevox.spec index 0b9c2c27be..7535cb843b 100644 --- a/anda/apps/voicevox/voicevox.spec +++ b/anda/apps/voicevox/voicevox.spec @@ -5,7 +5,7 @@ %define __strip /bin/true # do not perform compression in cpio -%define _source_payload w0.ufdio +%define _source_payload w19.zstdio %define _binary_payload w19.zstdio # Exclude private libraries @@ -14,7 +14,7 @@ Name: voicevox Version: 0.23.0 -Release: 1%?dist +Release: 2%?dist Summary: Free Japanese text-to-speech editor License: LGPL-3.0 URL: https://voicevox.hiroshiba.jp @@ -52,7 +52,7 @@ sed -i "s|Exec=.*|Exec=/usr/share/voicevox/VOICEVOX.AppImage|" squashfs-root/voi %install install -Dm755 VOICEVOX.AppImage %buildroot%_datadir/voicevox/VOICEVOX.AppImage install -Dm755 voicevox.sh %buildroot%_bindir/voicevox -install -Dm644 squashfs-root%_iconsdir/hicolor/0x0/apps/voicevox.png %buildroot%_iconsdir/hicolor/256x256/apps/voicevox.png +install -Dm644 squashfs-root%_iconsdir/hicolor/256x256/apps/voicevox.png %buildroot%_iconsdir/hicolor/256x256/apps/voicevox.png install -Dm644 squashfs-root/voicevox.desktop %buildroot%_datadir/applications/voicevox.desktop %files From bc5212d2dcf2250f169a48107056994fcefa9720 Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 3 Mar 2025 19:04:41 -0600 Subject: [PATCH 0149/2977] Fix (extest): Versioning (#3723) Signed-off-by: Gilver --- anda/misc/extest/rust-extest.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/misc/extest/rust-extest.spec b/anda/misc/extest/rust-extest.spec index 111d99b2ff..2a1c5f2d66 100644 --- a/anda/misc/extest/rust-extest.spec +++ b/anda/misc/extest/rust-extest.spec @@ -15,7 +15,7 @@ %global build_rustflags %build_rustflags -C link-arg=-fuse-ld=mold Name: extest -Version: %commit_date.git~%{shortcommit} +Version: %{commit_date}git.%{shortcommit} Release: 1%?dist Summary: X11 XTEST reimplementation primarily for Steam Controller on Wayland From 78620b6a0cd463f6410e8d169b531b02f140a7a4 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 4 Mar 2025 01:20:37 +0000 Subject: [PATCH 0150/2977] bump: ruffle yt-dlp --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 29bb1b42fc..46346ff428 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-03 +%global ver 2025-03-04 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 89b4c308a5..af68b58d1f 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.03.234637 +Version: 2025.03.04.005151 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From c45e7b76817417bfa3fc564c9425fa156fcfd851 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 4 Mar 2025 01:40:26 +0000 Subject: [PATCH 0151/2977] bump(nightly): mpv nightly prismlauncher-nightly --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 6 +++--- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index f08767d433..b13a85cbf6 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 630a036f64c4936e6236afa088b2fa7e62666451 +%global commit 2542a7824c11f7eedae1d6232c5d136722b31b97 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250303 +%global commit_date 20250304 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 9fa92c7498..c3304df6a8 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,7 +1,7 @@ -%global commit ae6d3503348fcff36831367f02ebd06d368f3e01 +%global commit 922aaa05341584a823be0d59dfafee083d3c74c2 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250303 -%global ver 0.177.0 +%global commit_date 20250304 +%global ver 0.178.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index e8111e1ef5..3fad0b24e6 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 02b6afe3d522992e7ec265a1ecadf4bd14784dcc +%global commit f9ab75868a47e37ab08e5a8d0a016b2235f36ab1 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250303 +%global commit_date 20250304 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 From 6b0e0c22149169c518052b3f1c0b9d7f7a9a98cd Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 4 Mar 2025 03:55:45 +0000 Subject: [PATCH 0152/2977] bump: electron --- anda/tools/electron/electron.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/electron/electron.spec b/anda/tools/electron/electron.spec index 43ae9f9705..3680b40e5b 100644 --- a/anda/tools/electron/electron.spec +++ b/anda/tools/electron/electron.spec @@ -12,7 +12,7 @@ %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so Name: electron -Version: 34.3.0 +Version: 35.0.0 Release: 1%?dist Summary: Build cross platform desktop apps with web technologies License: MIT From 99eb2cae98b6b45a05c276ab0ff40145d560e2d1 Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 4 Mar 2025 02:39:36 -0600 Subject: [PATCH 0153/2977] Fix (extest): Don't build i686 debug packages on F41 due to bug (#3734) * Ifcond Signed-off-by: Gilver * %if macro is always weird Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/misc/extest/rust-extest.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/anda/misc/extest/rust-extest.spec b/anda/misc/extest/rust-extest.spec index 2a1c5f2d66..631d402dfa 100644 --- a/anda/misc/extest/rust-extest.spec +++ b/anda/misc/extest/rust-extest.spec @@ -1,6 +1,11 @@ %global commit d6863d970d2686dd6282142af57503e1f2d561dc %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date 20241119 +%if 0%{?fedora} == 41 +%ifarch %ix86 +%global debug_package %{nil} +%endif +%endif # While there's an upstream version at Supreeeme/extest, we're using # the same fork as Bazzite so we can use the same patches. From 0f20b5bc5455f6131cc3622c1cf57fc24e0b0e8a Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 4 Mar 2025 02:39:51 -0600 Subject: [PATCH 0154/2977] Fix (voicevox): Disable AutoReq (#3729) Signed-off-by: Gilver --- anda/apps/voicevox/voicevox.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/apps/voicevox/voicevox.spec b/anda/apps/voicevox/voicevox.spec index 7535cb843b..32b4b1e1c0 100644 --- a/anda/apps/voicevox/voicevox.spec +++ b/anda/apps/voicevox/voicevox.spec @@ -24,6 +24,7 @@ Source2: https://github.com/VOICEVOX/voicevox/releases/download/%version/ Packager: madonuko BuildRequires: p7zip-plugins ExclusiveArch: x86_64 +AutoReq: no %description VOICEVOX is a free Japanese text-to-speech software with medium output quality. From 890630ad3384a568a811f32cc5f918fc5a213640 Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 4 Mar 2025 02:41:57 -0600 Subject: [PATCH 0155/2977] Fix (pokeshell): Fix install issues (#3721) * Fix the weird install issues from the install script, less symlinks * Actually this keeps the variable in the script in use * Remove unneeded `/` --- anda/misc/pokeshell/pokeshell.spec | 74 +++++++++++++++--------------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/anda/misc/pokeshell/pokeshell.spec b/anda/misc/pokeshell/pokeshell.spec index 4c7741fc10..e968178af0 100644 --- a/anda/misc/pokeshell/pokeshell.spec +++ b/anda/misc/pokeshell/pokeshell.spec @@ -4,58 +4,63 @@ %global date 20241124 %global ver 1.0.0 -Name: pokeshell -Version: %{ver}^%{date}git.%{shortcommit} -Release: 1%{?dist} -Summary: A shell program to show Pokémon sprites in the terminal. -License: GPL-3.0-or-later -URL: https://github.com/acxz/pokeshell -Source0: %{url}/archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz -Source1: HELPER_ALIASES -Requires: jq -Requires: ImageMagick -Requires: python3 -Requires: (timg or chafa) -BuildArch: noarch -Packager: Gilver E. +Name: pokeshell +Version: %{ver}^%{date}git.%{shortcommit} +Release: 2%{?dist} +Summary: A shell program to show Pokémon sprites in the terminal. +License: GPL-3.0-or-later +URL: https://github.com/acxz/pokeshell +Source0: %{url}/archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz +Source1: HELPER_ALIASES +BuildRequires: sed +Requires: bash +Requires: jq +Requires: ImageMagick +Requires: python3 +Requires: (timg or chafa) +BuildArch: noarch +Packager: Gilver E. %description A featureful shell program to show Pokémon sprites in the terminal. -%package helper-scripts -Summary: This package contains helper scripts for Pokéshell -Requires: %{name} -Requires: uv -Recommends: hyperfine -Recommends: pokeget-rs -Recommends: pokemon-colorscripts +%package helper-scripts +Summary: This package contains helper scripts for Pokéshell +Requires: bash +Requires: %{name} +Requires: uv +Recommends: hyperfine +Recommends: pokeget-rs +Recommends: pokemon-colorscripts %description helper-scripts Generates pokemon identifiers (such as localized names) using PokeAPI that the sprite backends do not support natively. See included README for what these scripts can do. -%package bash-completion -Summary: Bash completion for Pokéshell -Requires: bash -Requires: %{name} -Supplements: (%{name} and bash) +%package bash-completion +Summary: Bash completion for Pokéshell +Requires: bash +Requires: %{name} +Supplements: (%{name} and bash) -%description bash-completion +%description bash-completion Pokéshell Bash completion. -%package zsh-completion -Summary: Zsh completion for Pokéshell -Requires: %{name} -Requires: zsh -Supplements: (%{name} and zsh) +%package zsh-completion +Summary: Zsh completion for Pokéshell +Requires: %{name} +Requires: zsh +Supplements: (%{name} and zsh) -%description zsh-completion +%description zsh-completion Basic Zsh completion support for Pokéshell. %prep %autosetup -n %{name}-%{commit} cp %{SOURCE1} . +sed -i 's/MY_DIR=.*/MY_DIR=\/usr\/share\/%{name}/g' bin/pokeshell +sed -i 's/\.\.\/share\///' bin/pokeshell %build @@ -68,8 +73,6 @@ install -Dm644 scripts/*.sh -t %{buildroot}%{_datadir}/%{name}/scripts # Bash and Zsh completion share a single file, Zsh completion is pretty rudimentary install -Dm644 share/bash-completion/completions/pokeshell -t %{buildroot}%{bash_completions_dir} install -Dm644 share/bash-completion/completions/pokeshell %{buildroot}%{zsh_completions_dir}/_%{name} -# Keep actual directories out of /usr/bin -ln -sf %{_datadir}/%{name}/imageshell %{buildroot}%{_bindir}/imageshell # Make helper scripts directly executable ln -sf %{_datadir}/%{name}/scripts/create_pokemon_identifiers.py %{buildroot}%{_bindir}/create-pokemon-identifiers ln -sf %{_datadir}/%{name}/scripts/timing.sh %{buildroot}%{_bindir}/pokeget-timing @@ -78,7 +81,6 @@ ln -sf %{_datadir}/%{name}/scripts/timing.sh %{buildroot}%{_bindir}/pokeget-timi %license LICENSE.md %doc README.md %{_bindir}/%{name} -%{_bindir}/imageshell %dir %{_datadir}/%{name} %{_datadir}/%{name}/pokemon_identifiers.json %dir %{_datadir}/%{name}/imageshell From e0d648389d854daf10de6100ff005f0d9384bf4a Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 4 Mar 2025 02:43:40 -0600 Subject: [PATCH 0156/2977] UX (pokeget-rs): Make both names executable (#3722) * UX: Make both names executable Signed-off-by: Gilver * Oops Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/misc/pokeget-rs/pokeget-rs.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/anda/misc/pokeget-rs/pokeget-rs.spec b/anda/misc/pokeget-rs/pokeget-rs.spec index cde6f4768d..9902d125b1 100644 --- a/anda/misc/pokeget-rs/pokeget-rs.spec +++ b/anda/misc/pokeget-rs/pokeget-rs.spec @@ -2,10 +2,11 @@ %global pcommit c5aaa610ff2acdf7fd8e2dccd181bca8be9fcb3e %global pshortcommit %(c=%{pcommit}; echo ${c:0:7}) %global pcommit_date 20220622 +%global shortname pokeget -Name: pokeget-rs +Name: %{shortname}-rs Version: 1.6.3 -Release: 1%{?dist} +Release: 2%{?dist} SourceLicense: MIT License: MIT AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-2-Clause AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) Summary: A better Rust version of pokeget. @@ -34,13 +35,15 @@ popd %cargo_build %install -install -Dpm755 target/rpm/pokeget %{buildroot}%{_bindir}/%{name} +install -Dpm755 target/rpm/%{shortname} -t %{buildroot}%{_bindir} +ln -sf %{shortname} %{buildroot}%{_bindir}/%{name} %{cargo_license_online} > LICENSE.dependencies %files %license LICENSE LICENSE.dependencies data/%{pname}/license.md %doc README.md %{_bindir}/%{name} +%{_bindir}/%{shortname} %changelog * Sat Mar 01 2025 Gilver E. From 18a5b2da05a39ac3ead607447dd99663f97e089c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Garc=C3=ADa?= <4411661+GarciaLnk@users.noreply.github.com> Date: Tue, 4 Mar 2025 08:44:22 +0000 Subject: [PATCH 0157/2977] chore(devpod): add update script (#3724) --- anda/devs/devpod/DevPod.desktop | 2 +- anda/devs/devpod/golang-github-loft-sh-devpod.spec | 4 ++-- anda/devs/devpod/update.rhai | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 anda/devs/devpod/update.rhai diff --git a/anda/devs/devpod/DevPod.desktop b/anda/devs/devpod/DevPod.desktop index eba6b7fc2a..3b00d4d64a 100644 --- a/anda/devs/devpod/DevPod.desktop +++ b/anda/devs/devpod/DevPod.desktop @@ -2,7 +2,7 @@ Version=1.0 Type=Application Name=DevPod -Comment=DevPod +Comment=Codespaces but open-source, client-only and unopinionated: Works with any IDE and lets you use any cloud, kubernetes or just localhost docker Exec=/usr/bin/DevPod Icon=devpod.png Terminal=false diff --git a/anda/devs/devpod/golang-github-loft-sh-devpod.spec b/anda/devs/devpod/golang-github-loft-sh-devpod.spec index 578ecc23c3..2689afe4a3 100644 --- a/anda/devs/devpod/golang-github-loft-sh-devpod.spec +++ b/anda/devs/devpod/golang-github-loft-sh-devpod.spec @@ -3,7 +3,7 @@ # https://github.com/loft-sh/devpod %global goipath github.com/loft-sh/devpod -Version: 0.6.9 +Version: 0.6.13 %gometa -f @@ -17,7 +17,7 @@ and lets you use any cloud, kubernetes or just localhost docker.} loadtest/README.md Name: devpod -Release: %autorelease +Release: 1%?dist Summary: Codespaces but open-source, client-only and unopinionated: Works with any IDE and lets you use any cloud, kubernetes or just localhost docker Provides: golang-github-loft-sh-devpod BuildRequires: anda-srpm-macros mold diff --git a/anda/devs/devpod/update.rhai b/anda/devs/devpod/update.rhai new file mode 100644 index 0000000000..5e61578aae --- /dev/null +++ b/anda/devs/devpod/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("loft-sh/devpod")); From 1129efc8e6f9c76bf67d28765064680f8f969595 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 4 Mar 2025 08:57:22 +0000 Subject: [PATCH 0158/2977] bump: faad2 --- anda/multimedia/faad2/faad2.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/multimedia/faad2/faad2.spec b/anda/multimedia/faad2/faad2.spec index d2ced90136..e9d259b320 100644 --- a/anda/multimedia/faad2/faad2.spec +++ b/anda/multimedia/faad2/faad2.spec @@ -1,8 +1,8 @@ Summary: Library and frontend for decoding MPEG2/4 AAC Name: faad2 Epoch: 1 -Version: 2.11.1 -Release: 3%{?dist} +Version: 2.11.2 +Release: 1%?dist License: GPLv2+ URL: http://www.audiocoding.com/faad2.html Source: https://github.com/knik0/faad2/archive/%{version}/%{name}-%{version}.tar.gz From 637d3b309d3912d43ea538d2e018f8e34dc21305 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 4 Mar 2025 18:26:17 +0000 Subject: [PATCH 0159/2977] bump: preview stable --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index ddd753bd25..fd347e17f8 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.177.0-pre +%global ver 0.176.2 # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 4b32e41730..7bebd5c931 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.176.1 +Version: 0.176.2 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From 287c54145a9fbdabc5d072eac5093787f270e95d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 4 Mar 2025 19:08:40 +0000 Subject: [PATCH 0160/2977] bump: discord-canary-openasar discord-canary preview --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- anda/devs/zed/preview/zed-preview.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index eeb2699d76..3626c18b74 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.602 +Version: 0.0.603 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index fb8bda8b29..4d24b34b05 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.602 +Version: 0.0.603 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index fd347e17f8..27719c0718 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.176.2 +%global ver 0.177.1-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From 68458265bfbda22db198fb4bd0c5831b73ccccb2 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 4 Mar 2025 21:22:36 +0000 Subject: [PATCH 0161/2977] bump: lomiri-system-settings --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 138ec3bcc2..0e6611e9c9 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit 1b3d0ee6c1142d928a2b08a929723dbc41dc7fea +%global commit 385ad7b7354da4eaf4b1bc1056a8e7bf241534e3 %forgemeta Name: lomiri-system-settings From e1b70c27791c8ab38410740739c4f2c67a6818f3 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 5 Mar 2025 00:35:49 +0000 Subject: [PATCH 0162/2977] bump: discord-canary-openasar discord-canary ruffle --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 3626c18b74..c6dc81ea50 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.603 +Version: 0.0.604 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 4d24b34b05..97c8077281 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.603 +Version: 0.0.604 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 46346ff428..1d67adf5c0 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-04 +%global ver 2025-03-05 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 37a8e6c8f052acdc46bc36de5b6c684917961316 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 5 Mar 2025 01:40:16 +0000 Subject: [PATCH 0163/2977] bump(nightly): mpv nightly micro nightly rpi-utils spotx-bash --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/micro/micro-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/tools/rpi-utils/rpi-utils.spec | 4 ++-- anda/tools/spotx-bash/spotx-bash.spec | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index b13a85cbf6..9f0b152664 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 2542a7824c11f7eedae1d6232c5d136722b31b97 +%global commit ca1f60f0992d059d5190ec1c14d3bb3b80faaea9 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250304 +%global commit_date 20250305 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 6697b761fc..4f3b9cf290 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit ee8ae196ee0fad3824c7ae9eac947f2128b4ae4f +%global commit 66e8d919572fddc5fd145eb563a555deeb249b35 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-03-02 +%global fulldate 2025-03-04 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 diff --git a/anda/devs/micro/micro-nightly.spec b/anda/devs/micro/micro-nightly.spec index 5f941ca726..fb28114599 100644 --- a/anda/devs/micro/micro-nightly.spec +++ b/anda/devs/micro/micro-nightly.spec @@ -12,8 +12,8 @@ # Naming variable as something other than "commit" is necessary # to stop %%gometa from putting commit hash in release -%global commit_hash 3c68655f334aa4c4d3f9825e8370d2e86ae6d261 -%global commit_date 20250302 +%global commit_hash 2ae9812f47745f79bb4faa7e1916b984ee967e62 +%global commit_date 20250305 %global shortcommit %{sub %{commit_hash} 1 7} %global ver 2.0.14 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index c3304df6a8..7f77697029 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 922aaa05341584a823be0d59dfafee083d3c74c2 +%global commit ed13e05855993186b3b3972a92d1b58995de8a23 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250304 +%global commit_date 20250305 %global ver 0.178.0 %bcond_with check diff --git a/anda/tools/rpi-utils/rpi-utils.spec b/anda/tools/rpi-utils/rpi-utils.spec index 5042fe4f81..f22ee6c07f 100644 --- a/anda/tools/rpi-utils/rpi-utils.spec +++ b/anda/tools/rpi-utils/rpi-utils.spec @@ -1,5 +1,5 @@ -%global commit 61e4becfd5338e3eb2bb8c54cdd0b9b96a8afbf8 -%global commit_date 20250301 +%global commit 660bba39805585fb39d37d49b8268073932696bb +%global commit_date 20250305 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define _unpackaged_files_terminate_build 0 diff --git a/anda/tools/spotx-bash/spotx-bash.spec b/anda/tools/spotx-bash/spotx-bash.spec index e722a6e237..00120599d6 100644 --- a/anda/tools/spotx-bash/spotx-bash.spec +++ b/anda/tools/spotx-bash/spotx-bash.spec @@ -1,5 +1,5 @@ -%global commit 176fc61d6d96cfc22ca844e25c94e5419965b329 -%global commit_date 20250226 +%global commit 07f04cb32de86eefa463b9e69aa22957799defae +%global commit_date 20250305 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: spotx-bash From 4f3dab23f9ea39a87b5c632fb067b810c8647d8d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 5 Mar 2025 02:10:28 +0000 Subject: [PATCH 0164/2977] bump: discord-canary-openasar discord-canary protobuf --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- anda/langs/python/protobuf/python3-protobuf.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index c6dc81ea50..94cddc97b2 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.604 +Version: 0.0.605 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 97c8077281..0a84f289a9 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.604 +Version: 0.0.605 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com diff --git a/anda/langs/python/protobuf/python3-protobuf.spec b/anda/langs/python/protobuf/python3-protobuf.spec index 614edc8e52..e502b9f86d 100644 --- a/anda/langs/python/protobuf/python3-protobuf.spec +++ b/anda/langs/python/protobuf/python3-protobuf.spec @@ -2,7 +2,7 @@ %global pypi_name protobuf Name: python-%{pypi_name} -Version: 5.29.3 +Version: 6.30.0 Release: 1%?dist Summary: Protocol Buffers From e423741b1c5524296a7bc2c1620dfe76aaeeb005 Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 4 Mar 2025 23:11:27 -0600 Subject: [PATCH 0165/2977] Fix (pbcli): Missing ( in licenses (#3756) Signed-off-by: Gilver --- anda/misc/pbcli/pbcli.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/anda/misc/pbcli/pbcli.spec b/anda/misc/pbcli/pbcli.spec index 6284515f5e..7506f47766 100644 --- a/anda/misc/pbcli/pbcli.spec +++ b/anda/misc/pbcli/pbcli.spec @@ -3,28 +3,28 @@ pbcli is a command line client which allows to upload and download pastes from p Name: pbcli Version: 2.8.0 -Release: 1%?dist +Release: 2%?dist Summary: A PrivateBin commandline upload and download utility SourceLicense: Unlicense OR MIT -License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR MIT) AND BSD-3-Clause) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-3-Clause AND ISC AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) -URL: https://github.com/Mydayyy/pbcli +License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-3-Clause AND ISC AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) +URL: https://github.com/Mydayyy/%{name} Source0: %{url}/archive/refs/tags/v%{version}.tar.gz BuildRequires: anda-srpm-macros BuildRequires: cargo-rpm-macros >= 24 BuildRequires: mold +BuildRequires: openssl-libs BuildRequires: perl-ExtUtils-MM-Utils BuildRequires: perl-FindBin BuildRequires: perl-File-Compare BuildRequires: perl-File-Copy BuildRequires: perl-IPC-Cmd BuildRequires: perl-lib -BuildRequires: openssl-libs Packager: Gilver E. %description %_description %prep -%autosetup -n pbcli-%version +%autosetup -n %{name}-%{version} %cargo_prep_online %build @@ -32,16 +32,16 @@ Packager: Gilver E. %{cargo_license_online} > LICENSE.dependencies %install -install -Dm755 target/rpm/pbcli %{buildroot}%{_bindir}/pbcli -install -Dm755 target/rpm/libpbcli.so %{buildroot}%{_libdir}/libpbcli.so +install -Dm755 target/rpm/%{name} %{buildroot}%{_bindir}/%{name} +install -Dm755 target/rpm/lib%{name}.so %{buildroot}%{_libdir}/lib%{name}.so %files %doc README.md %license LICENSE-MIT %license LICENSE-UNLICENSE %license LICENSE.dependencies -%{_bindir}/pbcli -%{_libdir}/libpbcli.so +%{_bindir}/%{name} +%{_libdir}/lib%{name}.so %changelog * Sat Dec 21 2024 Gilver E. From 9c2ef552b9f223046375e07fc64f6c2d84abe4ff Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 5 Mar 2025 06:48:03 +0000 Subject: [PATCH 0166/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index af68b58d1f..ba843468ca 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.04.005151 +Version: 2025.03.05.063837 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 90b0e07193f3264478db42a076159bdfddf73192 Mon Sep 17 00:00:00 2001 From: Gilver Date: Wed, 5 Mar 2025 04:09:16 -0600 Subject: [PATCH 0167/2977] Fix (xpadneo-kmod-common): Obsoletes instead due to name change (#3755) * Drop release provides Signed-off-by: Gilver * Slight tweak Signed-off-by: Gilver * Add epoch Signed-off-by: Gilver * Add epoch Signed-off-by: Gilver * Add epoch Signed-off-by: Gilver * Maybe Obsoletes is right here Signed-off-by: Gilver * Right right no unversioned Obsoletes Signed-off-by: Gilver * Drop epoch and see if this works Signed-off-by: Gilver * Revert Signed-off-by: Gilver * Revert Signed-off-by: Gilver * Bump rel back down? Signed-off-by: Gilver * Actually I think this is fine due to Git versioning Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec b/anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec index 6995cc5268..67cf5a00b8 100644 --- a/anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec +++ b/anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec @@ -6,7 +6,7 @@ Name: %{real_name}-kmod-common Version: %{ver}^%{date}git.%{shortcommit} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Advanced Linux Driver for Xbox One Wireless Gamepad common files License: GPL-3.0 URL: https://atar-axis.github.io/%{real_name} @@ -14,7 +14,7 @@ Source0: https://github.com/atar-axis/%{real_name}/archive/%{commit}.tar. Source1: io.github.xpadneo.metainfo.xml BuildRequires: systemd-rpm-macros Provides: %{real_name}-kmod-common = %{?epoch:%{epoch}:}%{version} -Provides: %{real_name} = %{version}-%{release} +Obsoletes: %{real_name} < %{?epoch:%{epoch}:}%{version} BuildArch: noarch Packager: Gilver E. From 054daa9af1c4358bfcff14b96795efca039d2968 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 5 Mar 2025 12:49:06 +0000 Subject: [PATCH 0168/2977] bump: youki --- anda/langs/rust/youki/youki.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/rust/youki/youki.spec b/anda/langs/rust/youki/youki.spec index 36825db322..6f0fb7b532 100644 --- a/anda/langs/rust/youki/youki.spec +++ b/anda/langs/rust/youki/youki.spec @@ -1,5 +1,5 @@ Name: youki -Version: 0.5.1 +Version: 0.5.2 Release: 1%?dist Summary: A container runtime written in Rust From b6d90a656dd57c33c7394b527bf186e6934181e1 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 5 Mar 2025 13:47:03 +0000 Subject: [PATCH 0169/2977] bump: devpod --- anda/devs/devpod/golang-github-loft-sh-devpod.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/devpod/golang-github-loft-sh-devpod.spec b/anda/devs/devpod/golang-github-loft-sh-devpod.spec index 2689afe4a3..2a862302be 100644 --- a/anda/devs/devpod/golang-github-loft-sh-devpod.spec +++ b/anda/devs/devpod/golang-github-loft-sh-devpod.spec @@ -3,7 +3,7 @@ # https://github.com/loft-sh/devpod %global goipath github.com/loft-sh/devpod -Version: 0.6.13 +Version: 0.6.14 %gometa -f From 585f9f191b1145cdac8b9570fa205fdd8744371a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 5 Mar 2025 14:38:07 +0000 Subject: [PATCH 0170/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 27719c0718..bb86364974 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.177.1-pre +%global ver 0.177.2-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From b2b21d7f0938343a9d9f7fd00232079bba26f235 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 5 Mar 2025 20:55:48 +0000 Subject: [PATCH 0171/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index bb86364974..dc8ef10df0 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.177.2-pre +%global ver 0.177.3-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From 44084715453e780c81f1b6a530990a6721dcc549 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 5 Mar 2025 21:16:51 +0000 Subject: [PATCH 0172/2977] bump: mesa --- anda/lib/mesa/mesa.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index d222111206..e8140d9b98 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -75,7 +75,7 @@ Summary: Mesa graphics libraries # This should not break anything by default as the Mesa stream is ***EXPLICITLY*** # disabled by default, and has to be enabled manually. See `terra/release/terra-mesa.repo` for details. Epoch: 1 -Version: 25.0.0 +Version: 25.0.1 Release: 1%?dist License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org From 2c6fba7b31f5cc11ac5f3e73f651bdee81003108 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 6 Mar 2025 01:23:54 +0000 Subject: [PATCH 0173/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 1d67adf5c0..0e6988a768 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-05 +%global ver 2025-03-06 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From f3bd4f3118772805c56b411f59081eef0467e3a2 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 6 Mar 2025 01:40:30 +0000 Subject: [PATCH 0174/2977] bump(nightly): mpv nightly nightly albius nim-nightly astal --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/langs/go/albius/albius.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/lib/astal/astal/astal.spec | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 9f0b152664..531cf0a9dc 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit ca1f60f0992d059d5190ec1c14d3bb3b80faaea9 +%global commit 9a7c8334c23ffdc41b48e87c8ff9c65b85a2935b %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250305 +%global commit_date 20250306 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 4f3b9cf290..064eda00e3 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 66e8d919572fddc5fd145eb563a555deeb249b35 +%global commit e07b6fdf6ba342eb1fc4321c26fe5a6475be5133 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-03-04 +%global fulldate 2025-03-05 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 7f77697029..b85841564e 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit ed13e05855993186b3b3972a92d1b58995de8a23 +%global commit d3c68650c079917e873eb3347f7b04d0277c99dc %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250305 +%global commit_date 20250306 %global ver 0.178.0 %bcond_with check diff --git a/anda/langs/go/albius/albius.spec b/anda/langs/go/albius/albius.spec index 35f0f7c4e0..84760fad7a 100644 --- a/anda/langs/go/albius/albius.spec +++ b/anda/langs/go/albius/albius.spec @@ -1,6 +1,6 @@ %define debug_package %nil -%global commit e5c90d2e7406cc7c9652a49bd8eb67771a76eedf -%global commit_date 20241128 +%global commit e540d74a68f824996afad62cb9bbe17089b4fb3a +%global commit_date 20250306 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: albius diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 3f95b380a8..e19741c07e 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit e39d152b89c5635c27dd4d8fc71c48747c5fc20b +%global commit 569d02e212774ca4745ad968d05b69b75a9bcec7 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250301 +%global commit_date 20250306 %global debug_package %nil Name: nim-nightly diff --git a/anda/lib/astal/astal/astal.spec b/anda/lib/astal/astal/astal.spec index 87f85016bf..d7849be431 100644 --- a/anda/lib/astal/astal/astal.spec +++ b/anda/lib/astal/astal/astal.spec @@ -1,7 +1,7 @@ -%global commit 4b283b0045c0752c36c6e8306fc137f2c9f244a4 +%global commit db51a2bfdb726405660d300936cb6c7251785a0b %global shortcommit %{sub %commit 1 7} -%global commit_date 20250303 +%global commit_date 20250306 Name: astal Version: 0^%commit_date.%shortcommit From fc3a62b4ad7b07649291c50aa75b56f4565f2c62 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 6 Mar 2025 02:39:15 +0000 Subject: [PATCH 0175/2977] bump(branch): astal-gtk --- anda/lib/astal/astal-gtk/astal-gtk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/astal/astal-gtk/astal-gtk.spec b/anda/lib/astal/astal-gtk/astal-gtk.spec index 78062d40c9..433c14a265 100644 --- a/anda/lib/astal/astal-gtk/astal-gtk.spec +++ b/anda/lib/astal/astal-gtk/astal-gtk.spec @@ -1,5 +1,5 @@ -%global commit 4b283b0 -%global commit_date 20250303 +%global commit db51a2b +%global commit_date 20250306 Name: astal Version: 0^%commit_date.%commit From 323f1e271fae5a3d43c292ef4d10a9950a37063b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 6 Mar 2025 02:41:34 +0000 Subject: [PATCH 0176/2977] bump: unity-session --- anda/desktops/lomiri-unity/unity-session/unity-session.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/unity-session/unity-session.spec b/anda/desktops/lomiri-unity/unity-session/unity-session.spec index 4571f30150..329c74deef 100644 --- a/anda/desktops/lomiri-unity/unity-session/unity-session.spec +++ b/anda/desktops/lomiri-unity/unity-session/unity-session.spec @@ -1,4 +1,4 @@ -%define _ubuntu_rel 1ubuntu1 +%define _ubuntu_rel 2ubuntu1 Name: unity-session Summary: Lightdm profile for Unity 7 From 8f51ed8bdb2df164345f14e09d8ad55746b1107e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 6 Mar 2025 12:45:43 +0000 Subject: [PATCH 0177/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index bd3429052c..55fc6e74ec 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.3.0 +Version: 2025.3.1 Release: 1%?dist Summary: Front-end to your dev env From ad69205cb53ea9094c11506761ca7b702a1d7c8d Mon Sep 17 00:00:00 2001 From: Pornpipat Popum Date: Thu, 6 Mar 2025 22:24:19 +0700 Subject: [PATCH 0178/2977] bump(opentabletdriver): .net dependency (#3767) --- anda/system/opentabletdriver/opentabletdriver.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/system/opentabletdriver/opentabletdriver.spec b/anda/system/opentabletdriver/opentabletdriver.spec index 1c01461a36..aabc5673a8 100644 --- a/anda/system/opentabletdriver/opentabletdriver.spec +++ b/anda/system/opentabletdriver/opentabletdriver.spec @@ -6,11 +6,11 @@ %global __requires_exclude_from ^/usr/lib/opentabletdriver/.*$ %global __os_install_post %{nil} %global dotnet_sdk_version 8.0 -%global dotnet_runtime_version 6.0 +%global dotnet_runtime_version 8.0 Name: opentabletdriver Version: 0.6.5.1 -Release: 1%?dist +Release: 2%?dist Summary: A cross-platform open source tablet driver License: LGPLv3 URL: https://github.com/OpenTabletDriver/OpenTabletDriver @@ -19,7 +19,7 @@ Packager: Cappy Ishihara # This package can be built using a newer .NET SDK version, but you -# specifically need .NET 6.0 to run it. +# specifically need .NET 8.0 to run it. BuildRequires: dotnet-sdk-%{dotnet_sdk_version} BuildRequires: git jq systemd-rpm-macros BuildRequires: gtk3-devel From e4b90f27ac03b1aab61c0b433795a38d35f95a57 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 6 Mar 2025 17:17:15 +0000 Subject: [PATCH 0179/2977] bump: osu-lazer --- anda/games/osu-lazer/osu-lazer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index e52669e9c5..4e833242de 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -3,7 +3,7 @@ %define __strip /bin/true Name: osu-lazer -Version: 2025.225.0 +Version: 2025.306.0 Release: 1%?dist Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew. ExclusiveArch: x86_64 From e2ec91fba07781e6ada1df0b9f2a7f068950f00a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 6 Mar 2025 18:25:14 +0000 Subject: [PATCH 0180/2977] bump: flutter --- anda/devs/flutter/flutter.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/flutter/flutter.spec b/anda/devs/flutter/flutter.spec index dbced8016d..6923ed8f15 100644 --- a/anda/devs/flutter/flutter.spec +++ b/anda/devs/flutter/flutter.spec @@ -1,5 +1,5 @@ Name: flutter -Version: 3.29.0 +Version: 3.29.1 Release: 1%?dist Summary: SDK for crafting beautiful, fast user experiences from a single codebase License: BSD-3-Clause From 7cd7e1084a7e0f87dad7697026dde860610b431f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 6 Mar 2025 20:24:36 +0000 Subject: [PATCH 0181/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index dc8ef10df0..63e4c39f28 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.177.3-pre +%global ver 0.177.4-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From 412f57fc74a11cf264790df50f66804ebab375f8 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 6 Mar 2025 21:22:58 +0000 Subject: [PATCH 0182/2977] bump: discord-ptb-openasar discord-ptb --- anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec | 2 +- anda/apps/discord-ptb/discord-ptb.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec index 5585d33015..219b8b043d 100644 --- a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec +++ b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-ptb-openasar -Version: 0.0.132 +Version: 0.0.133 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-ptb/discord-ptb.spec b/anda/apps/discord-ptb/discord-ptb.spec index c22839fde0..541497db73 100644 --- a/anda/apps/discord-ptb/discord-ptb.spec +++ b/anda/apps/discord-ptb/discord-ptb.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-ptb -Version: 0.0.132 +Version: 0.0.133 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers. URL: https://discord.com From 103c26f76849c81bcb9f0a8048e57dc6fa9a993c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 6 Mar 2025 22:46:49 +0000 Subject: [PATCH 0183/2977] bump: stable --- anda/devs/zed/stable/zed.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 7bebd5c931..088f1a21e1 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.176.2 +Version: 0.176.3 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From 59e227dc079a8c557ee27ec144c0ee334dc925eb Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 7 Mar 2025 01:41:12 +0000 Subject: [PATCH 0184/2977] bump(nightly): mpv mwc nightly cros-keyboard-map spotx-bash --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/desktops/mwc/mwc.spec | 6 +++--- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/system/cros-keyboard-map/cros-keyboard-map.spec | 4 ++-- anda/tools/spotx-bash/spotx-bash.spec | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 531cf0a9dc..d58b13b987 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 9a7c8334c23ffdc41b48e87c8ff9c65b85a2935b +%global commit 2799d8b130d7d400ea5bf2dbf1e3ce8b529a8843 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250306 +%global commit_date 20250307 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/desktops/mwc/mwc.spec b/anda/desktops/mwc/mwc.spec index 9b7c23183d..0b6b2d0b18 100644 --- a/anda/desktops/mwc/mwc.spec +++ b/anda/desktops/mwc/mwc.spec @@ -1,7 +1,7 @@ -%global commit 9b9d4256be440b511e6c37165e01a6c2686e606f -%global commit_date 20250301 +%global commit be77084627d74f8e84615e9b192dace9649181e2 +%global commit_date 20250307 %global shortcommit %{sub %{commit} 1 7 } -%global ver 0.1.2 +%global ver 0.1.3 Name: mwc Version: %{ver}^%{commit_date}git.%{shortcommit} diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index b85841564e..c7f40e1a20 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit d3c68650c079917e873eb3347f7b04d0277c99dc +%global commit 6c025507b64455e1af3a080ef4a9c4d279b32206 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250306 +%global commit_date 20250307 %global ver 0.178.0 %bcond_with check diff --git a/anda/system/cros-keyboard-map/cros-keyboard-map.spec b/anda/system/cros-keyboard-map/cros-keyboard-map.spec index 6893b3cdbc..f7e714db5d 100644 --- a/anda/system/cros-keyboard-map/cros-keyboard-map.spec +++ b/anda/system/cros-keyboard-map/cros-keyboard-map.spec @@ -1,6 +1,6 @@ -%global commit_date 20250123 +%global commit_date 20250307 -%global tree_commit 4647ce2297a7142dabe3cae1de718a69cb370448 +%global tree_commit b96aab45f46626d8d77a2f890db9ec2d6661706b %global tree_shortcommit %(c=%{tree_commit}; echo ${c:0:7}) %global um_commit 46892acafb2fff3f3ace425d4694382c92645feb diff --git a/anda/tools/spotx-bash/spotx-bash.spec b/anda/tools/spotx-bash/spotx-bash.spec index 00120599d6..617dca8987 100644 --- a/anda/tools/spotx-bash/spotx-bash.spec +++ b/anda/tools/spotx-bash/spotx-bash.spec @@ -1,5 +1,5 @@ -%global commit 07f04cb32de86eefa463b9e69aa22957799defae -%global commit_date 20250305 +%global commit 979f4a0a815903847e3286cdcc5312b556a74ae9 +%global commit_date 20250307 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: spotx-bash From 7af7c7c18d523cfa1fdb93d3edf32bd7693b3c94 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 7 Mar 2025 08:55:41 +0000 Subject: [PATCH 0185/2977] bump: curlie --- anda/langs/go/curlie/golang-github-rs-curlie.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/langs/go/curlie/golang-github-rs-curlie.spec b/anda/langs/go/curlie/golang-github-rs-curlie.spec index 364bca654d..8f3ebe62d8 100644 --- a/anda/langs/go/curlie/golang-github-rs-curlie.spec +++ b/anda/langs/go/curlie/golang-github-rs-curlie.spec @@ -3,7 +3,7 @@ # https://github.com/rs/curlie %global goipath github.com/rs/curlie -Version: 1.7.2 +Version: 1.8.2 %gometa -f @@ -14,7 +14,7 @@ The power of curl, the ease of use of httpie.} %global godocs README.md Name: %{goname} -Release: 1%{?dist} +Release: 1%?dist Summary: The power of curl, the ease of use of httpie License: MIT From de050dcacba888433491582867807720bed12f5c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 7 Mar 2025 10:59:09 +0000 Subject: [PATCH 0186/2977] bump: osu-lazer --- anda/games/osu-lazer/osu-lazer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index 4e833242de..c6f5f922d4 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -1,4 +1,4 @@ -%define osuresver 2025.303.0 +%define osuresver 2025.307.0 %global debug_package %{nil} %define __strip /bin/true From c4cc8e41281f0bb27c35e06e22b3daf8f4bcbd47 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 7 Mar 2025 13:46:05 +0000 Subject: [PATCH 0187/2977] bump: tdlib --- anda/lib/tdlib/tdlib-nightly.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 8cd743aa79..832f786ed5 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,6 +1,6 @@ -%global commit 521aed8e497beb19d97c26ff39708542dc262023 -%global ver 1.8.45 -%global commit_date 20250219 +%global commit 207f3be7b58b2a2b9f0a066b5b6ef18782b8b517 +%global ver 1.8.46 +%global commit_date 20250307 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: tdlib-nightly From a380de5a67c50286ddff8929df5353877df5c04d Mon Sep 17 00:00:00 2001 From: Gilver Date: Fri, 7 Mar 2025 08:02:54 -0600 Subject: [PATCH 0188/2977] Feat (steam): Better Extest weak dep (#3735) Signed-off-by: Gilver --- anda/games/steam/steam.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/games/steam/steam.spec b/anda/games/steam/steam.spec index 5d3721c38c..f607d1d10b 100644 --- a/anda/games/steam/steam.spec +++ b/anda/games/steam/steam.spec @@ -5,7 +5,7 @@ Name: steam Version: 1.0.0.82 -Release: 1%?dist +Release: 2%?dist Summary: Installer for the Steam software distribution service # Redistribution and repackaging for Linux is allowed, see license file. udev rules are MIT. License: Steam License Agreement and MIT @@ -135,8 +135,8 @@ Recommends: gobject-introspection Requires: steam-devices = %{?epoch:%{epoch}:}%{version}-%{release} -# Woarkaround for GNOME issues with libei -Recommends: (extest if gnome-shell) +# Workaround for GNOME issues with libei +Recommends: (extest-%{name} if gnome-shell) %description Steam is a software distribution service with an online store, automated From 36a206df6091b0282cd1a4bbb3fb8549397c0e51 Mon Sep 17 00:00:00 2001 From: Gilver Date: Fri, 7 Mar 2025 08:04:22 -0600 Subject: [PATCH 0189/2977] fix(ghostty-nightly): Changes for localization support (#3765) * The macrofication Signed-off-by: Gilver * Oops Signed-off-by: Gilver * Okay then... Worked locally? Signed-off-by: Gilver * ??? Signed-off-by: Gilver --------- Signed-off-by: Gilver --- .../devs/ghostty/nightly/ghostty-nightly.spec | 107 ++++++++++-------- 1 file changed, 59 insertions(+), 48 deletions(-) diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 064eda00e3..3782ff2a41 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -4,13 +4,15 @@ %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 +%global base_name ghostty +%global reverse_dns com.mitchellh.%{base_name} %if 0%{?fedora} <= 40 %global cache_dir %{_builddir}/zig-cache %else %global cache_dir %{builddir}/zig-cache %endif -Name: ghostty-nightly +Name: %{base_name}-nightly Version: %{ver}~tip^%{commit_date}git%{shortcommit} Release: 1%?dist %if 0%{?fedora} <= 41 @@ -18,9 +20,10 @@ Epoch: 1 %endif Summary: A fast, native terminal emulator written in Zig; this is the Tip (nightly) build. License: MIT AND MPL-2.0 AND OFL-1.1 AND (WTFPL OR CC0-1.0) AND Apache-2.0 -URL: https://ghostty.org/ -Source0: https://github.com/ghostty-org/ghostty/releases/download/tip/ghostty-source.tar.gz -Source1: https://github.com/ghostty-org/ghostty/releases/download/tip/ghostty-source.tar.gz.minisig +URL: https://%{base_name}.org +Source0: https://github.com/%{base_name}-org/%{base_name}/releases/download/tip/%{base_name}-source.tar.gz +Source1: https://github.com/%{base_name}-org/%{base_name}/releases/download/tip/%{base_name}-source.tar.gz.minisig +BuildRequires: gettext BuildRequires: gtk4-devel BuildRequires: libadwaita-devel BuildRequires: libX11-devel @@ -44,8 +47,8 @@ Requires: %{name}-terminfo Requires: %{name}-shell-integration Requires: gtk4 Requires: libadwaita -Conflicts: ghostty -Provides: ghostty-tip = %{version}-%{release} +Conflicts: %{base_name} +Provides: %{base_name}-tip = %{ver}^%{commit_date}git%{shortcommit} %if 0%{?fedora} <= 41 Provides: %{name} = %{commit_date}.%{shortcommit} %endif @@ -127,7 +130,7 @@ This package contains files for Ghostty's terminfo. Available for debugging use. %prep /usr/bin/minisign -V -m %{SOURCE0} -x %{SOURCE1} -P %{public_key} -%autosetup -n ghostty-source +%autosetup -n %{base_name}-source ZIG_GLOBAL_CACHE_DIR="%{cache_dir}" ./nix/build-support/fetch-zig-cache.sh @@ -150,64 +153,72 @@ zig build \ -Demit-termcap \ -Demit-terminfo -%files +%find_lang %{reverse_dns} + +%files -f %{reverse_dns}.lang %doc README.md %license LICENSE -%_bindir/ghostty -%_datadir/applications/com.mitchellh.ghostty.desktop -%_datadir/bat/syntaxes/ghostty.sublime-syntax -%_datadir/ghostty/ -%_datadir/kio/servicemenus/com.mitchellh.ghostty.desktop -%_datadir/nautilus-python/extensions/ghostty.py -%_datadir/nvim/site/compiler/ghostty.vim -%_datadir/nvim/site/ftdetect/ghostty.vim -%_datadir/nvim/site/ftplugin/ghostty.vim -%_datadir/nvim/site/syntax/ghostty.vim -%_datadir/vim/vimfiles/compiler/ghostty.vim -%_datadir/vim/vimfiles/ftdetect/ghostty.vim -%_datadir/vim/vimfiles/ftplugin/ghostty.vim -%_datadir/vim/vimfiles/syntax/ghostty.vim -%_iconsdir/hicolor/16x16/apps/com.mitchellh.ghostty.png -%_iconsdir/hicolor/16x16@2/apps/com.mitchellh.ghostty.png -%_iconsdir/hicolor/32x32/apps/com.mitchellh.ghostty.png -%_iconsdir/hicolor/32x32@2/apps/com.mitchellh.ghostty.png -%_iconsdir/hicolor/128x128/apps/com.mitchellh.ghostty.png -%_iconsdir/hicolor/128x128@2/apps/com.mitchellh.ghostty.png -%_iconsdir/hicolor/256x256/apps/com.mitchellh.ghostty.png -%_iconsdir/hicolor/256x256@2/apps/com.mitchellh.ghostty.png -%_iconsdir/hicolor/512x512/apps/com.mitchellh.ghostty.png -%_iconsdir/hicolor/1024x1024/apps/com.mitchellh.ghostty.png -%_mandir/man1/ghostty.1.gz -%_mandir/man5/ghostty.5.gz +%{_bindir}/%{base_name} +%{_datadir}/applications/%{reverse_dns}.desktop +%{_datadir}/bat/syntaxes/%{base_name}.sublime-syntax +%dir %{_datadir}/%{base_name} +%{_datadir}/%{base_name}/doc +%{_datadir}/%{base_name}/themes +%{_datadir}/kio/servicemenus/%{reverse_dns}.desktop +%{_datadir}/nautilus-python/extensions/%{base_name}.py +%{_datadir}/nvim/site/compiler/%{base_name}.vim +%{_datadir}/nvim/site/ftdetect/%{base_name}.vim +%{_datadir}/nvim/site/ftplugin/%{base_name}.vim +%{_datadir}/nvim/site/syntax/%{base_name}.vim +%{_datadir}/vim/vimfiles/compiler/%{base_name}.vim +%{_datadir}/vim/vimfiles/ftdetect/%{base_name}.vim +%{_datadir}/vim/vimfiles/ftplugin/%{base_name}.vim +%{_datadir}/vim/vimfiles/syntax/%{base_name}.vim +%{_iconsdir}/hicolor/16x16/apps/%{reverse_dns}.png +%{_iconsdir}/hicolor/16x16@2/apps/%{reverse_dns}.png +%{_iconsdir}/hicolor/32x32/apps/%{reverse_dns}.png +%{_iconsdir}/hicolor/32x32@2/apps/%{reverse_dns}.png +%{_iconsdir}/hicolor/128x128/apps/%{reverse_dns}.png +%{_iconsdir}/hicolor/128x128@2/apps/%{reverse_dns}.png +%{_iconsdir}/hicolor/256x256/apps/%{reverse_dns}.png +%{_iconsdir}/hicolor/256x256@2/apps/%{reverse_dns}.png +%{_iconsdir}/hicolor/512x512/apps/%{reverse_dns}.png +%{_iconsdir}/hicolor/1024x1024/apps/%{reverse_dns}.png +%{_mandir}/man1/%{base_name}.1.gz +%{_mandir}/man5/%{base_name}.5.gz %files bash-completion -%bash_completions_dir/ghostty.bash +%{bash_completions_dir}/%{base_name}.bash %files fish-completion -%fish_completions_dir/ghostty.fish +%{fish_completions_dir}/%{base_name}.fish %files zsh-completion -%zsh_completions_dir/_ghostty +%{zsh_completions_dir}/_%{base_name} %files shell-integration -%_datadir/ghostty/shell-integration/bash/bash-preexec.sh -%_datadir/ghostty/shell-integration/bash/ghostty.bash -%_datadir/ghostty/shell-integration/elvish/lib/ghostty-integration.elv -%_datadir/ghostty/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish -%_datadir/ghostty/shell-integration/zsh/.zshenv -%_datadir/ghostty/shell-integration/zsh/ghostty-integration +%dir %{_datadir}/%{base_name}/shell-integration +%{_datadir}/%{base_name}/shell-integration/bash/bash-preexec.sh +%{_datadir}/%{base_name}/shell-integration/bash/%{base_name}.bash +%{_datadir}/%{base_name}/shell-integration/elvish/lib/%{base_name}-integration.elv +%{_datadir}/%{base_name}/shell-integration/fish/vendor_conf.d/%{base_name}-shell-integration.fish +%{_datadir}/%{base_name}/shell-integration/zsh/.zshenv +%{_datadir}/%{base_name}/shell-integration/zsh/%{base_name}-integration %files terminfo -%_datadir/terminfo/g/ghostty -%_datadir/terminfo/x/xterm-ghostty +%{_datadir}/terminfo/g/%{base_name} +%{_datadir}/terminfo/x/xterm-%{base_name} %files terminfo-source -%_datadir/terminfo/ghostty.termcap -%_datadir/terminfo/ghostty.terminfo +%{_datadir}/terminfo/%{base_name}.termcap +%{_datadir}/terminfo/%{base_name}.terminfo %changelog +* Wed Mar 05 2025 Gilver E. +- Update to 1.1.3~tip^20250305git66e8d91-2%{?dist} + * Ghostty now has localization support via gettext as well as corresponding localization files * Fri Jan 31 2025 Gilver E. -- Update to 1.1.1-1%{?dist}.20250131tipc5508e7 +- Update to 1.1.1~tip^20250131git5508e7-1%{?dist} * Low GHSA-98wc-794w-gjx3: Ghostty leaked file descriptors allowing the shell and any of its child processes to impact other Ghostty terminal instances * Better Git versioning scheme * Ghostty terminfo source files are now a subpackage From 46bb0965f3fe707c314f337c562eb1b8a553dd39 Mon Sep 17 00:00:00 2001 From: Gilver Date: Fri, 7 Mar 2025 08:05:30 -0600 Subject: [PATCH 0190/2977] refactor(pokeget-rs): Bundled provides and use `%git_clone` (#3772) * Drop global date Signed-off-by: Gilver * Bundled packages are versioned differently, my bad Signed-off-by: Gilver * Since I know how `%git_clone` works now maybe... Signed-off-by: Gilver * Update pokeget-rs.spec Signed-off-by: Gilver * Oops Signed-off-by: Gilver * Actually... Signed-off-by: Gilver * Right...RPMBuild Signed-off-by: Gilver * Cleanup unused macros? Signed-off-by: Gilver * Macro everything Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/misc/pokeget-rs/pokeget-rs.spec | 14 +++----------- anda/misc/pokeget-rs/update.rhai | 1 - 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/anda/misc/pokeget-rs/pokeget-rs.spec b/anda/misc/pokeget-rs/pokeget-rs.spec index 9902d125b1..aa430bf5e8 100644 --- a/anda/misc/pokeget-rs/pokeget-rs.spec +++ b/anda/misc/pokeget-rs/pokeget-rs.spec @@ -1,34 +1,26 @@ %global pname pokesprite %global pcommit c5aaa610ff2acdf7fd8e2dccd181bca8be9fcb3e -%global pshortcommit %(c=%{pcommit}; echo ${c:0:7}) -%global pcommit_date 20220622 %global shortname pokeget Name: %{shortname}-rs Version: 1.6.3 -Release: 2%{?dist} +Release: 3%{?dist} SourceLicense: MIT License: MIT AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-2-Clause AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) Summary: A better Rust version of pokeget. URL: https://github.com/talwat/%{name} -Source0: %{url}/archive/refs/tags/%{version}.tar.gz -Source1: https://github.com/msikma/%{pname}/archive/%{pcommit}/%{pname}-%{pcommit}.tar.gz#/%{pname}-%{pshortcommit}.tar.gz BuildRequires: anda-srpm-macros BuildRequires: cargo-rpm-macros BuildRequires: mold Provides: pokeget = %{version}-%{release} -Provides: bundled(%{pname}) = 2.7.0^%{pcommit_date}.%{pshortcommit} +Provides: bundled(%{pname}) = %{pcommit} Packager: Gilver E. %description Successor to pokeget, written in Rust. %prep -%autosetup -n %{name}-%{version} -mkdir -p data/%{pname} -pushd data/%{pname} -/usr/bin/gzip -dc '%{SOURCE1}' | /usr/bin/tar -xof - --strip-components=1 -popd +%git_clone %{url} %{version} %cargo_prep_online %build diff --git a/anda/misc/pokeget-rs/update.rhai b/anda/misc/pokeget-rs/update.rhai index 6e9adc7f26..30c9297bf3 100644 --- a/anda/misc/pokeget-rs/update.rhai +++ b/anda/misc/pokeget-rs/update.rhai @@ -5,5 +5,4 @@ if rpm.changed () { let json = get(url).json(); let c = json.2.sha; rpm.global("pcommit", c); - rpm.global("pcommit_date", date()); // could potentially result in the wrong date, fix if it becomes a problem } From 51338372098002838c827edfe0ec91d1f55cce41 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 7 Mar 2025 16:44:20 +0000 Subject: [PATCH 0191/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index 55fc6e74ec..8c0d8db61e 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.3.1 +Version: 2025.3.2 Release: 1%?dist Summary: Front-end to your dev env From 2d60646f8e5dad79ad0e238ae377881165d575e3 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 7 Mar 2025 19:37:23 +0000 Subject: [PATCH 0192/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 63e4c39f28..ca7c6bab3c 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.177.4-pre +%global ver 0.177.5-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From f68a17df37c0dd44fb37025b84c765324b9fa36d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 7 Mar 2025 20:23:38 +0000 Subject: [PATCH 0193/2977] bump: limine --- anda/system/limine/limine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/limine/limine.spec b/anda/system/limine/limine.spec index 107c6af847..e6d128928e 100644 --- a/anda/system/limine/limine.spec +++ b/anda/system/limine/limine.spec @@ -1,5 +1,5 @@ Name: limine -Version: 9.0.1 +Version: 9.1.0 Release: 1%?dist Summary: Modern, advanced, portable, multiprotocol bootloader License: BSD-2-Clause From 73b194c14398338c3b2de85d7e5a0d9a6b1e898a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 7 Mar 2025 20:47:18 +0000 Subject: [PATCH 0194/2977] bump: chezmoi --- anda/langs/go/chezmoi/chezmoi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/go/chezmoi/chezmoi.spec b/anda/langs/go/chezmoi/chezmoi.spec index 7b78a9d847..923e5d2613 100644 --- a/anda/langs/go/chezmoi/chezmoi.spec +++ b/anda/langs/go/chezmoi/chezmoi.spec @@ -4,7 +4,7 @@ # https://github.com/twpayne/chezmoi %global goipath github.com/twpayne/chezmoi -Version: 2.60.0 +Version: 2.60.1 %gometa -f From f776bef049176d87b8ab1f3bdb3c4899d457ae5c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 7 Mar 2025 22:49:55 +0000 Subject: [PATCH 0195/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index ba843468ca..73761cd8ea 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.05.063837 +Version: 2025.03.07.211453 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 0ad8401f02376c3982ce92090a0eaba5c2011268 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 7 Mar 2025 23:18:28 +0000 Subject: [PATCH 0196/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 94cddc97b2..b3d963dce5 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.605 +Version: 0.0.606 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 0a84f289a9..f11841a7e1 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.605 +Version: 0.0.606 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From e7a7fda24c112fb39851b4c34f9d14646999d06f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 7 Mar 2025 23:28:41 +0000 Subject: [PATCH 0197/2977] bump: komikku --- anda/apps/komikku/komikku.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/komikku/komikku.spec b/anda/apps/komikku/komikku.spec index e561b816c5..0f490ad80a 100644 --- a/anda/apps/komikku/komikku.spec +++ b/anda/apps/komikku/komikku.spec @@ -5,7 +5,7 @@ %global pure_protobuf_version 2.0.0 Name: komikku -Version: 1.71.0 +Version: 1.72.0 %forgemeta Release: 1%?dist Summary: A manga reader for GNOME From f431703eb474f7ed880f4bbab48f787cbdf8d9df Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 8 Mar 2025 01:14:31 +0000 Subject: [PATCH 0198/2977] bump(nightly): mpv nightly nightly nim-nightly astal nvidia-patch --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/lib/astal/astal/astal.spec | 4 ++-- anda/system/nvidia-patch/nvidia-patch.spec | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index d58b13b987..51c28776d5 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 2799d8b130d7d400ea5bf2dbf1e3ce8b529a8843 +%global commit 561156217e665b233523e5a73f914a7266128772 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250307 +%global commit_date 20250308 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 3782ff2a41..97c827f099 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit e07b6fdf6ba342eb1fc4321c26fe5a6475be5133 +%global commit e03e98e106e96d9ceff5a9781b147376eaed0491 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-03-05 +%global fulldate 2025-03-07 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index c7f40e1a20..fe7b86f1a4 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 6c025507b64455e1af3a080ef4a9c4d279b32206 +%global commit 450d727a04c774bb5d6484f6b8591b9d077b26f9 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250307 +%global commit_date 20250308 %global ver 0.178.0 %bcond_with check diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index e19741c07e..3dbf19e054 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 569d02e212774ca4745ad968d05b69b75a9bcec7 +%global commit dfab30734b08a021de53f63ccddc65701f356e67 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250306 +%global commit_date 20250308 %global debug_package %nil Name: nim-nightly diff --git a/anda/lib/astal/astal/astal.spec b/anda/lib/astal/astal/astal.spec index d7849be431..7e8af0c929 100644 --- a/anda/lib/astal/astal/astal.spec +++ b/anda/lib/astal/astal/astal.spec @@ -1,7 +1,7 @@ -%global commit db51a2bfdb726405660d300936cb6c7251785a0b +%global commit e14e19c220575446c4a0e815705c88b28e3850e0 %global shortcommit %{sub %commit 1 7} -%global commit_date 20250306 +%global commit_date 20250308 Name: astal Version: 0^%commit_date.%shortcommit diff --git a/anda/system/nvidia-patch/nvidia-patch.spec b/anda/system/nvidia-patch/nvidia-patch.spec index e2657b762c..35f5960de2 100644 --- a/anda/system/nvidia-patch/nvidia-patch.spec +++ b/anda/system/nvidia-patch/nvidia-patch.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} -%global commit ecbc5c6d5619314c9dc835f470844536c5201fd0 +%global commit a4dd61b439fd267147cc4650edbcae3ffabc5933 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250227 +%global commit_date 20250308 %global patches %{_datadir}/src/nvidia-patch From 48c9e6782321570b8824ed15ed7cf12c5a995955 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 8 Mar 2025 01:25:57 +0000 Subject: [PATCH 0199/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 0e6988a768..7477f1470c 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-06 +%global ver 2025-03-08 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From cff6ed1adc89ddd4c723444a7758d73615ebd74b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 8 Mar 2025 01:52:45 +0000 Subject: [PATCH 0200/2977] bump(branch): astal-gtk --- anda/lib/astal/astal-gtk/astal-gtk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/astal/astal-gtk/astal-gtk.spec b/anda/lib/astal/astal-gtk/astal-gtk.spec index 433c14a265..40f9765ee4 100644 --- a/anda/lib/astal/astal-gtk/astal-gtk.spec +++ b/anda/lib/astal/astal-gtk/astal-gtk.spec @@ -1,5 +1,5 @@ -%global commit db51a2b -%global commit_date 20250306 +%global commit e14e19c +%global commit_date 20250308 Name: astal Version: 0^%commit_date.%commit From a9e351e3376227dbcadebd3d25368e3af087b9c8 Mon Sep 17 00:00:00 2001 From: Pornpipat Popum Date: Sat, 8 Mar 2025 09:33:32 +0700 Subject: [PATCH 0201/2977] Separate v4l2loopback kmod from userspace tools (#3766) * Separate v4l2loopback kmod from userspace tools This fixes an issue where akmods rebuilds and reinstalls the entire userspace tools when updated, causing updates to be broken on non-Fedora systems (i.e Ultramarine) * move modprobe config * oops * ok i am fucking high --- anda/system/v4l2loopback/akmod/anda.hcl | 8 +++ .../modprobe-d-98-v4l2loopback.conf | 0 .../modules-load-d-v4l2loopback.conf | 0 anda/system/v4l2loopback/akmod/update.rhai | 1 + .../v4l2loopback/akmod/v4l2loopback-kmod.spec | 72 +++++++++++++++++++ anda/system/v4l2loopback/v4l2loopback.spec | 43 ++--------- 6 files changed, 88 insertions(+), 36 deletions(-) create mode 100644 anda/system/v4l2loopback/akmod/anda.hcl rename anda/system/v4l2loopback/{ => akmod}/modprobe-d-98-v4l2loopback.conf (100%) rename anda/system/v4l2loopback/{ => akmod}/modules-load-d-v4l2loopback.conf (100%) create mode 100644 anda/system/v4l2loopback/akmod/update.rhai create mode 100644 anda/system/v4l2loopback/akmod/v4l2loopback-kmod.spec diff --git a/anda/system/v4l2loopback/akmod/anda.hcl b/anda/system/v4l2loopback/akmod/anda.hcl new file mode 100644 index 0000000000..b47f435690 --- /dev/null +++ b/anda/system/v4l2loopback/akmod/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "v4l2loopback-kmod.spec" + } + labels { + mock = 1 + } +} diff --git a/anda/system/v4l2loopback/modprobe-d-98-v4l2loopback.conf b/anda/system/v4l2loopback/akmod/modprobe-d-98-v4l2loopback.conf similarity index 100% rename from anda/system/v4l2loopback/modprobe-d-98-v4l2loopback.conf rename to anda/system/v4l2loopback/akmod/modprobe-d-98-v4l2loopback.conf diff --git a/anda/system/v4l2loopback/modules-load-d-v4l2loopback.conf b/anda/system/v4l2loopback/akmod/modules-load-d-v4l2loopback.conf similarity index 100% rename from anda/system/v4l2loopback/modules-load-d-v4l2loopback.conf rename to anda/system/v4l2loopback/akmod/modules-load-d-v4l2loopback.conf diff --git a/anda/system/v4l2loopback/akmod/update.rhai b/anda/system/v4l2loopback/akmod/update.rhai new file mode 100644 index 0000000000..fd9dec4b15 --- /dev/null +++ b/anda/system/v4l2loopback/akmod/update.rhai @@ -0,0 +1 @@ +rpm.version(gh_tag("umlaeute/v4l2loopback")); diff --git a/anda/system/v4l2loopback/akmod/v4l2loopback-kmod.spec b/anda/system/v4l2loopback/akmod/v4l2loopback-kmod.spec new file mode 100644 index 0000000000..99d650fd71 --- /dev/null +++ b/anda/system/v4l2loopback/akmod/v4l2loopback-kmod.spec @@ -0,0 +1,72 @@ +# The reason why this package is a separate from the main one despite using the same sources +# is because akmods use the srpm to build the kmod package, and if the kmod package is included +# in the main package, akmods will reinstall the userspace package every time the kernel is updated. + +# I made the mistake of combining the specs when I ported this from RPMFusion, but to be fair +# they barely document anything. + +%global buildforkernels akmod +%global debug_package %{nil} + +%global commit 2c9b67072b15d903fecde67c7f269abeafee4c25 +%global commitdate 20230503 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global modulename v4l2loopback +Name: %{modulename}-kmod +Summary: Kernel module (kmod) for V4L2 loopback devices +Version: 0.14.0 +Release: 2%?dist +License: GPLv2+ +URL: https://github.com/umlaeute/v4l2loopback +Source0: %{url}/archive/v%{version}/%{modulename}-%{version}.tar.gz +Source1: modprobe-d-98-v4l2loopback.conf +Source2: modules-load-d-v4l2loopback.conf +Packager: Cappy Ishihara + +BuildRequires: gcc +BuildRequires: make +BuildRequires: help2man +BuildRequires: systemd-rpm-macros +BuildRequires: kmodtool +Requires: kernel-devel + +%{expand:%(kmodtool --target %{_target_cpu} --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } + +%description +This module allows you to create "virtual video devices". Normal (v4l2) applications will read these devices as if they were ordinary video devices, but the video will not be read from e.g. a capture card but instead it is generated by another application. + + +%prep +%{?kmodtool_check} +kmodtool --target %{_target_cpu} --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null + +%autosetup -p1 -n %{modulename}-%{version} + + +%build + +for kernel_version in %{?kernel_versions} ; do + make V=1 %{?_smp_mflags} M=${PWD}/_kmod_build_${kernel_version%%___*} VERSION=v%{version} v4l2loopback +done + + +%install +for kernel_version in %{?kernel_versions}; do + mkdir -p %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ + install -D -m 755 v4l2loopback.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ + chmod a+x %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/*.ko +done + +%{?akmod_install} + +install -D -m 0644 %{SOURCE1} %{buildroot}%{_modprobedir}/98-v4l2loopback.conf +install -D -m 0644 %{SOURCE2} %{buildroot}%{_modulesloaddir}/v4l2loopback.conf + +%files +%doc README.md AUTHORS NEWS +%license COPYING +%{_modprobedir}/98-v4l2loopback.conf +%{_modulesloaddir}/v4l2loopback.conf + +%changelog +%autochangelog diff --git a/anda/system/v4l2loopback/v4l2loopback.spec b/anda/system/v4l2loopback/v4l2loopback.spec index 216989c074..d9c46e3ce8 100644 --- a/anda/system/v4l2loopback/v4l2loopback.spec +++ b/anda/system/v4l2loopback/v4l2loopback.spec @@ -8,75 +8,47 @@ Name: v4l2loopback Summary: Utils for V4L2 loopback devices Version: 0.14.0 -Release: 1%?dist +Release: 2%?dist License: GPLv2+ URL: https://github.com/umlaeute/v4l2loopback Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +Packager: Cappy Ishihara -Source1: modprobe-d-98-v4l2loopback.conf -Source2: modules-load-d-v4l2loopback.conf BuildRequires: gcc BuildRequires: make BuildRequires: help2man BuildRequires: systemd-rpm-macros BuildRequires: kmodtool BuildRequires: systemd-rpm-macros -Requires: akmod-%{name} = %{version}-%{release} +Requires: %{name}-kmod Provides: %{name}-kmod-common = %{version}-%{release} -# Required for akmod-v4l2loopback -Requires: help2man ### For compatibility with older names Provides: %{name}-utils = %{version}-%{release} Obsoletes: %{name}-utils < 0.12.5-2 -%{expand:%(kmodtool --target %{_target_cpu} --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description -Allows creation of virtual video devices. Normal (v4l2) applications will read these devices as if they were ordinary video devices. - -%package kmod -Summary: Kernel module (kmod) for %{name} -Requires: kernel-devel - -%description kmod -This module allows you to create "virtual video devices". Normal (v4l2) applications will read these devices as if they were ordinary video devices, but the video will not be read from e.g. a capture card but instead it is generated by another application. - +Allows you to create "virtual video devices". Normal (v4l2) applications will read these devices as if they were ordinary video devices, but the video will not be read from e.g. a capture card but instead it is generated by another application. %prep -%{?kmodtool_check} -kmodtool --target %{_target_cpu} --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null %autosetup -p1 -n %{name}-%{version} -# for kernel_version in %{?kernel_versions} ; do -# cp -av ./* _kmod_build_${kernel_version%%___*} -# done - %build -for kernel_version in %{?kernel_versions} ; do - make V=1 %{?_smp_mflags} M=${PWD}/_kmod_build_${kernel_version%%___*} VERSION=v%{version} v4l2loopback -done - %{set_build_flags} %make_build utils %install -for kernel_version in %{?kernel_versions}; do - mkdir -p %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ - install -D -m 755 v4l2loopback.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ - chmod a+x %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/*.ko -done + %{set_build_flags} %make_build utils -%{?akmod_install} + make V=1 %{?_smp_mflags} install-utils DESTDIR=%{buildroot} PREFIX=%{_prefix} make V=1 %{?_smp_mflags} install-man DESTDIR=%{buildroot} PREFIX=%{_prefix} -install -D -m 0644 %{SOURCE1} %{buildroot}%{_modprobedir}/98-v4l2loopback.conf -install -D -m 0644 %{SOURCE2} %{buildroot}%{_modulesloaddir}/v4l2loopback.conf @@ -85,8 +57,7 @@ install -D -m 0644 %{SOURCE2} %{buildroot}%{_modulesloaddir}/v4l2loopback.conf %license COPYING %attr(0755,root,root) %{_bindir}/v4l2loopback-ctl %attr(0644,root,root) %{_mandir}/man1/v4l2loopback-ctl.1* -%{_modprobedir}/98-v4l2loopback.conf -%{_modulesloaddir}/v4l2loopback.conf + %changelog %autochangelog From 6da39c7564ba3ef76a4d16e3845bba5d844ac07a Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 8 Mar 2025 05:19:14 -0600 Subject: [PATCH 0202/2977] Add: Rio (#3788) * Add files * Apparently the URL updated * Add some deps Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/devs/rio/anda.hcl | 5 ++++ anda/devs/rio/rio.spec | 51 +++++++++++++++++++++++++++++++++++++++ anda/devs/rio/update.rhai | 1 + 3 files changed, 57 insertions(+) create mode 100644 anda/devs/rio/anda.hcl create mode 100644 anda/devs/rio/rio.spec create mode 100644 anda/devs/rio/update.rhai diff --git a/anda/devs/rio/anda.hcl b/anda/devs/rio/anda.hcl new file mode 100644 index 0000000000..1bd79453a3 --- /dev/null +++ b/anda/devs/rio/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "rio.spec" + } +} diff --git a/anda/devs/rio/rio.spec b/anda/devs/rio/rio.spec new file mode 100644 index 0000000000..307fdb8bcd --- /dev/null +++ b/anda/devs/rio/rio.spec @@ -0,0 +1,51 @@ +%global _description %{expand: +A hardware-accelerated terminal emulator focusing to run in desktops and browsers.} + +Name: rio +Version: 0.2.8 +Release: 1%{?dist} +Summary: A hardware-accelerated terminal written in Rust. +SourceLicense: MIT +License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND Apache-2.0 AND BSD-2-Clause AND BSL-1.0 AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND CC0-1.0 AND ISC AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND (MPL-2.0 OR GPL-3.0-only) AND MPL-2.0+ AND MPL-2.0 AND Unicode-3.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND Zlib +URL: http://rioterm.com +Source0: https://github.com/raphamorim/%{name}/archive/refs/tags/v%{version}.tar.gz +BuildRequires: anda-srpm-macros +BuildRequires: cargo-rpm-macros +BuildRequires: freetype-devel +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: libxcb-devel +BuildRequires: libxkbcommon-devel +BuildRequires: mold +Requires: freetype +Requires: fontconfig +Requires: hicolor-icon-theme +Requires: libgcc +Packager: Gilver E. + +%description %_description + +%prep +%autosetup -n %{name}-%{version} +%cargo_prep_online + +%build +%cargo_build -a + +%install +install -Dm755 target/rpm/%{name} %{buildroot}%{_bindir}/%{name} +install -Dm644 misc/%{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop +install -Dm644 misc/logo.svg %{buildroot}%{_iconsdir}/hicolor/scalable/apps/%{name}.svg +%{cargo_license_online -a} > LICENSE.dependencies + +%files +%doc README.md +%license LICENSE +%license LICENSE.dependencies +%{_bindir}/%{name} +%{_datadir}/applications/%{name}.desktop +%{_iconsdir}/hicolor/scalable/apps/%{name}.svg + +%changelog +* Sat Mar 8 2025 Gilver E. +- Initial package diff --git a/anda/devs/rio/update.rhai b/anda/devs/rio/update.rhai new file mode 100644 index 0000000000..3cd7f82d9c --- /dev/null +++ b/anda/devs/rio/update.rhai @@ -0,0 +1 @@ +rpm.version(crates("rioterm")); From 25ed84e23b8cfa707cf8413c445233c7979c06eb Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 8 Mar 2025 14:12:50 +0000 Subject: [PATCH 0203/2977] bump: uutils-coreutils-replace --- .../uutils-coreutils-replace/uutils-coreutils-replace.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/system/uutils-coreutils-replace/uutils-coreutils-replace.spec b/anda/system/uutils-coreutils-replace/uutils-coreutils-replace.spec index 71a27ffd2c..0dc63a0da3 100644 --- a/anda/system/uutils-coreutils-replace/uutils-coreutils-replace.spec +++ b/anda/system/uutils-coreutils-replace/uutils-coreutils-replace.spec @@ -5,8 +5,8 @@ %endif Name: uutils-coreutils-replace -Version: 0.0.29 -Release: 2%?dist +Version: 0.0.30 +Release: 1%?dist Summary: Cross-platform Rust rewrite of the GNU coreutils License: MIT URL: https://github.com/uutils/coreutils From 7c48f6b27e00a9385867cf48ea53be081a65e75d Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 8 Mar 2025 09:31:01 -0600 Subject: [PATCH 0204/2977] fix(rio): Rename package to Crate name due to a Fedora provides (#3794) * Fedora has some random package named this?? * Bump release already * While I'm here I'll copy the PKGBUILD Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/devs/rio/rio.spec | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/anda/devs/rio/rio.spec b/anda/devs/rio/rio.spec index 307fdb8bcd..5518b4f8d7 100644 --- a/anda/devs/rio/rio.spec +++ b/anda/devs/rio/rio.spec @@ -1,14 +1,15 @@ %global _description %{expand: A hardware-accelerated terminal emulator focusing to run in desktops and browsers.} +%global realname rio -Name: rio +Name: %{realname}term Version: 0.2.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A hardware-accelerated terminal written in Rust. SourceLicense: MIT License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND Apache-2.0 AND BSD-2-Clause AND BSL-1.0 AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND CC0-1.0 AND ISC AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND (MPL-2.0 OR GPL-3.0-only) AND MPL-2.0+ AND MPL-2.0 AND Unicode-3.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND Zlib URL: http://rioterm.com -Source0: https://github.com/raphamorim/%{name}/archive/refs/tags/v%{version}.tar.gz +Source0: https://github.com/raphamorim/%{realname}/archive/refs/tags/v%{version}.tar.gz BuildRequires: anda-srpm-macros BuildRequires: cargo-rpm-macros BuildRequires: freetype-devel @@ -26,25 +27,25 @@ Packager: Gilver E. %description %_description %prep -%autosetup -n %{name}-%{version} +%autosetup -n %{realname}-%{version} %cargo_prep_online %build %cargo_build -a %install -install -Dm755 target/rpm/%{name} %{buildroot}%{_bindir}/%{name} -install -Dm644 misc/%{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop -install -Dm644 misc/logo.svg %{buildroot}%{_iconsdir}/hicolor/scalable/apps/%{name}.svg +install -Dm755 target/rpm/%{realname} %{buildroot}%{_bindir}/%{realname} +install -Dm644 misc/%{realname}.desktop %{buildroot}%{_datadir}/applications/%{realname}.desktop +install -Dm644 docs/static/assets/%{realname}-logo.svg %{buildroot}%{_iconsdir}/hicolor/scalable/apps/%{realname}.svg %{cargo_license_online -a} > LICENSE.dependencies %files %doc README.md %license LICENSE %license LICENSE.dependencies -%{_bindir}/%{name} -%{_datadir}/applications/%{name}.desktop -%{_iconsdir}/hicolor/scalable/apps/%{name}.svg +%{_bindir}/%{realname} +%{_datadir}/applications/%{realname}.desktop +%{_iconsdir}/hicolor/scalable/apps/%{realname}.svg %changelog * Sat Mar 8 2025 Gilver E. From d178ee6029fb192daae5aa30a124ab5d3c405b8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Garc=C3=ADa?= <4411661+GarciaLnk@users.noreply.github.com> Date: Sat, 8 Mar 2025 17:03:56 +0000 Subject: [PATCH 0205/2977] fix(devpod): add current version and rename binary with spaces (#3799) * fix(devpod): rename binary with spaces i hate spaces * fix(devpod): add current version to devpod cli and desktop * chore: bump releasever --- anda/devs/devpod/golang-github-loft-sh-devpod.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/anda/devs/devpod/golang-github-loft-sh-devpod.spec b/anda/devs/devpod/golang-github-loft-sh-devpod.spec index 2a862302be..1a9b3969f6 100644 --- a/anda/devs/devpod/golang-github-loft-sh-devpod.spec +++ b/anda/devs/devpod/golang-github-loft-sh-devpod.spec @@ -17,7 +17,7 @@ and lets you use any cloud, kubernetes or just localhost docker.} loadtest/README.md Name: devpod -Release: 1%?dist +Release: 2%?dist Summary: Codespaces but open-source, client-only and unopinionated: Works with any IDE and lets you use any cloud, kubernetes or just localhost docker Provides: golang-github-loft-sh-devpod BuildRequires: anda-srpm-macros mold @@ -58,11 +58,13 @@ sed -i '/Comment=/s@DevPod@%summary@' %{S:1} %define gomodulesmode GO111MODULE=on # just remove -v -x for godsake %define gobuild_baseflags %{gocompilerflags} -tags="rpm_crashtraceback ${GO_BUILDTAGS-${BUILDTAGS-}}" -a +%define gobuild_ldflags -s -w -X github.com/loft-sh/devpod/pkg/version.version="v%version" ${GO_LDFLAGS-${LDFLAGS-}} %{?currentgoldflags} -B 0x$(echo "%{name}-%{version}-%{release}-${SOURCE_DATE_EPOCH:-}" | sha1sum | cut -d ' ' -f1) -compressdwarf=false -linkmode=external -extldflags '%{build_ldflags} %{?__golang_extldflags}' %define gobuilddir %_builddir/%buildsubdir # build cli (%{gobuild -o %{gobuilddir}/bin/devpod .}) & pushd desktop +yarn version --new-version %version --no-git-tag-version & yarn install & pushd src-tauri # cargo licenses @@ -82,7 +84,7 @@ popd # desktop install -m 0755 -vd %{buildroot}%{_bindir} install -m 0755 -vp bin/devpod %{buildroot}%{_bindir}/ # tauri -install -Dm755 desktop/src-tauri/target/rpm/DevPod -t %buildroot%_bindir +install -Dm755 "desktop/src-tauri/target/rpm/DevPod Desktop" %buildroot%_bindir/DevPod-Desktop install -Dm644 %{S:1} -t %buildroot%_datadir/applications/ install -Dm644 desktop/devpod.png -t %buildroot%_datadir/pixmaps/ @@ -92,6 +94,6 @@ install -Dm644 desktop/devpod.png -t %buildroot%_datadir/pixmaps/ %{_bindir}/devpod %files desktop -%_bindir/DevPod +%_bindir/DevPod-Desktop %_datadir/applications/DevPod.desktop %_datadir/pixmaps/devpod.png From 4ffdaa4f06e0a0200da7d53ac86543567deaec5f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 8 Mar 2025 21:18:32 +0000 Subject: [PATCH 0206/2977] bump: codium --- anda/devs/codium/codium.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/codium/codium.spec b/anda/devs/codium/codium.spec index 4baad4d10d..c4aa1eb6a1 100644 --- a/anda/devs/codium/codium.spec +++ b/anda/devs/codium/codium.spec @@ -12,7 +12,7 @@ %endif Name: codium -Version: 1.97.2.25045 +Version: 1.98.0.25067 Release: 1%?dist Summary: Code editing. Redefined. License: MIT From fb69e592e2989f8f0ddb4e21a5ab12c8eccd44e2 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 9 Mar 2025 01:20:25 +0000 Subject: [PATCH 0207/2977] bump(nightly): nightly mpv nightly micro nightly astal spotx-bash --- anda/apps/legcord/nightly/legcord-nightly.spec | 4 ++-- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/micro/micro-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/lib/astal/astal/astal.spec | 4 ++-- anda/tools/spotx-bash/spotx-bash.spec | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/anda/apps/legcord/nightly/legcord-nightly.spec b/anda/apps/legcord/nightly/legcord-nightly.spec index 266b7fe418..127bc2c0f0 100644 --- a/anda/apps/legcord/nightly/legcord-nightly.spec +++ b/anda/apps/legcord/nightly/legcord-nightly.spec @@ -1,5 +1,5 @@ -%global commit 1833760c8be5b5fd4a76bbcd0cf1632d7bff0216 -%global commit_date 20250215 +%global commit e293f9c7353cfda83d7be65841ade9f8c904b346 +%global commit_date 20250309 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define debug_package %nil diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 51c28776d5..a5e0e568e9 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 561156217e665b233523e5a73f914a7266128772 +%global commit d9cf7a3d395ca160face9fd0c649c7aab274a93a %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250308 +%global commit_date 20250309 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 97c827f099..a3e31d8022 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit e03e98e106e96d9ceff5a9781b147376eaed0491 +%global commit d3fd2b02e71f3eaecd310b246ee64a26a59b78e3 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-03-07 +%global fulldate 2025-03-08 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 diff --git a/anda/devs/micro/micro-nightly.spec b/anda/devs/micro/micro-nightly.spec index fb28114599..c12698bc4c 100644 --- a/anda/devs/micro/micro-nightly.spec +++ b/anda/devs/micro/micro-nightly.spec @@ -12,8 +12,8 @@ # Naming variable as something other than "commit" is necessary # to stop %%gometa from putting commit hash in release -%global commit_hash 2ae9812f47745f79bb4faa7e1916b984ee967e62 -%global commit_date 20250305 +%global commit_hash 98356765c14be7a937a09e120e12f419c46052a7 +%global commit_date 20250309 %global shortcommit %{sub %{commit_hash} 1 7} %global ver 2.0.14 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index fe7b86f1a4..7066cc0f7f 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 450d727a04c774bb5d6484f6b8591b9d077b26f9 +%global commit ed6bf7f161c6af6e10354faacb8b643a55c80b27 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250308 +%global commit_date 20250309 %global ver 0.178.0 %bcond_with check diff --git a/anda/lib/astal/astal/astal.spec b/anda/lib/astal/astal/astal.spec index 7e8af0c929..68fd8ffbd6 100644 --- a/anda/lib/astal/astal/astal.spec +++ b/anda/lib/astal/astal/astal.spec @@ -1,7 +1,7 @@ -%global commit e14e19c220575446c4a0e815705c88b28e3850e0 +%global commit f38433594051ee75957720d1c36de00896a67eb6 %global shortcommit %{sub %commit 1 7} -%global commit_date 20250308 +%global commit_date 20250309 Name: astal Version: 0^%commit_date.%shortcommit diff --git a/anda/tools/spotx-bash/spotx-bash.spec b/anda/tools/spotx-bash/spotx-bash.spec index 617dca8987..38eac043ba 100644 --- a/anda/tools/spotx-bash/spotx-bash.spec +++ b/anda/tools/spotx-bash/spotx-bash.spec @@ -1,5 +1,5 @@ -%global commit 979f4a0a815903847e3286cdcc5312b556a74ae9 -%global commit_date 20250307 +%global commit 4b34ec0211e7634b6716913e8c13c791f21b68b3 +%global commit_date 20250309 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: spotx-bash From 80e0d258892c4d5c6c173b06d89a952481a24f65 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 9 Mar 2025 02:00:11 +0000 Subject: [PATCH 0208/2977] bump(branch): astal-gtk --- anda/lib/astal/astal-gtk/astal-gtk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/astal/astal-gtk/astal-gtk.spec b/anda/lib/astal/astal-gtk/astal-gtk.spec index 40f9765ee4..fb0a7d10bb 100644 --- a/anda/lib/astal/astal-gtk/astal-gtk.spec +++ b/anda/lib/astal/astal-gtk/astal-gtk.spec @@ -1,5 +1,5 @@ -%global commit e14e19c -%global commit_date 20250308 +%global commit f384335 +%global commit_date 20250309 Name: astal Version: 0^%commit_date.%commit From b97e98dba593d11179e556a9586531eaeecef053 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 8 Mar 2025 20:16:16 -0600 Subject: [PATCH 0209/2977] fix(ghostty-nightly): Add gtk4-layer-shell build dependency (#3789) * Shrimp Signed-off-by: Gilver * Bump release Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/devs/ghostty/nightly/ghostty-nightly.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index a3e31d8022..2e7e009fa5 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -14,7 +14,7 @@ Name: %{base_name}-nightly Version: %{ver}~tip^%{commit_date}git%{shortcommit} -Release: 1%?dist +Release: 2%?dist %if 0%{?fedora} <= 41 Epoch: 1 %endif @@ -37,6 +37,7 @@ BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gtk4) +BuildRequires: pkgconfig(gtk4-layer-shell-0) BuildRequires: pkgconfig(harfbuzz) BuildRequires: pkgconfig(libadwaita-1) BuildRequires: pkgconfig(libpng) From b7c19dbd473ee4d04fc5ccbf5a90f0b183a6b7bd Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 8 Mar 2025 20:17:44 -0600 Subject: [PATCH 0210/2977] Fix deps (#3806) Signed-off-by: Gilver --- anda/misc/pokeshell/pokeshell.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/anda/misc/pokeshell/pokeshell.spec b/anda/misc/pokeshell/pokeshell.spec index e968178af0..05a130405e 100644 --- a/anda/misc/pokeshell/pokeshell.spec +++ b/anda/misc/pokeshell/pokeshell.spec @@ -6,7 +6,7 @@ Name: pokeshell Version: %{ver}^%{date}git.%{shortcommit} -Release: 2%{?dist} +Release: 3%{?dist} Summary: A shell program to show Pokémon sprites in the terminal. License: GPL-3.0-or-later URL: https://github.com/acxz/pokeshell @@ -17,7 +17,8 @@ Requires: bash Requires: jq Requires: ImageMagick Requires: python3 -Requires: (timg or chafa) +Requires: chafa +Recommends: timg BuildArch: noarch Packager: Gilver E. From 86f887dcdcff8ac9bc62e78aa751f63359c6eab3 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 8 Mar 2025 20:34:16 -0600 Subject: [PATCH 0211/2977] fix(mesa): Deprecate libglapi (#3807) * Pull in upstream changes Signed-off-by: Gilver * Bump release? Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/lib/mesa/mesa.spec | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index e8140d9b98..b28745bee9 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -76,7 +76,7 @@ Summary: Mesa graphics libraries # disabled by default, and has to be enabled manually. See `terra/release/terra-mesa.repo` for details. Epoch: 1 Version: 25.0.1 -Release: 1%?dist +Release: 2%?dist License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org @@ -264,6 +264,7 @@ Recommends: %{name}-va-drivers%{?_isa} Summary: Mesa-based VA-API video acceleration drivers Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: %{name}-vaapi-drivers < 22.2.0-5 +Obsoletes: %{name}-libglapi < 25.0.0~rc2-1 %description va-drivers %{summary}. @@ -335,18 +336,6 @@ Provides: libxatracker-devel%{?_isa} %{summary}. %endif -%package libglapi -Summary: Mesa shared glapi -Provides: libglapi -Provides: libglapi%{?_isa} -# If mesa-dri-drivers are installed, they must match in version. This is here to prevent using -# older mesa-dri-drivers together with a newer mesa-libglapi or its dependants. -# See https://bugzilla.redhat.com/show_bug.cgi?id=2193135 . -Requires: (%{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} if %{name}-dri-drivers%{?_isa}) - -%description libglapi -%{summary}. - %if 0%{?with_opencl} %package libOpenCL Summary: Mesa OpenCL runtime library @@ -510,7 +499,6 @@ popd %dir %{_includedir}/GL/internal %{_includedir}/GL/internal/dri_interface.h %{_libdir}/pkgconfig/dri.pc -%{_libdir}/libglapi.so %files libEGL %{_datadir}/glvnd/egl_vendor.d/50_mesa.json @@ -520,10 +508,6 @@ popd %{_includedir}/EGL/eglext_angle.h %{_includedir}/EGL/eglmesaext.h -%files libglapi -%{_libdir}/libglapi.so.0 -%{_libdir}/libglapi.so.0.* - %files libOSMesa %{_libdir}/libOSMesa.so.8* %files libOSMesa-devel From 327fd2c2256c9399a83fc47ca2f6d7f4e562dabf Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 8 Mar 2025 22:22:02 -0600 Subject: [PATCH 0212/2977] Add: xpad-noone (#3787) * Add: xpad-noone * Unmacro * Missing build deps * The funny? Signed-off-by: Gilver * Blegh Signed-off-by: Gilver * Update dkms-xpad-noone.spec Signed-off-by: Gilver * Update xpad-noone-kmod.spec Signed-off-by: Gilver * Update dkms-xpad-noone.spec Signed-off-by: Gilver * Fixes * Do what now Signed-off-by: Gilver * LMAO Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/system/xpad-noone/akmod/0000.patch | 43 +++++++++++++ anda/system/xpad-noone/akmod/anda.hcl | 8 +++ anda/system/xpad-noone/akmod/update.rhai | 12 ++++ .../xpad-noone/akmod/xpad-noone-kmod.spec | 60 +++++++++++++++++++ anda/system/xpad-noone/dkms/0000.patch | 43 +++++++++++++ anda/system/xpad-noone/dkms/anda.hcl | 9 +++ .../xpad-noone/dkms/dkms-xpad-noone.spec | 57 ++++++++++++++++++ .../xpad-noone/dkms/no-weak-modules.conf | 1 + anda/system/xpad-noone/dkms/update.rhai | 12 ++++ anda/system/xpad-noone/kmod-common/anda.hcl | 9 +++ .../system/xpad-noone/kmod-common/update.rhai | 8 +++ .../xpad-noone/kmod-common/xpad-noone.spec | 52 ++++++++++++++++ 12 files changed, 314 insertions(+) create mode 100644 anda/system/xpad-noone/akmod/0000.patch create mode 100644 anda/system/xpad-noone/akmod/anda.hcl create mode 100644 anda/system/xpad-noone/akmod/update.rhai create mode 100644 anda/system/xpad-noone/akmod/xpad-noone-kmod.spec create mode 100644 anda/system/xpad-noone/dkms/0000.patch create mode 100644 anda/system/xpad-noone/dkms/anda.hcl create mode 100644 anda/system/xpad-noone/dkms/dkms-xpad-noone.spec create mode 100644 anda/system/xpad-noone/dkms/no-weak-modules.conf create mode 100644 anda/system/xpad-noone/dkms/update.rhai create mode 100644 anda/system/xpad-noone/kmod-common/anda.hcl create mode 100644 anda/system/xpad-noone/kmod-common/update.rhai create mode 100644 anda/system/xpad-noone/kmod-common/xpad-noone.spec diff --git a/anda/system/xpad-noone/akmod/0000.patch b/anda/system/xpad-noone/akmod/0000.patch new file mode 100644 index 0000000000..59826a8f7f --- /dev/null +++ b/anda/system/xpad-noone/akmod/0000.patch @@ -0,0 +1,43 @@ +--- a/xpad.c ++++ b/xpad.c +@@ -117,6 +117,7 @@ static const struct xpad_device { + u8 xtype; + } xpad_device[] = { + { 0x0079, 0x18d4, "GPD Win 2 X-Box Controller", 0, XTYPE_XBOX360 }, ++ { 0x16d0, 0x10bc, "Cyborg Compact Gamingkeypad", 0, XTYPE_XBOX360 }, + { 0x03eb, 0xff01, "Wooting One (Legacy)", 0, XTYPE_XBOX360 }, + { 0x03eb, 0xff02, "Wooting Two (Legacy)", 0, XTYPE_XBOX360 }, + { 0x044f, 0x0f00, "Thrustmaster Wheel", 0, XTYPE_XBOX }, +@@ -303,6 +304,7 @@ static const struct xpad_device { + { 0x24c6, 0xfafe, "Rock Candy Gamepad for Xbox 360", 0, XTYPE_XBOX360 }, + { 0x2563, 0x058d, "OneXPlayer Gamepad", 0, XTYPE_XBOX360 }, + { 0x2dc8, 0x3106, "8BitDo Pro 2 Wired Controller", 0, XTYPE_XBOX360 }, ++ { 0x2dc8, 0x3109, "8BitDo Ultimate Wireless Bluetooth", 0, XTYPE_XBOX360 }, + { 0x31e3, 0x1100, "Wooting One", 0, XTYPE_XBOX360 }, + { 0x31e3, 0x1200, "Wooting Two", 0, XTYPE_XBOX360 }, + { 0x31e3, 0x1210, "Wooting Lekker", 0, XTYPE_XBOX360 }, +@@ -311,7 +313,8 @@ static const struct xpad_device { + { 0x31e3, 0x1310, "Wooting 60HE (ARM)", 0, XTYPE_XBOX360 }, + { 0x3285, 0x0607, "Nacon GC-100", 0, XTYPE_XBOX360 }, + { 0x3537, 0x1004, "GameSir T4 Kaleid", 0, XTYPE_XBOX360 }, ++ { 0x413d, 0x2104, "Black Shark Green Ghost Gamepad", 0, XTYPE_XBOX360 }, + { 0x3767, 0x0101, "Fanatec Speedster 3 Forceshock Wheel", 0, XTYPE_XBOX }, + { 0xffff, 0xffff, "Chinese-made Xbox Controller", 0, XTYPE_XBOX }, + { 0x0000, 0x0000, "Generic X-Box pad", 0, XTYPE_UNKNOWN } + }; +@@ -384,6 +387,7 @@ static const signed short xpad_abs_triggers[] = { + + static const struct usb_device_id xpad_table[] = { + { USB_INTERFACE_INFO('X', 'B', 0) }, /* Xbox USB-IF not-approved class */ ++ XPAD_XBOX360_VENDOR(0x16d0), /* Azeron Custom Gamingkeypad Vendor */ + XPAD_XBOX360_VENDOR(0x0079), /* GPD Win 2 controller */ + XPAD_XBOX360_VENDOR(0x03eb), /* Wooting Keyboards (Legacy) */ + XPAD_XBOX360_VENDOR(0x044f), /* Thrustmaster Xbox 360 controllers */ +@@ -420,6 +424,7 @@ + XPAD_XBOX360_VENDOR(0x31e3), /* Wooting Keyboards */ + XPAD_XBOX360_VENDOR(0x3285), /* Nacon GC-100 */ + XPAD_XBOX360_VENDOR(0x3537), /* GameSir Controllers */ ++ XPAD_XBOX360_VENDOR(0x413d), /* Black Shark Green Ghost Controller */ + { } + }; + diff --git a/anda/system/xpad-noone/akmod/anda.hcl b/anda/system/xpad-noone/akmod/anda.hcl new file mode 100644 index 0000000000..c4b205f12c --- /dev/null +++ b/anda/system/xpad-noone/akmod/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "xpad-noone-kmod.spec" + } + labels { + mock = 1 + } +} diff --git a/anda/system/xpad-noone/akmod/update.rhai b/anda/system/xpad-noone/akmod/update.rhai new file mode 100644 index 0000000000..0678161b52 --- /dev/null +++ b/anda/system/xpad-noone/akmod/update.rhai @@ -0,0 +1,12 @@ +let c = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +c.pop(); +rpm.global("commit", c); +if rpm.changed() { + rpm.release(); + let d = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout; + d.pop(); + rpm.global("commit_date", d); + let v = sh("cat anda/system/xpad-noone/kmod-common/xpadneo-noone.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; + v.pop(); + rpm.global("ver", v); +} diff --git a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec new file mode 100644 index 0000000000..64e15a9fd3 --- /dev/null +++ b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec @@ -0,0 +1,60 @@ +%global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commit_date 20240109 +%global ver 1.0 +%global modulename xpad-noone +%global debug_package %{nil} +%global buildforkernels akmod +%global _description %{expand: +This is the original upstream xpad driver from the Linux kernel with support for XBox One controllers removed. If you are running the xone driver you may have to replace the xpad kernel module with this one to retain the functionality of XBox and XBox 360 controllers.} + +Name: %{modulename}-kmod +Version: %{ver}^%{commit_date}git.%{shortcommit} +Release: 1%{?dist} +License: GPL-2.0-or-later +Summary: xpad driver with support for XBox One controllers removed +URL: https://github.com/medusalix/xpad-noone +Source0: %{url}/archive/%{commit}/%{modulename}-%{commit}.tar.gz#/%{modulename}-%{shortcommit}.tar.gz +# Extra support for controllers that register as XBox 360 controllers +Patch0: 0000.patch +BuildRequires: gcc +BuildRequires: kmodtool +BuildRequires: make +BuildRequires: systemd-rpm-macros +Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} +Requires: %{modulename}-akmod-modules +Requires: akmods +Conflicts: dkms-%{modulename} +Packager: Gilver E. + +%{expand:%(kmodtool --target %{_target_cpu} --repo terra --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } + +%description %_description + +%prep +%{?kmodtool_check} + +kmodtool --target %{_target_cpu} --repo terra --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null + +%autosetup -n %{modulename}-%{commit} -p1 + +for kernel_version in %{?kernel_versions} ; do + cp -a %{modulename}-%{commit} _kmod_build_${kernel_version%%___*} +done + +%build +for kernel_version in %{?kernel_versions} ; do + make V=1 %{?_smp_mflags} -C ${kernel_version##*___} M=${PWD}/_kmod_build_${kernel_version%%___*} VERSION=v%{version} modules +done + +%install +for kernel_version in %{?kernel_versions}; do + mkdir -p %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ + install -D -m 755 _kmod_build_${kernel_version%%___*}/%{modulename}.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ + chmod a+x %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/%{modulename}.ko +done +%{?akmod_install} + +%changelog +* Fri Mar 07 2025 Gilver E. +- Initial package diff --git a/anda/system/xpad-noone/dkms/0000.patch b/anda/system/xpad-noone/dkms/0000.patch new file mode 100644 index 0000000000..59826a8f7f --- /dev/null +++ b/anda/system/xpad-noone/dkms/0000.patch @@ -0,0 +1,43 @@ +--- a/xpad.c ++++ b/xpad.c +@@ -117,6 +117,7 @@ static const struct xpad_device { + u8 xtype; + } xpad_device[] = { + { 0x0079, 0x18d4, "GPD Win 2 X-Box Controller", 0, XTYPE_XBOX360 }, ++ { 0x16d0, 0x10bc, "Cyborg Compact Gamingkeypad", 0, XTYPE_XBOX360 }, + { 0x03eb, 0xff01, "Wooting One (Legacy)", 0, XTYPE_XBOX360 }, + { 0x03eb, 0xff02, "Wooting Two (Legacy)", 0, XTYPE_XBOX360 }, + { 0x044f, 0x0f00, "Thrustmaster Wheel", 0, XTYPE_XBOX }, +@@ -303,6 +304,7 @@ static const struct xpad_device { + { 0x24c6, 0xfafe, "Rock Candy Gamepad for Xbox 360", 0, XTYPE_XBOX360 }, + { 0x2563, 0x058d, "OneXPlayer Gamepad", 0, XTYPE_XBOX360 }, + { 0x2dc8, 0x3106, "8BitDo Pro 2 Wired Controller", 0, XTYPE_XBOX360 }, ++ { 0x2dc8, 0x3109, "8BitDo Ultimate Wireless Bluetooth", 0, XTYPE_XBOX360 }, + { 0x31e3, 0x1100, "Wooting One", 0, XTYPE_XBOX360 }, + { 0x31e3, 0x1200, "Wooting Two", 0, XTYPE_XBOX360 }, + { 0x31e3, 0x1210, "Wooting Lekker", 0, XTYPE_XBOX360 }, +@@ -311,7 +313,8 @@ static const struct xpad_device { + { 0x31e3, 0x1310, "Wooting 60HE (ARM)", 0, XTYPE_XBOX360 }, + { 0x3285, 0x0607, "Nacon GC-100", 0, XTYPE_XBOX360 }, + { 0x3537, 0x1004, "GameSir T4 Kaleid", 0, XTYPE_XBOX360 }, ++ { 0x413d, 0x2104, "Black Shark Green Ghost Gamepad", 0, XTYPE_XBOX360 }, + { 0x3767, 0x0101, "Fanatec Speedster 3 Forceshock Wheel", 0, XTYPE_XBOX }, + { 0xffff, 0xffff, "Chinese-made Xbox Controller", 0, XTYPE_XBOX }, + { 0x0000, 0x0000, "Generic X-Box pad", 0, XTYPE_UNKNOWN } + }; +@@ -384,6 +387,7 @@ static const signed short xpad_abs_triggers[] = { + + static const struct usb_device_id xpad_table[] = { + { USB_INTERFACE_INFO('X', 'B', 0) }, /* Xbox USB-IF not-approved class */ ++ XPAD_XBOX360_VENDOR(0x16d0), /* Azeron Custom Gamingkeypad Vendor */ + XPAD_XBOX360_VENDOR(0x0079), /* GPD Win 2 controller */ + XPAD_XBOX360_VENDOR(0x03eb), /* Wooting Keyboards (Legacy) */ + XPAD_XBOX360_VENDOR(0x044f), /* Thrustmaster Xbox 360 controllers */ +@@ -420,6 +424,7 @@ + XPAD_XBOX360_VENDOR(0x31e3), /* Wooting Keyboards */ + XPAD_XBOX360_VENDOR(0x3285), /* Nacon GC-100 */ + XPAD_XBOX360_VENDOR(0x3537), /* GameSir Controllers */ ++ XPAD_XBOX360_VENDOR(0x413d), /* Black Shark Green Ghost Controller */ + { } + }; + diff --git a/anda/system/xpad-noone/dkms/anda.hcl b/anda/system/xpad-noone/dkms/anda.hcl new file mode 100644 index 0000000000..fe3344b493 --- /dev/null +++ b/anda/system/xpad-noone/dkms/anda.hcl @@ -0,0 +1,9 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "dkms-xpad-noone.spec" + } + labels { + mock = 1 + } +} diff --git a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec new file mode 100644 index 0000000000..1a1a9e4234 --- /dev/null +++ b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec @@ -0,0 +1,57 @@ +%global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commit_date 20240109 +%global ver 1.0 +%global modulename xpad-noone +%global _description %{expand: +This is the original upstream xpad driver from the Linux kernel with support for XBox One controllers removed. If you are running the xone driver you may have to replace the xpad kernel module with this one to retain the functionality of XBox and XBox 360 controllers.} + +Name: dkms-%{modulename} +Version: %{ver}^%{commit_date}git.%{shortcommit} +Release: 1%{?dist} +License: GPL-2.0-or-later +Summary: xpad driver with support for XBox One controllers removed +URL: https://github.com/medusalix/xpad-noone +Source0: %{url}/archive/%{commit}/%{modulename}-%{commit}.tar.gz#/%{modulename}-%{shortcommit}.tar.gz +Source1: no-weak-modules.conf +# Extra support for controllers that register as XBox 360 controllers +Patch0: 0000.patch +Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} +Requires: dkms +Conflicts: akmod-%{modulename} +BuildArch: noarch +Packager: Gilver E. + +%description %_description + +%prep +%autosetup -n %{modulename}-%{commit} + +%build + +%install +mkdir -p %{buildroot}%{_usrsrc}/%{modulename}-%{version}/ +rm -rf LICENSE README.md +cp -fr ./* %{buildroot}%{_usrsrc}/%{modulename}-%{version}/ + +%if 0%{?fedora} +install -Dpm644 %{SOURCE1} %{buildroot}%{_sysconfdir}/dkms/%{modulename}.conf +%endif + +%post +dkms add -m %{modulename} -v %{version} -q --rpm_safe_upgrade || : +dkms build -m %{modulename} -v %{version} -q || : +dkms install -m %{modulename} -v %{version} -q --force || : + +%preun +dkms remove -m %{modulename} -v %{version} -q --all --rpm_safe_upgrade || : + +%files +%{_usrsrc}/%{modulename}-%{version} +%if 0%{?fedora} +%{_sysconfdir}/dkms/%{modulename}.conf +%endif + +%changelog +* Fri Mar 07 2025 Gilver E. +- Initial package diff --git a/anda/system/xpad-noone/dkms/no-weak-modules.conf b/anda/system/xpad-noone/dkms/no-weak-modules.conf new file mode 100644 index 0000000000..24f6f95c96 --- /dev/null +++ b/anda/system/xpad-noone/dkms/no-weak-modules.conf @@ -0,0 +1 @@ +NO_WEAK_MODULES="yes" diff --git a/anda/system/xpad-noone/dkms/update.rhai b/anda/system/xpad-noone/dkms/update.rhai new file mode 100644 index 0000000000..0678161b52 --- /dev/null +++ b/anda/system/xpad-noone/dkms/update.rhai @@ -0,0 +1,12 @@ +let c = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +c.pop(); +rpm.global("commit", c); +if rpm.changed() { + rpm.release(); + let d = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout; + d.pop(); + rpm.global("commit_date", d); + let v = sh("cat anda/system/xpad-noone/kmod-common/xpadneo-noone.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; + v.pop(); + rpm.global("ver", v); +} diff --git a/anda/system/xpad-noone/kmod-common/anda.hcl b/anda/system/xpad-noone/kmod-common/anda.hcl new file mode 100644 index 0000000000..87bd38dc9a --- /dev/null +++ b/anda/system/xpad-noone/kmod-common/anda.hcl @@ -0,0 +1,9 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "xpad-noone.spec" + } + labels { + nightly = 1 + } +} diff --git a/anda/system/xpad-noone/kmod-common/update.rhai b/anda/system/xpad-noone/kmod-common/update.rhai new file mode 100644 index 0000000000..699ca77a39 --- /dev/null +++ b/anda/system/xpad-noone/kmod-common/update.rhai @@ -0,0 +1,8 @@ +rpm.global("commit", gh_commit("medusalix/xpad-noone")); +if rpm.changed() { + rpm.release(); + rpm.global("commit_date", date()); + let html = get(`https://raw.githubusercontent.com/medusalix/xpad-noone/refs/heads/master/dkms.conf`); + let v = find("PACKAGE_VERSION=\"([\\d.]+)\"", html, 1); + rpm.global("ver", v); +} diff --git a/anda/system/xpad-noone/kmod-common/xpad-noone.spec b/anda/system/xpad-noone/kmod-common/xpad-noone.spec new file mode 100644 index 0000000000..36e0fe2c1d --- /dev/null +++ b/anda/system/xpad-noone/kmod-common/xpad-noone.spec @@ -0,0 +1,52 @@ +%global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commit_date 20240109 +%global ver 1.0 +%global _description %{expand: +This is the original upstream xpad driver from the Linux kernel with support for XBox One controllers removed. If you are running the xone driver you may have to replace the xpad kernel module with this one to retain the functionality of XBox and XBox 360 controllers.} + +Name: xpad-noone +Version: %{ver}^%{commit_date}git.%{shortcommit} +Release: 1%{?dist} +License: GPL-2.0-or-later +Summary: xpad driver with support for XBox One controllers removed +URL: https://github.com/medusalix/xpad-noone +Source0: %{url}/archive/%{commit}/%{name}-%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz +BuildRequires: sed +BuildRequires: systemd-rpm-macros +Provides: %{name}-kmod-common = %{?epoch:%{epoch}:}%{version} +Requires: (akmod-%{name} = %{?epoch:%{epoch}:}%{version} or dkms-%{name} = %{?epoch:%{epoch}:}%{version}) +Conflicts: xow <= 0.5 +Obsoletes: xow <= 0.5 +BuildArch: noarch +Packager: Gilver E. + +%description %_description + +%package akmod-modules +Summary: Modules for Akmods +Requires: akmod-%{name} +BuildArch: noarch + +%description akmod-modules +Akmods modules for the akmod-%{name} package. + +%prep +%autosetup -n %{name}-%{commit} +/usr/bin/sed -nE '/^BUILT_MODULE_NAME/{s@^.+"(.+)"@\1@; s|-|_|g; p}' dkms.conf > %{name}.conf + +%build + +%install +install -Dm644 %{name}.conf -t %{buildroot}%{_modulesloaddir} + +%files +%doc README.md +%license LICENSE + +%files akmod-modules +%{_modulesloaddir}/%{name}.conf + +%changelog +* Fri Mar 07 2025 Gilver E. +- Initial package From e820507a4743eca38150f35ef112f2217a099188 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 8 Mar 2025 22:23:13 -0600 Subject: [PATCH 0213/2977] refactor(xpadneo, xone): Fix potential installation issues and improve UX (#3785) * Kmod-common subpackaging and more * Update xpadneo.spec Signed-off-by: Gilver * Shouldn't need to be Mock Signed-off-by: Gilver * Shouldn't need to be Mock either Signed-off-by: Gilver * Make this dep on the thing it needs to work please Signed-off-by: Gilver * NOT THAT Signed-off-by: Gilver * THIS one Signed-off-by: Gilver * Requires Signed-off-by: Gilver * Conflicts Signed-off-by: Gilver * Deps Signed-off-by: Gilver * More deps Signed-off-by: Gilver * ? Signed-off-by: Gilver * ?? Signed-off-by: Gilver * Ah Signed-off-by: Gilver * Wheeee Signed-off-by: Gilver * Better... Signed-off-by: Gilver * Yeeeahhh Signed-off-by: Gilver * Update dkms-xpadneo.spec Signed-off-by: Gilver * Update xpadneo-kmod.spec Signed-off-by: Gilver * Fixup those deps * Fix update scripts * Macrooooo --------- Signed-off-by: Gilver --- anda/system/xone/akmod/anda.hcl | 1 - anda/system/xone/akmod/update.rhai | 8 +-- anda/system/xone/akmod/xone-kmod.spec | 24 +++---- anda/system/xone/dkms/anda.hcl | 1 - anda/system/xone/dkms/dkms-xone.spec | 35 ++++++----- ...weak-modules.conf => no-weak-modules.conf} | 0 anda/system/xone/dkms/update.rhai | 8 +-- anda/system/xone/kmod-common/anda.hcl | 3 +- anda/system/xone/kmod-common/update.rhai | 2 +- .../{xone-kmod-common.spec => xone.spec} | 62 ++++++++++++------ anda/system/xpadneo/akmod/anda.hcl | 1 - anda/system/xpadneo/akmod/update.rhai | 8 +-- anda/system/xpadneo/akmod/xpadneo-kmod.spec | 24 +++---- anda/system/xpadneo/dkms/anda.hcl | 1 - anda/system/xpadneo/dkms/dkms-xpadneo.spec | 35 ++++++----- anda/system/xpadneo/dkms/update.rhai | 8 +-- anda/system/xpadneo/kmod-common/anda.hcl | 3 +- .../kmod-common/xpadneo-kmod-common.spec | 46 -------------- anda/system/xpadneo/kmod-common/xpadneo.spec | 63 +++++++++++++++++++ 19 files changed, 180 insertions(+), 153 deletions(-) rename anda/system/xone/dkms/{dkms-no-weak-modules.conf => no-weak-modules.conf} (100%) rename anda/system/xone/kmod-common/{xone-kmod-common.spec => xone.spec} (60%) delete mode 100644 anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec create mode 100644 anda/system/xpadneo/kmod-common/xpadneo.spec diff --git a/anda/system/xone/akmod/anda.hcl b/anda/system/xone/akmod/anda.hcl index fdffbcf94e..a6a830915e 100644 --- a/anda/system/xone/akmod/anda.hcl +++ b/anda/system/xone/akmod/anda.hcl @@ -4,6 +4,5 @@ project pkg { } labels { mock = 1 - updbranch = 1 } } diff --git a/anda/system/xone/akmod/update.rhai b/anda/system/xone/akmod/update.rhai index 9df561bc86..0ac5d9b6bb 100644 --- a/anda/system/xone/akmod/update.rhai +++ b/anda/system/xone/akmod/update.rhai @@ -1,12 +1,12 @@ -let c = sh("cat anda/system/xone/kmod-common/xone-kmod-common.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +let c = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; c.pop(); rpm.global("commit", c); if rpm.changed() { rpm.release(); - let d = sh("cat anda/system/xone/kmod-common/xone-kmod-common.spec | grep '%global date' | sed -E 's/.+date //'", #{"stdout": "piped"}).ctx.stdout; + let d = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout; d.pop(); - rpm.global("date", d); - let v = sh("cat anda/system/xone/kmod-common/xone-kmod-common.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; + rpm.global("commit_date", d); + let v = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; v.pop(); rpm.global("ver", v); } diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index 18f4f5bc77..8986860ac8 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -1,21 +1,24 @@ %global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 -%global date 20241223 +%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.3 %define buildforkernels akmod %global debug_package %{nil} -%global real_name xone +%global modulename xone -Name: %{real_name}-kmod -Version: %{ver}^%{date}git.%{shortcommit} +Name: %{modulename}-kmod +Version: %{ver}^%{commit_date}git.%{shortcommit} Release: 1%?dist Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories License: GPL-2.0-or-later URL: https://github.com/dlundqvist/xone -Source0: %{url}/archive/%{commit}.tar.gz#/xone-%{shortcommit}.tar.gz +Source0: %{url}/archive/%{commit}.tar.gz#/%{modulename}-%{shortcommit}.tar.gz BuildRequires: kmodtool BuildRequires: systemd-rpm-macros -Requires: %{real_name}-kmod-common = %{?epoch:%{epoch}:}%{version} +Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} +Requires: %{modulename}-akmod-modules = %{?epoch:%{epoch}:}%{version} +Requires: akmods +Conflicts: dkms-%{modulename} Packager: Gilver E. %{expand:%(kmodtool --target %{_target_cpu} --repo terra --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } @@ -27,9 +30,7 @@ Linux kernel driver for Xbox One and Xbox Series X|S accessories. %{?kmodtool_check} kmodtool --target %{_target_cpu} --repo terra --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null -%autosetup -p1 -n %{real_name}-%{commit} - -/usr/bin/sed -nE '/^BUILT_MODULE_NAME/{s@^.+"(.+)"@\1@; s|-|_|g; p}' dkms.conf > %{real_name}.conf +%autosetup -p1 -n %{modulename}-%{commit} find . -type f -name '*.c' -exec sed -i "s/#VERSION#/%{version}/" {} \; @@ -46,8 +47,6 @@ for kernel_version in %{?kernel_versions}; do done %install -install -Dm644 %{real_name}.conf -t %{buildroot}%{_modulesloaddir} - for kernel_version in %{?kernel_versions}; do mkdir -p %{buildroot}/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ install -p -m 0755 _kmod_build_${kernel_version%%___*}/*.ko \ @@ -55,9 +54,6 @@ for kernel_version in %{?kernel_versions}; do done %{?akmod_install} -%files -%{_modulesloaddir}/%{real_name}.conf - %changelog * Thu Feb 27 2025 Gilver E. - Initial package diff --git a/anda/system/xone/dkms/anda.hcl b/anda/system/xone/dkms/anda.hcl index 251e8b3edd..e0b7e51d64 100644 --- a/anda/system/xone/dkms/anda.hcl +++ b/anda/system/xone/dkms/anda.hcl @@ -5,6 +5,5 @@ project pkg { } labels { mock = 1 - updbranch = 1 } } diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index 2fbb6b480e..3a3c39ea5a 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -1,22 +1,23 @@ %global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 -%global date 20241223 +%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.3 %global debug_package %{nil} -%global dkms_name xone +%global modulename xone -Name: dkms-%{dkms_name} -Version: %{ver}^%{date}git.%{shortcommit} +Name: dkms-%{modulename} +Version: %{ver}^%{commit_date}git.%{shortcommit} Release: 1%?dist Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories License: GPL-2.0-or-later URL: https://github.com/dlundqvist/xone -Source0: %{url}/archive/%{commit}.tar.gz#/%{dkms_name}-%{shortcommit}.tar.gz -Source1: dkms-no-weak-modules.conf +Source0: %{url}/archive/%{commit}.tar.gz#/%{modulename}-%{shortcommit}.tar.gz +Source1: no-weak-modules.conf BuildRequires: sed BuildRequires: systemd-rpm-macros -Requires: %{dkms_name}-kmod-common = %{?epoch:%{epoch}:}%{version} +Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} Requires: dkms +Conflicts: akmod-%{modulename} BuildArch: noarch Packager: Gilver E. @@ -24,7 +25,7 @@ Packager: Gilver E. Linux kernel driver for Xbox One and Xbox Series X|S accessories. %prep -%autosetup -p1 -n %{dkms_name}-%{commit} +%autosetup -p1 -n %{modulename}-%{commit} sed -i \ -e 's|#VERSION#|%{version}|g' \ @@ -35,28 +36,28 @@ find . -type f -name '*.c' -exec sed -i "s/#VERSION#/%{version}/" {} \; %install # Create empty tree: -mkdir -p %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/ -cp -fr auth bus driver transport Kbuild dkms.conf %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/ +mkdir -p %{buildroot}%{_usrsrc}/%{modulename}-%{version}/ +cp -fr auth bus driver transport Kbuild dkms.conf %{buildroot}%{_usrsrc}/%{modulename}-%{version}/ %if 0%{?fedora} # Do not enable weak modules support in Fedora (no kABI): -install -Dpm644 %{SOURCE1} %{buildroot}%{_sysconfdir}/dkms/%{dkms_name}.conf +install -Dpm644 %{SOURCE1} %{buildroot}%{_sysconfdir}/dkms/%{modulename}.conf %endif %post -dkms add -m %{dkms_name} -v %{version} -q --rpm_safe_upgrade || : +dkms add -m %{modulename} -v %{version} -q --rpm_safe_upgrade || : # Rebuild and make available for the currently running kernel: -dkms build -m %{dkms_name} -v %{version} -q || : -dkms install -m %{dkms_name} -v %{version} -q --force || : +dkms build -m %{modulename} -v %{version} -q || : +dkms install -m %{modulename} -v %{version} -q --force || : %preun # Remove all versions from DKMS registry: -dkms remove -m %{dkms_name} -v %{version} -q --all --rpm_safe_upgrade || : +dkms remove -m %{modulename} -v %{version} -q --all --rpm_safe_upgrade || : %files -%{_usrsrc}/%{dkms_name}-%{version} +%{_usrsrc}/%{modulename}-%{version} %if 0%{?fedora} -%{_sysconfdir}/dkms/%{dkms_name}.conf +%{_sysconfdir}/dkms/%{modulename}.conf %endif %changelog diff --git a/anda/system/xone/dkms/dkms-no-weak-modules.conf b/anda/system/xone/dkms/no-weak-modules.conf similarity index 100% rename from anda/system/xone/dkms/dkms-no-weak-modules.conf rename to anda/system/xone/dkms/no-weak-modules.conf diff --git a/anda/system/xone/dkms/update.rhai b/anda/system/xone/dkms/update.rhai index 9df561bc86..0ac5d9b6bb 100644 --- a/anda/system/xone/dkms/update.rhai +++ b/anda/system/xone/dkms/update.rhai @@ -1,12 +1,12 @@ -let c = sh("cat anda/system/xone/kmod-common/xone-kmod-common.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +let c = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; c.pop(); rpm.global("commit", c); if rpm.changed() { rpm.release(); - let d = sh("cat anda/system/xone/kmod-common/xone-kmod-common.spec | grep '%global date' | sed -E 's/.+date //'", #{"stdout": "piped"}).ctx.stdout; + let d = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout; d.pop(); - rpm.global("date", d); - let v = sh("cat anda/system/xone/kmod-common/xone-kmod-common.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; + rpm.global("commit_date", d); + let v = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; v.pop(); rpm.global("ver", v); } diff --git a/anda/system/xone/kmod-common/anda.hcl b/anda/system/xone/kmod-common/anda.hcl index 78c3e2c23c..bda7b47c56 100644 --- a/anda/system/xone/kmod-common/anda.hcl +++ b/anda/system/xone/kmod-common/anda.hcl @@ -1,10 +1,9 @@ project pkg { arches = ["x86_64"] rpm { - spec = "xone-kmod-common.spec" + spec = "xone.spec" } labels { - mock = 1 nightly = 1 } } diff --git a/anda/system/xone/kmod-common/update.rhai b/anda/system/xone/kmod-common/update.rhai index 5059508641..956d802fe6 100644 --- a/anda/system/xone/kmod-common/update.rhai +++ b/anda/system/xone/kmod-common/update.rhai @@ -1,7 +1,7 @@ rpm.global("commit", gh_commit("dlundqvist/xone")); if rpm.changed() { rpm.release(); - rpm.global("date", date()); + rpm.global("commit_date", date()); let ver = gh_tag("dlundqvist/xone"); ver.crop(1); rpm.global("ver", ver); diff --git a/anda/system/xone/kmod-common/xone-kmod-common.spec b/anda/system/xone/kmod-common/xone.spec similarity index 60% rename from anda/system/xone/kmod-common/xone-kmod-common.spec rename to anda/system/xone/kmod-common/xone.spec index 76f33d3b5c..abea73da92 100644 --- a/anda/system/xone/kmod-common/xone-kmod-common.spec +++ b/anda/system/xone/kmod-common/xone.spec @@ -1,14 +1,13 @@ %global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 -%global date 20241223 +%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.3 -%global real_name xone %global _dracutconfdir %{_prefix}/lib/dracut/dracut.conf.d %global firmware_hash 48084d9fa53b9bb04358f3bb127b7495dc8f7bb0b3ca1437bd24ef2b6eabdf66 -Name: %{real_name}-kmod-common -Version: %{ver}^%{date}git.%{shortcommit} -Release: 1%{?dist} +Name: xone +Version: %{ver}^%{commit_date}git.%{shortcommit} +Release: 2%{?dist} Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories common files License: GPL-2.0-or-later URL: https://github.com/dlundqvist/xone @@ -19,30 +18,44 @@ Source2: http://download.windowsupdate.com/c/msdownload/update/driver/drv ### Microsoft TOU copy: Source3: https://www.microsoft.com/en-us/legal/terms-of-use BuildRequires: cabextract +BuildRequires: sed BuildRequires: systemd-rpm-macros Requires: wireless-regdb -Requires: %{real_name}-firmware = 1.0.46.1 +Requires: %{name}-firmware = 1.0.46.1 +Requires: (akmod-%{name} = %{?epoch:%{epoch}:}%{version} or dkms-%{name} = %{?epoch:%{epoch}:}%{version}) Requires(post): dracut -Provides: %{real_name}-kmod-common = %{?epoch:%{epoch}:}%{version} +Provides: %{name}-kmod-common = %{?epoch:%{epoch}:}%{version} +Obsoletes: %{name}-kmod-common < %{?epoch:%{epoch}:}%{version}-2%{?dist} +Conflicts: xow <= 0.5 +Obsoletes: xow <= 0.5 BuildArch: noarch Packager: Gilver E. %description Linux kernel driver for Xbox One and Xbox Series X|S accessories common files. -%package -n %{real_name}-firmware -Version: 1.0.46.1 -Summary: Firmware for the XBox One controller dongle -License: Proprietary -Requires: wireless-regdb +%package akmod-modules +Summary: Modules for Akmods +Requires: akmod-%{name} BuildArch: noarch -%description -n %{real_name}-firmware +%description akmod-modules +Akmods modules for the akmod-%{name} package. + +%package firmware +Version: 1.0.46.1 +Summary: Firmware for the XBox One controller dongle +License: Proprietary +Requires: wireless-regdb +BuildArch: noarch + +%description firmware Proprietary firmware for XBox controller dongles. %prep -%autosetup -p1 -n xone-%{commit} +%autosetup -p1 -n %{name}-%{commit} /usr/bin/cp %{SOURCE3} . +/usr/bin/sed -nE '/^BUILT_MODULE_NAME/{s@^.+"(.+)"@\1@; s|-|_|g; p}' dkms.conf > %{name}.conf # Firmware: cabextract -F FW_ACC_00U.bin %{SOURCE2} @@ -51,28 +64,37 @@ echo %{firmware_hash} FW_ACC_00U.bin | sha256sum -c %install # xone-gip-headset module should have the snd-pcm and snd-seq modules be preloaded or it will give errors on boot due to injecting late. # It still loads afterwards, but this error is easily fixable by just loading the modules in the initramfs. -install -Dpm644 %{SOURCE1} %{buildroot}%{_dracutconfdir}/60-xone-snd.conf +install -Dpm644 %{SOURCE1} %{buildroot}%{_dracutconfdir}/60-%{name}-snd.conf # Blacklist: -install -Dpm644 install/modprobe.conf %{buildroot}%{_modprobedir}/60-%{real_name}.conf +install -Dpm644 install/modprobe.conf %{buildroot}%{_modprobedir}/60-%{name}.conf # Firmware: install -Dpm644 FW_ACC_00U.bin %{buildroot}%{_prefix}/lib/firmware/xow_dongle.bin +# Akmods modules +install -Dm644 %{name}.conf -t %{buildroot}%{_modulesloaddir} + %files %license LICENSE %doc README.md -%{_modprobedir}/60-%{real_name}.conf -%{_dracutconfdir}/60-%{real_name}-snd.conf +%{_modprobedir}/60-%{name}.conf +%{_dracutconfdir}/60-%{name}-snd.conf -%files -n xone-firmware +%files akmod-modules +%{_modulesloaddir}/%{name}.conf + +%files firmware %license terms-of-use %{_prefix}/lib/firmware/xow_dongle.bin %post /usr/bin/dracut -f -%post -n xone-firmware +%postun +/usr/bin/dracut -f + +%post firmware echo "The firmware for the wireless dongle is subject to Microsoft's Terms of Use:" echo 'https://www.microsoft.com/en-us/legal/terms-of-use' diff --git a/anda/system/xpadneo/akmod/anda.hcl b/anda/system/xpadneo/akmod/anda.hcl index 23ac0b839c..8527b571e3 100644 --- a/anda/system/xpadneo/akmod/anda.hcl +++ b/anda/system/xpadneo/akmod/anda.hcl @@ -4,6 +4,5 @@ project pkg { } labels { mock = 1 - updbranch = 1 } } diff --git a/anda/system/xpadneo/akmod/update.rhai b/anda/system/xpadneo/akmod/update.rhai index cd0af3f5e2..d20f937dc0 100644 --- a/anda/system/xpadneo/akmod/update.rhai +++ b/anda/system/xpadneo/akmod/update.rhai @@ -1,12 +1,12 @@ -let c = sh("cat anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +let c = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; c.pop(); rpm.global("commit", c); if rpm.changed() { rpm.release(); - let d = sh("cat anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec | grep '%global date' | sed -E 's/.+date //'", #{"stdout": "piped"}).ctx.stdout; + let d = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout; d.pop(); - rpm.global("date", d); - let v = sh("cat anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; + rpm.global("commit_date", d); + let v = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; v.pop(); rpm.global("ver", v); } diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec index 6d3c26714e..a2987c2c0a 100644 --- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec +++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec @@ -1,23 +1,26 @@ %global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 -%global date 20241224 +%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.9.7 %define buildforkernels akmod %global debug_package %{nil} -%global real_name xpadneo +%global modulename xpadneo -Name: %{real_name}-kmod -Version: %{ver}^%{date}git.%{shortcommit} -Release: 1%?dist +Name: %{modulename}-kmod +Version: %{ver}^%{commit_date}git.%{shortcommit} +Release: 2%?dist Summary: Advanced Linux Driver for Xbox One Wireless Gamepad License: GPL-3.0 URL: https://atar-axis.github.io/xpadneo Source0: https://github.com/atar-axis/xpadneo/archive/%{commit}.tar.gz#/xpadneo-%{shortcommit}.tar.gz BuildRequires: kmodtool BuildRequires: systemd-rpm-macros +Requires: akmods Requires: bluez Requires: bluez-tools -Requires: %{real_name}-kmod-common = %{?epoch:%{epoch}:}%{version} +Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} +Requires: %{modulename}-akmod-modules = %{?epoch:%{epoch}:}%{version} +Conflicts: dkms-%{modulename} Packager: Gilver E. %{expand:%(kmodtool --target %{_target_cpu} --repo terra --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } @@ -29,9 +32,7 @@ Advanced Linux Driver for Xbox One Wireless Gamepad. %{?kmodtool_check} kmodtool --target %{_target_cpu} --repo terra --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null -%autosetup -p1 -n %{real_name}-%{commit} - -/usr/bin/sed -nE '/^BUILT_MODULE_NAME/{s@^.+"(.+)"@\1@; s|-|_|g; p}' hid-%{real_name}/dkms.conf.in > %{real_name}.conf +%autosetup -p1 -n %{modulename}-%{commit} for kernel_version in %{?kernel_versions}; do mkdir _kmod_build_${kernel_version%%___*} @@ -46,8 +47,6 @@ for kernel_version in %{?kernel_versions}; do done %install -install -Dm644 %{real_name}.conf -t %{buildroot}%{_modulesloaddir} - for kernel_version in %{?kernel_versions}; do mkdir -p %{buildroot}/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ install -p -m 0755 _kmod_build_${kernel_version%%___*}/*.ko \ @@ -55,9 +54,6 @@ for kernel_version in %{?kernel_versions}; do done %{?akmod_install} -%files -%{_modulesloaddir}/%{real_name}.conf - %changelog * Thu Feb 27 2025 Gilver E. - Package refactoring for alternative DKMS package compatibility diff --git a/anda/system/xpadneo/dkms/anda.hcl b/anda/system/xpadneo/dkms/anda.hcl index 99098cb318..cade80863c 100644 --- a/anda/system/xpadneo/dkms/anda.hcl +++ b/anda/system/xpadneo/dkms/anda.hcl @@ -5,6 +5,5 @@ project pkg { } labels { mock = 1 - updbranch = 1 } } diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec index ae1fd9c52b..80a647a07f 100644 --- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec @@ -1,24 +1,25 @@ %global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 -%global date 20241224 +%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.9.7 %global debug_package %{nil} -%global dkms_name xpadneo +%global modulename xpadneo -Name: dkms-%{dkms_name} -Version: %{ver}^%{date}git.%{shortcommit} +Name: dkms-%{modulename} +Version: %{ver}^%{commit_date}git.%{shortcommit} Release: 1%?dist Summary: Advanced Linux Driver for Xbox One Wireless Gamepad License: GPL-3.0 -URL: https://atar-axis.github.io/%{dkms_name} -Source0: https://github.com/atar-axis/%{dkms_name}/archive/%{commit}.tar.gz#/%{dkms_name}-%{shortcommit}.tar.gz +URL: https://atar-axis.github.io/%{modulename} +Source0: https://github.com/atar-axis/%{modulename}/archive/%{commit}.tar.gz#/%{modulename}-%{shortcommit}.tar.gz Source1: %{name}.conf Source2: no-weak-modules.conf BuildRequires: sed Requires: bluez Requires: bluez-tools -Requires: %{dkms_name}-kmod-common = %{?epoch:%{epoch}:}%{version} +Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} Requires: dkms +Conflicts: akmod-%{modulename} BuildArch: noarch Packager: Gilver E. @@ -26,7 +27,7 @@ Packager: Gilver E. Advanced Linux Driver for Xbox One Wireless Gamepad. %prep -%autosetup -p1 -n %{dkms_name}-%{commit} +%autosetup -p1 -n %{modulename}-%{commit} cp -f %{SOURCE1} hid-xpadneo/src/dkms.conf @@ -38,28 +39,28 @@ sed -i -e 's/$(VERSION)/v%{version}/g' hid-xpadneo/src/Makefile %install # Create empty tree: -mkdir -p %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/ -cp -fr hid-xpadneo/src/* %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/ +mkdir -p %{buildroot}%{_usrsrc}/%{modulename}-%{version}/ +cp -fr hid-xpadneo/src/* %{buildroot}%{_usrsrc}/%{modulename}-%{version}/ %if 0%{?fedora} # Do not enable weak modules support in Fedora (no kABI): -install -Dpm644 %{SOURCE2} %{buildroot}%{_sysconfdir}/dkms/%{dkms_name}.conf +install -Dpm644 %{SOURCE2} %{buildroot}%{_sysconfdir}/dkms/%{modulename}.conf %endif %post -dkms add -m %{dkms_name} -v %{version} -q --rpm_safe_upgrade || : +dkms add -m %{modulename} -v %{version} -q --rpm_safe_upgrade || : # Rebuild and make available for the currently running kernel: -dkms build -m %{dkms_name} -v %{version} -q || : -dkms install -m %{dkms_name} -v %{version} -q --force || : +dkms build -m %{modulename} -v %{version} -q || : +dkms install -m %{modulename} -v %{version} -q --force || : %preun # Remove all versions from DKMS registry: -dkms remove -m %{dkms_name} -v %{version} -q --all --rpm_safe_upgrade || : +dkms remove -m %{modulename} -v %{version} -q --all --rpm_safe_upgrade || : %files -%{_usrsrc}/%{dkms_name}-%{version} +%{_usrsrc}/%{modulename}-%{version} %if 0%{?fedora} -%{_sysconfdir}/dkms/%{dkms_name}.conf +%{_sysconfdir}/dkms/%{modulename}.conf %endif %changelog diff --git a/anda/system/xpadneo/dkms/update.rhai b/anda/system/xpadneo/dkms/update.rhai index cd0af3f5e2..d20f937dc0 100644 --- a/anda/system/xpadneo/dkms/update.rhai +++ b/anda/system/xpadneo/dkms/update.rhai @@ -1,12 +1,12 @@ -let c = sh("cat anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +let c = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; c.pop(); rpm.global("commit", c); if rpm.changed() { rpm.release(); - let d = sh("cat anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec | grep '%global date' | sed -E 's/.+date //'", #{"stdout": "piped"}).ctx.stdout; + let d = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout; d.pop(); - rpm.global("date", d); - let v = sh("cat anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; + rpm.global("commit_date", d); + let v = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; v.pop(); rpm.global("ver", v); } diff --git a/anda/system/xpadneo/kmod-common/anda.hcl b/anda/system/xpadneo/kmod-common/anda.hcl index 353eb4917d..9b58032693 100644 --- a/anda/system/xpadneo/kmod-common/anda.hcl +++ b/anda/system/xpadneo/kmod-common/anda.hcl @@ -1,10 +1,9 @@ project pkg { arches = ["x86_64"] rpm { - spec = "xpadneo-kmod-common.spec" + spec = "xpadneo.spec" } labels { - mock = 1 nightly = 1 } } diff --git a/anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec b/anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec deleted file mode 100644 index 67cf5a00b8..0000000000 --- a/anda/system/xpadneo/kmod-common/xpadneo-kmod-common.spec +++ /dev/null @@ -1,46 +0,0 @@ -%global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 -%global date 20241224 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global ver 0.9.7 -%global real_name xpadneo - -Name: %{real_name}-kmod-common -Version: %{ver}^%{date}git.%{shortcommit} -Release: 3%{?dist} -Summary: Advanced Linux Driver for Xbox One Wireless Gamepad common files -License: GPL-3.0 -URL: https://atar-axis.github.io/%{real_name} -Source0: https://github.com/atar-axis/%{real_name}/archive/%{commit}.tar.gz#/%{real_name}-%{shortcommit}.tar.gz -Source1: io.github.xpadneo.metainfo.xml -BuildRequires: systemd-rpm-macros -Provides: %{real_name}-kmod-common = %{?epoch:%{epoch}:}%{version} -Obsoletes: %{real_name} < %{?epoch:%{epoch}:}%{version} -BuildArch: noarch -Packager: Gilver E. - -%description -Advanced Linux Driver for Xbox One Wireless Gamepad common files. - -%prep -%autosetup -p1 -n %{real_name}-%{commit} - -%install -# Aliases: -install -Dpm644 hid-%{real_name}/etc-modprobe.d/%{real_name}.conf -t %{buildroot}%{_modprobedir} - -# UDev rules: -install -Dpm644 hid-%{real_name}/etc-udev-rules.d/*.rules -t %{buildroot}%{_udevrulesdir}/ - -# Metadata -install -Dm644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo/io.github.xpadneo.metainfo.xml - -%files -%license LICENSE -%doc docs/*.md -%{_modprobedir}/%{real_name}.conf -%{_udevrulesdir}/60-%{real_name}.rules -%{_udevrulesdir}/70-%{real_name}-disable-hidraw.rules -%{_datadir}/metainfo/io.github.xpadneo.metainfo.xml - -%changelog -%autochangelog diff --git a/anda/system/xpadneo/kmod-common/xpadneo.spec b/anda/system/xpadneo/kmod-common/xpadneo.spec new file mode 100644 index 0000000000..b437e551e8 --- /dev/null +++ b/anda/system/xpadneo/kmod-common/xpadneo.spec @@ -0,0 +1,63 @@ +%global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 +%global commit_date 20241224 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global ver 0.9.7 + +Name: xpadneo +Version: %{ver}^%{commit_date}git.%{shortcommit} +Release: 4%{?dist} +Summary: Advanced Linux Driver for Xbox One Wireless Gamepad common files +License: GPL-3.0 +URL: https://atar-axis.github.io/%{name} +Source0: https://github.com/atar-axis/%{name}/archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz +Source1: io.github.%{name}.metainfo.xml +BuildRequires: sed +BuildRequires: systemd-rpm-macros +Requires: (akmod-%{name} = %{?epoch:%{epoch}:}%{version} or dkms-%{name} = %{?epoch:%{epoch}:}%{version}) +Provides: %{name}-kmod-common = %{?epoch:%{epoch}:}%{version} +Obsoletes: %{name}-kmod-common < %{?epoch:%{epoch}:}%{version}-3%{?dist} +BuildArch: noarch +Packager: Gilver E. + +%description +Advanced Linux Driver for Xbox One Wireless Gamepad common files. + +%package akmod-modules +Summary: Modules for Akmods +Requires: akmod-%{name} +BuildArch: noarch + +%description akmod-modules +Akmods modules for the akmod-%{name} package. + +%prep +%autosetup -p1 -n %{name}-%{commit} +/usr/bin/sed -nE '/^BUILT_MODULE_NAME/{s@^.+"(.+)"@\1@; s|-|_|g; p}' hid-%{name}/dkms.conf.in > %{name}.conf + +%install +# Aliases: +install -Dpm644 hid-%{name}/etc-modprobe.d/%{name}.conf -t %{buildroot}%{_modprobedir} + +# UDev rules: +install -Dpm644 hid-%{name}/etc-udev-rules.d/*.rules -t %{buildroot}%{_udevrulesdir}/ + +# Metadata +install -Dm644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo/io.github.%{name}.metainfo.xml + +# Akmods modules +install -Dm644 %{name}.conf -t %{buildroot}%{_modulesloaddir} + +%files +%license LICENSE +%doc docs/*.md +%{_modprobedir}/%{name}.conf +%{_udevrulesdir}/60-%{name}.rules +%{_udevrulesdir}/70-%{name}-disable-hidraw.rules +%{_datadir}/metainfo/io.github.%{name}.metainfo.xml + +%files akmod-modules +%{_modulesloaddir}/%{name}.conf + +%changelog +* Fri Mar 07 2025 Gilver E. +- Package refactoring From 88484e0f5f88e73b21cd24492732d64c68bd3c93 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 9 Mar 2025 04:31:10 +0000 Subject: [PATCH 0214/2977] bump: akmod dkms akmod dkms akmod dkms --- anda/system/xone/akmod/xone-kmod.spec | 1 + anda/system/xone/dkms/dkms-xone.spec | 1 + anda/system/xpad-noone/akmod/xpad-noone-kmod.spec | 5 +++-- anda/system/xpad-noone/dkms/dkms-xpad-noone.spec | 5 +++-- anda/system/xpadneo/akmod/xpadneo-kmod.spec | 3 ++- anda/system/xpadneo/dkms/dkms-xpadneo.spec | 1 + 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index 8986860ac8..f1c17ba42b 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -1,5 +1,6 @@ %global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 %global commit_date 20241223 +%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.3 %define buildforkernels akmod diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index 3a3c39ea5a..f56d801d06 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -1,5 +1,6 @@ %global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 %global commit_date 20241223 +%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.3 %global debug_package %{nil} diff --git a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec index 64e15a9fd3..ada296cd87 100644 --- a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec +++ b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec @@ -1,7 +1,8 @@ %global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5 +%global commit_date 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date 20240109 -%global ver 1.0 +%global ver %global modulename xpad-noone %global debug_package %{nil} %global buildforkernels akmod @@ -10,7 +11,7 @@ This is the original upstream xpad driver from the Linux kernel with support for Name: %{modulename}-kmod Version: %{ver}^%{commit_date}git.%{shortcommit} -Release: 1%{?dist} +Release: 1%?dist License: GPL-2.0-or-later Summary: xpad driver with support for XBox One controllers removed URL: https://github.com/medusalix/xpad-noone diff --git a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec index 1a1a9e4234..6f783a8666 100644 --- a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec +++ b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec @@ -1,14 +1,15 @@ %global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5 +%global commit_date 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date 20240109 -%global ver 1.0 +%global ver %global modulename xpad-noone %global _description %{expand: This is the original upstream xpad driver from the Linux kernel with support for XBox One controllers removed. If you are running the xone driver you may have to replace the xpad kernel module with this one to retain the functionality of XBox and XBox 360 controllers.} Name: dkms-%{modulename} Version: %{ver}^%{commit_date}git.%{shortcommit} -Release: 1%{?dist} +Release: 1%?dist License: GPL-2.0-or-later Summary: xpad driver with support for XBox One controllers removed URL: https://github.com/medusalix/xpad-noone diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec index a2987c2c0a..ccab8b7746 100644 --- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec +++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec @@ -1,5 +1,6 @@ %global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 %global commit_date 20241224 +%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.9.7 %define buildforkernels akmod @@ -8,7 +9,7 @@ Name: %{modulename}-kmod Version: %{ver}^%{commit_date}git.%{shortcommit} -Release: 2%?dist +Release: 1%?dist Summary: Advanced Linux Driver for Xbox One Wireless Gamepad License: GPL-3.0 URL: https://atar-axis.github.io/xpadneo diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec index 80a647a07f..7218fda2dc 100644 --- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec @@ -1,5 +1,6 @@ %global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 %global commit_date 20241224 +%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.9.7 %global debug_package %{nil} From 28536901c8f9303952cbb2f0b0c7f60b8045bfab Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 9 Mar 2025 04:45:31 +0000 Subject: [PATCH 0215/2977] bump: akmod dkms akmod dkms akmod dkms --- anda/system/xone/akmod/xone-kmod.spec | 1 + anda/system/xone/dkms/dkms-xone.spec | 1 + anda/system/xpad-noone/akmod/xpad-noone-kmod.spec | 1 + anda/system/xpad-noone/dkms/dkms-xpad-noone.spec | 1 + anda/system/xpadneo/akmod/xpadneo-kmod.spec | 1 + anda/system/xpadneo/dkms/dkms-xpadneo.spec | 1 + 6 files changed, 6 insertions(+) diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index f1c17ba42b..83251a615d 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -1,6 +1,7 @@ %global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 %global commit_date 20241223 %global commit_date 20241223 +%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.3 %define buildforkernels akmod diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index f56d801d06..5c99d34b2e 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -1,6 +1,7 @@ %global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 %global commit_date 20241223 %global commit_date 20241223 +%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.3 %global debug_package %{nil} diff --git a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec index ada296cd87..0a7b7a065d 100644 --- a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec +++ b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec @@ -1,5 +1,6 @@ %global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5 %global commit_date 20240109 +%global commit_date 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date 20240109 %global ver diff --git a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec index 6f783a8666..25ea81b220 100644 --- a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec +++ b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec @@ -1,5 +1,6 @@ %global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5 %global commit_date 20240109 +%global commit_date 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date 20240109 %global ver diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec index ccab8b7746..95f558424d 100644 --- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec +++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec @@ -1,6 +1,7 @@ %global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 %global commit_date 20241224 %global commit_date 20241224 +%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.9.7 %define buildforkernels akmod diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec index 7218fda2dc..9e48959141 100644 --- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec @@ -1,6 +1,7 @@ %global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 %global commit_date 20241224 %global commit_date 20241224 +%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.9.7 %global debug_package %{nil} From 0f33a6077bbd9f32fb993fcec93acaac3e8a2c85 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 9 Mar 2025 04:55:38 +0000 Subject: [PATCH 0216/2977] bump: akmod dkms akmod dkms akmod dkms --- anda/system/xone/akmod/xone-kmod.spec | 1 + anda/system/xone/dkms/dkms-xone.spec | 1 + anda/system/xpad-noone/akmod/xpad-noone-kmod.spec | 1 + anda/system/xpad-noone/dkms/dkms-xpad-noone.spec | 1 + anda/system/xpadneo/akmod/xpadneo-kmod.spec | 1 + anda/system/xpadneo/dkms/dkms-xpadneo.spec | 1 + 6 files changed, 6 insertions(+) diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index 83251a615d..b05ea60490 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -2,6 +2,7 @@ %global commit_date 20241223 %global commit_date 20241223 %global commit_date 20241223 +%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.3 %define buildforkernels akmod diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index 5c99d34b2e..3b393bbdf1 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -2,6 +2,7 @@ %global commit_date 20241223 %global commit_date 20241223 %global commit_date 20241223 +%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.3 %global debug_package %{nil} diff --git a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec index 0a7b7a065d..9127259fcb 100644 --- a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec +++ b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec @@ -1,6 +1,7 @@ %global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5 %global commit_date 20240109 %global commit_date 20240109 +%global commit_date 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date 20240109 %global ver diff --git a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec index 25ea81b220..991c261382 100644 --- a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec +++ b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec @@ -1,6 +1,7 @@ %global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5 %global commit_date 20240109 %global commit_date 20240109 +%global commit_date 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date 20240109 %global ver diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec index 95f558424d..43ad4c6819 100644 --- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec +++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec @@ -2,6 +2,7 @@ %global commit_date 20241224 %global commit_date 20241224 %global commit_date 20241224 +%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.9.7 %define buildforkernels akmod diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec index 9e48959141..e49ae271e2 100644 --- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec @@ -2,6 +2,7 @@ %global commit_date 20241224 %global commit_date 20241224 %global commit_date 20241224 +%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.9.7 %global debug_package %{nil} From c2cb4e47545ba821b2f6cabdec6a00adc8594799 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 9 Mar 2025 05:14:01 +0000 Subject: [PATCH 0217/2977] bump: akmod dkms akmod dkms akmod dkms --- anda/system/xone/akmod/xone-kmod.spec | 1 + anda/system/xone/dkms/dkms-xone.spec | 1 + anda/system/xpad-noone/akmod/xpad-noone-kmod.spec | 1 + anda/system/xpad-noone/dkms/dkms-xpad-noone.spec | 1 + anda/system/xpadneo/akmod/xpadneo-kmod.spec | 1 + anda/system/xpadneo/dkms/dkms-xpadneo.spec | 1 + 6 files changed, 6 insertions(+) diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index b05ea60490..7f5b83366d 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -3,6 +3,7 @@ %global commit_date 20241223 %global commit_date 20241223 %global commit_date 20241223 +%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.3 %define buildforkernels akmod diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index 3b393bbdf1..2c5a4f7522 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -3,6 +3,7 @@ %global commit_date 20241223 %global commit_date 20241223 %global commit_date 20241223 +%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.3 %global debug_package %{nil} diff --git a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec index 9127259fcb..61608e07a9 100644 --- a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec +++ b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec @@ -2,6 +2,7 @@ %global commit_date 20240109 %global commit_date 20240109 %global commit_date 20240109 +%global commit_date 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date 20240109 %global ver diff --git a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec index 991c261382..8c33bbb305 100644 --- a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec +++ b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec @@ -2,6 +2,7 @@ %global commit_date 20240109 %global commit_date 20240109 %global commit_date 20240109 +%global commit_date 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date 20240109 %global ver diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec index 43ad4c6819..ecfc58c626 100644 --- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec +++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec @@ -3,6 +3,7 @@ %global commit_date 20241224 %global commit_date 20241224 %global commit_date 20241224 +%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.9.7 %define buildforkernels akmod diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec index e49ae271e2..1aec80edab 100644 --- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec @@ -3,6 +3,7 @@ %global commit_date 20241224 %global commit_date 20241224 %global commit_date 20241224 +%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.9.7 %global debug_package %{nil} From 19979dc6b781abfa26c9a03b3dea045c4a4c3c13 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 9 Mar 2025 05:27:27 +0000 Subject: [PATCH 0218/2977] bump: akmod dkms akmod dkms akmod dkms --- anda/system/xone/akmod/xone-kmod.spec | 1 + anda/system/xone/dkms/dkms-xone.spec | 1 + anda/system/xpad-noone/akmod/xpad-noone-kmod.spec | 1 + anda/system/xpad-noone/dkms/dkms-xpad-noone.spec | 1 + anda/system/xpadneo/akmod/xpadneo-kmod.spec | 1 + anda/system/xpadneo/dkms/dkms-xpadneo.spec | 1 + 6 files changed, 6 insertions(+) diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index 7f5b83366d..286d564b51 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -4,6 +4,7 @@ %global commit_date 20241223 %global commit_date 20241223 %global commit_date 20241223 +%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.3 %define buildforkernels akmod diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index 2c5a4f7522..123404833b 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -4,6 +4,7 @@ %global commit_date 20241223 %global commit_date 20241223 %global commit_date 20241223 +%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.3 %global debug_package %{nil} diff --git a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec index 61608e07a9..7c4a393413 100644 --- a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec +++ b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec @@ -3,6 +3,7 @@ %global commit_date 20240109 %global commit_date 20240109 %global commit_date 20240109 +%global commit_date 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date 20240109 %global ver diff --git a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec index 8c33bbb305..e7ca59a9ed 100644 --- a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec +++ b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec @@ -3,6 +3,7 @@ %global commit_date 20240109 %global commit_date 20240109 %global commit_date 20240109 +%global commit_date 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date 20240109 %global ver diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec index ecfc58c626..029f81f988 100644 --- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec +++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec @@ -4,6 +4,7 @@ %global commit_date 20241224 %global commit_date 20241224 %global commit_date 20241224 +%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.9.7 %define buildforkernels akmod diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec index 1aec80edab..721e1fd3fe 100644 --- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec @@ -4,6 +4,7 @@ %global commit_date 20241224 %global commit_date 20241224 %global commit_date 20241224 +%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.9.7 %global debug_package %{nil} From e2539893461f58ad4e832bca6f83c3979de40beb Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 9 Mar 2025 05:38:09 +0000 Subject: [PATCH 0219/2977] bump: akmod dkms akmod dkms akmod dkms --- anda/system/xone/akmod/xone-kmod.spec | 1 + anda/system/xone/dkms/dkms-xone.spec | 1 + anda/system/xpad-noone/akmod/xpad-noone-kmod.spec | 1 + anda/system/xpad-noone/dkms/dkms-xpad-noone.spec | 1 + anda/system/xpadneo/akmod/xpadneo-kmod.spec | 1 + anda/system/xpadneo/dkms/dkms-xpadneo.spec | 1 + 6 files changed, 6 insertions(+) diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index 286d564b51..02195ccc9b 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -5,6 +5,7 @@ %global commit_date 20241223 %global commit_date 20241223 %global commit_date 20241223 +%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.3 %define buildforkernels akmod diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index 123404833b..8d0870f882 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -5,6 +5,7 @@ %global commit_date 20241223 %global commit_date 20241223 %global commit_date 20241223 +%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.3 %global debug_package %{nil} diff --git a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec index 7c4a393413..403af8036e 100644 --- a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec +++ b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec @@ -4,6 +4,7 @@ %global commit_date 20240109 %global commit_date 20240109 %global commit_date 20240109 +%global commit_date 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date 20240109 %global ver diff --git a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec index e7ca59a9ed..21655baed3 100644 --- a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec +++ b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec @@ -4,6 +4,7 @@ %global commit_date 20240109 %global commit_date 20240109 %global commit_date 20240109 +%global commit_date 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date 20240109 %global ver diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec index 029f81f988..6e2d5d7399 100644 --- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec +++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec @@ -5,6 +5,7 @@ %global commit_date 20241224 %global commit_date 20241224 %global commit_date 20241224 +%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.9.7 %define buildforkernels akmod diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec index 721e1fd3fe..8def14eee3 100644 --- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec @@ -5,6 +5,7 @@ %global commit_date 20241224 %global commit_date 20241224 %global commit_date 20241224 +%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.9.7 %global debug_package %{nil} From 0aa103556e35dcaadde01062cc47c04522cfbc9e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 9 Mar 2025 05:48:20 +0000 Subject: [PATCH 0220/2977] bump: akmod dkms akmod dkms akmod dkms --- anda/system/xone/akmod/xone-kmod.spec | 1 + anda/system/xone/dkms/dkms-xone.spec | 1 + anda/system/xpad-noone/akmod/xpad-noone-kmod.spec | 1 + anda/system/xpad-noone/dkms/dkms-xpad-noone.spec | 1 + anda/system/xpadneo/akmod/xpadneo-kmod.spec | 1 + anda/system/xpadneo/dkms/dkms-xpadneo.spec | 1 + 6 files changed, 6 insertions(+) diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index 02195ccc9b..b4e937f5c2 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -6,6 +6,7 @@ %global commit_date 20241223 %global commit_date 20241223 %global commit_date 20241223 +%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.3 %define buildforkernels akmod diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index 8d0870f882..acba6ed720 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -6,6 +6,7 @@ %global commit_date 20241223 %global commit_date 20241223 %global commit_date 20241223 +%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.3 %global debug_package %{nil} diff --git a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec index 403af8036e..8d76457b93 100644 --- a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec +++ b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec @@ -5,6 +5,7 @@ %global commit_date 20240109 %global commit_date 20240109 %global commit_date 20240109 +%global commit_date 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date 20240109 %global ver diff --git a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec index 21655baed3..f60b94acc2 100644 --- a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec +++ b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec @@ -5,6 +5,7 @@ %global commit_date 20240109 %global commit_date 20240109 %global commit_date 20240109 +%global commit_date 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date 20240109 %global ver diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec index 6e2d5d7399..40139fee0e 100644 --- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec +++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec @@ -6,6 +6,7 @@ %global commit_date 20241224 %global commit_date 20241224 %global commit_date 20241224 +%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.9.7 %define buildforkernels akmod diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec index 8def14eee3..9a852f7119 100644 --- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec @@ -6,6 +6,7 @@ %global commit_date 20241224 %global commit_date 20241224 %global commit_date 20241224 +%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.9.7 %global debug_package %{nil} From e10729bd5eef88bc444cd4cee3fcbd92c1baba22 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 9 Mar 2025 05:58:37 +0000 Subject: [PATCH 0221/2977] bump: akmod dkms akmod dkms akmod dkms --- anda/system/xone/akmod/xone-kmod.spec | 1 + anda/system/xone/dkms/dkms-xone.spec | 1 + anda/system/xpad-noone/akmod/xpad-noone-kmod.spec | 1 + anda/system/xpad-noone/dkms/dkms-xpad-noone.spec | 1 + anda/system/xpadneo/akmod/xpadneo-kmod.spec | 1 + anda/system/xpadneo/dkms/dkms-xpadneo.spec | 1 + 6 files changed, 6 insertions(+) diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index b4e937f5c2..32cea7ffd5 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -7,6 +7,7 @@ %global commit_date 20241223 %global commit_date 20241223 %global commit_date 20241223 +%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.3 %define buildforkernels akmod diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index acba6ed720..af807ad3e0 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -7,6 +7,7 @@ %global commit_date 20241223 %global commit_date 20241223 %global commit_date 20241223 +%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.3 %global debug_package %{nil} diff --git a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec index 8d76457b93..8c2a0f48c3 100644 --- a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec +++ b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec @@ -6,6 +6,7 @@ %global commit_date 20240109 %global commit_date 20240109 %global commit_date 20240109 +%global commit_date 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date 20240109 %global ver diff --git a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec index f60b94acc2..9ddeaf94d4 100644 --- a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec +++ b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec @@ -6,6 +6,7 @@ %global commit_date 20240109 %global commit_date 20240109 %global commit_date 20240109 +%global commit_date 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date 20240109 %global ver diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec index 40139fee0e..ca80123977 100644 --- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec +++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec @@ -7,6 +7,7 @@ %global commit_date 20241224 %global commit_date 20241224 %global commit_date 20241224 +%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.9.7 %define buildforkernels akmod diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec index 9a852f7119..0b1b9090b0 100644 --- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec @@ -7,6 +7,7 @@ %global commit_date 20241224 %global commit_date 20241224 %global commit_date 20241224 +%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.9.7 %global debug_package %{nil} From 66bc2d1c7616384507f108b6f221c2d6c7c73802 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 9 Mar 2025 06:26:07 +0000 Subject: [PATCH 0222/2977] bump: akmod dkms akmod dkms akmod dkms --- anda/system/xone/akmod/xone-kmod.spec | 1 + anda/system/xone/dkms/dkms-xone.spec | 1 + anda/system/xpad-noone/akmod/xpad-noone-kmod.spec | 1 + anda/system/xpad-noone/dkms/dkms-xpad-noone.spec | 1 + anda/system/xpadneo/akmod/xpadneo-kmod.spec | 1 + anda/system/xpadneo/dkms/dkms-xpadneo.spec | 1 + 6 files changed, 6 insertions(+) diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index 32cea7ffd5..fb6e71e562 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -8,6 +8,7 @@ %global commit_date 20241223 %global commit_date 20241223 %global commit_date 20241223 +%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.3 %define buildforkernels akmod diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index af807ad3e0..ea1b01f3c7 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -8,6 +8,7 @@ %global commit_date 20241223 %global commit_date 20241223 %global commit_date 20241223 +%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.3 %global debug_package %{nil} diff --git a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec index 8c2a0f48c3..424cfdae1d 100644 --- a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec +++ b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec @@ -7,6 +7,7 @@ %global commit_date 20240109 %global commit_date 20240109 %global commit_date 20240109 +%global commit_date 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date 20240109 %global ver diff --git a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec index 9ddeaf94d4..c802a7663f 100644 --- a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec +++ b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec @@ -7,6 +7,7 @@ %global commit_date 20240109 %global commit_date 20240109 %global commit_date 20240109 +%global commit_date 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date 20240109 %global ver diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec index ca80123977..eeca221c23 100644 --- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec +++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec @@ -8,6 +8,7 @@ %global commit_date 20241224 %global commit_date 20241224 %global commit_date 20241224 +%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.9.7 %define buildforkernels akmod diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec index 0b1b9090b0..9efac6f38f 100644 --- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec @@ -8,6 +8,7 @@ %global commit_date 20241224 %global commit_date 20241224 %global commit_date 20241224 +%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.9.7 %global debug_package %{nil} From cd31651c29270bd6544ffd416ea92a8397300466 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 9 Mar 2025 06:37:43 +0000 Subject: [PATCH 0223/2977] bump: akmod dkms akmod dkms akmod dkms --- anda/system/xone/akmod/xone-kmod.spec | 1 + anda/system/xone/dkms/dkms-xone.spec | 1 + anda/system/xpad-noone/akmod/xpad-noone-kmod.spec | 1 + anda/system/xpad-noone/dkms/dkms-xpad-noone.spec | 1 + anda/system/xpadneo/akmod/xpadneo-kmod.spec | 1 + anda/system/xpadneo/dkms/dkms-xpadneo.spec | 1 + 6 files changed, 6 insertions(+) diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index fb6e71e562..4a099ead3d 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -9,6 +9,7 @@ %global commit_date 20241223 %global commit_date 20241223 %global commit_date 20241223 +%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.3 %define buildforkernels akmod diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index ea1b01f3c7..acdf2d558b 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -9,6 +9,7 @@ %global commit_date 20241223 %global commit_date 20241223 %global commit_date 20241223 +%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.3 %global debug_package %{nil} diff --git a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec index 424cfdae1d..d758efbd3e 100644 --- a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec +++ b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec @@ -8,6 +8,7 @@ %global commit_date 20240109 %global commit_date 20240109 %global commit_date 20240109 +%global commit_date 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date 20240109 %global ver diff --git a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec index c802a7663f..55f5b85ae6 100644 --- a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec +++ b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec @@ -8,6 +8,7 @@ %global commit_date 20240109 %global commit_date 20240109 %global commit_date 20240109 +%global commit_date 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date 20240109 %global ver diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec index eeca221c23..6f8e8f0d83 100644 --- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec +++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec @@ -9,6 +9,7 @@ %global commit_date 20241224 %global commit_date 20241224 %global commit_date 20241224 +%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.9.7 %define buildforkernels akmod diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec index 9efac6f38f..007f9bd073 100644 --- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec @@ -9,6 +9,7 @@ %global commit_date 20241224 %global commit_date 20241224 %global commit_date 20241224 +%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 0.9.7 %global debug_package %{nil} From 5b1f57030a1f8b57c4a9b524b1cdc120d7a47fc3 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sun, 9 Mar 2025 00:41:32 -0600 Subject: [PATCH 0224/2977] fix(xpadneo, xone, xpad-noone): Update scripts (#3824) * Trying just about everything to fix this oh my GOD * Another updbranch * Fix typo * That file was saved?? * Merge * Doing this just because it makes conflict fixes easier --------- Signed-off-by: Gilver --- anda/system/xone/akmod/anda.hcl | 1 + anda/system/xone/akmod/update.rhai | 4 ++-- anda/system/xone/akmod/xone-kmod.spec | 14 ++------------ anda/system/xone/dkms/anda.hcl | 1 + anda/system/xone/dkms/dkms-xone.spec | 14 ++------------ anda/system/xone/kmod-common/update.rhai | 2 +- anda/system/xone/kmod-common/xone.spec | 4 ++-- anda/system/xpad-noone/akmod/anda.hcl | 1 + anda/system/xpad-noone/akmod/update.rhai | 6 +++--- .../system/xpad-noone/akmod/xpad-noone-kmod.spec | 16 +++------------- anda/system/xpad-noone/dkms/anda.hcl | 1 + anda/system/xpad-noone/dkms/dkms-xpad-noone.spec | 16 +++------------- anda/system/xpad-noone/dkms/update.rhai | 6 +++--- anda/system/xpad-noone/kmod-common/update.rhai | 2 +- .../xpad-noone/kmod-common/xpad-noone.spec | 4 ++-- anda/system/xpadneo/akmod/anda.hcl | 1 + anda/system/xpadneo/akmod/update.rhai | 4 ++-- anda/system/xpadneo/akmod/xpadneo-kmod.spec | 14 ++------------ anda/system/xpadneo/dkms/anda.hcl | 1 + anda/system/xpadneo/dkms/dkms-xpadneo.spec | 14 ++------------ anda/system/xpadneo/dkms/update.rhai | 4 ++-- anda/system/xpadneo/kmod-common/update.rhai | 2 +- anda/system/xpadneo/kmod-common/xpadneo.spec | 4 ++-- 23 files changed, 41 insertions(+), 95 deletions(-) diff --git a/anda/system/xone/akmod/anda.hcl b/anda/system/xone/akmod/anda.hcl index a6a830915e..3f2d068de2 100644 --- a/anda/system/xone/akmod/anda.hcl +++ b/anda/system/xone/akmod/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { mock = 1 + updbranch = 1 } } diff --git a/anda/system/xone/akmod/update.rhai b/anda/system/xone/akmod/update.rhai index 0ac5d9b6bb..95295c3ac6 100644 --- a/anda/system/xone/akmod/update.rhai +++ b/anda/system/xone/akmod/update.rhai @@ -3,9 +3,9 @@ c.pop(); rpm.global("commit", c); if rpm.changed() { rpm.release(); - let d = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout; + let d = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commitdate' | sed -E 's/.+commitdate //'", #{"stdout": "piped"}).ctx.stdout; d.pop(); - rpm.global("commit_date", d); + rpm.global("commitdate", d); let v = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; v.pop(); rpm.global("ver", v); diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index 4a099ead3d..710e47fcdf 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -1,23 +1,13 @@ %global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 -%global commit_date 20241223 -%global commit_date 20241223 -%global commit_date 20241223 -%global commit_date 20241223 -%global commit_date 20241223 -%global commit_date 20241223 -%global commit_date 20241223 -%global commit_date 20241223 -%global commit_date 20241223 -%global commit_date 20241223 -%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commitdate 20241223 %global ver 0.3 %define buildforkernels akmod %global debug_package %{nil} %global modulename xone Name: %{modulename}-kmod -Version: %{ver}^%{commit_date}git.%{shortcommit} +Version: %{ver}^%{commitdate}git.%{shortcommit} Release: 1%?dist Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories License: GPL-2.0-or-later diff --git a/anda/system/xone/dkms/anda.hcl b/anda/system/xone/dkms/anda.hcl index e0b7e51d64..86f43ddf89 100644 --- a/anda/system/xone/dkms/anda.hcl +++ b/anda/system/xone/dkms/anda.hcl @@ -5,5 +5,6 @@ project pkg { } labels { mock = 1 + updbranch = 1 } } diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index acdf2d558b..5ee46c5baa 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -1,22 +1,12 @@ %global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 -%global commit_date 20241223 -%global commit_date 20241223 -%global commit_date 20241223 -%global commit_date 20241223 -%global commit_date 20241223 -%global commit_date 20241223 -%global commit_date 20241223 -%global commit_date 20241223 -%global commit_date 20241223 -%global commit_date 20241223 -%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commitdate 20241223 %global ver 0.3 %global debug_package %{nil} %global modulename xone Name: dkms-%{modulename} -Version: %{ver}^%{commit_date}git.%{shortcommit} +Version: %{ver}^%{commitdate}git.%{shortcommit} Release: 1%?dist Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories License: GPL-2.0-or-later diff --git a/anda/system/xone/kmod-common/update.rhai b/anda/system/xone/kmod-common/update.rhai index 956d802fe6..805632e47a 100644 --- a/anda/system/xone/kmod-common/update.rhai +++ b/anda/system/xone/kmod-common/update.rhai @@ -1,7 +1,7 @@ rpm.global("commit", gh_commit("dlundqvist/xone")); if rpm.changed() { rpm.release(); - rpm.global("commit_date", date()); + rpm.global("commitdate", date()); let ver = gh_tag("dlundqvist/xone"); ver.crop(1); rpm.global("ver", ver); diff --git a/anda/system/xone/kmod-common/xone.spec b/anda/system/xone/kmod-common/xone.spec index abea73da92..f9fa79fc78 100644 --- a/anda/system/xone/kmod-common/xone.spec +++ b/anda/system/xone/kmod-common/xone.spec @@ -1,12 +1,12 @@ %global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 -%global commit_date 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commitdate 20241223 %global ver 0.3 %global _dracutconfdir %{_prefix}/lib/dracut/dracut.conf.d %global firmware_hash 48084d9fa53b9bb04358f3bb127b7495dc8f7bb0b3ca1437bd24ef2b6eabdf66 Name: xone -Version: %{ver}^%{commit_date}git.%{shortcommit} +Version: %{ver}^%{commitdate}git.%{shortcommit} Release: 2%{?dist} Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories common files License: GPL-2.0-or-later diff --git a/anda/system/xpad-noone/akmod/anda.hcl b/anda/system/xpad-noone/akmod/anda.hcl index c4b205f12c..eeaf7f0c82 100644 --- a/anda/system/xpad-noone/akmod/anda.hcl +++ b/anda/system/xpad-noone/akmod/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { mock = 1 + updbranch = 1 } } diff --git a/anda/system/xpad-noone/akmod/update.rhai b/anda/system/xpad-noone/akmod/update.rhai index 0678161b52..05ee92a730 100644 --- a/anda/system/xpad-noone/akmod/update.rhai +++ b/anda/system/xpad-noone/akmod/update.rhai @@ -3,10 +3,10 @@ c.pop(); rpm.global("commit", c); if rpm.changed() { rpm.release(); - let d = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout; + let d = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global commitdate' | sed -E 's/.+commitdate //'", #{"stdout": "piped"}).ctx.stdout; d.pop(); - rpm.global("commit_date", d); - let v = sh("cat anda/system/xpad-noone/kmod-common/xpadneo-noone.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; + rpm.global("commitdate", d); + let v = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; v.pop(); rpm.global("ver", v); } diff --git a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec index d758efbd3e..7ae74e4dcd 100644 --- a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec +++ b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec @@ -1,17 +1,7 @@ %global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5 -%global commit_date 20240109 -%global commit_date 20240109 -%global commit_date 20240109 -%global commit_date 20240109 -%global commit_date 20240109 -%global commit_date 20240109 -%global commit_date 20240109 -%global commit_date 20240109 -%global commit_date 20240109 -%global commit_date 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20240109 -%global ver +%global commitdate 20240109 +%global ver 1.0 %global modulename xpad-noone %global debug_package %{nil} %global buildforkernels akmod @@ -19,7 +9,7 @@ This is the original upstream xpad driver from the Linux kernel with support for XBox One controllers removed. If you are running the xone driver you may have to replace the xpad kernel module with this one to retain the functionality of XBox and XBox 360 controllers.} Name: %{modulename}-kmod -Version: %{ver}^%{commit_date}git.%{shortcommit} +Version: %{ver}^%{commitdate}git.%{shortcommit} Release: 1%?dist License: GPL-2.0-or-later Summary: xpad driver with support for XBox One controllers removed diff --git a/anda/system/xpad-noone/dkms/anda.hcl b/anda/system/xpad-noone/dkms/anda.hcl index fe3344b493..8d386a715f 100644 --- a/anda/system/xpad-noone/dkms/anda.hcl +++ b/anda/system/xpad-noone/dkms/anda.hcl @@ -5,5 +5,6 @@ project pkg { } labels { mock = 1 + updbranch = 1 } } diff --git a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec index 55f5b85ae6..f7831a347e 100644 --- a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec +++ b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec @@ -1,23 +1,13 @@ %global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5 -%global commit_date 20240109 -%global commit_date 20240109 -%global commit_date 20240109 -%global commit_date 20240109 -%global commit_date 20240109 -%global commit_date 20240109 -%global commit_date 20240109 -%global commit_date 20240109 -%global commit_date 20240109 -%global commit_date 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20240109 -%global ver +%global commitdate 20240109 +%global ver 1.0 %global modulename xpad-noone %global _description %{expand: This is the original upstream xpad driver from the Linux kernel with support for XBox One controllers removed. If you are running the xone driver you may have to replace the xpad kernel module with this one to retain the functionality of XBox and XBox 360 controllers.} Name: dkms-%{modulename} -Version: %{ver}^%{commit_date}git.%{shortcommit} +Version: %{ver}^%{commitdate}git.%{shortcommit} Release: 1%?dist License: GPL-2.0-or-later Summary: xpad driver with support for XBox One controllers removed diff --git a/anda/system/xpad-noone/dkms/update.rhai b/anda/system/xpad-noone/dkms/update.rhai index 0678161b52..05ee92a730 100644 --- a/anda/system/xpad-noone/dkms/update.rhai +++ b/anda/system/xpad-noone/dkms/update.rhai @@ -3,10 +3,10 @@ c.pop(); rpm.global("commit", c); if rpm.changed() { rpm.release(); - let d = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout; + let d = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global commitdate' | sed -E 's/.+commitdate //'", #{"stdout": "piped"}).ctx.stdout; d.pop(); - rpm.global("commit_date", d); - let v = sh("cat anda/system/xpad-noone/kmod-common/xpadneo-noone.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; + rpm.global("commitdate", d); + let v = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; v.pop(); rpm.global("ver", v); } diff --git a/anda/system/xpad-noone/kmod-common/update.rhai b/anda/system/xpad-noone/kmod-common/update.rhai index 699ca77a39..0c4d57f83f 100644 --- a/anda/system/xpad-noone/kmod-common/update.rhai +++ b/anda/system/xpad-noone/kmod-common/update.rhai @@ -1,7 +1,7 @@ rpm.global("commit", gh_commit("medusalix/xpad-noone")); if rpm.changed() { rpm.release(); - rpm.global("commit_date", date()); + rpm.global("commitdate", date()); let html = get(`https://raw.githubusercontent.com/medusalix/xpad-noone/refs/heads/master/dkms.conf`); let v = find("PACKAGE_VERSION=\"([\\d.]+)\"", html, 1); rpm.global("ver", v); diff --git a/anda/system/xpad-noone/kmod-common/xpad-noone.spec b/anda/system/xpad-noone/kmod-common/xpad-noone.spec index 36e0fe2c1d..767764d890 100644 --- a/anda/system/xpad-noone/kmod-common/xpad-noone.spec +++ b/anda/system/xpad-noone/kmod-common/xpad-noone.spec @@ -1,12 +1,12 @@ %global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20240109 +%global commitdate 20240109 %global ver 1.0 %global _description %{expand: This is the original upstream xpad driver from the Linux kernel with support for XBox One controllers removed. If you are running the xone driver you may have to replace the xpad kernel module with this one to retain the functionality of XBox and XBox 360 controllers.} Name: xpad-noone -Version: %{ver}^%{commit_date}git.%{shortcommit} +Version: %{ver}^%{commitdate}git.%{shortcommit} Release: 1%{?dist} License: GPL-2.0-or-later Summary: xpad driver with support for XBox One controllers removed diff --git a/anda/system/xpadneo/akmod/anda.hcl b/anda/system/xpadneo/akmod/anda.hcl index 8527b571e3..23ac0b839c 100644 --- a/anda/system/xpadneo/akmod/anda.hcl +++ b/anda/system/xpadneo/akmod/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { mock = 1 + updbranch = 1 } } diff --git a/anda/system/xpadneo/akmod/update.rhai b/anda/system/xpadneo/akmod/update.rhai index d20f937dc0..2a64921582 100644 --- a/anda/system/xpadneo/akmod/update.rhai +++ b/anda/system/xpadneo/akmod/update.rhai @@ -3,9 +3,9 @@ c.pop(); rpm.global("commit", c); if rpm.changed() { rpm.release(); - let d = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout; + let d = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commitdate' | sed -E 's/.+commitdate //'", #{"stdout": "piped"}).ctx.stdout; d.pop(); - rpm.global("commit_date", d); + rpm.global("commitdate", d); let v = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; v.pop(); rpm.global("ver", v); diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec index 6f8e8f0d83..ddf279cb16 100644 --- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec +++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec @@ -1,23 +1,13 @@ %global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 -%global commit_date 20241224 -%global commit_date 20241224 -%global commit_date 20241224 -%global commit_date 20241224 -%global commit_date 20241224 -%global commit_date 20241224 -%global commit_date 20241224 -%global commit_date 20241224 -%global commit_date 20241224 -%global commit_date 20241224 -%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commitdate 20241224 %global ver 0.9.7 %define buildforkernels akmod %global debug_package %{nil} %global modulename xpadneo Name: %{modulename}-kmod -Version: %{ver}^%{commit_date}git.%{shortcommit} +Version: %{ver}^%{commitdate}git.%{shortcommit} Release: 1%?dist Summary: Advanced Linux Driver for Xbox One Wireless Gamepad License: GPL-3.0 diff --git a/anda/system/xpadneo/dkms/anda.hcl b/anda/system/xpadneo/dkms/anda.hcl index cade80863c..99098cb318 100644 --- a/anda/system/xpadneo/dkms/anda.hcl +++ b/anda/system/xpadneo/dkms/anda.hcl @@ -5,5 +5,6 @@ project pkg { } labels { mock = 1 + updbranch = 1 } } diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec index 007f9bd073..5fe28ad089 100644 --- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec @@ -1,22 +1,12 @@ %global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 -%global commit_date 20241224 -%global commit_date 20241224 -%global commit_date 20241224 -%global commit_date 20241224 -%global commit_date 20241224 -%global commit_date 20241224 -%global commit_date 20241224 -%global commit_date 20241224 -%global commit_date 20241224 -%global commit_date 20241224 -%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commitdate 20241224 %global ver 0.9.7 %global debug_package %{nil} %global modulename xpadneo Name: dkms-%{modulename} -Version: %{ver}^%{commit_date}git.%{shortcommit} +Version: %{ver}^%{commitdate}git.%{shortcommit} Release: 1%?dist Summary: Advanced Linux Driver for Xbox One Wireless Gamepad License: GPL-3.0 diff --git a/anda/system/xpadneo/dkms/update.rhai b/anda/system/xpadneo/dkms/update.rhai index d20f937dc0..2a64921582 100644 --- a/anda/system/xpadneo/dkms/update.rhai +++ b/anda/system/xpadneo/dkms/update.rhai @@ -3,9 +3,9 @@ c.pop(); rpm.global("commit", c); if rpm.changed() { rpm.release(); - let d = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout; + let d = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commitdate' | sed -E 's/.+commitdate //'", #{"stdout": "piped"}).ctx.stdout; d.pop(); - rpm.global("commit_date", d); + rpm.global("commitdate", d); let v = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; v.pop(); rpm.global("ver", v); diff --git a/anda/system/xpadneo/kmod-common/update.rhai b/anda/system/xpadneo/kmod-common/update.rhai index 19b1642b6c..82cafc1ad1 100644 --- a/anda/system/xpadneo/kmod-common/update.rhai +++ b/anda/system/xpadneo/kmod-common/update.rhai @@ -1,7 +1,7 @@ rpm.global("commit", gh_commit("atar-axis/xpadneo")); if rpm.changed() { rpm.release(); - rpm.global("commit_date", date()); + rpm.global("commitdate", date()); let ver = gh("atar-axis/xpadneo"); ver.crop(1); rpm.global("ver", ver); diff --git a/anda/system/xpadneo/kmod-common/xpadneo.spec b/anda/system/xpadneo/kmod-common/xpadneo.spec index b437e551e8..f682dd3e75 100644 --- a/anda/system/xpadneo/kmod-common/xpadneo.spec +++ b/anda/system/xpadneo/kmod-common/xpadneo.spec @@ -1,10 +1,10 @@ %global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 -%global commit_date 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commitdate 20241224 %global ver 0.9.7 Name: xpadneo -Version: %{ver}^%{commit_date}git.%{shortcommit} +Version: %{ver}^%{commitdate}git.%{shortcommit} Release: 4%{?dist} Summary: Advanced Linux Driver for Xbox One Wireless Gamepad common files License: GPL-3.0 From 124b5c7cc69c379ed5567c84db23b968bd323dcd Mon Sep 17 00:00:00 2001 From: madomado Date: Sun, 9 Mar 2025 15:05:12 +0800 Subject: [PATCH 0225/2977] fix(codium-marketplace): sed the json properly (#3827) Honestly should use something like jq to rebuild the json properly instead imo, but whatever. Closes #3781 --- anda/devs/codium-marketplace/codium-marketplace.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/anda/devs/codium-marketplace/codium-marketplace.spec b/anda/devs/codium-marketplace/codium-marketplace.spec index fba321e07f..3701d312e9 100644 --- a/anda/devs/codium-marketplace/codium-marketplace.spec +++ b/anda/devs/codium-marketplace/codium-marketplace.spec @@ -2,7 +2,7 @@ Name: codium-marketplace Version: 1.65.0 -Release: 1%?dist +Release: 2%?dist Summary: Enable vscode marketplace in vscodium License: MIT BuildArch: noarch @@ -22,7 +22,7 @@ if [ $1 -gt 1 ]; then # update/install sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/ "serviceUrl": "https:\/\/marketplace.visualstudio.com\/_apis\/public\/gallery",/' \ -e '/^[[:blank:]]*"cacheUrl/d' \ -e '/^[[:blank:]]*"serviceUrl/a\ "cacheUrl": "https:\/\/vscode.blob.core.windows.net\/gallery\/index",' \ - -e 's/^[[:blank:]]*"itemUrl":.*/ "itemUrl": "https:\/\/marketplace.visualstudio.com\/items"/' \ + -e 's/^[[:blank:]]*"itemUrl":.*/ "itemUrl": "https:\/\/marketplace.visualstudio.com\/items",/' \ -e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \ /usr/share/codium/resources/app/product.json || true fi @@ -30,7 +30,7 @@ fi %preun sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/ "serviceUrl": "https:\/\/open-vsx.org\/vscode\/gallery",/' \ -e '/^[[:blank:]]*"cacheUrl/d' \ - -e 's/^[[:blank:]]*"itemUrl":.*/ "itemUrl": "https:\/\/open-vsx.org\/vscode\/item"/' \ + -e 's/^[[:blank:]]*"itemUrl":.*/ "itemUrl": "https:\/\/open-vsx.org\/vscode\/item",/' \ -e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \ -e '/^[[:blank:]]*"documentationUrl/i\ "linkProtectionTrustedDomains": ["https://open-vsx.org"],' \ /usr/share/codium/resources/app/product.json || true @@ -39,9 +39,9 @@ sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/ "serviceUrl": "https:\/\/open-vsx. sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/ "serviceUrl": "https:\/\/marketplace.visualstudio.com\/_apis\/public\/gallery",/' \ -e '/^[[:blank:]]*"cacheUrl/d' \ -e '/^[[:blank:]]*"serviceUrl/a\ "cacheUrl": "https:\/\/vscode.blob.core.windows.net\/gallery\/index",' \ - -e 's/^[[:blank:]]*"itemUrl":.*/ "itemUrl": "https:\/\/marketplace.visualstudio.com\/items"/' \ + -e 's/^[[:blank:]]*"itemUrl":.*/ "itemUrl": "https:\/\/marketplace.visualstudio.com\/items",/' \ -e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \ /usr/share/codium/resources/app/product.json || true %files -/tmp/terra-codium-marketplace-dummy-file \ No newline at end of file +/tmp/terra-codium-marketplace-dummy-file From 77cef24989ade9a6320dcc89c4f22c4c9cd604d5 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sun, 9 Mar 2025 01:09:17 -0600 Subject: [PATCH 0226/2977] chore(.backportrc.json): Drop F39 since it's EOL, add EL10 and F42 (#3823) Signed-off-by: Gilver --- .backportrc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.backportrc.json b/.backportrc.json index 1c7b5305f4..1c5d20bad8 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -2,7 +2,7 @@ "repoOwner": "terrapkg", "repoName": "packages", "resetAuthor": true, - "targetBranchChoices": ["f39", "f40", "frawhide"], + "targetBranchChoices": ["el10", "f40", "f41", "f42", "frawhide"], "branchLabelMapping": { "^sync-(.+)$": "$1" } From 38bcaa726ab2d675bcb7f9218902b32dac394278 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sun, 9 Mar 2025 01:09:46 -0600 Subject: [PATCH 0227/2977] fix(pokeget-rs): Change update script to JSON array (#3826) Signed-off-by: Gilver --- anda/misc/pokeget-rs/update.rhai | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/misc/pokeget-rs/update.rhai b/anda/misc/pokeget-rs/update.rhai index 30c9297bf3..bffa1c3c99 100644 --- a/anda/misc/pokeget-rs/update.rhai +++ b/anda/misc/pokeget-rs/update.rhai @@ -2,7 +2,7 @@ rpm.version(crates("pokeget")); // pokesprites has not received an update in years but let's keep the dep commit current just in case if rpm.changed () { let url = `https://api.github.com/repos/talwat/pokeget-rs/contents/data`; - let json = get(url).json(); - let c = json.2.sha; + let json = get(url).json_arr(); + let c = json[2].sha; rpm.global("pcommit", c); } From f847da3b9ae4c21ed556eb721b84e1e6a793c1ef Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 9 Mar 2025 07:10:26 +0000 Subject: [PATCH 0228/2977] bump(branch): akmod dkms akmod dkms akmod dkms --- anda/system/xone/akmod/xone-kmod.spec | 1 + anda/system/xone/dkms/dkms-xone.spec | 1 + anda/system/xpad-noone/akmod/xpad-noone-kmod.spec | 1 + anda/system/xpad-noone/dkms/dkms-xpad-noone.spec | 1 + anda/system/xpadneo/akmod/xpadneo-kmod.spec | 1 + anda/system/xpadneo/dkms/dkms-xpadneo.spec | 1 + 6 files changed, 6 insertions(+) diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index 710e47fcdf..aaa5207bc4 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -1,4 +1,5 @@ %global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 +%global commitdate 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20241223 %global ver 0.3 diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index 5ee46c5baa..2240b6094a 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -1,4 +1,5 @@ %global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 +%global commitdate 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20241223 %global ver 0.3 diff --git a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec index 7ae74e4dcd..d5c7b6e6af 100644 --- a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec +++ b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec @@ -1,4 +1,5 @@ %global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5 +%global commitdate 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20240109 %global ver 1.0 diff --git a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec index f7831a347e..7b60809c10 100644 --- a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec +++ b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec @@ -1,4 +1,5 @@ %global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5 +%global commitdate 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20240109 %global ver 1.0 diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec index ddf279cb16..7b051737e9 100644 --- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec +++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec @@ -1,4 +1,5 @@ %global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 +%global commitdate 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20241224 %global ver 0.9.7 diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec index 5fe28ad089..76635ad172 100644 --- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec @@ -1,4 +1,5 @@ %global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 +%global commitdate 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20241224 %global ver 0.9.7 From 5422bdce1042d743b01637b4dfc22012b33ce7e5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 9 Mar 2025 07:18:33 +0000 Subject: [PATCH 0229/2977] bump: pokeget-rs --- anda/misc/pokeget-rs/pokeget-rs.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/misc/pokeget-rs/pokeget-rs.spec b/anda/misc/pokeget-rs/pokeget-rs.spec index aa430bf5e8..360fe40c79 100644 --- a/anda/misc/pokeget-rs/pokeget-rs.spec +++ b/anda/misc/pokeget-rs/pokeget-rs.spec @@ -3,8 +3,8 @@ %global shortname pokeget Name: %{shortname}-rs -Version: 1.6.3 -Release: 3%{?dist} +Version: 1.6.4 +Release: 1%?dist SourceLicense: MIT License: MIT AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-2-Clause AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) Summary: A better Rust version of pokeget. From c4944b37569e29ebb4324348757ceacb094fb93c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 9 Mar 2025 07:33:56 +0000 Subject: [PATCH 0230/2977] bump(branch): akmod dkms akmod dkms akmod dkms --- anda/system/xone/akmod/xone-kmod.spec | 1 + anda/system/xone/dkms/dkms-xone.spec | 1 + anda/system/xpad-noone/akmod/xpad-noone-kmod.spec | 1 + anda/system/xpad-noone/dkms/dkms-xpad-noone.spec | 1 + anda/system/xpadneo/akmod/xpadneo-kmod.spec | 1 + anda/system/xpadneo/dkms/dkms-xpadneo.spec | 1 + 6 files changed, 6 insertions(+) diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index aaa5207bc4..c008a37175 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -1,5 +1,6 @@ %global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 %global commitdate 20241223 +%global commitdate 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20241223 %global ver 0.3 diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index 2240b6094a..41e25a5d3c 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -1,5 +1,6 @@ %global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 %global commitdate 20241223 +%global commitdate 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20241223 %global ver 0.3 diff --git a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec index d5c7b6e6af..5c92c2e462 100644 --- a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec +++ b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec @@ -1,5 +1,6 @@ %global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5 %global commitdate 20240109 +%global commitdate 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20240109 %global ver 1.0 diff --git a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec index 7b60809c10..7b1390eaa7 100644 --- a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec +++ b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec @@ -1,5 +1,6 @@ %global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5 %global commitdate 20240109 +%global commitdate 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20240109 %global ver 1.0 diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec index 7b051737e9..b16f94d8ec 100644 --- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec +++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec @@ -1,5 +1,6 @@ %global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 %global commitdate 20241224 +%global commitdate 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20241224 %global ver 0.9.7 diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec index 76635ad172..8598979bcf 100644 --- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec @@ -1,5 +1,6 @@ %global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 %global commitdate 20241224 +%global commitdate 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20241224 %global ver 0.9.7 From 8f2ff70819619037419ce063ce6b586702491fc6 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sun, 9 Mar 2025 01:34:53 -0600 Subject: [PATCH 0231/2977] feat(v4l2loopback): DKMS package (#3786) * Add files * Waaaaaaaa * Fixes * Bruh Signed-off-by: Gilver * No way they just changed the URL TODAY * Should probably be that Signed-off-by: Gilver * Only build noarch package once * ?????????????????? * Also no * Nevermind I guess * Modules file source --------- Signed-off-by: Gilver --- anda/system/v4l2loopback/akmod/anda.hcl | 1 + .../akmod/modules-load-d-v4l2loopback.conf | 1 - anda/system/v4l2loopback/akmod/update.rhai | 4 +- .../v4l2loopback/akmod/v4l2loopback-kmod.spec | 35 +++++------- anda/system/v4l2loopback/dkms/anda.hcl | 10 ++++ .../v4l2loopback/dkms/dkms-v4l2loopback.spec | 55 +++++++++++++++++++ .../v4l2loopback/dkms/no-weak-modules.conf | 1 + anda/system/v4l2loopback/dkms/update.rhai | 3 + .../v4l2loopback/{ => kmod-common}/anda.hcl | 4 +- .../modprobe-d-98-v4l2loopback.conf | 0 .../v4l2loopback/kmod-common/update.rhai | 1 + .../{ => kmod-common}/v4l2loopback.spec | 38 +++++++------ anda/system/v4l2loopback/update.rhai | 1 - 13 files changed, 111 insertions(+), 43 deletions(-) delete mode 100644 anda/system/v4l2loopback/akmod/modules-load-d-v4l2loopback.conf create mode 100644 anda/system/v4l2loopback/dkms/anda.hcl create mode 100644 anda/system/v4l2loopback/dkms/dkms-v4l2loopback.spec create mode 100644 anda/system/v4l2loopback/dkms/no-weak-modules.conf create mode 100644 anda/system/v4l2loopback/dkms/update.rhai rename anda/system/v4l2loopback/{ => kmod-common}/anda.hcl (63%) rename anda/system/v4l2loopback/{akmod => kmod-common}/modprobe-d-98-v4l2loopback.conf (100%) create mode 100644 anda/system/v4l2loopback/kmod-common/update.rhai rename anda/system/v4l2loopback/{ => kmod-common}/v4l2loopback.spec (60%) delete mode 100644 anda/system/v4l2loopback/update.rhai diff --git a/anda/system/v4l2loopback/akmod/anda.hcl b/anda/system/v4l2loopback/akmod/anda.hcl index b47f435690..f646d65261 100644 --- a/anda/system/v4l2loopback/akmod/anda.hcl +++ b/anda/system/v4l2loopback/akmod/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { mock = 1 + updbranch = 1 } } diff --git a/anda/system/v4l2loopback/akmod/modules-load-d-v4l2loopback.conf b/anda/system/v4l2loopback/akmod/modules-load-d-v4l2loopback.conf deleted file mode 100644 index d394e47bc8..0000000000 --- a/anda/system/v4l2loopback/akmod/modules-load-d-v4l2loopback.conf +++ /dev/null @@ -1 +0,0 @@ -v4l2loopback diff --git a/anda/system/v4l2loopback/akmod/update.rhai b/anda/system/v4l2loopback/akmod/update.rhai index fd9dec4b15..15672a87c9 100644 --- a/anda/system/v4l2loopback/akmod/update.rhai +++ b/anda/system/v4l2loopback/akmod/update.rhai @@ -1 +1,3 @@ -rpm.version(gh_tag("umlaeute/v4l2loopback")); +import "andax/bump_extras.rhai" as bump; + +rpm.version(bump::madoguchi("v4l2loopback", labels.branch)); diff --git a/anda/system/v4l2loopback/akmod/v4l2loopback-kmod.spec b/anda/system/v4l2loopback/akmod/v4l2loopback-kmod.spec index 99d650fd71..38fb51cdee 100644 --- a/anda/system/v4l2loopback/akmod/v4l2loopback-kmod.spec +++ b/anda/system/v4l2loopback/akmod/v4l2loopback-kmod.spec @@ -7,38 +7,40 @@ %global buildforkernels akmod %global debug_package %{nil} - %global commit 2c9b67072b15d903fecde67c7f269abeafee4c25 %global commitdate 20230503 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global modulename v4l2loopback +%global _description %{expand: +This module allows you to create \"virtual video devices.\" Normal \(v4l2\) applications will read these devices as if they were ordinary video devices, but the video will not be read from e.g. a capture card but instead it is generated by another application.} + + Name: %{modulename}-kmod Summary: Kernel module (kmod) for V4L2 loopback devices Version: 0.14.0 Release: 2%?dist -License: GPLv2+ -URL: https://github.com/umlaeute/v4l2loopback +License: GPL-2.0-or-later +URL: https://github.com/v4l2loopback/v4l2loopback Source0: %{url}/archive/v%{version}/%{modulename}-%{version}.tar.gz -Source1: modprobe-d-98-v4l2loopback.conf -Source2: modules-load-d-v4l2loopback.conf -Packager: Cappy Ishihara - BuildRequires: gcc BuildRequires: make BuildRequires: help2man BuildRequires: systemd-rpm-macros BuildRequires: kmodtool +Requires: akmods +Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} +Requires: %{modulename}-akmod-modules = %{?epoch:%{epoch}:}%{version} Requires: kernel-devel +Conflicts: dkms-%{modulename} +Packager: Cappy Ishihara -%{expand:%(kmodtool --target %{_target_cpu} --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } - -%description -This module allows you to create "virtual video devices". Normal (v4l2) applications will read these devices as if they were ordinary video devices, but the video will not be read from e.g. a capture card but instead it is generated by another application. +%{expand:%(kmodtool --target %{_target_cpu} --repo terra --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } +%description %_description %prep %{?kmodtool_check} -kmodtool --target %{_target_cpu} --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null +kmodtool --target %{_target_cpu} --repo terra --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null %autosetup -p1 -n %{modulename}-%{version} @@ -59,14 +61,5 @@ done %{?akmod_install} -install -D -m 0644 %{SOURCE1} %{buildroot}%{_modprobedir}/98-v4l2loopback.conf -install -D -m 0644 %{SOURCE2} %{buildroot}%{_modulesloaddir}/v4l2loopback.conf - -%files -%doc README.md AUTHORS NEWS -%license COPYING -%{_modprobedir}/98-v4l2loopback.conf -%{_modulesloaddir}/v4l2loopback.conf - %changelog %autochangelog diff --git a/anda/system/v4l2loopback/dkms/anda.hcl b/anda/system/v4l2loopback/dkms/anda.hcl new file mode 100644 index 0000000000..74c2e9914c --- /dev/null +++ b/anda/system/v4l2loopback/dkms/anda.hcl @@ -0,0 +1,10 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "dkms-v4l2loopback.spec" + } + labels { + mock = 1 + updbranch = 1 + } +} diff --git a/anda/system/v4l2loopback/dkms/dkms-v4l2loopback.spec b/anda/system/v4l2loopback/dkms/dkms-v4l2loopback.spec new file mode 100644 index 0000000000..2945881096 --- /dev/null +++ b/anda/system/v4l2loopback/dkms/dkms-v4l2loopback.spec @@ -0,0 +1,55 @@ +%global debug_package %{nil} +%global modulename v4l2loopback +%global _description %{expand: +This module allows you to create \"virtual video devices.\" Normal \(v4l2\) applications will read these devices as if they were ordinary video devices, but the video will not be read from e.g. a capture card but instead it is generated by another application.} + +Name: dkms-%{modulename} +Version: 0.14.0 +Release: 1%?dist +Summary: Utils for V4L2 loopback devices +License: GPL-2.0-or-later +URL: https://github.com/v4l2loopback/v4l2loopback +Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +Source1: no-weak-modules.conf +BuildRequires: systemd-rpm-macros +Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} +Requires: dkms +Conflicts: akmod-%{modulename} +BuildArch: noarch +Packager: Gilver E. + +%description %_description + +%prep +%autosetup -p1 -n %{modulename}-%{version} + +%build + +%install +mkdir -p %{buildroot}%{_usrsrc}/%{modulename}-%{version} +cp -fr v4l2loopback.h v4l2loopback.c v4l2loopback_formats.h dkms.conf Kbuild Makefile %{buildroot}%{_usrsrc}/%{modulename}-%{version}/ + +%if 0%{?fedora} +# Do not enable weak modules support in Fedora (no kABI): +install -Dpm644 %{SOURCE1} %{buildroot}%{_sysconfdir}/dkms/%{modulename}.conf +%endif + +%post +dkms add -m %{modulename} -v %{version} -q --rpm_safe_upgrade || : +# Rebuild and make available for the currently running kernel: +dkms build -m %{modulename} -v %{version} -q || : +dkms install -m %{modulename} -v %{version} -q --force || : + +%preun +# Remove all versions from DKMS registry: +dkms remove -m %{modulename} -v %{version} -q --all --rpm_safe_upgrade || : + +%files +%{_usrsrc}/%{modulename}-%{version} +%if 0%{?fedora} +%{_sysconfdir}/dkms/%{modulename}.conf +%endif + +%changelog +* Fri Mar 07 2025 Gilver E. +- Initial package diff --git a/anda/system/v4l2loopback/dkms/no-weak-modules.conf b/anda/system/v4l2loopback/dkms/no-weak-modules.conf new file mode 100644 index 0000000000..24f6f95c96 --- /dev/null +++ b/anda/system/v4l2loopback/dkms/no-weak-modules.conf @@ -0,0 +1 @@ +NO_WEAK_MODULES="yes" diff --git a/anda/system/v4l2loopback/dkms/update.rhai b/anda/system/v4l2loopback/dkms/update.rhai new file mode 100644 index 0000000000..15672a87c9 --- /dev/null +++ b/anda/system/v4l2loopback/dkms/update.rhai @@ -0,0 +1,3 @@ +import "andax/bump_extras.rhai" as bump; + +rpm.version(bump::madoguchi("v4l2loopback", labels.branch)); diff --git a/anda/system/v4l2loopback/anda.hcl b/anda/system/v4l2loopback/kmod-common/anda.hcl similarity index 63% rename from anda/system/v4l2loopback/anda.hcl rename to anda/system/v4l2loopback/kmod-common/anda.hcl index 14eb49b671..ca17cc3b34 100644 --- a/anda/system/v4l2loopback/anda.hcl +++ b/anda/system/v4l2loopback/kmod-common/anda.hcl @@ -1,8 +1,6 @@ project pkg { + arches = ["x86_64", "aarch64"] rpm { spec = "v4l2loopback.spec" } - labels { - mock = 1 - } } diff --git a/anda/system/v4l2loopback/akmod/modprobe-d-98-v4l2loopback.conf b/anda/system/v4l2loopback/kmod-common/modprobe-d-98-v4l2loopback.conf similarity index 100% rename from anda/system/v4l2loopback/akmod/modprobe-d-98-v4l2loopback.conf rename to anda/system/v4l2loopback/kmod-common/modprobe-d-98-v4l2loopback.conf diff --git a/anda/system/v4l2loopback/kmod-common/update.rhai b/anda/system/v4l2loopback/kmod-common/update.rhai new file mode 100644 index 0000000000..609ecb5f33 --- /dev/null +++ b/anda/system/v4l2loopback/kmod-common/update.rhai @@ -0,0 +1 @@ +rpm.version(gh_tag("v4l2loopback/v4l2loopback")); diff --git a/anda/system/v4l2loopback/v4l2loopback.spec b/anda/system/v4l2loopback/kmod-common/v4l2loopback.spec similarity index 60% rename from anda/system/v4l2loopback/v4l2loopback.spec rename to anda/system/v4l2loopback/kmod-common/v4l2loopback.spec index d9c46e3ce8..37bb386f78 100644 --- a/anda/system/v4l2loopback/v4l2loopback.spec +++ b/anda/system/v4l2loopback/kmod-common/v4l2loopback.spec @@ -1,6 +1,4 @@ -%global buildforkernels akmod %global debug_package %{nil} - %global commit 2c9b67072b15d903fecde67c7f269abeafee4c25 %global commitdate 20230503 %global shortcommit %(c=%{commit}; echo ${c:0:7}) @@ -8,48 +6,53 @@ Name: v4l2loopback Summary: Utils for V4L2 loopback devices Version: 0.14.0 -Release: 2%?dist -License: GPLv2+ -URL: https://github.com/umlaeute/v4l2loopback +Release: 3%?dist +License: GPL-2.0-or-later +URL: https://github.com/v4l2loopback/v4l2loopback Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -Packager: Cappy Ishihara - +Source1: modprobe-d-98-v4l2loopback.conf BuildRequires: gcc BuildRequires: make BuildRequires: help2man +BuildRequires: sed BuildRequires: systemd-rpm-macros -BuildRequires: kmodtool -BuildRequires: systemd-rpm-macros -Requires: %{name}-kmod -Provides: %{name}-kmod-common = %{version}-%{release} +Requires: (akmod-%{name} = %{?epoch:%{epoch}:}%{version} or dkms-%{name} = %{?epoch:%{epoch}:}%{version}) +Provides: %{name}-kmod-common = %{?epoch:%{epoch}:}%{version} ### For compatibility with older names Provides: %{name}-utils = %{version}-%{release} Obsoletes: %{name}-utils < 0.12.5-2 +Packager: Cappy Ishihara %description Allows you to create "virtual video devices". Normal (v4l2) applications will read these devices as if they were ordinary video devices, but the video will not be read from e.g. a capture card but instead it is generated by another application. +%package akmod-modules +Summary: Modules for Akmods +Requires: akmod-%{name} +BuildArch: noarch + +%description akmod-modules +Akmods modules for the akmod-%{name} package. %prep - %autosetup -p1 -n %{name}-%{version} -%build +/usr/bin/sed -nE '/^PACKAGE_NAME/{s@^.+"(.+)"@\1@; s|-|_|g; p}' dkms.conf > %{name}.conf +%build %{set_build_flags} %make_build utils %install - - %{set_build_flags} %make_build utils make V=1 %{?_smp_mflags} install-utils DESTDIR=%{buildroot} PREFIX=%{_prefix} make V=1 %{?_smp_mflags} install-man DESTDIR=%{buildroot} PREFIX=%{_prefix} - +install -Dm644 %{SOURCE1} %{buildroot}%{_modprobedir}/98-v4l2loopback.conf +install -Dm644 %{name}.conf -t %{buildroot}%{_modulesloaddir} %files @@ -57,7 +60,10 @@ make V=1 %{?_smp_mflags} install-man DESTDIR=%{buildroot} PREFIX=%{_prefix} %license COPYING %attr(0755,root,root) %{_bindir}/v4l2loopback-ctl %attr(0644,root,root) %{_mandir}/man1/v4l2loopback-ctl.1* +%{_modprobedir}/98-v4l2loopback.conf +%files akmod-modules +%{_modulesloaddir}/v4l2loopback.conf %changelog %autochangelog diff --git a/anda/system/v4l2loopback/update.rhai b/anda/system/v4l2loopback/update.rhai deleted file mode 100644 index fd9dec4b15..0000000000 --- a/anda/system/v4l2loopback/update.rhai +++ /dev/null @@ -1 +0,0 @@ -rpm.version(gh_tag("umlaeute/v4l2loopback")); From aaab14a4383ba6c891664555dfb8729b9cf5eb72 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 9 Mar 2025 08:14:03 +0000 Subject: [PATCH 0232/2977] bump(branch): akmod dkms akmod dkms akmod dkms --- anda/system/xone/akmod/xone-kmod.spec | 1 + anda/system/xone/dkms/dkms-xone.spec | 1 + anda/system/xpad-noone/akmod/xpad-noone-kmod.spec | 1 + anda/system/xpad-noone/dkms/dkms-xpad-noone.spec | 1 + anda/system/xpadneo/akmod/xpadneo-kmod.spec | 1 + anda/system/xpadneo/dkms/dkms-xpadneo.spec | 1 + 6 files changed, 6 insertions(+) diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index c008a37175..2c5c9c6ee5 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -1,6 +1,7 @@ %global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 %global commitdate 20241223 %global commitdate 20241223 +%global commitdate 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20241223 %global ver 0.3 diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index 41e25a5d3c..30c1123c1b 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -1,6 +1,7 @@ %global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 %global commitdate 20241223 %global commitdate 20241223 +%global commitdate 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20241223 %global ver 0.3 diff --git a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec index 5c92c2e462..32ccfacbf7 100644 --- a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec +++ b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec @@ -1,6 +1,7 @@ %global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5 %global commitdate 20240109 %global commitdate 20240109 +%global commitdate 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20240109 %global ver 1.0 diff --git a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec index 7b1390eaa7..32bbeaadb5 100644 --- a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec +++ b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec @@ -1,6 +1,7 @@ %global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5 %global commitdate 20240109 %global commitdate 20240109 +%global commitdate 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20240109 %global ver 1.0 diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec index b16f94d8ec..de5e2d598a 100644 --- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec +++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec @@ -1,6 +1,7 @@ %global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 %global commitdate 20241224 %global commitdate 20241224 +%global commitdate 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20241224 %global ver 0.9.7 diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec index 8598979bcf..48926a1694 100644 --- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec @@ -1,6 +1,7 @@ %global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 %global commitdate 20241224 %global commitdate 20241224 +%global commitdate 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20241224 %global ver 0.9.7 From 4bfd3fa8bbb8b8512a919eaf7ff1fea7abba40ab Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 9 Mar 2025 08:33:41 +0000 Subject: [PATCH 0233/2977] bump(branch): akmod dkms akmod dkms akmod dkms --- anda/system/xone/akmod/xone-kmod.spec | 1 + anda/system/xone/dkms/dkms-xone.spec | 1 + anda/system/xpad-noone/akmod/xpad-noone-kmod.spec | 1 + anda/system/xpad-noone/dkms/dkms-xpad-noone.spec | 1 + anda/system/xpadneo/akmod/xpadneo-kmod.spec | 1 + anda/system/xpadneo/dkms/dkms-xpadneo.spec | 1 + 6 files changed, 6 insertions(+) diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index 2c5c9c6ee5..90a04d2b8b 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -2,6 +2,7 @@ %global commitdate 20241223 %global commitdate 20241223 %global commitdate 20241223 +%global commitdate 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20241223 %global ver 0.3 diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index 30c1123c1b..83a29816d9 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -2,6 +2,7 @@ %global commitdate 20241223 %global commitdate 20241223 %global commitdate 20241223 +%global commitdate 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20241223 %global ver 0.3 diff --git a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec index 32ccfacbf7..29018fe6d2 100644 --- a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec +++ b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec @@ -2,6 +2,7 @@ %global commitdate 20240109 %global commitdate 20240109 %global commitdate 20240109 +%global commitdate 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20240109 %global ver 1.0 diff --git a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec index 32bbeaadb5..171a691593 100644 --- a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec +++ b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec @@ -2,6 +2,7 @@ %global commitdate 20240109 %global commitdate 20240109 %global commitdate 20240109 +%global commitdate 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20240109 %global ver 1.0 diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec index de5e2d598a..904b18d74b 100644 --- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec +++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec @@ -2,6 +2,7 @@ %global commitdate 20241224 %global commitdate 20241224 %global commitdate 20241224 +%global commitdate 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20241224 %global ver 0.9.7 diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec index 48926a1694..2160c09ffc 100644 --- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec @@ -2,6 +2,7 @@ %global commitdate 20241224 %global commitdate 20241224 %global commitdate 20241224 +%global commitdate 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20241224 %global ver 0.9.7 From 46eb0c0bd57d0f8241a6ce93a226fde91e2c19b6 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sun, 9 Mar 2025 03:58:46 -0500 Subject: [PATCH 0234/2977] fix(xpadneo, xone, xpad-noone): Actually fix update scripts (#3845) * Remove weirdness Signed-off-by: Gilver * Add space Signed-off-by: Gilver * Add space Signed-off-by: Gilver * Remove extra macros Signed-off-by: Gilver * Somehow this wasn't updated Signed-off-by: Gilver * Update update.rhai Signed-off-by: Gilver * Update update.rhai Signed-off-by: Gilver * Update update.rhai Signed-off-by: Gilver * Update update.rhai Signed-off-by: Gilver * Update update.rhai Signed-off-by: Gilver * Update dkms-xpad-noone.spec Signed-off-by: Gilver * Update xpad-noone-kmod.spec Signed-off-by: Gilver * Update dkms-xpadneo.spec Signed-off-by: Gilver * Update xpadneo-kmod.spec Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/system/xone/akmod/update.rhai | 2 +- anda/system/xone/akmod/xone-kmod.spec | 4 ---- anda/system/xone/dkms/dkms-xone.spec | 4 ---- anda/system/xone/dkms/update.rhai | 6 +++--- anda/system/xpad-noone/akmod/update.rhai | 2 +- anda/system/xpad-noone/akmod/xpad-noone-kmod.spec | 4 ---- anda/system/xpad-noone/dkms/dkms-xpad-noone.spec | 4 ---- anda/system/xpad-noone/dkms/update.rhai | 2 +- anda/system/xpadneo/akmod/update.rhai | 2 +- anda/system/xpadneo/akmod/xpadneo-kmod.spec | 4 ---- anda/system/xpadneo/dkms/dkms-xpadneo.spec | 4 ---- anda/system/xpadneo/dkms/update.rhai | 2 +- 12 files changed, 8 insertions(+), 32 deletions(-) diff --git a/anda/system/xone/akmod/update.rhai b/anda/system/xone/akmod/update.rhai index 95295c3ac6..1e2fcbcc56 100644 --- a/anda/system/xone/akmod/update.rhai +++ b/anda/system/xone/akmod/update.rhai @@ -1,4 +1,4 @@ -let c = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +let c = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; c.pop(); rpm.global("commit", c); if rpm.changed() { diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index 90a04d2b8b..710e47fcdf 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -1,8 +1,4 @@ %global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 -%global commitdate 20241223 -%global commitdate 20241223 -%global commitdate 20241223 -%global commitdate 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20241223 %global ver 0.3 diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index 83a29816d9..5ee46c5baa 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -1,8 +1,4 @@ %global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 -%global commitdate 20241223 -%global commitdate 20241223 -%global commitdate 20241223 -%global commitdate 20241223 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20241223 %global ver 0.3 diff --git a/anda/system/xone/dkms/update.rhai b/anda/system/xone/dkms/update.rhai index 0ac5d9b6bb..1e2fcbcc56 100644 --- a/anda/system/xone/dkms/update.rhai +++ b/anda/system/xone/dkms/update.rhai @@ -1,11 +1,11 @@ -let c = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +let c = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; c.pop(); rpm.global("commit", c); if rpm.changed() { rpm.release(); - let d = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout; + let d = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global commitdate' | sed -E 's/.+commitdate //'", #{"stdout": "piped"}).ctx.stdout; d.pop(); - rpm.global("commit_date", d); + rpm.global("commitdate", d); let v = sh("cat anda/system/xone/kmod-common/xone.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; v.pop(); rpm.global("ver", v); diff --git a/anda/system/xpad-noone/akmod/update.rhai b/anda/system/xpad-noone/akmod/update.rhai index 05ee92a730..26a5eb17b4 100644 --- a/anda/system/xpad-noone/akmod/update.rhai +++ b/anda/system/xpad-noone/akmod/update.rhai @@ -1,4 +1,4 @@ -let c = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +let c = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; c.pop(); rpm.global("commit", c); if rpm.changed() { diff --git a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec index 29018fe6d2..7ae74e4dcd 100644 --- a/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec +++ b/anda/system/xpad-noone/akmod/xpad-noone-kmod.spec @@ -1,8 +1,4 @@ %global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5 -%global commitdate 20240109 -%global commitdate 20240109 -%global commitdate 20240109 -%global commitdate 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20240109 %global ver 1.0 diff --git a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec index 171a691593..f7831a347e 100644 --- a/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec +++ b/anda/system/xpad-noone/dkms/dkms-xpad-noone.spec @@ -1,8 +1,4 @@ %global commit 6970c40930bedd8b58d0764894e0d5f04813b7c5 -%global commitdate 20240109 -%global commitdate 20240109 -%global commitdate 20240109 -%global commitdate 20240109 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20240109 %global ver 1.0 diff --git a/anda/system/xpad-noone/dkms/update.rhai b/anda/system/xpad-noone/dkms/update.rhai index 05ee92a730..26a5eb17b4 100644 --- a/anda/system/xpad-noone/dkms/update.rhai +++ b/anda/system/xpad-noone/dkms/update.rhai @@ -1,4 +1,4 @@ -let c = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +let c = sh("cat anda/system/xpad-noone/kmod-common/xpad-noone.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; c.pop(); rpm.global("commit", c); if rpm.changed() { diff --git a/anda/system/xpadneo/akmod/update.rhai b/anda/system/xpadneo/akmod/update.rhai index 2a64921582..b7de501f56 100644 --- a/anda/system/xpadneo/akmod/update.rhai +++ b/anda/system/xpadneo/akmod/update.rhai @@ -1,4 +1,4 @@ -let c = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +let c = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; c.pop(); rpm.global("commit", c); if rpm.changed() { diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec index 904b18d74b..ddf279cb16 100644 --- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec +++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec @@ -1,8 +1,4 @@ %global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 -%global commitdate 20241224 -%global commitdate 20241224 -%global commitdate 20241224 -%global commitdate 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20241224 %global ver 0.9.7 diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec index 2160c09ffc..5fe28ad089 100644 --- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec @@ -1,8 +1,4 @@ %global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 -%global commitdate 20241224 -%global commitdate 20241224 -%global commitdate 20241224 -%global commitdate 20241224 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commitdate 20241224 %global ver 0.9.7 diff --git a/anda/system/xpadneo/dkms/update.rhai b/anda/system/xpadneo/dkms/update.rhai index 2a64921582..b7de501f56 100644 --- a/anda/system/xpadneo/dkms/update.rhai +++ b/anda/system/xpadneo/dkms/update.rhai @@ -1,4 +1,4 @@ -let c = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commit' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; +let c = sh("cat anda/system/xpadneo/kmod-common/xpadneo.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; c.pop(); rpm.global("commit", c); if rpm.changed() { From 89516c456e63c91099cf3d0a65deef576ce37708 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 9 Mar 2025 17:12:13 +0000 Subject: [PATCH 0235/2977] bump: osu-lazer --- anda/games/osu-lazer/osu-lazer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index c6f5f922d4..1e7e69ebce 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -3,7 +3,7 @@ %define __strip /bin/true Name: osu-lazer -Version: 2025.306.0 +Version: 2025.310.0 Release: 1%?dist Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew. ExclusiveArch: x86_64 From 0e54f906c4ee3446f3d02955ac53896aac245cd5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 10 Mar 2025 01:14:52 +0000 Subject: [PATCH 0236/2977] bump: ruffle limine --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- anda/system/limine/limine.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 7477f1470c..5c42db24e7 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-08 +%global ver 2025-03-10 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/system/limine/limine.spec b/anda/system/limine/limine.spec index e6d128928e..c329bb3f94 100644 --- a/anda/system/limine/limine.spec +++ b/anda/system/limine/limine.spec @@ -1,5 +1,5 @@ Name: limine -Version: 9.1.0 +Version: 9.1.1 Release: 1%?dist Summary: Modern, advanced, portable, multiprotocol bootloader License: BSD-2-Clause From 47993e6ca4bcae164bc131ca6258833715705920 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 10 Mar 2025 01:18:03 +0000 Subject: [PATCH 0237/2977] bump(nightly): mpv nightly nightly prismlauncher-nightly --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 6 +++--- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index a5e0e568e9..6986d9bcdb 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit d9cf7a3d395ca160face9fd0c649c7aab274a93a +%global commit edf4fdfb1f33ae194715992d21c538c8d3a19e89 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250309 +%global commit_date 20250310 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 2e7e009fa5..99d13251e7 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit d3fd2b02e71f3eaecd310b246ee64a26a59b78e3 +%global commit 480b1a980521b310c777ca393a93f4ff350003fc %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-03-08 +%global fulldate 2025-03-10 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 @@ -14,7 +14,7 @@ Name: %{base_name}-nightly Version: %{ver}~tip^%{commit_date}git%{shortcommit} -Release: 2%?dist +Release: 1%?dist %if 0%{?fedora} <= 41 Epoch: 1 %endif diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 7066cc0f7f..6a39459c88 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit ed6bf7f161c6af6e10354faacb8b643a55c80b27 +%global commit 8a7a78fafbd4c4ec643b32c44020b1256a96401c %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250309 +%global commit_date 20250310 %global ver 0.178.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 3fad0b24e6..162bbfb12d 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit f9ab75868a47e37ab08e5a8d0a016b2235f36ab1 +%global commit bb9e19eec65464da5c33ae359eb15b543dd978f1 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250304 +%global commit_date 20250310 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 From 045cac2aebf283abddcb9a1fc3e475a0bd9f22a7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 10 Mar 2025 03:17:56 +0000 Subject: [PATCH 0238/2977] bump: feishin --- anda/apps/feishin/feishin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/feishin/feishin.spec b/anda/apps/feishin/feishin.spec index fef80dc997..21b5208af4 100644 --- a/anda/apps/feishin/feishin.spec +++ b/anda/apps/feishin/feishin.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: feishin -Version: 0.12.2 +Version: 0.12.3 Release: 1%?dist Summary: A modern self-hosted music player License: GPL-3.0 From ddf78a2229ea94bd6503eed82b1a036b9048a79c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 10 Mar 2025 03:55:39 +0000 Subject: [PATCH 0239/2977] bump: electron --- anda/tools/electron/electron.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/electron/electron.spec b/anda/tools/electron/electron.spec index 3680b40e5b..388f80c0d0 100644 --- a/anda/tools/electron/electron.spec +++ b/anda/tools/electron/electron.spec @@ -12,7 +12,7 @@ %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so Name: electron -Version: 35.0.0 +Version: 35.0.1 Release: 1%?dist Summary: Build cross platform desktop apps with web technologies License: MIT From b60021e6748443afb482d1060209834c495703fb Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 10 Mar 2025 15:55:30 +0000 Subject: [PATCH 0240/2977] bump: devpod --- anda/devs/devpod/golang-github-loft-sh-devpod.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/devpod/golang-github-loft-sh-devpod.spec b/anda/devs/devpod/golang-github-loft-sh-devpod.spec index 1a9b3969f6..d6347a9f78 100644 --- a/anda/devs/devpod/golang-github-loft-sh-devpod.spec +++ b/anda/devs/devpod/golang-github-loft-sh-devpod.spec @@ -3,7 +3,7 @@ # https://github.com/loft-sh/devpod %global goipath github.com/loft-sh/devpod -Version: 0.6.14 +Version: 0.6.15 %gometa -f @@ -17,7 +17,7 @@ and lets you use any cloud, kubernetes or just localhost docker.} loadtest/README.md Name: devpod -Release: 2%?dist +Release: 1%?dist Summary: Codespaces but open-source, client-only and unopinionated: Works with any IDE and lets you use any cloud, kubernetes or just localhost docker Provides: golang-github-loft-sh-devpod BuildRequires: anda-srpm-macros mold From 633173812ed50f91e75d4a2ab7b47ac8f57aeb96 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 10 Mar 2025 16:41:04 +0000 Subject: [PATCH 0241/2977] bump: vala-panel-appmenu --- anda/langs/vala/vala-panel-appmenu/vala-panel-appmenu.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/vala/vala-panel-appmenu/vala-panel-appmenu.spec b/anda/langs/vala/vala-panel-appmenu/vala-panel-appmenu.spec index e6cc115938..0f507b28db 100644 --- a/anda/langs/vala/vala-panel-appmenu/vala-panel-appmenu.spec +++ b/anda/langs/vala/vala-panel-appmenu/vala-panel-appmenu.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/vala-panel-project/vala-panel-appmenu -%global commit 218bb4aaf1a1d9fcd89a71a14c8bf99cfd94ba1e +%global commit 8c8e788bf04c8c2911b72a24e3b79842d5b2b286 %forgemeta Name: vala-panel-appmenu From 01af5637e7f095b6776ed29bf47e1812e0b5c6f5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 10 Mar 2025 16:57:32 +0000 Subject: [PATCH 0242/2977] bump: rio --- anda/devs/rio/rio.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/rio/rio.spec b/anda/devs/rio/rio.spec index 5518b4f8d7..081eb7e7d4 100644 --- a/anda/devs/rio/rio.spec +++ b/anda/devs/rio/rio.spec @@ -3,8 +3,8 @@ A hardware-accelerated terminal emulator focusing to run in desktops and browser %global realname rio Name: %{realname}term -Version: 0.2.8 -Release: 2%{?dist} +Version: 0.2.9 +Release: 1%?dist Summary: A hardware-accelerated terminal written in Rust. SourceLicense: MIT License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND Apache-2.0 AND BSD-2-Clause AND BSL-1.0 AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND CC0-1.0 AND ISC AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND (MPL-2.0 OR GPL-3.0-only) AND MPL-2.0+ AND MPL-2.0 AND Unicode-3.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND Zlib From 839869c3b2b682df75735112e8949acbeb7a51e7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 10 Mar 2025 17:35:31 +0000 Subject: [PATCH 0243/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index ca7c6bab3c..41598e779d 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.177.5-pre +%global ver 0.177.6-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From 057c02562df3094a7e48a0c4e3afe50c3f44b209 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 10 Mar 2025 20:26:51 +0000 Subject: [PATCH 0244/2977] bump: discord-openasar discord --- anda/apps/discord-openasar/discord-openasar.spec | 2 +- anda/apps/discord/discord.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-openasar/discord-openasar.spec b/anda/apps/discord-openasar/discord-openasar.spec index 93ae38c32d..b97c96460a 100644 --- a/anda/apps/discord-openasar/discord-openasar.spec +++ b/anda/apps/discord-openasar/discord-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-openasar -Version: 0.0.87 +Version: 0.0.88 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord/discord.spec b/anda/apps/discord/discord.spec index 5ff5c3f9db..0f2a326181 100644 --- a/anda/apps/discord/discord.spec +++ b/anda/apps/discord/discord.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord -Version: 0.0.87 +Version: 0.0.88 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: https://discord.com From d0fc945a5f619001e0e538b54392487f88727d40 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 10 Mar 2025 22:34:46 +0000 Subject: [PATCH 0245/2977] bump: heroic-games-launcher --- anda/games/heroic-games-launcher/heroic-games-launcher.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/games/heroic-games-launcher/heroic-games-launcher.spec b/anda/games/heroic-games-launcher/heroic-games-launcher.spec index fa8cb28cd4..5d1c90e2bd 100644 --- a/anda/games/heroic-games-launcher/heroic-games-launcher.spec +++ b/anda/games/heroic-games-launcher/heroic-games-launcher.spec @@ -5,8 +5,8 @@ %global git_name HeroicGamesLauncher Name: heroic-games-launcher -Version: 2.16.0 -Release: 2%?dist +Version: 2.16.1 +Release: 1%?dist Summary: A games launcher for GOG, Amazon, and Epic Games License: GPL-3.0-only AND MIT AND BSD-3-Clause URL: https://heroicgameslauncher.com From b5eea1cd7d75a8453fe8a9b450e24d9d5e1c0618 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 10 Mar 2025 23:55:43 +0000 Subject: [PATCH 0246/2977] bump: limine --- anda/system/limine/limine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/limine/limine.spec b/anda/system/limine/limine.spec index c329bb3f94..57fcf5dc68 100644 --- a/anda/system/limine/limine.spec +++ b/anda/system/limine/limine.spec @@ -1,5 +1,5 @@ Name: limine -Version: 9.1.1 +Version: 9.1.2 Release: 1%?dist Summary: Modern, advanced, portable, multiprotocol bootloader License: BSD-2-Clause From fbe1c5df286c74c0da2a127769930c800bb63416 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 11 Mar 2025 01:22:57 +0000 Subject: [PATCH 0247/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 5c42db24e7..84df806674 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-10 +%global ver 2025-03-11 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 08e9cab73748c2c689ce3211d0f34508ce6ab1a4 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 11 Mar 2025 01:41:08 +0000 Subject: [PATCH 0248/2977] bump(nightly): mpv nightly nightly prismlauncher-nightly nim-nightly --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 2 +- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 6986d9bcdb..84f7fa5f64 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit edf4fdfb1f33ae194715992d21c538c8d3a19e89 +%global commit 4c26e7d2edd9000bc8d0ff9cf86cf1dee25f37f1 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250310 +%global commit_date 20250311 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 99d13251e7..781e94f354 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,4 +1,4 @@ -%global commit 480b1a980521b310c777ca393a93f4ff350003fc +%global commit 95daca616db5c24d7bb37fd5a3ac2f8762bb4ead %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global fulldate 2025-03-10 %global commit_date %(echo %{fulldate} | sed 's/-//g') diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 6a39459c88..7c64481b99 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 8a7a78fafbd4c4ec643b32c44020b1256a96401c +%global commit 1a3597d726c3e37d4e9284ad6a009235df7ae96c %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250310 +%global commit_date 20250311 %global ver 0.178.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 162bbfb12d..278864ae6c 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit bb9e19eec65464da5c33ae359eb15b543dd978f1 +%global commit 1e1730e5a9bf286d10b2f768e60e1e4cd2fa8f20 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250310 +%global commit_date 20250311 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 3dbf19e054..13ed7fe1db 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit dfab30734b08a021de53f63ccddc65701f356e67 +%global commit f8294ce06e61752d15624e0422c5296292ef5467 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250308 +%global commit_date 20250311 %global debug_package %nil Name: nim-nightly From 369c6b5d3f983f59ad2f6de1799abea15358e913 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 11 Mar 2025 04:21:59 +0000 Subject: [PATCH 0249/2977] bump: bun --- anda/devs/bun/bun-bin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/bun/bun-bin.spec b/anda/devs/bun/bun-bin.spec index ab2d6c88ea..399a60471d 100644 --- a/anda/devs/bun/bun-bin.spec +++ b/anda/devs/bun/bun-bin.spec @@ -6,7 +6,7 @@ %endif Name: bun-bin -Version: 1.2.4 +Version: 1.2.5 Release: 1%?dist Summary: Incredibly fast JavaScript runtime, bundler, test runner, and package manager – all in one License: MIT From 14a4edd4f04544607891e6c3193ce9fc092e5a66 Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 10 Mar 2025 23:54:38 -0500 Subject: [PATCH 0250/2977] chore: Bump ghostty-nightly manually (#3855) Signed-off-by: Gilver --- anda/devs/ghostty/nightly/ghostty-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 781e94f354..d5c6781e52 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -14,7 +14,7 @@ Name: %{base_name}-nightly Version: %{ver}~tip^%{commit_date}git%{shortcommit} -Release: 1%?dist +Release: 2%?dist %if 0%{?fedora} <= 41 Epoch: 1 %endif From f6268d8102ba96618a29f18675ab578e4b2c8e2d Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 10 Mar 2025 23:57:51 -0500 Subject: [PATCH 0251/2977] fix(mesa): Remove libglapi entirely and change what obsoletes it (#3849) * Just nuke libglapi Signed-off-by: Gilver * No Signed-off-by: Gilver * Bump release Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/lib/mesa/mesa.spec | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index b28745bee9..fb1860d1c7 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -76,7 +76,7 @@ Summary: Mesa graphics libraries # disabled by default, and has to be enabled manually. See `terra/release/terra-mesa.repo` for details. Epoch: 1 Version: 25.0.1 -Release: 2%?dist +Release: 3%?dist License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org @@ -209,7 +209,6 @@ Obsoletes: mesa-omx-drivers < %{?epoch:%{epoch}:}%{version}-%{release} %package libGL Summary: Mesa libGL runtime libraries -Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: libglvnd-glx%{?_isa} >= 1:1.3.2 Recommends: %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -231,7 +230,6 @@ Recommends: gl-manpages Summary: Mesa libEGL runtime libraries Requires: libglvnd-egl%{?_isa} >= 1:1.3.2 Requires: %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Recommends: %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description libEGL @@ -251,10 +249,10 @@ Provides: libEGL-devel%{?_isa} %package dri-drivers Summary: Mesa-based DRI drivers Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?with_va} Recommends: %{name}-va-drivers%{?_isa} %endif +Obsoletes: %{name}-libglapi < 25.0.0~rc2-1 %description dri-drivers %{summary}. @@ -264,7 +262,6 @@ Recommends: %{name}-va-drivers%{?_isa} Summary: Mesa-based VA-API video acceleration drivers Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: %{name}-vaapi-drivers < 22.2.0-5 -Obsoletes: %{name}-libglapi < 25.0.0~rc2-1 %description va-drivers %{summary}. @@ -281,7 +278,6 @@ Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{rel %package libOSMesa Summary: Mesa offscreen rendering libraries -Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Provides: libOSMesa Provides: libOSMesa%{?_isa} From 763fac09cb31b0d2f5d12c8fee5a64d5cc6d129e Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 11 Mar 2025 13:50:20 +0800 Subject: [PATCH 0252/2977] feat(mesa): patches: two commit backports for game fixes (#3825) Closes #3804 --- ...f9a972324a72dd507e09ac975b969e6c88e0.patch | 34 +++++++++++++++++ ...8799be3afe9a1e7ca9156a5d44ffe0aae681.patch | 38 +++++++++++++++++++ anda/lib/mesa/mesa.spec | 5 ++- 3 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 anda/lib/mesa/13a3f9a972324a72dd507e09ac975b969e6c88e0.patch create mode 100644 anda/lib/mesa/237d8799be3afe9a1e7ca9156a5d44ffe0aae681.patch diff --git a/anda/lib/mesa/13a3f9a972324a72dd507e09ac975b969e6c88e0.patch b/anda/lib/mesa/13a3f9a972324a72dd507e09ac975b969e6c88e0.patch new file mode 100644 index 0000000000..43b451f3d1 --- /dev/null +++ b/anda/lib/mesa/13a3f9a972324a72dd507e09ac975b969e6c88e0.patch @@ -0,0 +1,34 @@ +From 13a3f9a972324a72dd507e09ac975b969e6c88e0 Mon Sep 17 00:00:00 2001 +From: Hans-Kristian Arntzen +Date: Tue, 25 Feb 2025 12:43:17 +0100 +Subject: [PATCH] radv: Always set 0 dispatch offset for indirect CS. + +Fixes severe glitching in Avowed. + +Signed-off-by: Hans-Kristian Arntzen +Reviewed-by: Samuel Pitoiset +Reviewed-by: Natalie Vock +Cc: mesa-stable +Part-of: +--- + src/amd/vulkan/radv_cmd_buffer.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c +index d8c0c6810524b..d85c0659cb04e 100644 +--- a/src/amd/vulkan/radv_cmd_buffer.c ++++ b/src/amd/vulkan/radv_cmd_buffer.c +@@ -11722,6 +11722,10 @@ radv_emit_dispatch_packets(struct radv_cmd_buffer *cmd_buffer, const struct radv + dispatch_initiator |= S_00B800_USE_THREAD_DIMENSIONS(1); + } + ++ /* Indirect CS does not support offsets in the API. Must program this in case there have been ++ * preceding 1D RT dispatch or vkCmdDispatchBase. */ ++ dispatch_initiator |= S_00B800_FORCE_START_AT_000(1); ++ + if (grid_size_offset) { + if (device->load_grid_size_from_user_sgpr) { + assert(pdev->info.gfx_level >= GFX10_3); +-- +GitLab + diff --git a/anda/lib/mesa/237d8799be3afe9a1e7ca9156a5d44ffe0aae681.patch b/anda/lib/mesa/237d8799be3afe9a1e7ca9156a5d44ffe0aae681.patch new file mode 100644 index 0000000000..47151e7f03 --- /dev/null +++ b/anda/lib/mesa/237d8799be3afe9a1e7ca9156a5d44ffe0aae681.patch @@ -0,0 +1,38 @@ +From 237d8799be3afe9a1e7ca9156a5d44ffe0aae681 Mon Sep 17 00:00:00 2001 +From: Natalie Vock +Date: Fri, 28 Feb 2025 14:21:57 +0100 +Subject: [PATCH] radv/rt: Limit monolithic pipelines to 50 stages + +Beyond that, monolithic pipelines just bloat to incredible sizes, +destroying compile times for questionable, if any, runtime perf benefit. + +Indiana Jones: The Great Circle has more than 100 stages and takes +several minutes to compile its RT pipeline on Deck when using monolithic +compilation, and yet separate shaders still end up faster (probably +because instruction cache coherency in traversal is better). + +Part-of: +--- + src/amd/vulkan/radv_pipeline_rt.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/amd/vulkan/radv_pipeline_rt.c b/src/amd/vulkan/radv_pipeline_rt.c +index 0658840966c30..bcda4aae5528d 100644 +--- a/src/amd/vulkan/radv_pipeline_rt.c ++++ b/src/amd/vulkan/radv_pipeline_rt.c +@@ -602,7 +602,11 @@ radv_rt_compile_shaders(struct radv_device *device, struct vk_pipeline_cache *ca + + bool library = pipeline->base.base.create_flags & VK_PIPELINE_CREATE_2_LIBRARY_BIT_KHR; + +- bool monolithic = !library; ++ /* Beyond 50 shader stages, inlining everything bloats the shader a ton, increasing compile times and ++ * potentially even reducing runtime performance because of instruction cache coherency issues in the ++ * traversal loop. ++ */ ++ bool monolithic = !library && pipeline->stage_count < 50; + for (uint32_t i = 0; i < pCreateInfo->stageCount; i++) { + if (rt_stages[i].shader || rt_stages[i].nir) + continue; +-- +GitLab + diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index fb1860d1c7..0324d039f6 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -76,7 +76,7 @@ Summary: Mesa graphics libraries # disabled by default, and has to be enabled manually. See `terra/release/terra-mesa.repo` for details. Epoch: 1 Version: 25.0.1 -Release: 3%?dist +Release: 4%?dist License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org @@ -99,6 +99,9 @@ Patch20: valve.patch # https://gitlab.freedesktop.org/mesa/mesa/-/issues/12633 Patch21: 12633.patch +Patch30: 237d8799be3afe9a1e7ca9156a5d44ffe0aae681.patch +Patch31: 13a3f9a972324a72dd507e09ac975b969e6c88e0.patch + # s390x: fix build #Patch100: https://src.fedoraproject.org/rpms/mesa/raw/e89544b7a4d811a64ca23b402add29524cc6f704/f/fix-egl-on-s390x.patch From fb67fd1396f7e94021e0916c4e348374e3145010 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 11 Mar 2025 06:50:15 +0000 Subject: [PATCH 0253/2977] bump: opengamepadui --- anda/games/opengamepadui/opengamepadui.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/opengamepadui/opengamepadui.spec b/anda/games/opengamepadui/opengamepadui.spec index e29d8635f3..7c1075e7a2 100644 --- a/anda/games/opengamepadui/opengamepadui.spec +++ b/anda/games/opengamepadui/opengamepadui.spec @@ -1,5 +1,5 @@ Name: opengamepadui -Version: 0.35.8 +Version: 0.37.0 Release: 1%?dist Summary: Open source gamepad-native game launcher and overlay From d88d9ad8aaec56057d45d41d2eba1598adb7d6e5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 11 Mar 2025 13:39:06 +0000 Subject: [PATCH 0254/2977] bump: libnvidia-container nvidia-container-toolkit --- anda/lib/nvidia/libnvidia-container/libnvidia-container.spec | 2 +- .../nvidia-container-toolkit/nvidia-container-toolkit.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/lib/nvidia/libnvidia-container/libnvidia-container.spec b/anda/lib/nvidia/libnvidia-container/libnvidia-container.spec index 81ecd846f2..c846546099 100644 --- a/anda/lib/nvidia/libnvidia-container/libnvidia-container.spec +++ b/anda/lib/nvidia/libnvidia-container/libnvidia-container.spec @@ -1,7 +1,7 @@ %global _major 1 Name: libnvidia-container -Version: 1.17.4 +Version: 1.17.5 Release: 1%?dist Summary: NVIDIA container runtime library License: BSD-3-Clause AND Apache-2.0 AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND GPL-2.0-only diff --git a/anda/system/nvidia/nvidia-container-toolkit/nvidia-container-toolkit.spec b/anda/system/nvidia/nvidia-container-toolkit/nvidia-container-toolkit.spec index 887eda961b..5371192865 100644 --- a/anda/system/nvidia/nvidia-container-toolkit/nvidia-container-toolkit.spec +++ b/anda/system/nvidia/nvidia-container-toolkit/nvidia-container-toolkit.spec @@ -1,6 +1,6 @@ Name: nvidia-container-toolkit -Version: 1.17.4 -Release: 2%?dist +Version: 1.17.5 +Release: 1%?dist Summary: NVIDIA Container Toolkit License: Apache-2.0 Group: Development/Tools/Other From 02fcd4a7fdde03848c7e6028c692a39653467d5a Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 11 Mar 2025 10:40:59 -0500 Subject: [PATCH 0255/2977] feat(youtube-music, voicevox): Re-enable AutoReq with appropriate libraries excluded (#3871) * YouTube Music: Re-enable AutoReq Signed-off-by: Gilver * Voicevox: Re-enable AutoReq Signed-off-by: Gilver * Update voicevox.spec Signed-off-by: Gilver * Update youtube-music.spec Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/apps/voicevox/voicevox.spec | 5 ++--- anda/apps/youtube-music/youtube-music.spec | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/anda/apps/voicevox/voicevox.spec b/anda/apps/voicevox/voicevox.spec index 32b4b1e1c0..33b49aa934 100644 --- a/anda/apps/voicevox/voicevox.spec +++ b/anda/apps/voicevox/voicevox.spec @@ -9,8 +9,8 @@ %define _binary_payload w19.zstdio # Exclude private libraries -%global __requires_exclude libffmpeg.so -%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so +%global __provides_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$ +%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$ Name: voicevox Version: 0.23.0 @@ -24,7 +24,6 @@ Source2: https://github.com/VOICEVOX/voicevox/releases/download/%version/ Packager: madonuko BuildRequires: p7zip-plugins ExclusiveArch: x86_64 -AutoReq: no %description VOICEVOX is a free Japanese text-to-speech software with medium output quality. diff --git a/anda/apps/youtube-music/youtube-music.spec b/anda/apps/youtube-music/youtube-music.spec index 8ddcb2195c..fa894d1339 100644 --- a/anda/apps/youtube-music/youtube-music.spec +++ b/anda/apps/youtube-music/youtube-music.spec @@ -13,7 +13,7 @@ Name: youtube-music Version: 3.7.5 -Release: 3%?dist +Release: 4%?dist Summary: YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader) Source1: youtube-music.desktop License: MIT @@ -35,7 +35,6 @@ BuildRequires: pnpm nodejs20 Requires: nss Requires: libXext Requires: libXfixes -AutoReq: no %description YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader) From d2787ea5aea00778924c0d78da84c51a3072fffc Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 11 Mar 2025 17:55:43 +0000 Subject: [PATCH 0256/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 41598e779d..72aad80e0e 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.177.6-pre +%global ver 0.177.7-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From a37ae430c3134a12de720a7da93b321f284cb63e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 11 Mar 2025 18:47:02 +0000 Subject: [PATCH 0257/2977] bump: codium --- anda/devs/codium/codium.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/codium/codium.spec b/anda/devs/codium/codium.spec index c4aa1eb6a1..c399bba875 100644 --- a/anda/devs/codium/codium.spec +++ b/anda/devs/codium/codium.spec @@ -12,7 +12,7 @@ %endif Name: codium -Version: 1.98.0.25067 +Version: 1.98.1.25070 Release: 1%?dist Summary: Code editing. Redefined. License: MIT From 80b133350f2440196c5fb203247d0ff75ca3c9a7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 12 Mar 2025 01:21:29 +0000 Subject: [PATCH 0258/2977] bump: ruffle fuc --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- anda/tools/fuc/fuc.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 84df806674..357c33f578 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-11 +%global ver 2025-03-12 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/tools/fuc/fuc.spec b/anda/tools/fuc/fuc.spec index 09b4a29ae7..855c90793d 100644 --- a/anda/tools/fuc/fuc.spec +++ b/anda/tools/fuc/fuc.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} Name: fuc -Version: 3.0.0 +Version: 3.0.1 Release: 1%?dist Summary: Modern, performance focused unix commands URL: https://github.com/SUPERCILEX/fuc From 050d4a1d8f3b15a74b4db3fce693c2c6368a5c8a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 12 Mar 2025 01:40:01 +0000 Subject: [PATCH 0259/2977] bump(nightly): micro nightly nim-nightly astal nvidia-patch --- anda/devs/micro/micro-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/lib/astal/astal/astal.spec | 4 ++-- anda/system/nvidia-patch/nvidia-patch.spec | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/anda/devs/micro/micro-nightly.spec b/anda/devs/micro/micro-nightly.spec index c12698bc4c..d834c27a4e 100644 --- a/anda/devs/micro/micro-nightly.spec +++ b/anda/devs/micro/micro-nightly.spec @@ -12,8 +12,8 @@ # Naming variable as something other than "commit" is necessary # to stop %%gometa from putting commit hash in release -%global commit_hash 98356765c14be7a937a09e120e12f419c46052a7 -%global commit_date 20250309 +%global commit_hash 7d16dcdaa6711c27b5a5585afbc60ea89944799f +%global commit_date 20250312 %global shortcommit %{sub %{commit_hash} 1 7} %global ver 2.0.14 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 7c64481b99..103e522cc6 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 1a3597d726c3e37d4e9284ad6a009235df7ae96c +%global commit cfb9a4beb0293d1d92fcab83858a40f3a55fb7a6 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250311 +%global commit_date 20250312 %global ver 0.178.0 %bcond_with check diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 13ed7fe1db..5c70d28100 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit f8294ce06e61752d15624e0422c5296292ef5467 +%global commit 82891e6850c4b10c123f7fa5fcaaade1baaded44 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250311 +%global commit_date 20250312 %global debug_package %nil Name: nim-nightly diff --git a/anda/lib/astal/astal/astal.spec b/anda/lib/astal/astal/astal.spec index 68fd8ffbd6..4501615121 100644 --- a/anda/lib/astal/astal/astal.spec +++ b/anda/lib/astal/astal/astal.spec @@ -1,7 +1,7 @@ -%global commit f38433594051ee75957720d1c36de00896a67eb6 +%global commit bedc1fe771bf30460fc3f250d5530fb0c5c30790 %global shortcommit %{sub %commit 1 7} -%global commit_date 20250309 +%global commit_date 20250312 Name: astal Version: 0^%commit_date.%shortcommit diff --git a/anda/system/nvidia-patch/nvidia-patch.spec b/anda/system/nvidia-patch/nvidia-patch.spec index 35f5960de2..f5f1b712ef 100644 --- a/anda/system/nvidia-patch/nvidia-patch.spec +++ b/anda/system/nvidia-patch/nvidia-patch.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} -%global commit a4dd61b439fd267147cc4650edbcae3ffabc5933 +%global commit f5128d450c29cdd0bc02ddf17221de9b57d5f6c8 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250308 +%global commit_date 20250312 %global patches %{_datadir}/src/nvidia-patch From a5d2bcf696c42a58ae2fd7263d58ada43d0e1be6 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 12 Mar 2025 02:39:01 +0000 Subject: [PATCH 0260/2977] bump(branch): astal-gtk --- anda/lib/astal/astal-gtk/astal-gtk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/astal/astal-gtk/astal-gtk.spec b/anda/lib/astal/astal-gtk/astal-gtk.spec index fb0a7d10bb..be46cd21cc 100644 --- a/anda/lib/astal/astal-gtk/astal-gtk.spec +++ b/anda/lib/astal/astal-gtk/astal-gtk.spec @@ -1,5 +1,5 @@ -%global commit f384335 -%global commit_date 20250309 +%global commit bedc1fe +%global commit_date 20250312 Name: astal Version: 0^%commit_date.%commit From b7681841946e107a407c0b68ff992588efba523a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 12 Mar 2025 02:41:17 +0000 Subject: [PATCH 0261/2977] bump: lomiri-system-settings --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 0e6611e9c9..f81261b6b6 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit 385ad7b7354da4eaf4b1bc1056a8e7bf241534e3 +%global commit 8292174726642280d69d9f4e3f2659ad2f6995b0 %forgemeta Name: lomiri-system-settings From dd88515e6396e5d71ab50cecebe8d4f00d52b84f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 12 Mar 2025 07:58:04 +0000 Subject: [PATCH 0262/2977] bump: datetime --- .../mate/indicators/datetime/ayatana-indicator-datetime.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/mate/indicators/datetime/ayatana-indicator-datetime.spec b/anda/desktops/mate/indicators/datetime/ayatana-indicator-datetime.spec index 3baeddcd5e..94dafb8502 100644 --- a/anda/desktops/mate/indicators/datetime/ayatana-indicator-datetime.spec +++ b/anda/desktops/mate/indicators/datetime/ayatana-indicator-datetime.spec @@ -1,6 +1,6 @@ Name: ayatana-indicator-datetime Summary: A GTK implementation of the StatusNotifierItem Specification -Version: 24.5.0 +Version: 24.5.1 Release: 1%?dist License: GPL-3.0 URL: https://github.com/AyatanaIndicators/ayatana-indicator-datetime From 6c9335d09c8dea833ea72c27ca5c40547a01206d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 12 Mar 2025 08:50:30 +0000 Subject: [PATCH 0263/2977] bump: lomiri-system-settings --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index f81261b6b6..0b63febb06 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit 8292174726642280d69d9f4e3f2659ad2f6995b0 +%global commit 0a6b3857285742a613c9b76934627f8311a29c79 %forgemeta Name: lomiri-system-settings From da9a54d0170c94fb0b868360a700a2717991bd20 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 12 Mar 2025 10:39:25 +0000 Subject: [PATCH 0264/2977] bump: dart --- anda/langs/dart/dart.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/dart/dart.spec b/anda/langs/dart/dart.spec index 683b80f1b2..533c0f4e4f 100644 --- a/anda/langs/dart/dart.spec +++ b/anda/langs/dart/dart.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: dart -Version: 3.7.1 +Version: 3.7.2 Release: 1%?dist Summary: The Dart Language License: BSD-3-Clause From 295d1ab8dfdd94be6d42011c288fafb96a3a5c31 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 12 Mar 2025 11:47:10 +0000 Subject: [PATCH 0265/2977] bump: tela-icon-theme --- anda/themes/tela-icon-theme/tela-icon-theme.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/themes/tela-icon-theme/tela-icon-theme.spec b/anda/themes/tela-icon-theme/tela-icon-theme.spec index 561910809c..17eeb280b3 100644 --- a/anda/themes/tela-icon-theme/tela-icon-theme.spec +++ b/anda/themes/tela-icon-theme/tela-icon-theme.spec @@ -1,5 +1,5 @@ -%global commit 6a9055d8b238eee6e2134f5f00a83e0c4707f677 -%global commit_date 20250226 +%global commit 4bb0b0102dcb731d7cfec339f23ed2939d6cb2fc +%global commit_date 20250312 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: tela-icon-theme From 2658158a427b166868501188958562770776a482 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 12 Mar 2025 11:57:27 +0000 Subject: [PATCH 0266/2977] bump: tela-icon-theme --- anda/themes/tela-icon-theme/tela-icon-theme.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/themes/tela-icon-theme/tela-icon-theme.spec b/anda/themes/tela-icon-theme/tela-icon-theme.spec index 17eeb280b3..5dbae93712 100644 --- a/anda/themes/tela-icon-theme/tela-icon-theme.spec +++ b/anda/themes/tela-icon-theme/tela-icon-theme.spec @@ -1,4 +1,4 @@ -%global commit 4bb0b0102dcb731d7cfec339f23ed2939d6cb2fc +%global commit 578908e1f81245f00a77700298b4f2b9ecf97820 %global commit_date 20250312 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From 74944f2950c9bba93cd4af1970d7ac3e1cdb8070 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 12 Mar 2025 12:42:59 +0000 Subject: [PATCH 0267/2977] bump: messages --- .../mate/indicators/messages/ayatana-indicator-messages.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/mate/indicators/messages/ayatana-indicator-messages.spec b/anda/desktops/mate/indicators/messages/ayatana-indicator-messages.spec index 2e2b00a231..163a7595a2 100644 --- a/anda/desktops/mate/indicators/messages/ayatana-indicator-messages.spec +++ b/anda/desktops/mate/indicators/messages/ayatana-indicator-messages.spec @@ -1,6 +1,6 @@ Name: ayatana-indicator-messages Summary: Ayatana Indicator Messages Applet -Version: 24.5.0 +Version: 24.5.1 Release: 1%?dist License: GPLv3 URL: https://github.com/AyatanaIndicators/ayatana-indicator-messages From 82422f1f1221120a68b03860d103d031e723a1c5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 12 Mar 2025 17:45:30 +0000 Subject: [PATCH 0268/2977] bump: preview stable --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 72aad80e0e..1f9389d26a 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.177.7-pre +%global ver 0.177.7 # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 088f1a21e1..b94785b52d 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.176.3 +Version: 0.177.7 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From 286113193e51f9fd092b6bd9c732104d32b572ef Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 12 Mar 2025 19:16:52 +0000 Subject: [PATCH 0269/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 1f9389d26a..c60743bfa7 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.177.7 +%global ver 0.178.0-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From ee9a71621ded8b71a9adb4913d136d066d5346df Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 13 Mar 2025 01:41:44 +0000 Subject: [PATCH 0270/2977] bump(nightly): mpv micro nightly nim-nightly astal kmod-common spotx-bash --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/micro/micro-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 6 +++--- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/lib/astal/astal/astal.spec | 4 ++-- anda/system/xone/kmod-common/xone.spec | 6 +++--- anda/tools/spotx-bash/spotx-bash.spec | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 84f7fa5f64..e2e5827ede 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 4c26e7d2edd9000bc8d0ff9cf86cf1dee25f37f1 +%global commit ae3420fe6674295cc732933332336cdb3afd81ec %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250311 +%global commit_date 20250313 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/devs/micro/micro-nightly.spec b/anda/devs/micro/micro-nightly.spec index d834c27a4e..ec271bf378 100644 --- a/anda/devs/micro/micro-nightly.spec +++ b/anda/devs/micro/micro-nightly.spec @@ -12,8 +12,8 @@ # Naming variable as something other than "commit" is necessary # to stop %%gometa from putting commit hash in release -%global commit_hash 7d16dcdaa6711c27b5a5585afbc60ea89944799f -%global commit_date 20250312 +%global commit_hash fa317456e91c97af1b2c68f1e657ab426d035929 +%global commit_date 20250313 %global shortcommit %{sub %{commit_hash} 1 7} %global ver 2.0.14 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 103e522cc6..089b933de7 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,7 +1,7 @@ -%global commit cfb9a4beb0293d1d92fcab83858a40f3a55fb7a6 +%global commit 0081b816fecf59ae7351a14eb7249e600389d508 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250312 -%global ver 0.178.0 +%global commit_date 20250313 +%global ver 0.179.0 %bcond_with check diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 5c70d28100..4da250f508 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 82891e6850c4b10c123f7fa5fcaaade1baaded44 +%global commit fb93295344b78d2d45c81bc78bdba8526a893a09 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250312 +%global commit_date 20250313 %global debug_package %nil Name: nim-nightly diff --git a/anda/lib/astal/astal/astal.spec b/anda/lib/astal/astal/astal.spec index 4501615121..66e040845e 100644 --- a/anda/lib/astal/astal/astal.spec +++ b/anda/lib/astal/astal/astal.spec @@ -1,7 +1,7 @@ -%global commit bedc1fe771bf30460fc3f250d5530fb0c5c30790 +%global commit e9c4963334ca0924cb9a14482a1e61a1bac4736e %global shortcommit %{sub %commit 1 7} -%global commit_date 20250312 +%global commit_date 20250313 Name: astal Version: 0^%commit_date.%shortcommit diff --git a/anda/system/xone/kmod-common/xone.spec b/anda/system/xone/kmod-common/xone.spec index f9fa79fc78..5125561f69 100644 --- a/anda/system/xone/kmod-common/xone.spec +++ b/anda/system/xone/kmod-common/xone.spec @@ -1,13 +1,13 @@ -%global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 +%global commit aeb27e6d98f7b22b3672701af6171612254a4d0c %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20241223 +%global commitdate 20250313 %global ver 0.3 %global _dracutconfdir %{_prefix}/lib/dracut/dracut.conf.d %global firmware_hash 48084d9fa53b9bb04358f3bb127b7495dc8f7bb0b3ca1437bd24ef2b6eabdf66 Name: xone Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 2%{?dist} +Release: 1%?dist Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories common files License: GPL-2.0-or-later URL: https://github.com/dlundqvist/xone diff --git a/anda/tools/spotx-bash/spotx-bash.spec b/anda/tools/spotx-bash/spotx-bash.spec index 38eac043ba..c7c067aa86 100644 --- a/anda/tools/spotx-bash/spotx-bash.spec +++ b/anda/tools/spotx-bash/spotx-bash.spec @@ -1,5 +1,5 @@ -%global commit 4b34ec0211e7634b6716913e8c13c791f21b68b3 -%global commit_date 20250309 +%global commit d83897ee597f19adca9221918cebce6ed3353e8a +%global commit_date 20250313 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: spotx-bash From 40531926630acff530bbf74d5226232397ba5a83 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 13 Mar 2025 01:55:17 +0000 Subject: [PATCH 0271/2977] bump: lomiri-system-settings inputplumber tela-icon-theme --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- anda/games/inputplumber/inputplumber.spec | 4 ++-- anda/themes/tela-icon-theme/tela-icon-theme.spec | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 0b63febb06..6d2b9949b4 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit 0a6b3857285742a613c9b76934627f8311a29c79 +%global commit fe1da1273b5e9af843154a8061e95577346586ae %forgemeta Name: lomiri-system-settings diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index e6e39ac986..b03190fea2 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,8 +1,8 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.49.2 -Release: 2%?dist +Version: 0.49.3 +Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later URL: https://github.com/ShadowBlip/InputPlumber diff --git a/anda/themes/tela-icon-theme/tela-icon-theme.spec b/anda/themes/tela-icon-theme/tela-icon-theme.spec index 5dbae93712..0d5157aab3 100644 --- a/anda/themes/tela-icon-theme/tela-icon-theme.spec +++ b/anda/themes/tela-icon-theme/tela-icon-theme.spec @@ -1,5 +1,5 @@ -%global commit 578908e1f81245f00a77700298b4f2b9ecf97820 -%global commit_date 20250312 +%global commit 10d1b0c896d78fb750c2189f577245db48ba8d95 +%global commit_date 20250313 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: tela-icon-theme From 7d91d3a8a337cb65295040c7ffa7cf36ba92e670 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 13 Mar 2025 02:41:06 +0000 Subject: [PATCH 0272/2977] bump(branch): astal-gtk akmod dkms --- anda/lib/astal/astal-gtk/astal-gtk.spec | 4 ++-- anda/system/xone/akmod/xone-kmod.spec | 4 ++-- anda/system/xone/dkms/dkms-xone.spec | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/anda/lib/astal/astal-gtk/astal-gtk.spec b/anda/lib/astal/astal-gtk/astal-gtk.spec index be46cd21cc..242a2a9bf0 100644 --- a/anda/lib/astal/astal-gtk/astal-gtk.spec +++ b/anda/lib/astal/astal-gtk/astal-gtk.spec @@ -1,5 +1,5 @@ -%global commit bedc1fe -%global commit_date 20250312 +%global commit e9c4963 +%global commit_date 20250313 Name: astal Version: 0^%commit_date.%commit diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index 710e47fcdf..79b30e6dbc 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -1,6 +1,6 @@ -%global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 +%global commit aeb27e6d98f7b22b3672701af6171612254a4d0c %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20241223 +%global commitdate 20250313 %global ver 0.3 %define buildforkernels akmod %global debug_package %{nil} diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index 5ee46c5baa..6311b65934 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -1,6 +1,6 @@ -%global commit 6b9d59aed71f6de543c481c33df4705d4a590a31 +%global commit aeb27e6d98f7b22b3672701af6171612254a4d0c %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20241223 +%global commitdate 20250313 %global ver 0.3 %global debug_package %{nil} %global modulename xone From 50ffd4ca0b33e244f0f5474e9ca444b057b24a40 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 13 Mar 2025 02:55:28 +0000 Subject: [PATCH 0273/2977] bump: inputplumber --- anda/games/inputplumber/inputplumber.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index b03190fea2..7401979c73 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.49.3 +Version: 0.49.4 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later From 3becb2c1aed3715b67e95605324fbcd49edefae6 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 13 Mar 2025 04:00:12 +0000 Subject: [PATCH 0274/2977] bump: limine --- anda/system/limine/limine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/limine/limine.spec b/anda/system/limine/limine.spec index 57fcf5dc68..5d5fb57e48 100644 --- a/anda/system/limine/limine.spec +++ b/anda/system/limine/limine.spec @@ -1,5 +1,5 @@ Name: limine -Version: 9.1.2 +Version: 9.1.3 Release: 1%?dist Summary: Modern, advanced, portable, multiprotocol bootloader License: BSD-2-Clause From 67cbbbc65db5f8b25a17bcb6db3a04d3a0d0618d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 13 Mar 2025 04:29:34 +0000 Subject: [PATCH 0275/2977] bump: lomiri-system-settings --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 6d2b9949b4..e5fc9c9687 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit fe1da1273b5e9af843154a8061e95577346586ae +%global commit 7ba48c8e452ffca24348412c4a67a9543a901ec4 %forgemeta Name: lomiri-system-settings From 89d710eb097866c33570128d304b6c20aa248858 Mon Sep 17 00:00:00 2001 From: Gilver Date: Wed, 12 Mar 2025 23:38:58 -0500 Subject: [PATCH 0276/2977] fix(ghostty-nightly): Add gtk4-layer-shell dep (#3879) * Update ghostty-nightly.spec Signed-off-by: Gilver * Update ghostty-nightly.spec Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/devs/ghostty/nightly/ghostty-nightly.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index d5c6781e52..b7576122fe 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -14,7 +14,7 @@ Name: %{base_name}-nightly Version: %{ver}~tip^%{commit_date}git%{shortcommit} -Release: 2%?dist +Release: 3%?dist %if 0%{?fedora} <= 41 Epoch: 1 %endif @@ -47,6 +47,7 @@ BuildRequires: pkgconfig(zlib) Requires: %{name}-terminfo Requires: %{name}-shell-integration Requires: gtk4 +Requires: gtk4-layer-shell Requires: libadwaita Conflicts: %{base_name} Provides: %{base_name}-tip = %{ver}^%{commit_date}git%{shortcommit} From f51c1b0ffdff18a48a3fcabffb2ff435f512ac27 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 13 Mar 2025 04:45:51 +0000 Subject: [PATCH 0277/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 73761cd8ea..9f09e1ff59 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.07.211453 +Version: 2025.03.13.043748 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From ec650c2d84b32bfa264946c1c1ca4534a9df9eb7 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Wed, 12 Mar 2025 21:51:30 -0700 Subject: [PATCH 0278/2977] feat(mesa): Add patch for vram issue in Mesa 25 (#3880) (#3881) * Add patch for vram issue in Mesa 25 Signed-off-by: Kyle Gospodnetich * Use new patch Signed-off-by: Kyle Gospodnetich * Increase release number Signed-off-by: Kyle Gospodnetich --------- Signed-off-by: Kyle Gospodnetich (cherry picked from commit cf80e1cfba20ddcd51e332e76d130087bcb4c8c9) Co-authored-by: Kyle Gospodnetich --- anda/lib/mesa/34005.patch | 46 +++++++++++++++++++++++++++++++++++++++ anda/lib/mesa/mesa.spec | 6 ++++- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 anda/lib/mesa/34005.patch diff --git a/anda/lib/mesa/34005.patch b/anda/lib/mesa/34005.patch new file mode 100644 index 0000000000..cd4a36c58e --- /dev/null +++ b/anda/lib/mesa/34005.patch @@ -0,0 +1,46 @@ +From c6270978411609f52afb8c6a2219fcb94f9013bb Mon Sep 17 00:00:00 2001 +From: Samuel Pitoiset +Date: Tue, 11 Mar 2025 15:29:37 +0100 +Subject: [PATCH] radv/amdgpu: fix device deduplication + +To correctly deduplicate device inside the winsys, it should use the +fd or amdgpu_device_handle. Using the allocated ac_drm_device as key +is obviously broken. + +Not deduplicating devices breaks memory budget and a bunch of games +were broken. + +Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12686 +Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12775 +Fixes: a565f2994fe ("amd: move all uses of libdrm_amdgpu to ac_linux_drm") +Signed-off-by: Samuel Pitoiset +Part-of: +--- + src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c +index be8df8708c813..8b57abeb0b1ca 100644 +--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c ++++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c +@@ -234,7 +234,7 @@ radv_amdgpu_winsys_create(int fd, uint64_t debug_flags, uint64_t perftest_flags, + goto fail; + } + +- struct hash_entry *entry = _mesa_hash_table_search(winsyses, dev); ++ struct hash_entry *entry = _mesa_hash_table_search(winsyses, (void *)ac_drm_device_get_cookie(dev)); + if (entry) { + ws = (struct radv_amdgpu_winsys *)entry->data; + ++ws->refcount; +@@ -325,7 +325,7 @@ radv_amdgpu_winsys_create(int fd, uint64_t debug_flags, uint64_t perftest_flags, + radv_amdgpu_bo_init_functions(ws); + radv_amdgpu_cs_init_functions(ws); + +- _mesa_hash_table_insert(winsyses, dev, ws); ++ _mesa_hash_table_insert(winsyses, (void *)ac_drm_device_get_cookie(dev), ws); + simple_mtx_unlock(&winsys_creation_mutex); + + return &ws->base; +-- +GitLab + diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index 0324d039f6..ec1fd8cf5a 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -76,7 +76,7 @@ Summary: Mesa graphics libraries # disabled by default, and has to be enabled manually. See `terra/release/terra-mesa.repo` for details. Epoch: 1 Version: 25.0.1 -Release: 4%?dist +Release: 5%?dist License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org @@ -99,6 +99,10 @@ Patch20: valve.patch # https://gitlab.freedesktop.org/mesa/mesa/-/issues/12633 Patch21: 12633.patch +# radv/amdgpu: fix device deduplication +# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34005/diffs +Patch22: 34005.patch + Patch30: 237d8799be3afe9a1e7ca9156a5d44ffe0aae681.patch Patch31: 13a3f9a972324a72dd507e09ac975b969e6c88e0.patch From 1bf89247e714648cb3ba72b6b2d1f022ced07224 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 13 Mar 2025 06:46:35 +0000 Subject: [PATCH 0279/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index b3d963dce5..03b13cae67 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.606 +Version: 0.0.607 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index f11841a7e1..df58c7cdb3 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.606 +Version: 0.0.607 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 290d7ba082d5eb232ba68de9278cf65e4a883aef Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 13 Mar 2025 06:56:36 +0000 Subject: [PATCH 0280/2977] bump: tela-icon-theme --- anda/themes/tela-icon-theme/tela-icon-theme.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/themes/tela-icon-theme/tela-icon-theme.spec b/anda/themes/tela-icon-theme/tela-icon-theme.spec index 0d5157aab3..9c491b1b2e 100644 --- a/anda/themes/tela-icon-theme/tela-icon-theme.spec +++ b/anda/themes/tela-icon-theme/tela-icon-theme.spec @@ -1,4 +1,4 @@ -%global commit 10d1b0c896d78fb750c2189f577245db48ba8d95 +%global commit f1e1427e8e484deb3018b6607d139805c3947cdb %global commit_date 20250313 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From 5a5f199479ddbd9455697009fd286b02bf57e448 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 13 Mar 2025 07:19:02 +0000 Subject: [PATCH 0281/2977] bump: osu-lazer --- anda/games/osu-lazer/osu-lazer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index 1e7e69ebce..d0ec97ba34 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -1,4 +1,4 @@ -%define osuresver 2025.307.0 +%define osuresver 2025.313.0 %global debug_package %{nil} %define __strip /bin/true From 2a972a1d962484ff4152b89237c0677eded6b786 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 13 Mar 2025 13:26:13 +0000 Subject: [PATCH 0282/2977] bump: tdlib --- anda/lib/tdlib/tdlib-nightly.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 832f786ed5..a94337f94b 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,6 +1,6 @@ -%global commit 207f3be7b58b2a2b9f0a066b5b6ef18782b8b517 +%global commit b498497bbfd6b80c86f800b3546a0170206317d3 %global ver 1.8.46 -%global commit_date 20250307 +%global commit_date 20250313 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: tdlib-nightly From fa591fb93cb10380e860c35fe5a7fb6bd6199479 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 13 Mar 2025 15:25:07 +0000 Subject: [PATCH 0283/2977] bump: preview stable --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index c60743bfa7..d2b33e5145 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.178.0-pre +%global ver 0.177.8 # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index b94785b52d..965161a4ec 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.177.7 +Version: 0.177.8 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From f2af03d19f914c0301df95f21184997760c77a93 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 13 Mar 2025 16:23:29 +0000 Subject: [PATCH 0284/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index d2b33e5145..4f2b34f63e 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.177.8 +%global ver 0.178.1-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From 2a9d7628c923aef7d22a7848cfa4ffceb57467a4 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 13 Mar 2025 18:46:28 +0000 Subject: [PATCH 0285/2977] bump: codium --- anda/devs/codium/codium.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/codium/codium.spec b/anda/devs/codium/codium.spec index c399bba875..ba73762df1 100644 --- a/anda/devs/codium/codium.spec +++ b/anda/devs/codium/codium.spec @@ -12,7 +12,7 @@ %endif Name: codium -Version: 1.98.1.25070 +Version: 1.98.2.25072 Release: 1%?dist Summary: Code editing. Redefined. License: MIT From 5a66c02b39deae7ca119ebdd8c19fe6992c2a762 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 13 Mar 2025 19:38:15 +0000 Subject: [PATCH 0286/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 03b13cae67..a07e1e47b1 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.607 +Version: 0.0.608 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index df58c7cdb3..3a3532ad57 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.607 +Version: 0.0.608 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 1b44d6b2344f829b922be724ee35f041f947c526 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 13 Mar 2025 21:00:15 +0000 Subject: [PATCH 0287/2977] bump: flutter --- anda/devs/flutter/flutter.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/flutter/flutter.spec b/anda/devs/flutter/flutter.spec index 6923ed8f15..d38b1691f9 100644 --- a/anda/devs/flutter/flutter.spec +++ b/anda/devs/flutter/flutter.spec @@ -1,5 +1,5 @@ Name: flutter -Version: 3.29.1 +Version: 3.29.2 Release: 1%?dist Summary: SDK for crafting beautiful, fast user experiences from a single codebase License: BSD-3-Clause From 0a0b023e6a29bda1d28dd00c910b0d2d88fa5aa2 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 13 Mar 2025 22:22:53 +0000 Subject: [PATCH 0288/2977] bump: discord-ptb-openasar discord-ptb --- anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec | 2 +- anda/apps/discord-ptb/discord-ptb.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec index 219b8b043d..169a381cfb 100644 --- a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec +++ b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-ptb-openasar -Version: 0.0.133 +Version: 0.0.134 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-ptb/discord-ptb.spec b/anda/apps/discord-ptb/discord-ptb.spec index 541497db73..78464ae2e7 100644 --- a/anda/apps/discord-ptb/discord-ptb.spec +++ b/anda/apps/discord-ptb/discord-ptb.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-ptb -Version: 0.0.133 +Version: 0.0.134 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers. URL: https://discord.com From c96bab26c2c9c2f488318c8f6ce262dc9b6033ff Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 13 Mar 2025 22:39:21 +0000 Subject: [PATCH 0289/2977] bump: inputplumber protobuf --- anda/games/inputplumber/inputplumber.spec | 2 +- anda/langs/python/protobuf/python3-protobuf.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index 7401979c73..9da9193455 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.49.4 +Version: 0.49.5 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later diff --git a/anda/langs/python/protobuf/python3-protobuf.spec b/anda/langs/python/protobuf/python3-protobuf.spec index e502b9f86d..fba79acc17 100644 --- a/anda/langs/python/protobuf/python3-protobuf.spec +++ b/anda/langs/python/protobuf/python3-protobuf.spec @@ -2,7 +2,7 @@ %global pypi_name protobuf Name: python-%{pypi_name} -Version: 6.30.0 +Version: 6.30.1 Release: 1%?dist Summary: Protocol Buffers From 40819d7298172e0c0b5d0aecf2e8e0d998be2a86 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 14 Mar 2025 01:40:03 +0000 Subject: [PATCH 0290/2977] bump(nightly): mpv nightly nightly astal spotx-bash --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 6 +++--- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/lib/astal/astal/astal.spec | 4 ++-- anda/tools/spotx-bash/spotx-bash.spec | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index e2e5827ede..88dd29ac26 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit ae3420fe6674295cc732933332336cdb3afd81ec +%global commit d9dadf07ae9425ad3cc6cc2ee9464038224efdcb %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250313 +%global commit_date 20250314 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index b7576122fe..ab98d16562 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 95daca616db5c24d7bb37fd5a3ac2f8762bb4ead +%global commit 73c7943fff38f679a9a434457b5089bc5722411d %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-03-10 +%global fulldate 2025-03-13 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 @@ -14,7 +14,7 @@ Name: %{base_name}-nightly Version: %{ver}~tip^%{commit_date}git%{shortcommit} -Release: 3%?dist +Release: 1%?dist %if 0%{?fedora} <= 41 Epoch: 1 %endif diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 089b933de7..e12d6f752e 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 0081b816fecf59ae7351a14eb7249e600389d508 +%global commit 22ad7b17c53596f54aa6429822adf03adac0f012 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250313 +%global commit_date 20250314 %global ver 0.179.0 %bcond_with check diff --git a/anda/lib/astal/astal/astal.spec b/anda/lib/astal/astal/astal.spec index 66e040845e..128037ceec 100644 --- a/anda/lib/astal/astal/astal.spec +++ b/anda/lib/astal/astal/astal.spec @@ -1,7 +1,7 @@ -%global commit e9c4963334ca0924cb9a14482a1e61a1bac4736e +%global commit 69efb4c91e590adcb5a3d8938454f987982e3891 %global shortcommit %{sub %commit 1 7} -%global commit_date 20250313 +%global commit_date 20250314 Name: astal Version: 0^%commit_date.%shortcommit diff --git a/anda/tools/spotx-bash/spotx-bash.spec b/anda/tools/spotx-bash/spotx-bash.spec index c7c067aa86..e6b69b37d3 100644 --- a/anda/tools/spotx-bash/spotx-bash.spec +++ b/anda/tools/spotx-bash/spotx-bash.spec @@ -1,5 +1,5 @@ -%global commit d83897ee597f19adca9221918cebce6ed3353e8a -%global commit_date 20250313 +%global commit c3d4b777081b3cdb52d52b43ac1589c349c87173 +%global commit_date 20250314 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: spotx-bash From c703af2a9519ab3a8ea7fcbc9ea2c254d519cc60 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 14 Mar 2025 01:44:32 +0000 Subject: [PATCH 0291/2977] bump: ruffle lomiri-system-settings --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 357c33f578..70cfd58f94 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-12 +%global ver 2025-03-14 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index e5fc9c9687..562fb96837 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit 7ba48c8e452ffca24348412c4a67a9543a901ec4 +%global commit bebc62098c5b10f51900a295e2db467937c2ccfc %forgemeta Name: lomiri-system-settings From f1b5d1631c3348b2423e3120b4bbb42564d87843 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 14 Mar 2025 02:38:43 +0000 Subject: [PATCH 0292/2977] bump(branch): astal-gtk --- anda/lib/astal/astal-gtk/astal-gtk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/astal/astal-gtk/astal-gtk.spec b/anda/lib/astal/astal-gtk/astal-gtk.spec index 242a2a9bf0..8ef83e83fa 100644 --- a/anda/lib/astal/astal-gtk/astal-gtk.spec +++ b/anda/lib/astal/astal-gtk/astal-gtk.spec @@ -1,5 +1,5 @@ -%global commit e9c4963 -%global commit_date 20250313 +%global commit 69efb4c +%global commit_date 20250314 Name: astal Version: 0^%commit_date.%commit From fba6071e3e343cc15fe98d65ec691789e2d1b8fe Mon Sep 17 00:00:00 2001 From: Gilver Date: Fri, 14 Mar 2025 02:53:33 -0500 Subject: [PATCH 0293/2977] fix(protobuf): Remove obsolete file (#3889) --- anda/langs/python/protobuf/python3-protobuf.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/anda/langs/python/protobuf/python3-protobuf.spec b/anda/langs/python/protobuf/python3-protobuf.spec index fba79acc17..b7fa3c44f2 100644 --- a/anda/langs/python/protobuf/python3-protobuf.spec +++ b/anda/langs/python/protobuf/python3-protobuf.spec @@ -3,7 +3,7 @@ Name: python-%{pypi_name} Version: 6.30.1 -Release: 1%?dist +Release: 2%?dist Summary: Protocol Buffers License: BSD-3-Clause @@ -39,7 +39,6 @@ rm -rf %{pypi_name}.egg-info %doc README.md %{python3_sitearch}/google %{python3_sitearch}/%{pypi_name}-%{version}-py%{python3_version}.egg-info -%{python3_sitearch}/%{pypi_name}-%{version}-py%{python3_version}-nspkg.pth %changelog * Sun Feb 19 2023 windowsboy111 - 4.22.0-1 From 41a3511e1845210fae92c17c4c424c093ebe606b Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 14 Mar 2025 17:14:51 +0800 Subject: [PATCH 0294/2977] feat(mpv-nightly): include fish completions (#3894) Signed-off-by: madomado --- anda/apps/mpv/mpv-nightly.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 88dd29ac26..7e4d6e7cc5 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -209,6 +209,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/mpv.desktop %dir %{_datadir}/bash-completion/completions/ %{_datadir}/bash-completion/completions/mpv %{_datadir}/icons/hicolor/*/apps/mpv*.* +%{_datadir}/fish/vendor_completions.d/mpv.fish %dir %{_datadir}/zsh/ %dir %{_datadir}/zsh/site-functions/ %{_datadir}/zsh/site-functions/_mpv From bbdb6510c01d81e5d5357463456643cf48180683 Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 14 Mar 2025 19:46:32 +0800 Subject: [PATCH 0295/2977] feat(pokeget-rs): pull from crates.io (#3844) * feat(pokeget-rs): pull from crates.io * Update rust-pokeget.spec Signed-off-by: madomado * Refactor Pokeget, update licenses * I THOUGHT I added the check bruh * Packager(s) Signed-off-by: Gilver --------- Signed-off-by: madomado Signed-off-by: Gilver Co-authored-by: Gilver --- anda/misc/pokeget-rs/anda.hcl | 5 -- anda/misc/pokeget-rs/pokeget-rs.spec | 42 --------------- anda/misc/pokeget/anda.hcl | 5 ++ anda/misc/pokeget/pokeget.spec | 53 +++++++++++++++++++ anda/misc/{pokeget-rs => pokeget}/update.rhai | 0 5 files changed, 58 insertions(+), 47 deletions(-) delete mode 100644 anda/misc/pokeget-rs/anda.hcl delete mode 100644 anda/misc/pokeget-rs/pokeget-rs.spec create mode 100644 anda/misc/pokeget/anda.hcl create mode 100644 anda/misc/pokeget/pokeget.spec rename anda/misc/{pokeget-rs => pokeget}/update.rhai (100%) diff --git a/anda/misc/pokeget-rs/anda.hcl b/anda/misc/pokeget-rs/anda.hcl deleted file mode 100644 index 9a46c244e6..0000000000 --- a/anda/misc/pokeget-rs/anda.hcl +++ /dev/null @@ -1,5 +0,0 @@ -project pkg { - rpm { - spec = "pokeget-rs.spec" - } -} diff --git a/anda/misc/pokeget-rs/pokeget-rs.spec b/anda/misc/pokeget-rs/pokeget-rs.spec deleted file mode 100644 index 360fe40c79..0000000000 --- a/anda/misc/pokeget-rs/pokeget-rs.spec +++ /dev/null @@ -1,42 +0,0 @@ -%global pname pokesprite -%global pcommit c5aaa610ff2acdf7fd8e2dccd181bca8be9fcb3e -%global shortname pokeget - -Name: %{shortname}-rs -Version: 1.6.4 -Release: 1%?dist -SourceLicense: MIT -License: MIT AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-2-Clause AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) -Summary: A better Rust version of pokeget. -URL: https://github.com/talwat/%{name} -BuildRequires: anda-srpm-macros -BuildRequires: cargo-rpm-macros -BuildRequires: mold -Provides: pokeget = %{version}-%{release} -Provides: bundled(%{pname}) = %{pcommit} -Packager: Gilver E. - -%description -Successor to pokeget, written in Rust. - -%prep -%git_clone %{url} %{version} -%cargo_prep_online - -%build -%cargo_build - -%install -install -Dpm755 target/rpm/%{shortname} -t %{buildroot}%{_bindir} -ln -sf %{shortname} %{buildroot}%{_bindir}/%{name} -%{cargo_license_online} > LICENSE.dependencies - -%files -%license LICENSE LICENSE.dependencies data/%{pname}/license.md -%doc README.md -%{_bindir}/%{name} -%{_bindir}/%{shortname} - -%changelog -* Sat Mar 01 2025 Gilver E. -- Initial package diff --git a/anda/misc/pokeget/anda.hcl b/anda/misc/pokeget/anda.hcl new file mode 100644 index 0000000000..2d02d88522 --- /dev/null +++ b/anda/misc/pokeget/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "pokeget.spec" + } +} diff --git a/anda/misc/pokeget/pokeget.spec b/anda/misc/pokeget/pokeget.spec new file mode 100644 index 0000000000..e7e0304dcf --- /dev/null +++ b/anda/misc/pokeget/pokeget.spec @@ -0,0 +1,53 @@ +%global pname pokesprite +%global pcommit c5aaa610ff2acdf7fd8e2dccd181bca8be9fcb3e +%global crate pokeget +%bcond check 1 + +Name: %{crate} +Version: 1.6.4 +Release: 3%?dist +SourceLicense: MIT +License: (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-2-Clause AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) +Summary: A better Rust version of pokeget. +URL: https://crates.io/crates/%{crate} +Source0: %{crates_source} +BuildRequires: anda-srpm-macros +BuildRequires: cargo-rpm-macros +BuildRequires: mold +Provides: bundled(%{pname}) = %{pcommit} +Obsoletes: %{crate}-rs < %{version}-%{release} +Packager: Gilver E. , madonuko + +%description +Successor to pokeget, written in Rust. + +%prep +%autosetup -n %{crate}-%{version} -p1 +%cargo_prep_online + +%build +%cargo_build + +%install +install -Dpm755 target/rpm/%{crate} -t %{buildroot}%{_bindir} +%{cargo_license_online} > LICENSE.dependencies + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE +%license LICENSE.dependencies +%license data/%{pname}/license.md +%doc README.md +%doc OTHER_PROJECTS.md +%{_bindir}/%{crate} + +%changelog +* Mon Mar 10 2025 Gilver E. +- Rename package to drop the rs suffix as the original pokeget is fully obsoleted +- Update licenses +* Sat Mar 01 2025 Gilver E. +- Initial package diff --git a/anda/misc/pokeget-rs/update.rhai b/anda/misc/pokeget/update.rhai similarity index 100% rename from anda/misc/pokeget-rs/update.rhai rename to anda/misc/pokeget/update.rhai From d14afaca2423929027f97f73acff2d5ad0d4301d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Garc=C3=ADa?= <4411661+GarciaLnk@users.noreply.github.com> Date: Fri, 14 Mar 2025 13:17:58 +0000 Subject: [PATCH 0296/2977] fix(devpod): rename binaries to match upstream (#3888) This is required for the current version of the desktop app to work, as it tries to call the `devpod-cli` binary This also updates the .desktop file to match upstream and adds a missing dependency --- anda/devs/devpod/DevPod.desktop | 9 ++++----- .../devpod/golang-github-loft-sh-devpod.spec | 19 ++++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/anda/devs/devpod/DevPod.desktop b/anda/devs/devpod/DevPod.desktop index 3b00d4d64a..e51b0f7aeb 100644 --- a/anda/devs/devpod/DevPod.desktop +++ b/anda/devs/devpod/DevPod.desktop @@ -2,10 +2,9 @@ Version=1.0 Type=Application Name=DevPod -Comment=Codespaces but open-source, client-only and unopinionated: Works with any IDE and lets you use any cloud, kubernetes or just localhost docker -Exec=/usr/bin/DevPod -Icon=devpod.png +Comment=Spin up dev environments in any infra +Exec=dev-pod-desktop +Icon=dev-pod-desktop Terminal=false StartupNotify=false -Categories=Utility;TextEditor;Development;IDE; -MimeType=text/plain;application/x-zerosize; +Categories=Development; diff --git a/anda/devs/devpod/golang-github-loft-sh-devpod.spec b/anda/devs/devpod/golang-github-loft-sh-devpod.spec index d6347a9f78..f540d06c83 100644 --- a/anda/devs/devpod/golang-github-loft-sh-devpod.spec +++ b/anda/devs/devpod/golang-github-loft-sh-devpod.spec @@ -17,8 +17,8 @@ and lets you use any cloud, kubernetes or just localhost docker.} loadtest/README.md Name: devpod -Release: 1%?dist -Summary: Codespaces but open-source, client-only and unopinionated: Works with any IDE and lets you use any cloud, kubernetes or just localhost docker +Release: 2%?dist +Summary: Spin up dev environments in any infra Provides: golang-github-loft-sh-devpod BuildRequires: anda-srpm-macros mold BuildRequires: yarnpkg rust-packaging @@ -27,7 +27,7 @@ Recommends: devpod-desktop License: MPL-2.0 URL: https://devpod.sh Source: %{gosource} -# gendesk --pkgname=DevPod --name=DevPod --exec=/usr/bin/DevPod --icon=devpod.png --categories='Utility;TextEditor;Development;IDE' --mimetypes='text/plain;application/x-zerosize' -n +# gendesk --pkgname=DevPod --name=DevPod --exec=dev-pod-desktop --icon=dev-pod-desktop --categories='Development' -n Source1: DevPod.desktop %description %{common_description} @@ -41,6 +41,7 @@ BuildRequires: pkgconfig(gdk-3.0) BuildRequires: pkgconfig(javascriptcoregtk-4.1) BuildRequires: pkgconfig(libsoup-3.0) BuildRequires: pkgconfig(webkit2gtk-4.1) +Requires: libappindicator-gtk3 %description desktop %{common_description} @@ -82,18 +83,18 @@ popd # desktop %install # go install -m 0755 -vd %{buildroot}%{_bindir} -install -m 0755 -vp bin/devpod %{buildroot}%{_bindir}/ +install -m 0755 -vp bin/devpod %{buildroot}%{_bindir}/devpod-cli # tauri -install -Dm755 "desktop/src-tauri/target/rpm/DevPod Desktop" %buildroot%_bindir/DevPod-Desktop +install -Dm755 "desktop/src-tauri/target/rpm/DevPod Desktop" %buildroot%_bindir/dev-pod-desktop install -Dm644 %{S:1} -t %buildroot%_datadir/applications/ -install -Dm644 desktop/devpod.png -t %buildroot%_datadir/pixmaps/ +install -Dm644 desktop/devpod.png %buildroot%_datadir/pixmaps/dev-pod-desktop.png %files %license LICENSE %doc README.md SECURITY.md -%{_bindir}/devpod +%{_bindir}/devpod-cli %files desktop -%_bindir/DevPod-Desktop +%_bindir/dev-pod-desktop %_datadir/applications/DevPod.desktop -%_datadir/pixmaps/devpod.png +%_datadir/pixmaps/dev-pod-desktop.png From 8ab3b6e65f29a0ee481ede8c9cf6b2ba43957825 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 14 Mar 2025 15:47:29 +0000 Subject: [PATCH 0297/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 4f2b34f63e..f917a9541b 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.178.1-pre +%global ver 0.178.2-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From c99c166ded81c4de44162fa52e85e5119bc67574 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 14 Mar 2025 16:26:32 +0000 Subject: [PATCH 0298/2977] bump: stable --- anda/devs/zed/stable/zed.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 965161a4ec..0e67fd9583 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.177.8 +Version: 0.177.9 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From 2ca305d68e168a117abc8c58ec30cab9555718f3 Mon Sep 17 00:00:00 2001 From: Gilver Date: Fri, 14 Mar 2025 11:46:44 -0500 Subject: [PATCH 0299/2977] feat(mpv-nightly): Make shell completions subpackages (#3907) * Update mpv-nightly.spec Signed-off-by: Gilver * Bump release Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/apps/mpv/mpv-nightly.spec | 45 ++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 7e4d6e7cc5..bfe2f24767 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -5,7 +5,7 @@ Name: mpv-nightly Version: %ver^%commit_date.%shortcommit -Release: 1%?dist +Release: 2%?dist License: GPL-2.0-or-later AND LGPL-2.1-or-later Summary: Movie player playing most video formats and DVDs @@ -124,6 +124,33 @@ Requires: mpv-nightly-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description devel This package contains development header files and libraries for Mpv. +%package bash-completion +Summary: MPV Bash completion +Requires: bash +Requires: %{name} +Supplements: (%{name} and bash) + +%description bash-completion +Bash shell completion for MPV. + +%package fish-completion +Summary: MPV Fish completion +Requires: fish +Requires: %{name} +Supplements: (%{name} and fish) + +%description fish-completion +Fish shell completion for MPV. + +%package zsh-completion +Summary: MPV Zsh completion +Requires: zsh +Requires: %{name} +Supplements: (%{name} and zsh) + +%description zsh-completion +Zsh shell completion for MPV. + %prep %autosetup -p1 -n mpv-%commit sed -e "s|/usr/local/etc|%{_sysconfdir}/mpv|" -i etc/mpv.conf @@ -205,14 +232,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/mpv.desktop %{_docdir}/mpv/ %{_bindir}/mpv %{_datadir}/applications/mpv.desktop -%dir %{_datadir}/bash-completion/ -%dir %{_datadir}/bash-completion/completions/ -%{_datadir}/bash-completion/completions/mpv %{_datadir}/icons/hicolor/*/apps/mpv*.* -%{_datadir}/fish/vendor_completions.d/mpv.fish -%dir %{_datadir}/zsh/ -%dir %{_datadir}/zsh/site-functions/ -%{_datadir}/zsh/site-functions/_mpv %{_mandir}/man1/mpv.* %{_metainfodir}/mpv.metainfo.xml %dir %{_sysconfdir}/mpv/ @@ -227,5 +247,14 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/mpv.desktop %{_libdir}/libmpv.so %{_libdir}/pkgconfig/mpv.pc +%files bash-completion +%{bash_completions_dir}/mpv + +%files fish-completion +%{fish_completions_dir}/mpv.fish + +%files zsh-completion +%{zsh_completions_dir}/_mpv + %changelog %autochangelog From d9dcb734987fc15d15a27b526bd77779d3ecf5df Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 15 Mar 2025 00:47:41 +0800 Subject: [PATCH 0300/2977] fix: nim (#3906) Signed-off-by: madomado --- anda/langs/nim/nim/nim.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/anda/langs/nim/nim/nim.spec b/anda/langs/nim/nim/nim.spec index 1c430e99da..5fc62c7a0e 100644 --- a/anda/langs/nim/nim/nim.spec +++ b/anda/langs/nim/nim/nim.spec @@ -71,10 +71,6 @@ koch tools -t:-fPIE -l:-pie & nim c -d:danger -t:-fPIE -l:-pie nimsuggest/nimsuggest.nim & wait -%ifarch x86_64 -sed -i '/ Date: Fri, 14 Mar 2025 11:47:57 -0500 Subject: [PATCH 0301/2977] Revert 7c48f6b (#3805) Turns out it was a metadata bug. Sigh. --- anda/devs/rio/rio.spec | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/anda/devs/rio/rio.spec b/anda/devs/rio/rio.spec index 081eb7e7d4..85ae3f2d37 100644 --- a/anda/devs/rio/rio.spec +++ b/anda/devs/rio/rio.spec @@ -1,15 +1,15 @@ +%global crate rioterm %global _description %{expand: A hardware-accelerated terminal emulator focusing to run in desktops and browsers.} -%global realname rio -Name: %{realname}term +Name: rio Version: 0.2.9 -Release: 1%?dist +Release: 2%{?dist} Summary: A hardware-accelerated terminal written in Rust. SourceLicense: MIT License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND Apache-2.0 AND BSD-2-Clause AND BSL-1.0 AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND CC0-1.0 AND ISC AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND (MPL-2.0 OR GPL-3.0-only) AND MPL-2.0+ AND MPL-2.0 AND Unicode-3.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND Zlib URL: http://rioterm.com -Source0: https://github.com/raphamorim/%{realname}/archive/refs/tags/v%{version}.tar.gz +Source0: https://github.com/raphamorim/%{name}/archive/refs/tags/v%{version}.tar.gz BuildRequires: anda-srpm-macros BuildRequires: cargo-rpm-macros BuildRequires: freetype-devel @@ -18,34 +18,37 @@ BuildRequires: gcc-c++ BuildRequires: libxcb-devel BuildRequires: libxkbcommon-devel BuildRequires: mold +BuildRequires: sed Requires: freetype Requires: fontconfig Requires: hicolor-icon-theme Requires: libgcc +Obsoletes: %{crate} < %{version}-%{release} Packager: Gilver E. %description %_description %prep -%autosetup -n %{realname}-%{version} +%autosetup -n %{name}-%{version} +sed -i 's/Exec=.*/Exec=%{crate}/g' misc/%{name}.desktop %cargo_prep_online %build %cargo_build -a %install -install -Dm755 target/rpm/%{realname} %{buildroot}%{_bindir}/%{realname} -install -Dm644 misc/%{realname}.desktop %{buildroot}%{_datadir}/applications/%{realname}.desktop -install -Dm644 docs/static/assets/%{realname}-logo.svg %{buildroot}%{_iconsdir}/hicolor/scalable/apps/%{realname}.svg +install -Dm755 target/rpm/%{name} %{buildroot}%{_bindir}/%{crate} +install -Dm644 misc/%{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop +install -Dm644 docs/static/assets/%{name}-logo.svg %{buildroot}%{_iconsdir}/hicolor/scalable/apps/%{name}.svg %{cargo_license_online -a} > LICENSE.dependencies %files %doc README.md %license LICENSE %license LICENSE.dependencies -%{_bindir}/%{realname} -%{_datadir}/applications/%{realname}.desktop -%{_iconsdir}/hicolor/scalable/apps/%{realname}.svg +%{_bindir}/%{crate} +%{_datadir}/applications/%{name}.desktop +%{_iconsdir}/hicolor/scalable/apps/%{name}.svg %changelog * Sat Mar 8 2025 Gilver E. From 183a945759c78c4b895f977f5bd32f8a23000843 Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 15 Mar 2025 01:26:30 +0800 Subject: [PATCH 0302/2977] add: sndio (#3876) for #3851 (build dependency) --- anda/multimedia/sndio/anda.hcl | 5 ++ anda/multimedia/sndio/sndio.spec | 105 ++++++++++++++++++++++++++++++ anda/multimedia/sndio/update.rhai | 1 + 3 files changed, 111 insertions(+) create mode 100644 anda/multimedia/sndio/anda.hcl create mode 100644 anda/multimedia/sndio/sndio.spec create mode 100644 anda/multimedia/sndio/update.rhai diff --git a/anda/multimedia/sndio/anda.hcl b/anda/multimedia/sndio/anda.hcl new file mode 100644 index 0000000000..f860fc944a --- /dev/null +++ b/anda/multimedia/sndio/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "sndio.spec" + } +} diff --git a/anda/multimedia/sndio/sndio.spec b/anda/multimedia/sndio/sndio.spec new file mode 100644 index 0000000000..62c6ba329a --- /dev/null +++ b/anda/multimedia/sndio/sndio.spec @@ -0,0 +1,105 @@ +Name: sndio +Version: 1.10.0 +Release: 1%?dist +Summary: A sound library +#Group: Sound/Utilities + +License: ISC +URL: https://www.sndio.org +Source0: https://www.sndio.org/%{name}-%{version}.tar.gz + +Provides: %{name}d = %version-%release +Provides: %{name}ctl = %version-%release +Provides: midicat = %version-%release +Provides: aucat = %version-%release + + +BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(libbsd) +BuildRequires: systemd-rpm-macros +BuildRequires: make gcc +Requires: %name-libs = %{version}-%{release} + +%description +Sndio is a small audio and MIDI framework part of the OpenBSD project and ported to FreeBSD, Linux and NetBSD. It provides a lightweight audio & MIDI server and a fully documented user-space API to access either the server or the hardware directly in a uniform way. Sndio is designed to work for desktop applications, but pays special attention to synchronization mechanisms and reliability required by music applications. Reliability through simplicity are part of the project goals. + +%package libs +Summary: Libraries for %{name} + +%description libs +This package contains libraries for %{name}. + +%package devel +Summary: Development files for %{name} +Requires: %name-libs + +%description devel +This package contains development files for %{name}. + +%prep +%autosetup + +cat< sndiod.conf +u sndiod - "sndio" / /usr/sbin/nologin +EOF + +cat< 100-sndio.rules +polkit.addRule(function(action, subject) { + if (subject.isInGroup("sndiod")) { + return polkit.Result.YES; + } +}); +EOF + +%build +./configure \ + --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --mandir=%{_mandir} \ + --with-libbsd +%make_build + +%install +%make_install + +# Install sndiod systemd service file +install -Dpm755 contrib/%{name}d.service %{buildroot}%{_unitdir}/%{name}d.service +install -Dpm644 contrib/default.%{name}d %{buildroot}%{_sysconfdir}/default/%{name}d + +install -Dpm644 sndiod.conf -t %buildroot%_sysusersdir/ +install -Dpm644 100-sndio.rules -t %buildroot%_datadir/polkit-1/rules.d/ + +# Fix for installing pkgconfig to correct lib64 dir on 64-bit systems. +%dnl %ifnarch %ix86 +%dnl %__mkdir_p %{buildroot}%{_libdir}/pkgconfig +%dnl mv %{buildroot}/usr/lib/pkgconfig/sndio.pc %{buildroot}%{_libdir}/pkgconfig +%dnl %endif + +%post +%systemd_post %{name}d.service + +%preun +%systemd_preun %{name}d.service + +%postun +%systemd_postun_with_restart %{name}d.service + +%files +%{_bindir}/aucat +%{_bindir}/midicat +%{_bindir}/sndiod +%{_bindir}/sndioctl +%{_datadir}/polkit-1/rules.d/100-sndio.rules +%{_mandir}/man*/* +%{_unitdir}/%{name}d.service +%{_sysconfdir}/default/%{name}d +%{_sysusersdir}/%{name}d.conf + +%files libs +%license LICENSE +%{_libdir}/libsndio.so.7* + +%files devel +%{_libdir}/libsndio.so +%{_libdir}/pkgconfig/sndio.pc +%{_includedir}/sndio.h diff --git a/anda/multimedia/sndio/update.rhai b/anda/multimedia/sndio/update.rhai new file mode 100644 index 0000000000..3e3a7cae4b --- /dev/null +++ b/anda/multimedia/sndio/update.rhai @@ -0,0 +1 @@ +rpm.version(`

  • `.find(get("https://sndio.org"), 1)); From 0ac9fb5b03d5109c6bfd1548216fbdfb6552cbb3 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 14 Mar 2025 17:41:11 +0000 Subject: [PATCH 0303/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index 8c0d8db61e..d7e463a6e7 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.3.2 +Version: 2025.3.3 Release: 1%?dist Summary: Front-end to your dev env From 36ba71fe5c1f12af23bed2fbca9788ed532495a2 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 01:39:15 +0000 Subject: [PATCH 0304/2977] bump(nightly): nightly mpv nightly nightly prismlauncher-nightly rpi-utils spotx-bash --- anda/apps/legcord/nightly/legcord-nightly.spec | 4 ++-- anda/apps/mpv/mpv-nightly.spec | 6 +++--- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/tools/rpi-utils/rpi-utils.spec | 4 ++-- anda/tools/spotx-bash/spotx-bash.spec | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/anda/apps/legcord/nightly/legcord-nightly.spec b/anda/apps/legcord/nightly/legcord-nightly.spec index 127bc2c0f0..f4a7f186a8 100644 --- a/anda/apps/legcord/nightly/legcord-nightly.spec +++ b/anda/apps/legcord/nightly/legcord-nightly.spec @@ -1,5 +1,5 @@ -%global commit e293f9c7353cfda83d7be65841ade9f8c904b346 -%global commit_date 20250309 +%global commit 13c3ca026bb143ff13d5c560e34603153ab16677 +%global commit_date 20250315 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define debug_package %nil diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index bfe2f24767..48a1723c64 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,11 +1,11 @@ -%global commit d9dadf07ae9425ad3cc6cc2ee9464038224efdcb +%global commit a8f5beb5a38e0ed169a9fb9faff6c5ca0a43dfee %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250314 +%global commit_date 20250315 %global ver 0.39.0 Name: mpv-nightly Version: %ver^%commit_date.%shortcommit -Release: 2%?dist +Release: 1%?dist License: GPL-2.0-or-later AND LGPL-2.1-or-later Summary: Movie player playing most video formats and DVDs diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index ab98d16562..d3d3b8b9fd 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 73c7943fff38f679a9a434457b5089bc5722411d +%global commit 234b804872af665ca8091892ff3ea35ea278b32c %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-03-13 +%global fulldate 2025-03-14 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index e12d6f752e..4a59e23832 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 22ad7b17c53596f54aa6429822adf03adac0f012 +%global commit 7c1405db379487f00e6e4eee9735e79f5a24b279 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250314 +%global commit_date 20250315 %global ver 0.179.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 278864ae6c..669271be01 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 1e1730e5a9bf286d10b2f768e60e1e4cd2fa8f20 +%global commit 1a1bc14a73f80b105dfefa5e3efdf1c593582e22 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250311 +%global commit_date 20250315 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/tools/rpi-utils/rpi-utils.spec b/anda/tools/rpi-utils/rpi-utils.spec index f22ee6c07f..68ed058c38 100644 --- a/anda/tools/rpi-utils/rpi-utils.spec +++ b/anda/tools/rpi-utils/rpi-utils.spec @@ -1,5 +1,5 @@ -%global commit 660bba39805585fb39d37d49b8268073932696bb -%global commit_date 20250305 +%global commit 685afa8c0d6f2310eaefe1b528627a8bf3154ca0 +%global commit_date 20250315 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define _unpackaged_files_terminate_build 0 diff --git a/anda/tools/spotx-bash/spotx-bash.spec b/anda/tools/spotx-bash/spotx-bash.spec index e6b69b37d3..852f40e062 100644 --- a/anda/tools/spotx-bash/spotx-bash.spec +++ b/anda/tools/spotx-bash/spotx-bash.spec @@ -1,5 +1,5 @@ -%global commit c3d4b777081b3cdb52d52b43ac1589c349c87173 -%global commit_date 20250314 +%global commit f6e102798220026f54b2bb387fb3c4b96aaf9c57 +%global commit_date 20250315 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: spotx-bash From 9e7f9b6a7676200f00ff4af2aed350cf3d398859 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 01:48:22 +0000 Subject: [PATCH 0305/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 70cfd58f94..79992e6df0 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-14 +%global ver 2025-03-15 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From ea0e7755f89a9e5371ffac6a170a2501bbbd51b0 Mon Sep 17 00:00:00 2001 From: Gilver Date: Fri, 14 Mar 2025 23:02:09 -0500 Subject: [PATCH 0306/2977] feat(rio): Devel package (#3920) * Add devel package Signed-off-by: Gilver * Bump release Signed-off-by: Gilver * Hard dep? Signed-off-by: Gilver * Careful Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/devs/rio/rio.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/anda/devs/rio/rio.spec b/anda/devs/rio/rio.spec index 85ae3f2d37..74288915f5 100644 --- a/anda/devs/rio/rio.spec +++ b/anda/devs/rio/rio.spec @@ -4,7 +4,7 @@ A hardware-accelerated terminal emulator focusing to run in desktops and browser Name: rio Version: 0.2.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A hardware-accelerated terminal written in Rust. SourceLicense: MIT License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND Apache-2.0 AND BSD-2-Clause AND BSL-1.0 AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND CC0-1.0 AND ISC AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND (MPL-2.0 OR GPL-3.0-only) AND MPL-2.0+ AND MPL-2.0 AND Unicode-3.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND Zlib @@ -28,6 +28,13 @@ Packager: Gilver E. %description %_description +%package devel +Summary: Development files for Rio +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains the development libraries for Rio. + %prep %autosetup -n %{name}-%{version} sed -i 's/Exec=.*/Exec=%{crate}/g' misc/%{name}.desktop @@ -38,6 +45,7 @@ sed -i 's/Exec=.*/Exec=%{crate}/g' misc/%{name}.desktop %install install -Dm755 target/rpm/%{name} %{buildroot}%{_bindir}/%{crate} +install -Dm755 target/rpm/*.so -t %{buildroot}%{_libdir} install -Dm644 misc/%{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop install -Dm644 docs/static/assets/%{name}-logo.svg %{buildroot}%{_iconsdir}/hicolor/scalable/apps/%{name}.svg %{cargo_license_online -a} > LICENSE.dependencies @@ -50,6 +58,11 @@ install -Dm644 docs/static/assets/%{name}-logo.svg %{buildroot}%{_iconsdir}/hico %{_datadir}/applications/%{name}.desktop %{_iconsdir}/hicolor/scalable/apps/%{name}.svg +%files devel +%{_libdir}/librio_backend.so +%{_libdir}/librio_proc_macros.so +%{_libdir}/libsugarloaf.so + %changelog * Sat Mar 8 2025 Gilver E. - Initial package From c41ea79293329301a44a2c704cd2146a5e121f5b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 04:37:36 +0000 Subject: [PATCH 0307/2977] bump: srpm-macros --- anda/terra/srpm-macros/anda-srpm-macros.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/terra/srpm-macros/anda-srpm-macros.spec b/anda/terra/srpm-macros/anda-srpm-macros.spec index 27c1c3b108..1df4f68ed7 100644 --- a/anda/terra/srpm-macros/anda-srpm-macros.spec +++ b/anda/terra/srpm-macros/anda-srpm-macros.spec @@ -1,5 +1,5 @@ Name: anda-srpm-macros -Version: 0.2.7 +Version: 0.2.8 Release: 1%?dist Summary: SRPM macros for extra Fedora packages From ac01365cdc9a2d88b48d30b8757d73bf25eb8234 Mon Sep 17 00:00:00 2001 From: Gilver Date: Fri, 14 Mar 2025 23:46:20 -0500 Subject: [PATCH 0308/2977] fix(mesa): Obsolete by Epoch (#3926) * Update mesa.spec * Update mesa.spec Signed-off-by: madomado * Drop anda-srpm-macros build dep Signed-off-by: Gilver --------- Signed-off-by: madomado Signed-off-by: Gilver Co-authored-by: madomado --- anda/lib/mesa/mesa.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index ec1fd8cf5a..bbcffcc102 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -259,7 +259,7 @@ Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{rel %if 0%{?with_va} Recommends: %{name}-va-drivers%{?_isa} %endif -Obsoletes: %{name}-libglapi < 25.0.0~rc2-1 +Obsoletes: %{name}-libglapi < 1:25.0.0~rc2-1 %description dri-drivers %{summary}. @@ -268,7 +268,7 @@ Obsoletes: %{name}-libglapi < 25.0.0~rc2-1 %package va-drivers Summary: Mesa-based VA-API video acceleration drivers Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: %{name}-vaapi-drivers < 22.2.0-5 +Obsoletes: %{name}-vaapi-drivers < 1:22.2.0-5 %description va-drivers %{summary}. From 6ade33cc6467e29be64a0a622f26a99ce667969a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 04:48:46 +0000 Subject: [PATCH 0309/2977] bump: anda --- anda/tools/buildsys/anda/rust-anda.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/anda/rust-anda.spec b/anda/tools/buildsys/anda/rust-anda.spec index 8db2cc50b1..43996367dd 100644 --- a/anda/tools/buildsys/anda/rust-anda.spec +++ b/anda/tools/buildsys/anda/rust-anda.spec @@ -5,7 +5,7 @@ %global crate anda Name: rust-anda -Version: 0.4.8 +Version: 0.4.9 Release: 1%?dist Summary: Andaman Build toolchain From 3399e42ebc5a1f21f507e013b3ca25119eab4470 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 05:53:05 +0000 Subject: [PATCH 0310/2977] bump: mock-configs --- anda/terra/mock-configs/terra-mock-configs.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/terra/mock-configs/terra-mock-configs.spec b/anda/terra/mock-configs/terra-mock-configs.spec index c96477a9e0..d4db931a9e 100644 --- a/anda/terra/mock-configs/terra-mock-configs.spec +++ b/anda/terra/mock-configs/terra-mock-configs.spec @@ -1,6 +1,6 @@ Name: terra-mock-configs -Version: 1.4.1 -Release: 2%?dist +Version: 1.4.2 +Release: 1%?dist Epoch: 1 Summary: Mock configs for Terra repos From 7cf9cbcc30554f6094ac0b42a5e98ae51e99204d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 06:32:01 +0000 Subject: [PATCH 0311/2977] bump: audacity-freeworld extest uwufetch gcm-core --- anda/apps/audacity-freeworld/audacity-freeworld.spec | 2 +- anda/misc/extest/rust-extest.spec | 4 ++-- anda/misc/uwufetch/uwufetch.spec | 2 +- anda/tools/gcm-core/gcm-core.spec | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/anda/apps/audacity-freeworld/audacity-freeworld.spec b/anda/apps/audacity-freeworld/audacity-freeworld.spec index 34623d542c..93ecd7d7ca 100644 --- a/anda/apps/audacity-freeworld/audacity-freeworld.spec +++ b/anda/apps/audacity-freeworld/audacity-freeworld.spec @@ -1,7 +1,7 @@ %global __requires_exclude ^lib-.*.so %global __provides_exclude ^lib-.*.so -%global ver Audacity 3.7.1 +%global ver Audacity-3.7.3 %global sanitized_ver %(sed 's/ *//;s/Audacity//' <<< "%{ver}") Name: audacity-freeworld diff --git a/anda/misc/extest/rust-extest.spec b/anda/misc/extest/rust-extest.spec index 631d402dfa..c4b5732925 100644 --- a/anda/misc/extest/rust-extest.spec +++ b/anda/misc/extest/rust-extest.spec @@ -1,6 +1,6 @@ -%global commit d6863d970d2686dd6282142af57503e1f2d561dc +%global commit %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20241119 +%global commit_date 20250315 %if 0%{?fedora} == 41 %ifarch %ix86 %global debug_package %{nil} diff --git a/anda/misc/uwufetch/uwufetch.spec b/anda/misc/uwufetch/uwufetch.spec index 6b46034594..29e2bc2e9f 100644 --- a/anda/misc/uwufetch/uwufetch.spec +++ b/anda/misc/uwufetch/uwufetch.spec @@ -1,5 +1,5 @@ Name: uwufetch -Version: 2.1 +Version: Release: 1%?dist Summary: A meme system info tool for Linux, based on nyan/uwu trend on r/linuxmasterrace. License: GPL-3.0 diff --git a/anda/tools/gcm-core/gcm-core.spec b/anda/tools/gcm-core/gcm-core.spec index f3d14992ed..d958aac142 100644 --- a/anda/tools/gcm-core/gcm-core.spec +++ b/anda/tools/gcm-core/gcm-core.spec @@ -6,7 +6,7 @@ %global forgeurl https://github.com/GitCredentialManager/git-credential-manager Name: gcm-core -Version: 2.6.1 +Version: %forgemeta Release: 1%?dist Summary: Secure, cross-platform Git credential storage From 5b0e8cfd0f0bde73930a6476bd0e624586419507 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 06:47:50 +0000 Subject: [PATCH 0312/2977] bump: extest gcm-core --- anda/misc/extest/rust-extest.spec | 2 +- anda/tools/gcm-core/gcm-core.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/misc/extest/rust-extest.spec b/anda/misc/extest/rust-extest.spec index c4b5732925..b845e14c7c 100644 --- a/anda/misc/extest/rust-extest.spec +++ b/anda/misc/extest/rust-extest.spec @@ -1,5 +1,5 @@ %global commit -%global shortcommit %(c=%{commit}; echo ${c:0:7}) + %global commit_date 20250315 %if 0%{?fedora} == 41 %ifarch %ix86 diff --git a/anda/tools/gcm-core/gcm-core.spec b/anda/tools/gcm-core/gcm-core.spec index d958aac142..242fa60e26 100644 --- a/anda/tools/gcm-core/gcm-core.spec +++ b/anda/tools/gcm-core/gcm-core.spec @@ -7,7 +7,7 @@ Name: gcm-core Version: -%forgemeta + Release: 1%?dist Summary: Secure, cross-platform Git credential storage From 041461a6d531b1396f9d3388214803dba27e4682 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 06:58:05 +0000 Subject: [PATCH 0313/2977] bump: extest anda --- anda/misc/extest/rust-extest.spec | 2 +- anda/tools/buildsys/anda/rust-anda.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/misc/extest/rust-extest.spec b/anda/misc/extest/rust-extest.spec index b845e14c7c..58c1be8785 100644 --- a/anda/misc/extest/rust-extest.spec +++ b/anda/misc/extest/rust-extest.spec @@ -1,6 +1,6 @@ %global commit -%global commit_date 20250315 + %if 0%{?fedora} == 41 %ifarch %ix86 %global debug_package %{nil} diff --git a/anda/tools/buildsys/anda/rust-anda.spec b/anda/tools/buildsys/anda/rust-anda.spec index 43996367dd..0c39143337 100644 --- a/anda/tools/buildsys/anda/rust-anda.spec +++ b/anda/tools/buildsys/anda/rust-anda.spec @@ -5,7 +5,7 @@ %global crate anda Name: rust-anda -Version: 0.4.9 +Version: 0.4.10 Release: 1%?dist Summary: Andaman Build toolchain From 0b8efe038e7fe0dfe8f3cbac832163d6da87b07a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 07:22:11 +0000 Subject: [PATCH 0314/2977] bump: extest --- anda/misc/extest/rust-extest.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/misc/extest/rust-extest.spec b/anda/misc/extest/rust-extest.spec index 58c1be8785..990026c592 100644 --- a/anda/misc/extest/rust-extest.spec +++ b/anda/misc/extest/rust-extest.spec @@ -1,7 +1,7 @@ %global commit -%if 0%{?fedora} == 41 + %ifarch %ix86 %global debug_package %{nil} %endif From 409105971ed45e9f9e0f489cf0455f5eadb1e12a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 07:30:28 +0000 Subject: [PATCH 0315/2977] bump: extest --- anda/misc/extest/rust-extest.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/misc/extest/rust-extest.spec b/anda/misc/extest/rust-extest.spec index 990026c592..302c56723d 100644 --- a/anda/misc/extest/rust-extest.spec +++ b/anda/misc/extest/rust-extest.spec @@ -2,7 +2,7 @@ -%ifarch %ix86 + %global debug_package %{nil} %endif %endif From 10592e9d3b6d07b8df56010df9828608fe5f2288 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 07:40:38 +0000 Subject: [PATCH 0316/2977] bump: extest --- anda/misc/extest/rust-extest.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/misc/extest/rust-extest.spec b/anda/misc/extest/rust-extest.spec index 302c56723d..8c05195bce 100644 --- a/anda/misc/extest/rust-extest.spec +++ b/anda/misc/extest/rust-extest.spec @@ -3,7 +3,7 @@ -%global debug_package %{nil} + %endif %endif From 27b713794452e3c79e8320dbe6bea459a9cfb1ef Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 07:50:43 +0000 Subject: [PATCH 0317/2977] bump: extest --- anda/misc/extest/rust-extest.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/misc/extest/rust-extest.spec b/anda/misc/extest/rust-extest.spec index 8c05195bce..8b408ae9d2 100644 --- a/anda/misc/extest/rust-extest.spec +++ b/anda/misc/extest/rust-extest.spec @@ -4,7 +4,7 @@ -%endif + %endif # While there's an upstream version at Supreeeme/extest, we're using From ad4151b07cff79f29abade807429d97c64631d2a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 08:20:45 +0000 Subject: [PATCH 0318/2977] bump: extest --- anda/misc/extest/rust-extest.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/misc/extest/rust-extest.spec b/anda/misc/extest/rust-extest.spec index 8b408ae9d2..00f6d17afd 100644 --- a/anda/misc/extest/rust-extest.spec +++ b/anda/misc/extest/rust-extest.spec @@ -5,7 +5,7 @@ -%endif + # While there's an upstream version at Supreeeme/extest, we're using # the same fork as Bazzite so we can use the same patches. From 5ebcde7647fa91b6b328c447b0362c31400adb87 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 08:41:17 +0000 Subject: [PATCH 0319/2977] bump: extest --- anda/misc/extest/rust-extest.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/misc/extest/rust-extest.spec b/anda/misc/extest/rust-extest.spec index 00f6d17afd..199ec74ec2 100644 --- a/anda/misc/extest/rust-extest.spec +++ b/anda/misc/extest/rust-extest.spec @@ -7,7 +7,7 @@ -# While there's an upstream version at Supreeeme/extest, we're using + # the same fork as Bazzite so we can use the same patches. # This fork has no tags so we're gonna use the commit hash as the version From 2af43e3de6991b9149405330e21569ee7e05f3ae Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 08:55:41 +0000 Subject: [PATCH 0320/2977] bump: extest --- anda/misc/extest/rust-extest.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/misc/extest/rust-extest.spec b/anda/misc/extest/rust-extest.spec index 199ec74ec2..2405a774a0 100644 --- a/anda/misc/extest/rust-extest.spec +++ b/anda/misc/extest/rust-extest.spec @@ -8,7 +8,7 @@ -# the same fork as Bazzite so we can use the same patches. + # This fork has no tags so we're gonna use the commit hash as the version # Don't mangle shebangs From aa2ed6a62111d00bc838bd61e0c6bc05e2ff6425 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 09:16:41 +0000 Subject: [PATCH 0321/2977] bump: extest --- anda/misc/extest/rust-extest.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/misc/extest/rust-extest.spec b/anda/misc/extest/rust-extest.spec index 2405a774a0..5f6e2e4392 100644 --- a/anda/misc/extest/rust-extest.spec +++ b/anda/misc/extest/rust-extest.spec @@ -9,7 +9,7 @@ -# This fork has no tags so we're gonna use the commit hash as the version + # Don't mangle shebangs %global __brp_mangle_shebangs %{nil} From b93a1ecda6734656838f7c2946a8fa5694b5224d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 09:30:03 +0000 Subject: [PATCH 0322/2977] bump: extest electron --- anda/misc/extest/rust-extest.spec | 2 +- anda/tools/electron/electron.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/misc/extest/rust-extest.spec b/anda/misc/extest/rust-extest.spec index 5f6e2e4392..9a029b9318 100644 --- a/anda/misc/extest/rust-extest.spec +++ b/anda/misc/extest/rust-extest.spec @@ -11,7 +11,7 @@ -# Don't mangle shebangs + %global __brp_mangle_shebangs %{nil} # Exclude input files from mangling diff --git a/anda/tools/electron/electron.spec b/anda/tools/electron/electron.spec index 388f80c0d0..35614b2a3a 100644 --- a/anda/tools/electron/electron.spec +++ b/anda/tools/electron/electron.spec @@ -12,7 +12,7 @@ %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so Name: electron -Version: 35.0.1 +Version: 35.0.2 Release: 1%?dist Summary: Build cross platform desktop apps with web technologies License: MIT From 22a30cb68e6c11bd93cd8e963729cbbd4a1f3e3e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 09:40:29 +0000 Subject: [PATCH 0323/2977] bump: extest --- anda/misc/extest/rust-extest.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/misc/extest/rust-extest.spec b/anda/misc/extest/rust-extest.spec index 9a029b9318..419bfbb1f4 100644 --- a/anda/misc/extest/rust-extest.spec +++ b/anda/misc/extest/rust-extest.spec @@ -12,7 +12,7 @@ -%global __brp_mangle_shebangs %{nil} + # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ From 20ead400542506af66fe5bf5605a5b9e6e793e97 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 15 Mar 2025 04:50:47 -0500 Subject: [PATCH 0324/2977] fix(audacity, extest, gcm-core, uwufetch): Update scripts (#3933) * Update rust-extest.spec Signed-off-by: Gilver * Update update.rhai Signed-off-by: Gilver * Update gcm-core.spec Signed-off-by: Gilver * Update update.rhai Signed-off-by: Gilver * Update uwufetch.spec Signed-off-by: Gilver * Update update.rhai Signed-off-by: Gilver * Update update.rhai Signed-off-by: Gilver * Update audacity-freeworld.spec Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/apps/audacity-freeworld/audacity-freeworld.spec | 2 +- anda/apps/audacity-freeworld/update.rhai | 3 +++ anda/misc/extest/rust-extest.spec | 2 +- anda/misc/extest/update.rhai | 4 ++-- anda/misc/uwufetch/update.rhai | 2 +- anda/misc/uwufetch/uwufetch.spec | 4 ++-- anda/tools/gcm-core/gcm-core.spec | 2 +- anda/tools/gcm-core/update.rhai | 2 +- 8 files changed, 12 insertions(+), 9 deletions(-) diff --git a/anda/apps/audacity-freeworld/audacity-freeworld.spec b/anda/apps/audacity-freeworld/audacity-freeworld.spec index 93ecd7d7ca..e2e22a8c86 100644 --- a/anda/apps/audacity-freeworld/audacity-freeworld.spec +++ b/anda/apps/audacity-freeworld/audacity-freeworld.spec @@ -2,7 +2,7 @@ %global __provides_exclude ^lib-.*.so %global ver Audacity-3.7.3 -%global sanitized_ver %(sed 's/ *//;s/Audacity//' <<< "%{ver}") +%global sanitized_ver %(echo %{ver} | sed 's/Audacity-//g') Name: audacity-freeworld Version: %{sanitized_ver} diff --git a/anda/apps/audacity-freeworld/update.rhai b/anda/apps/audacity-freeworld/update.rhai index 911fc1d97a..e0acc0c618 100644 --- a/anda/apps/audacity-freeworld/update.rhai +++ b/anda/apps/audacity-freeworld/update.rhai @@ -1 +1,4 @@ rpm.global("ver", gh("audacity/audacity")); +if rpm.changed() { + rpm.release(); +} diff --git a/anda/misc/extest/rust-extest.spec b/anda/misc/extest/rust-extest.spec index 419bfbb1f4..fecba1e9ee 100644 --- a/anda/misc/extest/rust-extest.spec +++ b/anda/misc/extest/rust-extest.spec @@ -25,7 +25,7 @@ Release: 1%?dist Summary: X11 XTEST reimplementation primarily for Steam Controller on Wayland License: MIT -URL: https://github.com/KyleGospo/extest +URL: https://github.com/bazzite-org/extest Source0: %{url}/archive/%{commit}.tar.gz diff --git a/anda/misc/extest/update.rhai b/anda/misc/extest/update.rhai index 803a1d0255..cf43758e46 100644 --- a/anda/misc/extest/update.rhai +++ b/anda/misc/extest/update.rhai @@ -1,5 +1,5 @@ -rpm.global("commit", gh_commit("KyleGospo/extest")); +rpm.global("commit", gh_commit("bazzite-org/extest")); if rpm.changed() { rpm.global("commit_date", date()); rpm.release(); -} \ No newline at end of file +} diff --git a/anda/misc/uwufetch/update.rhai b/anda/misc/uwufetch/update.rhai index ff156f789b..7ddbe03216 100644 --- a/anda/misc/uwufetch/update.rhai +++ b/anda/misc/uwufetch/update.rhai @@ -1 +1 @@ -rpm.version(gh("TheDarkBug/uwufetch")); +rpm.version(gh("ad-oliviero/uwufetch")); diff --git a/anda/misc/uwufetch/uwufetch.spec b/anda/misc/uwufetch/uwufetch.spec index 29e2bc2e9f..9658f887eb 100644 --- a/anda/misc/uwufetch/uwufetch.spec +++ b/anda/misc/uwufetch/uwufetch.spec @@ -3,7 +3,7 @@ Version: Release: 1%?dist Summary: A meme system info tool for Linux, based on nyan/uwu trend on r/linuxmasterrace. License: GPL-3.0 -URL: https://github.com/TheDarkBug/uwufetch +URL: https://github.com/ad-oliviero/uwufetch BuildRequires: make gcc git anda-srpm-macros %description @@ -30,4 +30,4 @@ rm -rf %{?buildroot}%{_includedir} %changelog * Thu Jun 22 2023 Alyxia Sother -- Initial package. \ No newline at end of file +- Initial package. diff --git a/anda/tools/gcm-core/gcm-core.spec b/anda/tools/gcm-core/gcm-core.spec index 242fa60e26..70ccbc92da 100644 --- a/anda/tools/gcm-core/gcm-core.spec +++ b/anda/tools/gcm-core/gcm-core.spec @@ -3,7 +3,7 @@ %global long_name git-credential-manager -%global forgeurl https://github.com/GitCredentialManager/git-credential-manager +%global forgeurl https://github.com/git-ecosystem/git-credential-manager Name: gcm-core Version: diff --git a/anda/tools/gcm-core/update.rhai b/anda/tools/gcm-core/update.rhai index 10dbb7fdf2..37231d1203 100644 --- a/anda/tools/gcm-core/update.rhai +++ b/anda/tools/gcm-core/update.rhai @@ -1 +1 @@ -rpm.version(gh("GitCredentialManager/git-credential-manager")); +rpm.version(gh("git-ecosystem/git-credential-manager")); From 34162f21f1cb08876ff953dafa63b1abdc0f8277 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 10:00:48 +0000 Subject: [PATCH 0325/2977] bump: extest --- anda/misc/extest/rust-extest.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/misc/extest/rust-extest.spec b/anda/misc/extest/rust-extest.spec index fecba1e9ee..737cf2dd60 100644 --- a/anda/misc/extest/rust-extest.spec +++ b/anda/misc/extest/rust-extest.spec @@ -14,7 +14,7 @@ -# Exclude input files from mangling +d6863d970d2686dd6282142af57503e1f2d561dc %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker %global build_rustflags %build_rustflags -C link-arg=-fuse-ld=mold From 33e875d3199ffb00739e991a332e0496ffc40bc5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 13:28:45 +0000 Subject: [PATCH 0326/2977] bump: pillow-heif --- anda/langs/python/pillow-heif/python3-pillow-heif.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/python/pillow-heif/python3-pillow-heif.spec b/anda/langs/python/pillow-heif/python3-pillow-heif.spec index 803ee65023..758f8e1cbd 100644 --- a/anda/langs/python/pillow-heif/python3-pillow-heif.spec +++ b/anda/langs/python/pillow-heif/python3-pillow-heif.spec @@ -6,7 +6,7 @@ %bcond_with doc Name: python-%{srcname} -Version: 0.21.0 +Version: 0.22.0 Release: 1%?dist Summary: Python library for working with HEIF images and plugin for Pillow From 3c439a93f92fc6471b106115a49c51af42ca22ec Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 15 Mar 2025 21:45:20 +0800 Subject: [PATCH 0327/2977] fix(fluent-icon-theme): maybe conflicts itself? (#3927) Signed-off-by: madomado --- anda/themes/fluent-icon-theme/fluent-icon-theme.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anda/themes/fluent-icon-theme/fluent-icon-theme.spec b/anda/themes/fluent-icon-theme/fluent-icon-theme.spec index 4f654bc29c..b49f99f2c1 100644 --- a/anda/themes/fluent-icon-theme/fluent-icon-theme.spec +++ b/anda/themes/fluent-icon-theme/fluent-icon-theme.spec @@ -2,7 +2,7 @@ Name: fluent-icon-theme Version: 20250226 -Release: 1%?dist +Release: 2%?dist Summary: Fluent icon theme for linux desktops License: GPL-3.0 @@ -11,6 +11,7 @@ Source0: %{url}/archive/refs/tags/%{tag}.tar.gz BuildArch: noarch BuildRequires: gtk-update-icon-cache fdupes +Conflicts: %name %description Fluent icon theme for linux desktops. From dc83fa2326063b23f749860d7dd40387fcc843dd Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 15 Mar 2025 22:52:34 +0800 Subject: [PATCH 0328/2977] fix(extest): revert the weird anda update bug (#3938) Signed-off-by: madomado --- anda/misc/extest/rust-extest.spec | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/anda/misc/extest/rust-extest.spec b/anda/misc/extest/rust-extest.spec index 737cf2dd60..5351523df8 100644 --- a/anda/misc/extest/rust-extest.spec +++ b/anda/misc/extest/rust-extest.spec @@ -1,20 +1,20 @@ -%global commit +%global commit d6863d970d2686dd6282142af57503e1f2d561dc +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commit_date 20241119 +%if 0%{?fedora} == 41 +%ifarch %ix86 +%global debug_package %{nil} +%endif +%endif +# While there's an upstream version at Supreeeme/extest, we're using +# the same fork as Bazzite so we can use the same patches. +# This fork has no tags so we're gonna use the commit hash as the version +# Don't mangle shebangs +%global __brp_mangle_shebangs %{nil} - - - - - - - - - - - - -d6863d970d2686dd6282142af57503e1f2d561dc +# Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker %global build_rustflags %build_rustflags -C link-arg=-fuse-ld=mold @@ -25,7 +25,7 @@ Release: 1%?dist Summary: X11 XTEST reimplementation primarily for Steam Controller on Wayland License: MIT -URL: https://github.com/bazzite-org/extest +URL: https://github.com/KyleGospo/extest Source0: %{url}/archive/%{commit}.tar.gz @@ -102,4 +102,3 @@ install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_libexecdir}/extest/override_stea %changelog %autochangelog - From 5249d033c6b2c5e1fcc8eade587e059398f95ddd Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 16:24:37 +0000 Subject: [PATCH 0329/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 9f09e1ff59..da36437910 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.13.043748 +Version: 2025.03.15.161417 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 985de89ca8caca2b2d24b826b4cea1498234acaa Mon Sep 17 00:00:00 2001 From: Antheas Kapenekakis <5252246+antheas@users.noreply.github.com> Date: Sat, 15 Mar 2025 18:36:49 +0100 Subject: [PATCH 0330/2977] fix(mesa): backport AMD GPU artifact fix, cleanup and attribute patches (#3943) * fix(mesa): backport AMD GPU artifact fix, cleanup and attribute patches * cleanup and reorder * Fix patch credit Signed-off-by: Gilver --------- Signed-off-by: Gilver Co-authored-by: Gilver --- anda/lib/mesa/12633.patch | 26 - ...f9a972324a72dd507e09ac975b969e6c88e0.patch | 34 - ...8799be3afe9a1e7ca9156a5d44ffe0aae681.patch | 38 -- anda/lib/mesa/34005.patch | 46 -- anda/lib/mesa/bazzite.patch | 581 ++++++++++++++++++ anda/lib/mesa/mesa.spec | 24 +- anda/lib/mesa/valve.patch | 143 ----- 7 files changed, 584 insertions(+), 308 deletions(-) delete mode 100644 anda/lib/mesa/12633.patch delete mode 100644 anda/lib/mesa/13a3f9a972324a72dd507e09ac975b969e6c88e0.patch delete mode 100644 anda/lib/mesa/237d8799be3afe9a1e7ca9156a5d44ffe0aae681.patch delete mode 100644 anda/lib/mesa/34005.patch create mode 100644 anda/lib/mesa/bazzite.patch delete mode 100644 anda/lib/mesa/valve.patch diff --git a/anda/lib/mesa/12633.patch b/anda/lib/mesa/12633.patch deleted file mode 100644 index 527e3b6e3d..0000000000 --- a/anda/lib/mesa/12633.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit d0279e717ee740746f0770c5a9870d752108e756 (HEAD -> makepkg) -Author: Maarten Lankhorst -Date: Mon Feb 17 14:55:29 2025 -0800 - - HACK: drm/xe gamescope fix - - Workaround gamescope DRM issues on Xe by allocating ANV_BO_ALLOC_SCANOUT - when using VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT - - Link: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/4292#note_2784316 - Signed-off-by: Matthew Schwartz - -diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c -index 1884932bbc7..cbc1b4aad87 100644 ---- a/src/intel/vulkan/anv_device.c -+++ b/src/intel/vulkan/anv_device.c -@@ -1533,6 +1533,9 @@ VkResult anv_AllocateMemory( - dedicated_info->image != VK_NULL_HANDLE) { - ANV_FROM_HANDLE(anv_image, image, dedicated_info->image); - -+ if (image->vk.tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) -+ alloc_flags |= ANV_BO_ALLOC_SCANOUT; -+ - /* Apply implicit sync to be compatible with clients relying on - * implicit fencing. This matches the behavior in iris i915_batch - * submit. An example client is VA-API (iHD), so only dedicated diff --git a/anda/lib/mesa/13a3f9a972324a72dd507e09ac975b969e6c88e0.patch b/anda/lib/mesa/13a3f9a972324a72dd507e09ac975b969e6c88e0.patch deleted file mode 100644 index 43b451f3d1..0000000000 --- a/anda/lib/mesa/13a3f9a972324a72dd507e09ac975b969e6c88e0.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 13a3f9a972324a72dd507e09ac975b969e6c88e0 Mon Sep 17 00:00:00 2001 -From: Hans-Kristian Arntzen -Date: Tue, 25 Feb 2025 12:43:17 +0100 -Subject: [PATCH] radv: Always set 0 dispatch offset for indirect CS. - -Fixes severe glitching in Avowed. - -Signed-off-by: Hans-Kristian Arntzen -Reviewed-by: Samuel Pitoiset -Reviewed-by: Natalie Vock -Cc: mesa-stable -Part-of: ---- - src/amd/vulkan/radv_cmd_buffer.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c -index d8c0c6810524b..d85c0659cb04e 100644 ---- a/src/amd/vulkan/radv_cmd_buffer.c -+++ b/src/amd/vulkan/radv_cmd_buffer.c -@@ -11722,6 +11722,10 @@ radv_emit_dispatch_packets(struct radv_cmd_buffer *cmd_buffer, const struct radv - dispatch_initiator |= S_00B800_USE_THREAD_DIMENSIONS(1); - } - -+ /* Indirect CS does not support offsets in the API. Must program this in case there have been -+ * preceding 1D RT dispatch or vkCmdDispatchBase. */ -+ dispatch_initiator |= S_00B800_FORCE_START_AT_000(1); -+ - if (grid_size_offset) { - if (device->load_grid_size_from_user_sgpr) { - assert(pdev->info.gfx_level >= GFX10_3); --- -GitLab - diff --git a/anda/lib/mesa/237d8799be3afe9a1e7ca9156a5d44ffe0aae681.patch b/anda/lib/mesa/237d8799be3afe9a1e7ca9156a5d44ffe0aae681.patch deleted file mode 100644 index 47151e7f03..0000000000 --- a/anda/lib/mesa/237d8799be3afe9a1e7ca9156a5d44ffe0aae681.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 237d8799be3afe9a1e7ca9156a5d44ffe0aae681 Mon Sep 17 00:00:00 2001 -From: Natalie Vock -Date: Fri, 28 Feb 2025 14:21:57 +0100 -Subject: [PATCH] radv/rt: Limit monolithic pipelines to 50 stages - -Beyond that, monolithic pipelines just bloat to incredible sizes, -destroying compile times for questionable, if any, runtime perf benefit. - -Indiana Jones: The Great Circle has more than 100 stages and takes -several minutes to compile its RT pipeline on Deck when using monolithic -compilation, and yet separate shaders still end up faster (probably -because instruction cache coherency in traversal is better). - -Part-of: ---- - src/amd/vulkan/radv_pipeline_rt.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/amd/vulkan/radv_pipeline_rt.c b/src/amd/vulkan/radv_pipeline_rt.c -index 0658840966c30..bcda4aae5528d 100644 ---- a/src/amd/vulkan/radv_pipeline_rt.c -+++ b/src/amd/vulkan/radv_pipeline_rt.c -@@ -602,7 +602,11 @@ radv_rt_compile_shaders(struct radv_device *device, struct vk_pipeline_cache *ca - - bool library = pipeline->base.base.create_flags & VK_PIPELINE_CREATE_2_LIBRARY_BIT_KHR; - -- bool monolithic = !library; -+ /* Beyond 50 shader stages, inlining everything bloats the shader a ton, increasing compile times and -+ * potentially even reducing runtime performance because of instruction cache coherency issues in the -+ * traversal loop. -+ */ -+ bool monolithic = !library && pipeline->stage_count < 50; - for (uint32_t i = 0; i < pCreateInfo->stageCount; i++) { - if (rt_stages[i].shader || rt_stages[i].nir) - continue; --- -GitLab - diff --git a/anda/lib/mesa/34005.patch b/anda/lib/mesa/34005.patch deleted file mode 100644 index cd4a36c58e..0000000000 --- a/anda/lib/mesa/34005.patch +++ /dev/null @@ -1,46 +0,0 @@ -From c6270978411609f52afb8c6a2219fcb94f9013bb Mon Sep 17 00:00:00 2001 -From: Samuel Pitoiset -Date: Tue, 11 Mar 2025 15:29:37 +0100 -Subject: [PATCH] radv/amdgpu: fix device deduplication - -To correctly deduplicate device inside the winsys, it should use the -fd or amdgpu_device_handle. Using the allocated ac_drm_device as key -is obviously broken. - -Not deduplicating devices breaks memory budget and a bunch of games -were broken. - -Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12686 -Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12775 -Fixes: a565f2994fe ("amd: move all uses of libdrm_amdgpu to ac_linux_drm") -Signed-off-by: Samuel Pitoiset -Part-of: ---- - src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c -index be8df8708c813..8b57abeb0b1ca 100644 ---- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c -+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c -@@ -234,7 +234,7 @@ radv_amdgpu_winsys_create(int fd, uint64_t debug_flags, uint64_t perftest_flags, - goto fail; - } - -- struct hash_entry *entry = _mesa_hash_table_search(winsyses, dev); -+ struct hash_entry *entry = _mesa_hash_table_search(winsyses, (void *)ac_drm_device_get_cookie(dev)); - if (entry) { - ws = (struct radv_amdgpu_winsys *)entry->data; - ++ws->refcount; -@@ -325,7 +325,7 @@ radv_amdgpu_winsys_create(int fd, uint64_t debug_flags, uint64_t perftest_flags, - radv_amdgpu_bo_init_functions(ws); - radv_amdgpu_cs_init_functions(ws); - -- _mesa_hash_table_insert(winsyses, dev, ws); -+ _mesa_hash_table_insert(winsyses, (void *)ac_drm_device_get_cookie(dev), ws); - simple_mtx_unlock(&winsys_creation_mutex); - - return &ws->base; --- -GitLab - diff --git a/anda/lib/mesa/bazzite.patch b/anda/lib/mesa/bazzite.patch new file mode 100644 index 0000000000..1ad3cd5ac5 --- /dev/null +++ b/anda/lib/mesa/bazzite.patch @@ -0,0 +1,581 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Antheas Kapenekakis +Date: Sat, 15 Mar 2025 16:38:53 +0100 +Subject: [NA] Developer files, readme, etc + +-- +2.48.1 + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Antheas Kapenekakis +Date: Sat, 15 Mar 2025 16:39:08 +0100 +Subject: [BEGIN] SteamOS Changes + +-- +2.48.1 + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Bas Nieuwenhuizen +Date: Fri, 14 Jan 2022 15:58:45 +0100 +Subject: STEAMOS: radv: min image count override for FH5 + +Otherwise in combination with the vblank time reservation in +gamescope the game could get stuck in low power states. +--- + src/util/00-radv-defaults.conf | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/util/00-radv-defaults.conf b/src/util/00-radv-defaults.conf +index d2dbe4d5e11..1851504036a 100644 +--- a/src/util/00-radv-defaults.conf ++++ b/src/util/00-radv-defaults.conf +@@ -220,5 +220,9 @@ Application bugs worked around in this file: + + ++ ++ ++ + + +-- +2.48.1 + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Samuel Pitoiset +Date: Thu, 22 Feb 2024 22:32:45 +0100 +Subject: STEAMOS: Dynamic swapchain override for gamescope limiter for DRI3 + only + +The original patch (from Bas) contained WSI VK support too but it's +been removed because the Gamescope WSI layer already handles that. + +Signed-off-by: Samuel Pitoiset +--- + .../frontends/dri/loader_dri3_helper.c | 42 ++++++++++++++++++- + .../frontends/dri/loader_dri3_helper.h | 1 + + 2 files changed, 41 insertions(+), 2 deletions(-) + +diff --git a/src/gallium/frontends/dri/loader_dri3_helper.c b/src/gallium/frontends/dri/loader_dri3_helper.c +index 9e4ca3f5707..7863623f8de 100644 +--- a/src/gallium/frontends/dri/loader_dri3_helper.c ++++ b/src/gallium/frontends/dri/loader_dri3_helper.c +@@ -297,6 +297,30 @@ dri3_update_max_num_back(struct loader_dri3_drawable *draw) + } + } + ++static unsigned ++gamescope_swapchain_override() ++{ ++ const char *path = getenv("GAMESCOPE_LIMITER_FILE"); ++ if (!path) ++ return 0; ++ ++ static simple_mtx_t mtx = SIMPLE_MTX_INITIALIZER; ++ static int fd = -1; ++ ++ simple_mtx_lock(&mtx); ++ if (fd < 0) { ++ fd = open(path, O_RDONLY); ++ } ++ simple_mtx_unlock(&mtx); ++ ++ if (fd < 0) ++ return 0; ++ ++ uint32_t override_value = 0; ++ pread(fd, &override_value, sizeof(override_value), 0); ++ return override_value; ++} ++ + void + loader_dri3_set_swap_interval(struct loader_dri3_drawable *draw, int interval) + { +@@ -311,10 +335,12 @@ loader_dri3_set_swap_interval(struct loader_dri3_drawable *draw, int interval) + * PS. changing from value A to B and A < B won't cause swap out of order but + * may still gets wrong target_msc value at the beginning. + */ +- if (draw->swap_interval != interval) ++ if (draw->orig_swap_interval != interval) + loader_dri3_swapbuffer_barrier(draw); + +- draw->swap_interval = interval; ++ draw->orig_swap_interval = interval; ++ if (gamescope_swapchain_override() != 1) ++ draw->swap_interval = interval; + } + + static void +@@ -443,6 +469,12 @@ loader_dri3_drawable_init(xcb_connection_t *conn, + + draw->swap_interval = dri_get_initial_swap_interval(draw->dri_screen_render_gpu); + ++ draw->orig_swap_interval = draw->swap_interval; ++ ++ unsigned gamescope_override = gamescope_swapchain_override(); ++ if (gamescope_override == 1) ++ draw->swap_interval = 1; ++ + dri3_update_max_num_back(draw); + + /* Create a new drawable */ +@@ -1087,6 +1119,12 @@ loader_dri3_swap_buffers_msc(struct loader_dri3_drawable *draw, + if (draw->type == LOADER_DRI3_DRAWABLE_WINDOW) { + dri3_fence_reset(draw->conn, back); + ++ unsigned gamescope_override = gamescope_swapchain_override(); ++ if (gamescope_override == 1) ++ draw->swap_interval = 1; ++ else ++ draw->swap_interval = draw->orig_swap_interval; ++ + /* Compute when we want the frame shown by taking the last known + * successful MSC and adding in a swap interval for each outstanding swap + * request. target_msc=divisor=remainder=0 means "Use glXSwapBuffers() +diff --git a/src/gallium/frontends/dri/loader_dri3_helper.h b/src/gallium/frontends/dri/loader_dri3_helper.h +index 9061e9755e2..6cc64be298a 100644 +--- a/src/gallium/frontends/dri/loader_dri3_helper.h ++++ b/src/gallium/frontends/dri/loader_dri3_helper.h +@@ -170,6 +170,7 @@ struct loader_dri3_drawable { + bool block_on_depleted_buffers; + bool queries_buffer_age; + int swap_interval; ++ int orig_swap_interval; + + const struct loader_dri3_vtable *vtable; + +-- +2.48.1 + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Samuel Pitoiset +Date: Mon, 24 Feb 2025 17:48:21 +0100 +Subject: radv: stop computing the UUID using the physical device cache key + +Otherwise, the UUID changes for games that have shader-based drirc +workarounds and this breaks precompiled shaders on SteamDeck. + +Instead, use this pdev cache key to compute the logical device hash +which is common to all pipelines. + +Signed-off-by: Samuel Pitoiset +--- + src/amd/vulkan/radv_device.c | 6 +++++- + src/amd/vulkan/radv_physical_device.c | 1 - + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c +index 2de839e5d6d..da732ae503e 100644 +--- a/src/amd/vulkan/radv_device.c ++++ b/src/amd/vulkan/radv_device.c +@@ -858,6 +858,7 @@ radv_device_init_cache_key(struct radv_device *device) + const struct radv_physical_device *pdev = radv_device_physical(device); + const struct radv_instance *instance = radv_physical_device_instance(pdev); + struct radv_device_cache_key *key = &device->cache_key; ++ struct mesa_blake3 ctx; + + key->keep_shader_info = device->keep_shader_info; + key->trap_excp_flags = device->trap_handler_shader && instance->trap_excp_flags; +@@ -879,7 +880,10 @@ radv_device_init_cache_key(struct radv_device *device) + key->primitives_generated_query = true; + } + +- _mesa_blake3_compute(key, sizeof(*key), device->cache_hash); ++ _mesa_blake3_init(&ctx); ++ _mesa_blake3_update(&ctx, &pdev->cache_key, sizeof(pdev->cache_key)); ++ _mesa_blake3_update(&ctx, &device->cache_key, sizeof(device->cache_key)); ++ _mesa_blake3_final(&ctx, device->cache_hash); + } + + static void +diff --git a/src/amd/vulkan/radv_physical_device.c b/src/amd/vulkan/radv_physical_device.c +index f24203fcccc..b1a742d48ef 100644 +--- a/src/amd/vulkan/radv_physical_device.c ++++ b/src/amd/vulkan/radv_physical_device.c +@@ -264,7 +264,6 @@ radv_device_get_cache_uuid(struct radv_physical_device *pdev, void *uuid) + return -1; + #endif + +- _mesa_sha1_update(&ctx, &pdev->cache_key, sizeof(pdev->cache_key)); + _mesa_sha1_final(&ctx, sha1); + + memcpy(uuid, sha1, VK_UUID_SIZE); +-- +2.48.1 + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Antheas Kapenekakis +Date: Sat, 15 Mar 2025 16:39:25 +0100 +Subject: [BEGIN] SteamOS Backports + +-- +2.48.1 + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Natalie Vock +Date: Fri, 28 Feb 2025 14:21:57 +0100 +Subject: radv/rt: Limit monolithic pipelines to 50 stages + +Beyond that, monolithic pipelines just bloat to incredible sizes, +destroying compile times for questionable, if any, runtime perf benefit. + +Indiana Jones: The Great Circle has more than 100 stages and takes +several minutes to compile its RT pipeline on Deck when using monolithic +compilation, and yet separate shaders still end up faster (probably +because instruction cache coherency in traversal is better). + +Part-of: +--- + src/amd/vulkan/radv_pipeline_rt.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/amd/vulkan/radv_pipeline_rt.c b/src/amd/vulkan/radv_pipeline_rt.c +index 5a23dc99cc4..1421688d580 100644 +--- a/src/amd/vulkan/radv_pipeline_rt.c ++++ b/src/amd/vulkan/radv_pipeline_rt.c +@@ -600,7 +600,11 @@ radv_rt_compile_shaders(struct radv_device *device, struct vk_pipeline_cache *ca + + bool library = pipeline->base.base.create_flags & VK_PIPELINE_CREATE_2_LIBRARY_BIT_KHR; + +- bool monolithic = !library; ++ /* Beyond 50 shader stages, inlining everything bloats the shader a ton, increasing compile times and ++ * potentially even reducing runtime performance because of instruction cache coherency issues in the ++ * traversal loop. ++ */ ++ bool monolithic = !library && pipeline->stage_count < 50; + for (uint32_t i = 0; i < pCreateInfo->stageCount; i++) { + if (rt_stages[i].shader || rt_stages[i].nir) + continue; +-- +2.48.1 + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Antheas Kapenekakis +Date: Sat, 15 Mar 2025 16:39:33 +0100 +Subject: [BEGIN] Our Mesa backports + +-- +2.48.1 + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Rhys Perry +Date: Tue, 25 Feb 2025 18:07:30 +0000 +Subject: aco: insert dependency waits in certain situations + +This seems to fix some artifacts, but we're not sure why, so it might not +be a correct or optimal solution. + +fossil-db (navi31): +Totals from 28424 (35.81% of 79377) affected shaders: +Instrs: 30112910 -> 30348977 (+0.78%); split: -0.00%, +0.78% +CodeSize: 159542980 -> 160485336 (+0.59%); split: -0.00%, +0.59% +Latency: 221438396 -> 221500856 (+0.03%); split: -0.00%, +0.03% +InvThroughput: 38154231 -> 38159984 (+0.02%); split: -0.00%, +0.02% + +Signed-off-by: Rhys Perry +Reviewed-by: Georg Lehmann +Backport-to: 25.0 +Part-of: +--- + src/amd/compiler/aco_insert_NOPs.cpp | 101 +++++++++++++++++++++++---- + 1 file changed, 87 insertions(+), 14 deletions(-) + +diff --git a/src/amd/compiler/aco_insert_NOPs.cpp b/src/amd/compiler/aco_insert_NOPs.cpp +index de062be2c74..1005f82812c 100644 +--- a/src/amd/compiler/aco_insert_NOPs.cpp ++++ b/src/amd/compiler/aco_insert_NOPs.cpp +@@ -259,6 +259,9 @@ struct NOP_ctx_gfx11 { + std::bitset<128> sgpr_read_by_valu_as_lanemask; + std::bitset<128> sgpr_read_by_valu_as_lanemask_then_wr_by_salu; + ++ std::bitset<128> sgpr_read_by_valu_as_lanemask2; ++ std::bitset<128> sgpr_read_by_valu_as_lanemask_then_wr_by_valu; ++ + /* WMMAHazards */ + std::bitset<256> vgpr_written_by_wmma; + +@@ -278,8 +281,11 @@ struct NOP_ctx_gfx11 { + valu_since_wr_by_trans.join_min(other.valu_since_wr_by_trans); + trans_since_wr_by_trans.join_min(other.trans_since_wr_by_trans); + sgpr_read_by_valu_as_lanemask |= other.sgpr_read_by_valu_as_lanemask; ++ sgpr_read_by_valu_as_lanemask2 |= other.sgpr_read_by_valu_as_lanemask2; + sgpr_read_by_valu_as_lanemask_then_wr_by_salu |= + other.sgpr_read_by_valu_as_lanemask_then_wr_by_salu; ++ sgpr_read_by_valu_as_lanemask_then_wr_by_valu |= ++ other.sgpr_read_by_valu_as_lanemask_then_wr_by_valu; + vgpr_written_by_wmma |= other.vgpr_written_by_wmma; + sgpr_read_by_valu |= other.sgpr_read_by_valu; + sgpr_read_by_valu_then_wr_by_valu |= other.sgpr_read_by_valu_then_wr_by_valu; +@@ -297,8 +303,11 @@ struct NOP_ctx_gfx11 { + valu_since_wr_by_trans == other.valu_since_wr_by_trans && + trans_since_wr_by_trans == other.trans_since_wr_by_trans && + sgpr_read_by_valu_as_lanemask == other.sgpr_read_by_valu_as_lanemask && ++ sgpr_read_by_valu_as_lanemask2 == other.sgpr_read_by_valu_as_lanemask2 && + sgpr_read_by_valu_as_lanemask_then_wr_by_salu == + other.sgpr_read_by_valu_as_lanemask_then_wr_by_salu && ++ sgpr_read_by_valu_as_lanemask_then_wr_by_valu == ++ other.sgpr_read_by_valu_as_lanemask_then_wr_by_valu && + vgpr_written_by_wmma == other.vgpr_written_by_wmma && + sgpr_read_by_valu == other.sgpr_read_by_valu && + sgpr_read_by_valu_then_wr_by_salu == other.sgpr_read_by_valu_then_wr_by_salu; +@@ -1377,6 +1386,30 @@ handle_valu_partial_forwarding_hazard(State& state, aco_ptr& instr) + return global_state.hazard_found; + } + ++static bool ++instr_reads_lanemask(Instruction* instr, Operand* op) ++{ ++ if (!instr->isVALU()) ++ return false; ++ if (instr->isVOPD()) { ++ *op = Operand(vcc, s1); ++ return instr->opcode == aco_opcode::v_dual_cndmask_b32 || ++ instr->vopd().opy == aco_opcode::v_dual_cndmask_b32; ++ } ++ switch (instr->opcode) { ++ case aco_opcode::v_addc_co_u32: ++ case aco_opcode::v_subb_co_u32: ++ case aco_opcode::v_subbrev_co_u32: ++ case aco_opcode::v_cndmask_b16: ++ case aco_opcode::v_cndmask_b32: ++ case aco_opcode::v_div_fmas_f32: ++ case aco_opcode::v_div_fmas_f64: ++ *op = instr->operands.back(); ++ return !instr->operands.back().isConstant(); ++ default: return false; ++ } ++} ++ + void + handle_instruction_gfx11(State& state, NOP_ctx_gfx11& ctx, aco_ptr& instr, + std::vector>& new_instructions) +@@ -1473,14 +1506,47 @@ handle_instruction_gfx11(State& state, NOP_ctx_gfx11& ctx, aco_ptr& + sa_sdst = 0; + } + ++ /* VALU reading a SGPR as a lane mask and later written as a lane mask shouldn't be read again ++ * as a lane mask without a wait. ++ * ++ * TODO: this fixes #12623 and #11480, but needs further investigation as to why. ++ */ ++ Operand lanemask_op; ++ if (instr_reads_lanemask(instr.get(), &lanemask_op)) { ++ unsigned reg = lanemask_op.physReg().reg(); ++ if (ctx.sgpr_read_by_valu_as_lanemask_then_wr_by_valu[reg] || ++ (state.program->wave_size == 64 && ++ ctx.sgpr_read_by_valu_as_lanemask_then_wr_by_valu[reg + 1])) { ++ bool is_vcc = reg == vcc || reg == vcc_hi; ++ bld.sopp(aco_opcode::s_waitcnt_depctr, is_vcc ? 0xfffd : 0xf1ff); ++ if (is_vcc) ++ wait.va_vcc = 0; ++ else ++ wait.va_sdst = 0; ++ } ++ } ++ + if (va_vdst == 0) { + ctx.valu_since_wr_by_trans.reset(); + ctx.trans_since_wr_by_trans.reset(); ++ ctx.sgpr_read_by_valu_as_lanemask_then_wr_by_valu.reset(); + } + + if (sa_sdst == 0) + ctx.sgpr_read_by_valu_as_lanemask_then_wr_by_salu.reset(); + ++ if (wait.va_sdst == 0) { ++ std::bitset<128> old = ctx.sgpr_read_by_valu_as_lanemask_then_wr_by_valu; ++ ctx.sgpr_read_by_valu_as_lanemask_then_wr_by_valu.reset(); ++ ctx.sgpr_read_by_valu_as_lanemask_then_wr_by_valu[vcc] = old[vcc]; ++ ctx.sgpr_read_by_valu_as_lanemask_then_wr_by_valu[vcc_hi] = old[vcc_hi]; ++ } ++ ++ if (wait.va_vcc == 0) { ++ ctx.sgpr_read_by_valu_as_lanemask_then_wr_by_valu[vcc] = false; ++ ctx.sgpr_read_by_valu_as_lanemask_then_wr_by_valu[vcc_hi] = false; ++ } ++ + if (state.program->wave_size == 64 && instr->isSALU() && + check_written_regs(instr, ctx.sgpr_read_by_valu_as_lanemask)) { + unsigned reg = instr->definitions[0].physReg().reg(); +@@ -1511,21 +1577,28 @@ handle_instruction_gfx11(State& state, NOP_ctx_gfx11& ctx, aco_ptr& + if (!op.isConstant() && op.physReg().reg() < 126) + ctx.sgpr_read_by_valu_as_lanemask.reset(); + } +- switch (instr->opcode) { +- case aco_opcode::v_addc_co_u32: +- case aco_opcode::v_subb_co_u32: +- case aco_opcode::v_subbrev_co_u32: +- case aco_opcode::v_cndmask_b16: +- case aco_opcode::v_cndmask_b32: +- case aco_opcode::v_div_fmas_f32: +- case aco_opcode::v_div_fmas_f64: +- if (instr->operands.back().physReg() != exec) { +- ctx.sgpr_read_by_valu_as_lanemask.set(instr->operands.back().physReg().reg()); +- ctx.sgpr_read_by_valu_as_lanemask.set(instr->operands.back().physReg().reg() + 1); +- } +- break; +- default: break; ++ } ++ ++ if (instr_reads_lanemask(instr.get(), &lanemask_op)) { ++ unsigned reg = lanemask_op.physReg().reg(); ++ if (state.program->wave_size == 64 && reg != exec) { ++ ctx.sgpr_read_by_valu_as_lanemask.set(reg); ++ ctx.sgpr_read_by_valu_as_lanemask.set(reg + 1); + } ++ ctx.sgpr_read_by_valu_as_lanemask2.set(reg); ++ if (state.program->wave_size == 64) ++ ctx.sgpr_read_by_valu_as_lanemask2.set(reg + 1); ++ } ++ ++ if (instr->opcode != aco_opcode::v_readlane_b32_e64 && ++ instr->opcode != aco_opcode::v_readfirstlane_b32 && ++ !instr->definitions.empty() && ++ instr->definitions.back().getTemp().type() == RegType::sgpr) { ++ unsigned reg = instr->definitions.back().physReg().reg(); ++ if (ctx.sgpr_read_by_valu_as_lanemask2[reg]) ++ ctx.sgpr_read_by_valu_as_lanemask_then_wr_by_valu[reg] = true; ++ if (state.program->wave_size == 64 && ctx.sgpr_read_by_valu_as_lanemask2[reg + 1]) ++ ctx.sgpr_read_by_valu_as_lanemask_then_wr_by_valu[reg + 1] = true; + } + } + } else { +-- +2.48.1 + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Ivan A. Melnikov" +Date: Fri, 7 Mar 2025 19:29:31 +0400 +Subject: gallium/radeon: Make sure radeonsi PCI IDs are also included + +When importing libdrm_radeon code [1][2] it was somehow missed +that what libdrm has in one r600_pci_ids.h, Mesa has split +into r600_pci_ids.h and radeonsi_pci_ids.h. So, devices +with ids from radeonsi_pci_ids.h were not considered valid for +radeon_surface_manager_new. + +This commit changes that, thus fixing radeonsi for these +devices. + +[1] commit 1299f5c50a490fadeb60b61677596f13399ee136 +[2] commit 3aa7497cc0bb52c8099fb07b27f9aee5e18e58ca + +Fixes: 1299f5c50a490fadeb60b61677596f13399ee136 +Signed-off-by: Ivan A. Melnikov +Part-of: +--- + src/gallium/winsys/radeon/drm/radeon_surface.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/gallium/winsys/radeon/drm/radeon_surface.c b/src/gallium/winsys/radeon/drm/radeon_surface.c +index 8a3302df684..3c469ad0c6e 100644 +--- a/src/gallium/winsys/radeon/drm/radeon_surface.c ++++ b/src/gallium/winsys/radeon/drm/radeon_surface.c +@@ -132,6 +132,9 @@ static int radeon_get_family(struct radeon_surface_manager *surf_man) + switch (surf_man->device_id) { + #define CHIPSET(pci_id, name, fam) case pci_id: surf_man->family = CHIP_##fam; break; + #include "pci_ids/r600_pci_ids.h" ++#undef CHIPSET ++#define CHIPSET(pci_id, fam) case pci_id: surf_man->family = CHIP_##fam; break; ++#include "pci_ids/radeonsi_pci_ids.h" + #undef CHIPSET + default: + return -EINVAL; +-- +2.48.1 + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Samuel Pitoiset +Date: Tue, 11 Mar 2025 15:29:37 +0100 +Subject: radv/amdgpu: fix device deduplication + +To correctly deduplicate device inside the winsys, it should use the +fd or amdgpu_device_handle. Using the allocated ac_drm_device as key +is obviously broken. + +Not deduplicating devices breaks memory budget and a bunch of games +were broken. + +Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12686 +Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12775 +Fixes: a565f2994fe ("amd: move all uses of libdrm_amdgpu to ac_linux_drm") +Signed-off-by: Samuel Pitoiset +Part-of: +--- + src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c +index be8df8708c8..8b57abeb0b1 100644 +--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c ++++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c +@@ -234,7 +234,7 @@ radv_amdgpu_winsys_create(int fd, uint64_t debug_flags, uint64_t perftest_flags, + goto fail; + } + +- struct hash_entry *entry = _mesa_hash_table_search(winsyses, dev); ++ struct hash_entry *entry = _mesa_hash_table_search(winsyses, (void *)ac_drm_device_get_cookie(dev)); + if (entry) { + ws = (struct radv_amdgpu_winsys *)entry->data; + ++ws->refcount; +@@ -325,7 +325,7 @@ radv_amdgpu_winsys_create(int fd, uint64_t debug_flags, uint64_t perftest_flags, + radv_amdgpu_bo_init_functions(ws); + radv_amdgpu_cs_init_functions(ws); + +- _mesa_hash_table_insert(winsyses, dev, ws); ++ _mesa_hash_table_insert(winsyses, (void *)ac_drm_device_get_cookie(dev), ws); + simple_mtx_unlock(&winsys_creation_mutex); + + return &ws->base; +-- +2.48.1 + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Maarten Lankhorst +Date: Mon, 17 Feb 2025 14:55:29 -0800 +Subject: anv: Mark images with format modifiers set as scanout. + +We currently use the presence of struct WSI_IMAGE_CREATE_INFO_MESA.scanout to mark the BO as scanout, +but this only handles the linear case, and fails when drm format modifiers are used. + +Also handle the case of exportable BO with tiling set to VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT. +This fixes the gamescope handling of using vulkan allocated images for scanout. + +Link: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12633 +Signed-off-by: Maarten Lankhorst +Signed-off-by: Matthew Schwartz + +Normalspeak: fixes battlemage iGPUs in gamescope +--- + src/intel/vulkan/anv_device.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c +index 1884932bbc7..cbc1b4aad87 100644 +--- a/src/intel/vulkan/anv_device.c ++++ b/src/intel/vulkan/anv_device.c +@@ -1533,6 +1533,9 @@ VkResult anv_AllocateMemory( + dedicated_info->image != VK_NULL_HANDLE) { + ANV_FROM_HANDLE(anv_image, image, dedicated_info->image); + ++ if (image->vk.tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) ++ alloc_flags |= ANV_BO_ALLOC_SCANOUT; ++ + /* Apply implicit sync to be compatible with clients relying on + * implicit fencing. This matches the behavior in iris i915_batch + * submit. An example client is VA-API (iHD), so only dedicated +-- +2.48.1 + diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index bbcffcc102..10118f22ff 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -76,7 +76,7 @@ Summary: Mesa graphics libraries # disabled by default, and has to be enabled manually. See `terra/release/terra-mesa.repo` for details. Epoch: 1 Version: 25.0.1 -Release: 5%?dist +Release: 6%?dist License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org @@ -88,26 +88,8 @@ Source0: https://archive.mesa3d.org/%{srcname}-%{version}.tar.xz # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD. Source1: Mesa-MLAA-License-Clarification-Email.txt -#Patch10: https://src.fedoraproject.org/rpms/mesa/raw/e89544b7a4d811a64ca23b402add29524cc6f704/f/gnome-shell-glthread-disable.patch -#Patch11: https://src.fedoraproject.org/rpms/mesa/raw/e89544b7a4d811a64ca23b402add29524cc6f704/f/0001-llvmpipe-Init-eglQueryDmaBufModifiersEXT-num_modifie.patch -#Patch12: https://src.fedoraproject.org/rpms/mesa/raw/e89544b7a4d811a64ca23b402add29524cc6f704/f/0001-Revert-ac-radeonsi-remove-has_syncobj-has_fence_to_h.patch - -# https://gitlab.com/evlaV/mesa/ -Patch20: valve.patch - -# Fix issues with Intel Battlemage under Valve's gamescope in DRM mode -# https://gitlab.freedesktop.org/mesa/mesa/-/issues/12633 -Patch21: 12633.patch - -# radv/amdgpu: fix device deduplication -# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34005/diffs -Patch22: 34005.patch - -Patch30: 237d8799be3afe9a1e7ca9156a5d44ffe0aae681.patch -Patch31: 13a3f9a972324a72dd507e09ac975b969e6c88e0.patch - -# s390x: fix build -#Patch100: https://src.fedoraproject.org/rpms/mesa/raw/e89544b7a4d811a64ca23b402add29524cc6f704/f/fix-egl-on-s390x.patch +# https://github.com/bazzite-org/mesa +Patch20: bazzite.patch BuildRequires: meson >= 1.3.0 BuildRequires: gcc diff --git a/anda/lib/mesa/valve.patch b/anda/lib/mesa/valve.patch deleted file mode 100644 index d4eb3da790..0000000000 --- a/anda/lib/mesa/valve.patch +++ /dev/null @@ -1,143 +0,0 @@ -From 04afaf13b208f5c58c0b057f3dfc2dfa5c19a334 Mon Sep 17 00:00:00 2001 -From: Bas Nieuwenhuizen -Date: Fri, 14 Jan 2022 15:58:45 +0100 -Subject: [PATCH 5/8] STEAMOS: radv: min image count override for FH5 - -Otherwise in combination with the vblank time reservation in -gamescope the game could get stuck in low power states. ---- - src/util/00-radv-defaults.conf | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/util/00-radv-defaults.conf b/src/util/00-radv-defaults.conf -index 1cbb2e087c9..43488ada6bc 100644 ---- a/src/util/00-radv-defaults.conf -+++ b/src/util/00-radv-defaults.conf -@@ -207,6 +207,11 @@ Application bugs worked around in this file: - - -+ -+ -+ -+ - - - -2.42.0 - - -From b1c0d3de07bf958317f386585ce541b1c336e929 Mon Sep 17 00:00:00 2001 -From: Bas Nieuwenhuizen -Date: Mon, 21 Feb 2022 18:43:54 +0100 -Subject: [PATCH 6/8] STEAMOS: Dynamic swapchain override for gamescope limiter - ---- - src/gallium/frontends/dri/loader_dri3_helper.c | 42 +++++++++++++++++++++++++++++++-- - src/gallium/frontends/dri/loader_dri3_helper.h | 1 + - src/loader/meson.build | 2 +- - 4 files changed, 80 insertions(+), 3 deletions(-) - -diff --git a/src/gallium/frontends/dri/loader_dri3_helper.c b/src/gallium/frontends/dri/loader_dri3_helper.c -index 2631a9e2fd5..dbf6db349c6 100644 ---- a/src/gallium/frontends/dri/loader_dri3_helper.c -+++ b/src/gallium/frontends/dri/loader_dri3_helper.c -@@ -276,6 +276,30 @@ dri3_update_max_num_back(struct loader_dri3_drawable *draw) - } - } - -+static unsigned -+gamescope_swapchain_override() -+{ -+ const char *path = getenv("GAMESCOPE_LIMITER_FILE"); -+ if (!path) -+ return 0; -+ -+ static simple_mtx_t mtx = SIMPLE_MTX_INITIALIZER; -+ static int fd = -1; -+ -+ simple_mtx_lock(&mtx); -+ if (fd < 0) { -+ fd = open(path, O_RDONLY); -+ } -+ simple_mtx_unlock(&mtx); -+ -+ if (fd < 0) -+ return 0; -+ -+ uint32_t override_value = 0; -+ pread(fd, &override_value, sizeof(override_value), 0); -+ return override_value; -+} -+ - void - loader_dri3_set_swap_interval(struct loader_dri3_drawable *draw, int interval) - { -@@ -290,10 +314,12 @@ loader_dri3_set_swap_interval(struct loader_dri3_drawable *draw, int interval) - * PS. changing from value A to B and A < B won't cause swap out of order but - * may still gets wrong target_msc value at the beginning. - */ -- if (draw->swap_interval != interval) -+ if (draw->orig_swap_interval != interval) - loader_dri3_swapbuffer_barrier(draw); - -- draw->swap_interval = interval; -+ draw->orig_swap_interval = interval; -+ if (gamescope_swapchain_override() != 1) -+ draw->swap_interval = interval; - } - - static void -@@ -422,6 +448,12 @@ loader_dri3_drawable_init(xcb_connection_t *conn, - - draw->swap_interval = dri_get_initial_swap_interval(draw->dri_screen_render_gpu); - -+ draw->orig_swap_interval = draw->swap_interval; -+ -+ unsigned gamescope_override = gamescope_swapchain_override(); -+ if (gamescope_override == 1) -+ draw->swap_interval = 1; -+ - dri3_update_max_num_back(draw); - - /* Create a new drawable */ -@@ -1066,6 +1098,12 @@ loader_dri3_swap_buffers_msc(struct loader_dri3_drawable *draw, - if (draw->type == LOADER_DRI3_DRAWABLE_WINDOW) { - dri3_fence_reset(draw->conn, back); - -+ unsigned gamescope_override = gamescope_swapchain_override(); -+ if (gamescope_override == 1) -+ draw->swap_interval = 1; -+ else -+ draw->swap_interval = draw->orig_swap_interval; -+ - /* Compute when we want the frame shown by taking the last known - * successful MSC and adding in a swap interval for each outstanding swap - * request. target_msc=divisor=remainder=0 means "Use glXSwapBuffers() -diff --git a/src/gallium/frontends/dri/loader_dri3_helper.h b/src/gallium/frontends/dri/loader_dri3_helper.h -index cc2362dd599..fe73b3f329c 100644 ---- a/src/gallium/frontends/dri/loader_dri3_helper.h -+++ b/src/gallium/frontends/dri/loader_dri3_helper.h -@@ -170,6 +170,7 @@ struct loader_dri3_drawable { - bool block_on_depleted_buffers; - bool queries_buffer_age; - int swap_interval; -+ int orig_swap_interval; - - const struct loader_dri3_vtable *vtable; - -diff --git a/src/gallium/frontends/dri/meson.build b/src/gallium/frontends/dri/meson.build -index a98c8c0..0d4f816 100644 ---- a/src/gallium/frontends/dri/meson.build -+++ b/src/gallium/frontends/dri/meson.build -@@ -23,7 +23,7 @@ if with_platform_x11 - deps_for_libdri += dep_xcb - if with_dri_platform == 'drm' - deps_for_libdri += [dep_xcb_dri3, dep_xcb_present, dep_xcb_sync, -- dep_xshmfence, dep_xcb_xfixes] -+ dep_xshmfence, dep_xcb_xfixes, dep_xcb_xrandr, idep_mesautil] - files_libdri += files('loader_dri3_helper.c') - endif - endif From f83ce255602b4ee1d21ec3e095022ab6076f5158 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 20:37:14 +0000 Subject: [PATCH 0331/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index da36437910..b88984525e 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.15.161417 +Version: 2025.03.15.202938 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 27da608faaf88a4b9a0bce8d960caf83642bfa2b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 20:57:41 +0000 Subject: [PATCH 0332/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index b88984525e..89fdf9cd4e 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.15.202938 +Version: 2025.03.15.204805 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 96819bf23f601e7fc1dc41d60a91b9e2150ebc14 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 21:20:32 +0000 Subject: [PATCH 0333/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 89fdf9cd4e..b6013704eb 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.15.204805 +Version: 2025.03.15.205811 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 0c5d7ad93d4e6087b75fb626b60f4a1f189a8053 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 21:31:25 +0000 Subject: [PATCH 0334/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index b6013704eb..ce489b7e7d 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.15.205811 +Version: 2025.03.15.212136 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 1bf2f67f4a473fc79e595d6fef427a4ddab5d07e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 21:46:04 +0000 Subject: [PATCH 0335/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index ce489b7e7d..9eddf2d7c5 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.15.212136 +Version: 2025.03.15.212833 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From dc174661eea30bd4668917441e6bc298525ba0d0 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 15 Mar 2025 21:55:57 +0000 Subject: [PATCH 0336/2977] bump: coolercontrol --- anda/apps/coolercontrol/coolercontrol.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/coolercontrol/coolercontrol.spec b/anda/apps/coolercontrol/coolercontrol.spec index f2a3731032..eddcdae8ba 100644 --- a/anda/apps/coolercontrol/coolercontrol.spec +++ b/anda/apps/coolercontrol/coolercontrol.spec @@ -8,7 +8,7 @@ for background device management, as well as a GUI to expertly customize your se %global __brp_mangle_shebangs %{nil} Name: coolercontrol -Version: 1.4.5 +Version: 2.0.0 Release: 1%?dist Summary: Cooling device control for Linux License: GPL-3.0-or-later From d5c11c9bbe6351814f8bacce5c66c4f6c1615770 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 16 Mar 2025 01:07:09 +0000 Subject: [PATCH 0337/2977] bump(branch): kf6-kio --- anda/desktops/kde/kf6-kio/kf6-kio.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/kde/kf6-kio/kf6-kio.spec b/anda/desktops/kde/kf6-kio/kf6-kio.spec index 909c2d59c0..9446e0072f 100644 --- a/anda/desktops/kde/kf6-kio/kf6-kio.spec +++ b/anda/desktops/kde/kf6-kio/kf6-kio.spec @@ -1,7 +1,7 @@ %global framework kio %global stable_kf6 stable -%global majmin_ver_kf6 6.11 +%global majmin_ver_kf6 6.12 Name: kf6-%{framework}.switcheroo Version: %{majmin_ver_kf6}.0 From 94f4b79f1ea45aba21153ecdc572a1fd7572f4b6 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 16 Mar 2025 01:47:01 +0000 Subject: [PATCH 0338/2977] bump(nightly): nightly mpv nightly micro nightly nim-nightly --- anda/apps/legcord/nightly/legcord-nightly.spec | 4 ++-- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/micro/micro-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/anda/apps/legcord/nightly/legcord-nightly.spec b/anda/apps/legcord/nightly/legcord-nightly.spec index f4a7f186a8..a012ca5c90 100644 --- a/anda/apps/legcord/nightly/legcord-nightly.spec +++ b/anda/apps/legcord/nightly/legcord-nightly.spec @@ -1,5 +1,5 @@ -%global commit 13c3ca026bb143ff13d5c560e34603153ab16677 -%global commit_date 20250315 +%global commit ed2c44542707dabe257b52963e12fc8f965691ac +%global commit_date 20250316 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define debug_package %nil diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 48a1723c64..c5c20aefd1 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit a8f5beb5a38e0ed169a9fb9faff6c5ca0a43dfee +%global commit 6c4218252278c582c7a40654c66f8216aac43326 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250315 +%global commit_date 20250316 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index d3d3b8b9fd..d981d6c71e 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 234b804872af665ca8091892ff3ea35ea278b32c +%global commit 644acdacdcb02588b3769238e0508d39cd28d460 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-03-14 +%global fulldate 2025-03-15 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 diff --git a/anda/devs/micro/micro-nightly.spec b/anda/devs/micro/micro-nightly.spec index ec271bf378..2888822287 100644 --- a/anda/devs/micro/micro-nightly.spec +++ b/anda/devs/micro/micro-nightly.spec @@ -12,8 +12,8 @@ # Naming variable as something other than "commit" is necessary # to stop %%gometa from putting commit hash in release -%global commit_hash fa317456e91c97af1b2c68f1e657ab426d035929 -%global commit_date 20250313 +%global commit_hash 219fb12482055312b29aa35007d0bb33ef918f30 +%global commit_date 20250316 %global shortcommit %{sub %{commit_hash} 1 7} %global ver 2.0.14 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 4a59e23832..3f85e46cca 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 7c1405db379487f00e6e4eee9735e79f5a24b279 +%global commit 8a31dcaeb09fbab0d6bbfd816a1256a0bcf056d1 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250315 +%global commit_date 20250316 %global ver 0.179.0 %bcond_with check diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 4da250f508..631c6196fc 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit fb93295344b78d2d45c81bc78bdba8526a893a09 +%global commit 2b699bca530317873d0b3bf2ee2e59ef221010f0 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250313 +%global commit_date 20250316 %global debug_package %nil Name: nim-nightly From 0561eac241ec0a5c538d8a5f802c03ff8b7525b3 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 16 Mar 2025 02:02:42 +0000 Subject: [PATCH 0339/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 79992e6df0..b2a424bb9a 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-15 +%global ver 2025-03-16 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 5834526532d09d03ad07d539b9772f0bdb85b360 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 15 Mar 2025 21:38:53 -0500 Subject: [PATCH 0340/2977] feat(pbcli): Enable uniffi support and package development files (#3953) * Attempt to enable optional features Signed-off-by: Gilver * Update licenses, package development files Signed-off-by: Gilver * Changelog Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/misc/pbcli/pbcli.spec | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/anda/misc/pbcli/pbcli.spec b/anda/misc/pbcli/pbcli.spec index 7506f47766..79d8b19eef 100644 --- a/anda/misc/pbcli/pbcli.spec +++ b/anda/misc/pbcli/pbcli.spec @@ -3,10 +3,10 @@ pbcli is a command line client which allows to upload and download pastes from p Name: pbcli Version: 2.8.0 -Release: 2%?dist +Release: 3%?dist Summary: A PrivateBin commandline upload and download utility SourceLicense: Unlicense OR MIT -License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-3-Clause AND ISC AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) +License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 AND ISC) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND Apache-2.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-3-Clause AND ISC AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND MPL-2.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) URL: https://github.com/Mydayyy/%{name} Source0: %{url}/archive/refs/tags/v%{version}.tar.gz BuildRequires: anda-srpm-macros @@ -23,17 +23,25 @@ Packager: Gilver E. %description %_description +%package devel +Summary: Development libraries for %{name} +Requires: %{name} + +%description devel +This package contains the development files for %{name}. + %prep %autosetup -n %{name}-%{version} %cargo_prep_online %build -%cargo_build -%{cargo_license_online} > LICENSE.dependencies +%cargo_build -f uniffi +%{cargo_license_online -f uniffi} > LICENSE.dependencies %install install -Dm755 target/rpm/%{name} %{buildroot}%{_bindir}/%{name} install -Dm755 target/rpm/lib%{name}.so %{buildroot}%{_libdir}/lib%{name}.so +install -Dm644 target/rpm/lib%{name}.a %{buildroot}%{_libdir}/lib%{name}.a %files %doc README.md @@ -41,8 +49,14 @@ install -Dm755 target/rpm/lib%{name}.so %{buildroot}%{_libdir}/lib%{name}.so %license LICENSE-UNLICENSE %license LICENSE.dependencies %{_bindir}/%{name} + +%files devel +%{_libdir}/lib%{name}.a %{_libdir}/lib%{name}.so %changelog +* Sat Mar 14 2025 Gilver E. +- Enable uniffi support +- Package development files * Sat Dec 21 2024 Gilver E. - Initial package From 4b4e267fd06e9c82503d29ca89844a6574a7585b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 16 Mar 2025 06:31:32 +0000 Subject: [PATCH 0341/2977] bump: osu-lazer --- anda/games/osu-lazer/osu-lazer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index d0ec97ba34..d38e32c5b9 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -3,7 +3,7 @@ %define __strip /bin/true Name: osu-lazer -Version: 2025.310.0 +Version: 2025.316.0 Release: 1%?dist Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew. ExclusiveArch: x86_64 From 62254e5db4694788b62518353cc43c72d3156617 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 16 Mar 2025 09:50:20 +0000 Subject: [PATCH 0342/2977] bump: legcord-bin stable --- anda/apps/legcord/legcord-bin/legcord-bin.spec | 2 +- anda/apps/legcord/stable/legcord.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/legcord/legcord-bin/legcord-bin.spec b/anda/apps/legcord/legcord-bin/legcord-bin.spec index 207ee7aa06..0be09978e7 100644 --- a/anda/apps/legcord/legcord-bin/legcord-bin.spec +++ b/anda/apps/legcord/legcord-bin/legcord-bin.spec @@ -14,7 +14,7 @@ %global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so Name: legcord-bin -Version: 1.1.0 +Version: 1.1.1 Release: 1%?dist License: OSL-3.0 Summary: Custom lightweight Discord client designed to enhance your experience diff --git a/anda/apps/legcord/stable/legcord.spec b/anda/apps/legcord/stable/legcord.spec index 1532fc4792..470cfc5ef2 100644 --- a/anda/apps/legcord/stable/legcord.spec +++ b/anda/apps/legcord/stable/legcord.spec @@ -5,7 +5,7 @@ %global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so Name: legcord -Version: 1.1.0 +Version: 1.1.1 Release: 1%?dist License: OSL-3.0 Summary: Custom lightweight Discord client designed to enhance your experience From fb5c686377cfc35e183413d89157f1e29fde00ca Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 16 Mar 2025 11:40:30 +0000 Subject: [PATCH 0343/2977] bump: lomiri-system-settings --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 562fb96837..5f126d76ae 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit bebc62098c5b10f51900a295e2db467937c2ccfc +%global commit c15e9568cca2977000eb524a052d6e33b36b5773 %forgemeta Name: lomiri-system-settings From 2078867539c4f9bac993620fc07cdd02d283465f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 16 Mar 2025 12:31:40 +0000 Subject: [PATCH 0344/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 9eddf2d7c5..238528a87e 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.15.212833 +Version: 2025.03.16.114559 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 71ca43cb31f569443162e48dfbeddbb355d2b8ab Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 16 Mar 2025 13:55:25 +0000 Subject: [PATCH 0345/2977] bump: maple --- anda/fonts/maple/maple-fonts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/fonts/maple/maple-fonts.spec b/anda/fonts/maple/maple-fonts.spec index cd988ed0e1..0f008f79ca 100644 --- a/anda/fonts/maple/maple-fonts.spec +++ b/anda/fonts/maple/maple-fonts.spec @@ -1,6 +1,6 @@ %define debug_package %nil %define _ttfontsdir %{_datadir}/fonts/maple -%global upstream_ver v7.0-beta36 +%global upstream_ver v7.0 %define sanitized_ver %(echo "$( sed 's/^.//;s/-/~/' <<< "%{upstream_ver}" )") Name: maple-fonts From 9efacbc1f26da52b3e03c64472a984c2ab052645 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 16 Mar 2025 17:14:48 +0000 Subject: [PATCH 0346/2977] bump: limine --- anda/system/limine/limine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/limine/limine.spec b/anda/system/limine/limine.spec index 5d5fb57e48..5352753dcb 100644 --- a/anda/system/limine/limine.spec +++ b/anda/system/limine/limine.spec @@ -1,5 +1,5 @@ Name: limine -Version: 9.1.3 +Version: 9.2.0 Release: 1%?dist Summary: Modern, advanced, portable, multiprotocol bootloader License: BSD-2-Clause From 0e295192f461576c124293e6115254038127e796 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 16 Mar 2025 19:13:26 +0000 Subject: [PATCH 0347/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 238528a87e..87509e30c3 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.16.114559 +Version: 2025.03.16.185503 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From a675759ca22a2fea0701d2ade4180ceeaaad68d7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 16 Mar 2025 19:36:56 +0000 Subject: [PATCH 0348/2977] bump: lomiri-system-settings --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 5f126d76ae..37221445bd 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit c15e9568cca2977000eb524a052d6e33b36b5773 +%global commit f05f3a566215966d905f0d98aac33556bfcc4d2f %forgemeta Name: lomiri-system-settings From 434a252d21ba8b5d1b47eb474358ce426affca8d Mon Sep 17 00:00:00 2001 From: Sergey Avseyev Date: Sun, 16 Mar 2025 20:22:16 +0000 Subject: [PATCH 0349/2977] komikku: fix license path (#3961) RPM build errors: File not found: /usr/share/licenses/komikku/LICENSE --- anda/apps/komikku/komikku.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/komikku/komikku.spec b/anda/apps/komikku/komikku.spec index 0f490ad80a..ffd50db4e9 100644 --- a/anda/apps/komikku/komikku.spec +++ b/anda/apps/komikku/komikku.spec @@ -7,7 +7,7 @@ Name: komikku Version: 1.72.0 %forgemeta -Release: 1%?dist +Release: 2%?dist Summary: A manga reader for GNOME BuildArch: noarch @@ -92,7 +92,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %files -f %{name}.lang -%license LICENSE +%license LICENSES/* %doc README.md %{_bindir}/%{name} %{_datadir}/%{name}/ From 95451346d963a14d84061d23e0c5ab41f03f0f21 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 16 Mar 2025 22:17:52 +0000 Subject: [PATCH 0350/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 87509e30c3..c14214e065 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.16.185503 +Version: 2025.03.16.220324 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From b396df311ad7fa0dd331ef45e6a96da85cb375df Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 16 Mar 2025 22:33:17 +0000 Subject: [PATCH 0351/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index c14214e065..0caa9f90d0 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.16.220324 +Version: 2025.03.16.221236 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 5a75742ecf89dc9766cdf41bbecc4389c0db5cf4 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sun, 16 Mar 2025 20:14:30 -0500 Subject: [PATCH 0352/2977] fix(uwufetch): Make Git based and fix Git cloning (#3951) * Update uwufetch.spec Signed-off-by: Gilver * Make Uwufetch Git based Signed-off-by: Gilver * Update uwufetch.spec Signed-off-by: Gilver * Nightly Signed-off-by: Gilver * No debug packages Signed-off-by: Gilver * Let's test this... Signed-off-by: Gilver * Update uwufetch.spec Signed-off-by: Gilver * Update uwufetch.spec Signed-off-by: Gilver * Whoops Signed-off-by: Gilver * Okay got it, but why is make_install ignoring the Makefile DESTDIR Signed-off-by: Gilver * Update uwufetch.spec Signed-off-by: Gilver * Update uwufetch.spec Signed-off-by: Gilver * Ack Signed-off-by: Gilver * Absolutely cursed Signed-off-by: Gilver * Update uwufetch.spec Signed-off-by: Gilver * Update uwufetch.spec Signed-off-by: Gilver * Bruh Signed-off-by: Gilver * Update uwufetch.spec Signed-off-by: Gilver * Try this? Signed-off-by: Gilver * Update uwufetch.spec Signed-off-by: Gilver * See what's unpackaged first Signed-off-by: Gilver * Update uwufetch.spec Signed-off-by: Gilver * That's a development library it looks like Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/misc/uwufetch/anda.hcl | 3 +++ anda/misc/uwufetch/update.rhai | 9 +++++++- anda/misc/uwufetch/uwufetch.spec | 38 +++++++++++++++++++++++++------- 3 files changed, 41 insertions(+), 9 deletions(-) diff --git a/anda/misc/uwufetch/anda.hcl b/anda/misc/uwufetch/anda.hcl index 69406c2907..623d2105d5 100644 --- a/anda/misc/uwufetch/anda.hcl +++ b/anda/misc/uwufetch/anda.hcl @@ -2,4 +2,7 @@ project pkg { rpm { spec = "uwufetch.spec" } + labels { + nightly = 1 + } } diff --git a/anda/misc/uwufetch/update.rhai b/anda/misc/uwufetch/update.rhai index 7ddbe03216..599bb2194c 100644 --- a/anda/misc/uwufetch/update.rhai +++ b/anda/misc/uwufetch/update.rhai @@ -1 +1,8 @@ -rpm.version(gh("ad-oliviero/uwufetch")); +rpm.global("commit", gh_commit("ad-oliviero/uwufetch")); +if rpm.changed() { + rpm.release(); + rpm.global("commit_date", date()); + let ver = gh_tag("ad-oliviero/uwufetch"); + ver.crop(1); + rpm.global("ver", ver); +} diff --git a/anda/misc/uwufetch/uwufetch.spec b/anda/misc/uwufetch/uwufetch.spec index 9658f887eb..b033f1aa9e 100644 --- a/anda/misc/uwufetch/uwufetch.spec +++ b/anda/misc/uwufetch/uwufetch.spec @@ -1,33 +1,55 @@ +%global commit 28b471b813d1c9aab77eeeb61f65304e586fb275 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commit_date 20240423 +%global ver 2.1 +%global debug_package %{nil} + Name: uwufetch -Version: +Version: %{ver}^%{commit_date}git.%{shortcommit} Release: 1%?dist Summary: A meme system info tool for Linux, based on nyan/uwu trend on r/linuxmasterrace. License: GPL-3.0 URL: https://github.com/ad-oliviero/uwufetch BuildRequires: make gcc git anda-srpm-macros +Requires: freecolor +Requires: xwininfo +Recommends: lshw %description A meme system info tool for (almost) all your Linux/Unix-based systems, based on the nyan/UwU trend on r/linuxmasterrace. +%package devel +Summary: Development files for UwUFetch. +Requires: %{name} + +%description devel +This package contains delevoplent files for UwUFetch. + %prep -git clone https://github.com/TheDarkBug/uwufetch.git . -git checkout %{version} +%git_clone %{url} %{commit} %build %make_build %install -make install DESTDIR=%{?buildroot}%{_prefix} -mkdir %{?buildroot}%{_libdir} -mv %{?buildroot}%{_prefix}/lib/libfetch.so %{?buildroot}%{_libdir}/libfetch.so -rm -rf %{?buildroot}%{_includedir} +%make_install DESTDIR=%{buildroot}%{_prefix} +mkdir -p %{buildroot}%{_libdir} +mv %{buildroot}%{_prefix}/lib/libfetch.so %{buildroot}%{_libdir}/libfetch.so %files +%doc CODE_OF_CONDUCT.md +%doc README.md +%license LICENSE +%license res/COPYRIGHT.md +%dir %{_prefix}/lib/uwufetch %{_prefix}/lib/uwufetch/* -%{_libdir}/libfetch.so %{_mandir}/man1/uwufetch.1.gz %{_bindir}/uwufetch +%files devel +%{_libdir}/libfetch.so +%{_includedir}/fetch.h + %changelog * Thu Jun 22 2023 Alyxia Sother - Initial package. From 72e0368984dd835671301f7bfb589df4ad41743d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 17 Mar 2025 01:25:18 +0000 Subject: [PATCH 0353/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index b2a424bb9a..a39a36c184 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-16 +%global ver 2025-03-17 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 417a2557ce394dad44d61a3a0c856f9f9575ab30 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 17 Mar 2025 01:44:06 +0000 Subject: [PATCH 0354/2977] bump(nightly): nightly mwc nightly nightly prismlauncher-nightly cros-keyboard-map rpi-utils --- anda/apps/legcord/nightly/legcord-nightly.spec | 4 ++-- anda/desktops/mwc/mwc.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/system/cros-keyboard-map/cros-keyboard-map.spec | 4 ++-- anda/tools/rpi-utils/rpi-utils.spec | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/anda/apps/legcord/nightly/legcord-nightly.spec b/anda/apps/legcord/nightly/legcord-nightly.spec index a012ca5c90..9999f7496f 100644 --- a/anda/apps/legcord/nightly/legcord-nightly.spec +++ b/anda/apps/legcord/nightly/legcord-nightly.spec @@ -1,5 +1,5 @@ -%global commit ed2c44542707dabe257b52963e12fc8f965691ac -%global commit_date 20250316 +%global commit d974d27fb6d424e9c50c95675fa56ae8d952b42b +%global commit_date 20250317 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define debug_package %nil diff --git a/anda/desktops/mwc/mwc.spec b/anda/desktops/mwc/mwc.spec index 0b6b2d0b18..c7bd207b98 100644 --- a/anda/desktops/mwc/mwc.spec +++ b/anda/desktops/mwc/mwc.spec @@ -1,5 +1,5 @@ -%global commit be77084627d74f8e84615e9b192dace9649181e2 -%global commit_date 20250307 +%global commit 33b49684edb7a8ac65bbca4d7378959208fbe604 +%global commit_date 20250317 %global shortcommit %{sub %{commit} 1 7 } %global ver 0.1.3 diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index d981d6c71e..2be241c8b0 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 644acdacdcb02588b3769238e0508d39cd28d460 +%global commit c344c320eb93d800da36c035790530be0a2d618f %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-03-15 +%global fulldate 2025-03-16 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 3f85e46cca..13ba25d642 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 8a31dcaeb09fbab0d6bbfd816a1256a0bcf056d1 +%global commit d5bb12631a4798f35c2a1a1dc721d2c9337acd68 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250316 +%global commit_date 20250317 %global ver 0.179.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 669271be01..f98d688959 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 1a1bc14a73f80b105dfefa5e3efdf1c593582e22 +%global commit d0b9073f6031a7d93b3011c53f4e469e8f836a0d %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250315 +%global commit_date 20250317 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/system/cros-keyboard-map/cros-keyboard-map.spec b/anda/system/cros-keyboard-map/cros-keyboard-map.spec index f7e714db5d..274f20ae59 100644 --- a/anda/system/cros-keyboard-map/cros-keyboard-map.spec +++ b/anda/system/cros-keyboard-map/cros-keyboard-map.spec @@ -1,6 +1,6 @@ -%global commit_date 20250307 +%global commit_date 20250317 -%global tree_commit b96aab45f46626d8d77a2f890db9ec2d6661706b +%global tree_commit d7356896fdf513aa4e51ff34c49998638ff9ee3e %global tree_shortcommit %(c=%{tree_commit}; echo ${c:0:7}) %global um_commit 46892acafb2fff3f3ace425d4694382c92645feb diff --git a/anda/tools/rpi-utils/rpi-utils.spec b/anda/tools/rpi-utils/rpi-utils.spec index 68ed058c38..fdfb28c31b 100644 --- a/anda/tools/rpi-utils/rpi-utils.spec +++ b/anda/tools/rpi-utils/rpi-utils.spec @@ -1,5 +1,5 @@ -%global commit 685afa8c0d6f2310eaefe1b528627a8bf3154ca0 -%global commit_date 20250315 +%global commit 44702618aea131093bf334b8fb520163122c179b +%global commit_date 20250317 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define _unpackaged_files_terminate_build 0 From 53b702518574a964c68a1931825417a15797c637 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 17 Mar 2025 08:33:51 +0000 Subject: [PATCH 0355/2977] bump: zellij --- anda/langs/rust/zellij/rust-zellij.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/rust/zellij/rust-zellij.spec b/anda/langs/rust/zellij/rust-zellij.spec index 67f05ad290..0cfbad8b15 100644 --- a/anda/langs/rust/zellij/rust-zellij.spec +++ b/anda/langs/rust/zellij/rust-zellij.spec @@ -5,7 +5,7 @@ %global crate zellij Name: rust-zellij -Version: 0.41.2 +Version: 0.42.0 Release: 1%?dist Summary: Terminal workspace with batteries included From a0dccef53f78b26b2dd18e1d5e002ec86052d9de Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 17 Mar 2025 16:23:44 +0000 Subject: [PATCH 0356/2977] bump: lomiri-system-settings --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 37221445bd..3b3ebf527b 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit f05f3a566215966d905f0d98aac33556bfcc4d2f +%global commit ebe859d9e46ea602e5bbc7e223984c653bd9acd4 %forgemeta Name: lomiri-system-settings From 86a5334171b417e13b233a1febfa68d7b492d40c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 17 Mar 2025 16:46:31 +0000 Subject: [PATCH 0357/2977] bump: lomiri-system-settings --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 3b3ebf527b..377d49351e 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit ebe859d9e46ea602e5bbc7e223984c653bd9acd4 +%global commit 0edd8e1fcfbf4697eb4d396473216b37c2cbe228 %forgemeta Name: lomiri-system-settings From 6212a44465794bd7cc5096849bdd78db5123f4d0 Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 18 Mar 2025 01:07:32 +0800 Subject: [PATCH 0358/2977] add: subtitleedit (#3966) --- anda/apps/subtitleedit/anda.hcl | 5 +++ anda/apps/subtitleedit/subtitleedit.spec | 56 ++++++++++++++++++++++++ anda/apps/subtitleedit/update.rhai | 1 + 3 files changed, 62 insertions(+) create mode 100644 anda/apps/subtitleedit/anda.hcl create mode 100644 anda/apps/subtitleedit/subtitleedit.spec create mode 100644 anda/apps/subtitleedit/update.rhai diff --git a/anda/apps/subtitleedit/anda.hcl b/anda/apps/subtitleedit/anda.hcl new file mode 100644 index 0000000000..1470b4a07a --- /dev/null +++ b/anda/apps/subtitleedit/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "subtitleedit.spec" + } +} diff --git a/anda/apps/subtitleedit/subtitleedit.spec b/anda/apps/subtitleedit/subtitleedit.spec new file mode 100644 index 0000000000..134bc7f3c6 --- /dev/null +++ b/anda/apps/subtitleedit/subtitleedit.spec @@ -0,0 +1,56 @@ +%global pkgdir %_datadir/subtitleedit +%global realname subtitleedit + +Name: %realname.bin +Version: 4.0.11 +Release: 1%?dist +Summary: An advanced subtitle editor and converter +License: GPL-3.0-only +URL: https://www.nikse.dk/SubtitleEdit +Source0: https://github.com/SubtitleEdit/subtitleedit/releases/download/%version/SE%{gsub %version %. %{quote:}}.zip +Source1: https://github.com/SubtitleEdit/subtitleedit/blob/%version/src/libse/Icon.png?raw=true +Packager: madonuko +Provides: %realname = %evr +Conflicts: %realname +BuildRequires: unzip anda-srpm-macros +Requires: mono dejavu-fonts + +%description +%summary. + + +%prep +cat< subtitleedit.desktop +[Desktop Entry] +Name=Subtitle Edit +Comment=An advanced subtitle editor and converter +Exec=/usr/bin/subtitleedit %%F +Icon=subtitleedit +Terminal=false +Type=Application +Categories=Video;AudioVideo;AudioVideoEditing; +EOF + +cat< subtitleedit +#!/usr/bin/sh +exec mono /opt/subtitleedit/SubtitleEdit.exe "$@" +EOF + + +%install +mkdir -p %buildroot%pkgdir +unzip %{S:0} -d %buildroot%pkgdir +rm -r %buildroot%pkgdir/Tesseract302 +rm %buildroot%pkgdir/Hunspell{x86,x64}.dll +touch %buildroot%pkgdir/.PACKAGE-MANAGER + +install -Dm755 subtitleedit -t %buildroot%_bindir +install -Dm644 subtitleedit.desktop -t %buildroot%_datadir/applications +install -Dm644 %{S:1} %buildroot%_datadir/pixmaps/subtitleedit.png + + +%files +%pkgdir +%_bindir/%realname +%_datadir/applications/%realname.desktop +%_datadir/pixmaps/%realname.png diff --git a/anda/apps/subtitleedit/update.rhai b/anda/apps/subtitleedit/update.rhai new file mode 100644 index 0000000000..e56075c537 --- /dev/null +++ b/anda/apps/subtitleedit/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("SubtitleEdit/subtitleedit")); From b1fedf068ecb729a059a227fa721c5795a602e28 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 17 Mar 2025 19:40:20 +0000 Subject: [PATCH 0359/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index f917a9541b..8e0d2ef0b0 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.178.2-pre +%global ver 0.178.3-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From 2db1edfd36519e56a7f2e5d04fa69373a1d10d38 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 17 Mar 2025 19:48:20 +0000 Subject: [PATCH 0360/2977] bump: stable --- anda/devs/zed/stable/zed.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 0e67fd9583..0bbf8c015e 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.177.9 +Version: 0.177.10 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From 37205f5e8f84443e87987b17c700335d26b36b9b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 17 Mar 2025 22:17:51 +0000 Subject: [PATCH 0361/2977] bump: sass --- anda/misc/sass/sass.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/misc/sass/sass.spec b/anda/misc/sass/sass.spec index 490ec80e80..3ba3225a66 100644 --- a/anda/misc/sass/sass.spec +++ b/anda/misc/sass/sass.spec @@ -4,7 +4,7 @@ %define _build_id_links none Name: sass -Version: 1.85.1 +Version: 1.86.0 Release: 1%?dist Summary: The reference implementation of Sass, written in Dart License: MIT From 2625d7d1274e62222db3f0a1885340051e449b5a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 18 Mar 2025 01:23:10 +0000 Subject: [PATCH 0362/2977] bump: ruffle lomiri-system-settings --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index a39a36c184..a824a3a097 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-17 +%global ver 2025-03-18 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 377d49351e..5994e11388 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit 0edd8e1fcfbf4697eb4d396473216b37c2cbe228 +%global commit dfc840a2a4e0b0379b40cb6ec9309c5437c79d19 %forgemeta Name: lomiri-system-settings From b984664f4e3d8d86ca4e3265402a08c5b40a7052 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 18 Mar 2025 01:41:56 +0000 Subject: [PATCH 0363/2977] bump(nightly): nightly nightly astal openbangla-keyboard rpi-utils spotx-bash --- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/lib/astal/astal/astal.spec | 4 ++-- .../misc/openbangla-keyboard/openbangla-keyboard-nightly.spec | 4 ++-- anda/tools/rpi-utils/rpi-utils.spec | 4 ++-- anda/tools/spotx-bash/spotx-bash.spec | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 2be241c8b0..bfac993f1b 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit c344c320eb93d800da36c035790530be0a2d618f +%global commit 742bca713d2c5d2633df9ee99d358d8a104919fb %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-03-16 +%global fulldate 2025-03-17 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 13ba25d642..0f6466e492 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit d5bb12631a4798f35c2a1a1dc721d2c9337acd68 +%global commit cd5d7e82d0037dfb4dd5abb83dfac22a2dcc0f70 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250317 +%global commit_date 20250318 %global ver 0.179.0 %bcond_with check diff --git a/anda/lib/astal/astal/astal.spec b/anda/lib/astal/astal/astal.spec index 128037ceec..8763511030 100644 --- a/anda/lib/astal/astal/astal.spec +++ b/anda/lib/astal/astal/astal.spec @@ -1,7 +1,7 @@ -%global commit 69efb4c91e590adcb5a3d8938454f987982e3891 +%global commit e5a8e3b60e41d06450284baf7008abe4ac27a53d %global shortcommit %{sub %commit 1 7} -%global commit_date 20250314 +%global commit_date 20250318 Name: astal Version: 0^%commit_date.%shortcommit diff --git a/anda/misc/openbangla-keyboard/openbangla-keyboard-nightly.spec b/anda/misc/openbangla-keyboard/openbangla-keyboard-nightly.spec index 831dfbe766..7fa49e0382 100644 --- a/anda/misc/openbangla-keyboard/openbangla-keyboard-nightly.spec +++ b/anda/misc/openbangla-keyboard/openbangla-keyboard-nightly.spec @@ -1,6 +1,6 @@ %global ver 2.0.0 -%global commit 92c5a0a19173bff062cc77272739ac6f8d424347 -%global commit_date 20250224 +%global commit 048372f1dcd01e915373565730e930f541482061 +%global commit_date 20250318 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: openbangla-keyboard-nightly diff --git a/anda/tools/rpi-utils/rpi-utils.spec b/anda/tools/rpi-utils/rpi-utils.spec index fdfb28c31b..cc36bbea14 100644 --- a/anda/tools/rpi-utils/rpi-utils.spec +++ b/anda/tools/rpi-utils/rpi-utils.spec @@ -1,5 +1,5 @@ -%global commit 44702618aea131093bf334b8fb520163122c179b -%global commit_date 20250317 +%global commit bd817cb48f7a7c1db017c7782b4586ea3e2090dd +%global commit_date 20250318 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define _unpackaged_files_terminate_build 0 diff --git a/anda/tools/spotx-bash/spotx-bash.spec b/anda/tools/spotx-bash/spotx-bash.spec index 852f40e062..be4e1c13ac 100644 --- a/anda/tools/spotx-bash/spotx-bash.spec +++ b/anda/tools/spotx-bash/spotx-bash.spec @@ -1,5 +1,5 @@ -%global commit f6e102798220026f54b2bb387fb3c4b96aaf9c57 -%global commit_date 20250315 +%global commit e4b4b0dea09fd9152aaf9b3da3ee3e0aa9fc7f2f +%global commit_date 20250318 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: spotx-bash From a3a8581874d3a694ab5d8bad40d089c9ef66543f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 18 Mar 2025 02:47:18 +0000 Subject: [PATCH 0364/2977] bump(branch): astal-gtk --- anda/lib/astal/astal-gtk/astal-gtk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/astal/astal-gtk/astal-gtk.spec b/anda/lib/astal/astal-gtk/astal-gtk.spec index 8ef83e83fa..f3ee6ae581 100644 --- a/anda/lib/astal/astal-gtk/astal-gtk.spec +++ b/anda/lib/astal/astal-gtk/astal-gtk.spec @@ -1,5 +1,5 @@ -%global commit 69efb4c -%global commit_date 20250314 +%global commit e5a8e3b +%global commit_date 20250318 Name: astal Version: 0^%commit_date.%commit From 3b6f162d9766da2cb76321b712948d922b3354ea Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 17 Mar 2025 23:33:57 -0500 Subject: [PATCH 0365/2977] fix(ghostty): Don't conflict with ncurses-term on F42 and Rawhide (#3980) * fix(stable): Don't conflict with ncurses-term-6.5-5.20250125 Signed-off-by: Gilver * fix(nightly): Don't conflict with ncurses-term-6.5-5.20250125 Signed-off-by: Gilver * fix(stable): Macro typo Signed-off-by: Gilver * stable: Bump release Signed-off-by: Gilver * nightly: Add ncurses dep Signed-off-by: Gilver * stable: Add ncurses dep Signed-off-by: Gilver --------- Signed-off-by: Gilver --- .../devs/ghostty/nightly/ghostty-nightly.spec | 10 +++ anda/devs/ghostty/stable/ghostty.spec | 90 ++++++++++--------- 2 files changed, 60 insertions(+), 40 deletions(-) diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index bfac993f1b..8f1860ba5d 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -116,6 +116,9 @@ Supplements: %{name} %if 0%{?fedora} <= 41 Provides: %{name}-terminfo = %{commit_date}.%{shortcommit} %endif +%if 0%{?fedora} >= 42 +Requires: ncurses-term >= 6.5-5.20250125%{?dist} +%endif BuildArch: noarch %description terminfo @@ -155,6 +158,11 @@ zig build \ -Demit-termcap \ -Demit-terminfo +#Don't conflict with ncurses-term on F42 and up +%if 0%{?fedora} >= 42 +rm -rf %{buildroot}%{_datadir}/terminfo/g/ghostty +%endif + %find_lang %{reverse_dns} %files -f %{reverse_dns}.lang @@ -208,7 +216,9 @@ zig build \ %{_datadir}/%{base_name}/shell-integration/zsh/%{base_name}-integration %files terminfo +%if 0%{?fedora} < 42 %{_datadir}/terminfo/g/%{base_name} +%endif %{_datadir}/terminfo/x/xterm-%{base_name} %files terminfo-source diff --git a/anda/devs/ghostty/stable/ghostty.spec b/anda/devs/ghostty/stable/ghostty.spec index d2f8e6696e..221e247864 100644 --- a/anda/devs/ghostty/stable/ghostty.spec +++ b/anda/devs/ghostty/stable/ghostty.spec @@ -8,7 +8,7 @@ Name: ghostty Version: 1.1.2 -Release: 2%?dist +Release: 3%?dist Summary: A fast, native terminal emulator written in Zig. License: MIT AND MPL-2.0 AND OFL-1.1 AND (WTFPL OR CC0-1.0) AND Apache-2.0 URL: https://ghostty.org/ @@ -83,6 +83,9 @@ This package contains files allowing Ghostty to integrate with various shells. %package terminfo Summary: Ghostty terminfo Supplements: %{name} +%if 0%{?fedora} >= 42 +Requires: ncurses-term >= 6.5-5.20250125%{?dist} +%endif BuildArch: noarch %description terminfo @@ -125,60 +128,67 @@ zig build \ -Demit-termcap \ -Demit-terminfo +#Don't conflict with ncurses-term on F42 and up +%if 0%{?fedora} >= 42 +rm -rf %{buildroot}%{_datadir}/terminfo/g/ghostty +%endif + %files %doc README.md %license LICENSE -%_bindir/ghostty -%_datadir/applications/com.mitchellh.ghostty.desktop -%_datadir/bat/syntaxes/ghostty.sublime-syntax -%_datadir/ghostty/ -%_datadir/kio/servicemenus/com.mitchellh.ghostty.desktop -%_datadir/nautilus-python/extensions/ghostty.py -%_datadir/nvim/site/compiler/ghostty.vim -%_datadir/nvim/site/ftdetect/ghostty.vim -%_datadir/nvim/site/ftplugin/ghostty.vim -%_datadir/nvim/site/syntax/ghostty.vim -%_datadir/vim/vimfiles/compiler/ghostty.vim -%_datadir/vim/vimfiles/ftdetect/ghostty.vim -%_datadir/vim/vimfiles/ftplugin/ghostty.vim -%_datadir/vim/vimfiles/syntax/ghostty.vim -%_iconsdir/hicolor/16x16/apps/com.mitchellh.ghostty.png -%_iconsdir/hicolor/16x16@2/apps/com.mitchellh.ghostty.png -%_iconsdir/hicolor/32x32/apps/com.mitchellh.ghostty.png -%_iconsdir/hicolor/32x32@2/apps/com.mitchellh.ghostty.png -%_iconsdir/hicolor/128x128/apps/com.mitchellh.ghostty.png -%_iconsdir/hicolor/128x128@2/apps/com.mitchellh.ghostty.png -%_iconsdir/hicolor/256x256/apps/com.mitchellh.ghostty.png -%_iconsdir/hicolor/256x256@2/apps/com.mitchellh.ghostty.png -%_iconsdir/hicolor/512x512/apps/com.mitchellh.ghostty.png -%_iconsdir/hicolor/1024x1024/apps/com.mitchellh.ghostty.png -%_mandir/man1/ghostty.1.gz -%_mandir/man5/ghostty.5.gz +%{_bindir}/ghostty +%{_datadir}/applications/com.mitchellh.ghostty.desktop +%{_datadir}/bat/syntaxes/ghostty.sublime-syntax +%{_datadir}/ghostty/ +%{_datadir}/kio/servicemenus/com.mitchellh.ghostty.desktop +%{_datadir}/nautilus-python/extensions/ghostty.py +%{_datadir}/nvim/site/compiler/ghostty.vim +%{_datadir}/nvim/site/ftdetect/ghostty.vim +%{_datadir}/nvim/site/ftplugin/ghostty.vim +%{_datadir}/nvim/site/syntax/ghostty.vim +%{_datadir}/vim/vimfiles/compiler/ghostty.vim +%{_datadir}/vim/vimfiles/ftdetect/ghostty.vim +%{_datadir}/vim/vimfiles/ftplugin/ghostty.vim +%{_datadir}/vim/vimfiles/syntax/ghostty.vim +%{_iconsdir}/hicolor/16x16/apps/com.mitchellh.ghostty.png +%{_iconsdir}/hicolor/16x16@2/apps/com.mitchellh.ghostty.png +%{_iconsdir}/hicolor/32x32/apps/com.mitchellh.ghostty.png +%{_iconsdir}/hicolor/32x32@2/apps/com.mitchellh.ghostty.png +%{_iconsdir}/hicolor/128x128/apps/com.mitchellh.ghostty.png +%{_iconsdir}/hicolor/128x128@2/apps/com.mitchellh.ghostty.png +%{_iconsdir}/hicolor/256x256/apps/com.mitchellh.ghostty.png +%{_iconsdir}/hicolor/256x256@2/apps/com.mitchellh.ghostty.png +%{_iconsdir}/hicolor/512x512/apps/com.mitchellh.ghostty.png +%{_iconsdir}/hicolor/1024x1024/apps/com.mitchellh.ghostty.png +%{_mandir}/man1/ghostty.1.gz +%{_mandir}/man5/ghostty.5.gz %files bash-completion -%bash_completions_dir/ghostty.bash +%{bash_completions_dir}/ghostty.bash %files fish-completion -%fish_completions_dir/ghostty.fish +%{fish_completions_dir}/ghostty.fish %files zsh-completion -%zsh_completions_dir/_ghostty +%{zsh_completions_dir}/_ghostty %files shell-integration -%_datadir/ghostty/shell-integration/bash/bash-preexec.sh -%_datadir/ghostty/shell-integration/bash/ghostty.bash -%_datadir/ghostty/shell-integration/elvish/lib/ghostty-integration.elv -%_datadir/ghostty/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish -%_datadir/ghostty/shell-integration/zsh/.zshenv -%_datadir/ghostty/shell-integration/zsh/ghostty-integration +%{_datadir}/ghostty/shell-integration/bash/bash-preexec.sh +%{_datadir}/ghostty/shell-integration/bash/ghostty.bash +%{_datadir}/ghostty/shell-integration/elvish/lib/ghostty-integration.elv +%{_datadir}/ghostty/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish +%{_datadir}/ghostty/shell-integration/zsh/.zshenv +%{_datadir}/ghostty/shell-integration/zsh/ghostty-integration %files terminfo -%_datadir/terminfo/g/ghostty -%_datadir/terminfo/x/xterm-ghostty +%if 0%{?fedora} < 42 +%{_datadir}/terminfo/g/ghostty +%endif +%{_datadir}/terminfo/x/xterm-ghostty %files terminfo-source -%_datadir/terminfo/ghostty.termcap -%_datadir/terminfo/ghostty.terminfo +%{_datadir}/terminfo/ghostty.termcap +%{_datadir}/terminfo/ghostty.terminfo %changelog * Fri Jan 31 2025 Gilver E. From cae3841d5bbe72c63f2bceb7869ff00f7fb6f3bf Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 18 Mar 2025 12:39:18 +0800 Subject: [PATCH 0366/2977] fix(kf6-kio): obsoletes the corr. pkgs (#3919) Signed-off-by: madomado --- anda/desktops/kde/kf6-kio/kf6-kio.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/anda/desktops/kde/kf6-kio/kf6-kio.spec b/anda/desktops/kde/kf6-kio/kf6-kio.spec index 9446e0072f..5d9832fd41 100644 --- a/anda/desktops/kde/kf6-kio/kf6-kio.spec +++ b/anda/desktops/kde/kf6-kio/kf6-kio.spec @@ -5,7 +5,7 @@ Name: kf6-%{framework}.switcheroo Version: %{majmin_ver_kf6}.0 -Release: 1%{?dist}.switcheroo +Release: 2%{?dist}.switcheroo Summary: KDE Frameworks 6 Tier 3 solution for filesystem abstraction License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT @@ -109,6 +109,7 @@ Summary: Documentation files for %{name} Requires: %{name}-core = %{version}-%{release} BuildArch: noarch Provides: kf6-kio-doc = %version-%release +Obsoletes: kf6-kio-doc <= %version-%release %description doc Documentation for %{name}. @@ -120,6 +121,7 @@ Requires: %{name}-doc = %{version}-%{release} Requires: kf6-filesystem Recommends: switcheroo-control Provides: kf6-kio-core = %version-%release +Obsoletes: kf6-kio-core <= %version-%release %description core KIOCore library provides core non-GUI components for working with KIO. @@ -127,6 +129,7 @@ KIOCore library provides core non-GUI components for working with KIO. Summary: Runtime libraries for KIO Core Requires: %{name}-core%{?_isa} = %{version}-%{release} Provides: kf6-kio-core-libs = %version-%release +Obsoletes: kf6-kio-core-libs <= %version-%release %description core-libs %{summary}. @@ -137,6 +140,7 @@ Summary: Widgets for KIO Framework %{?kf6_kinit_requires} Requires: %{name}-core%{?_isa} = %{version}-%{release} Provides: kf6-kio-widgets = %version-%release +Obsoletes: kf6-kio-widgets <= %version-%release %description widgets KIOWidgets contains classes that provide generic job control, progress reporting, etc. @@ -145,6 +149,7 @@ reporting, etc. Summary: Runtime libraries for KIO Widgets library Requires: %{name}-widgets%{?_isa} = %{version}-%{release} Provides: kf6-kio-widgets-libs = %version-%release +Obsoletes: kf6-kio-widgets-libs <= %version-%release %description widgets-libs %{summary}. @@ -152,6 +157,7 @@ Provides: kf6-kio-widgets-libs = %version-%release Summary: Widgets for file-handling for KIO Framework Requires: %{name}-widgets%{?_isa} = %{version}-%{release} Provides: kf6-kio-file-widgets = %version-%release +Obsoletes: kf6-kio-file-widgets <= %version-%release %description file-widgets The KIOFileWidgets library provides the file selection dialog and its components. @@ -160,6 +166,7 @@ its components. Summary: Gui components for the KIO Framework Requires: %{name}-core%{?_isa} = %{version}-%{release} Provides: kf6-kio-gui = %version-%release +Obsoletes: kf6-kio-gui <= %version-%release %description gui %{summary}. @@ -167,6 +174,7 @@ Provides: kf6-kio-gui = %version-%release Summary: Developer Documentation files for %{name} BuildArch: noarch Provides: kf6-kio-qch-doc = %version-%release +Obsoletes: kf6-kio-qch-doc <= %version-%release %description qch-doc Developer Documentation files for %{name} for use with KDevelop or QtCreator. From 48ce7c2ebdd187fe8e8b96aca758cabbcc8baa31 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 18 Mar 2025 04:43:30 +0000 Subject: [PATCH 0367/2977] bump(branch): kf6-kio --- anda/desktops/kde/kf6-kio/kf6-kio.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/kde/kf6-kio/kf6-kio.spec b/anda/desktops/kde/kf6-kio/kf6-kio.spec index 5d9832fd41..8226b72536 100644 --- a/anda/desktops/kde/kf6-kio/kf6-kio.spec +++ b/anda/desktops/kde/kf6-kio/kf6-kio.spec @@ -5,7 +5,7 @@ Name: kf6-%{framework}.switcheroo Version: %{majmin_ver_kf6}.0 -Release: 2%{?dist}.switcheroo +Release: 1%{?dist}.switcheroo Summary: KDE Frameworks 6 Tier 3 solution for filesystem abstraction License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT From 8426452cb3bacc53cbf753342a6ef68894601d2c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 18 Mar 2025 07:58:25 +0000 Subject: [PATCH 0368/2977] bump: osu-lazer --- anda/games/osu-lazer/osu-lazer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index d38e32c5b9..3f97d31c05 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -1,4 +1,4 @@ -%define osuresver 2025.313.0 +%define osuresver 2025.318.0 %global debug_package %{nil} %define __strip /bin/true From ebde3f39b0ded049827736938b1e21056e02332d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 18 Mar 2025 11:15:21 +0000 Subject: [PATCH 0369/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index d7e463a6e7..7d054f3a06 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.3.3 +Version: 2025.3.4 Release: 1%?dist Summary: Front-end to your dev env From 096bd4d95273a444b991dafb2cf3b641b4245d1d Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 18 Mar 2025 06:50:34 -0500 Subject: [PATCH 0370/2977] fix(steam): Fedora packages steam-devices now (#3988) * fix: Fedora packages steam-devices now Signed-off-by: Gilver * Fix source number Signed-off-by: Gilver * Actually this is a more accurate name Signed-off-by: Gilver * Actually since we're here Signed-off-by: Gilver * Maybe weak dep instead since it's mostly for 2FA Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/games/steam/steam.spec | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/anda/games/steam/steam.spec b/anda/games/steam/steam.spec index f607d1d10b..95ffa20dde 100644 --- a/anda/games/steam/steam.spec +++ b/anda/games/steam/steam.spec @@ -5,7 +5,7 @@ Name: steam Version: 1.0.0.82 -Release: 2%?dist +Release: 3%?dist Summary: Installer for the Steam software distribution service # Redistribution and repackaging for Linux is allowed, see license file. udev rules are MIT. License: Steam License Agreement and MIT @@ -30,12 +30,8 @@ Source6: https://raw.githubusercontent.com/denilsonsa/udev-joystick-black # Configure limits in systemd Source7: https://github.com/terrapkg/pkg-steam/raw/refs/heads/main/01-steam.conf -# Newer udev rules than what is bundled in the tarball -Source8: https://raw.githubusercontent.com/ValveSoftware/steam-devices/master/60-steam-input.rules -Source9: https://raw.githubusercontent.com/ValveSoftware/steam-devices/master/60-steam-vr.rules - # Steam restart script -Source11: steamrestart.sh +Source9: steamrestart.sh # Do not install desktop file in lib/steam, do not install apt sources Patch0: https://github.com/terrapkg/pkg-steam/raw/refs/heads/main/steam-makefile.patch @@ -133,7 +129,8 @@ Recommends: xdg-user-dirs # Allow using Steam Runtime Launch Options Recommends: gobject-introspection -Requires: steam-devices = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: steam-devices +Requires: steam-device-rules # Workaround for GNOME issues with libei Recommends: (extest-%{name} if gnome-shell) @@ -145,16 +142,13 @@ and screenshot functionality, and many social features. This package contains the installer for the Steam software distribution service. -%package devices -Summary: Permissions required by Steam for gaming devices +%package device-rules +Summary: Fix for keyboard/mouse/tablet being detected as joystick in Linux +Obsoletes: steam-devices < %{version}-%{release} BuildArch: noarch -%description devices -Steam is a software distribution service with an online store, automated -installation, automatic updates, achievements, SteamCloud synchronized savegame -and screenshot functionality, and many social features. - -This package contains the necessary permissions for gaming devices. +%description device-rules +This package contains fixes for devices being detected incorrectly by Steam. %prep %autosetup -p1 -n %{name}-launcher @@ -171,7 +165,7 @@ rm -fr %{buildroot}%{_docdir}/%{name}/ \ %{buildroot}%{_bindir}/%{name}deps mkdir -p %{buildroot}%{_udevrulesdir}/ -install -m 644 -p %{SOURCE6} %{SOURCE8} %{SOURCE9} \ +install -m 644 -p %{SOURCE6} \ %{buildroot}%{_udevrulesdir}/ # Environment files @@ -183,7 +177,7 @@ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system.conf.d/ mkdir -p %{buildroot}%{_prefix}/lib/systemd/user.conf.d/ install -m 644 -p %{SOURCE7} %{buildroot}%{_prefix}/lib/systemd/system.conf.d/ install -m 644 -p %{SOURCE7} %{buildroot}%{_prefix}/lib/systemd/user.conf.d/ -install -m 775 -p %{SOURCE11} %{buildroot}%{_bindir}/steamrestart +install -m 775 -p %{SOURCE9} %{buildroot}%{_bindir}/steamrestart %check desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop @@ -208,8 +202,8 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{appstream_id %dir %{_prefix}/lib/systemd/user.conf.d/ %{_prefix}/lib/systemd/user.conf.d/01-steam.conf -%files devices -%{_udevrulesdir}/* +%files device-rules +%{_udevrulesdir}/51-these-are-not-joysticks-rm.rules %changelog * Sun Sep 01 2024 Simone Caronni - 1.0.0.81-1 From 820311edf1628476ee9a8ceba4455e0fa6e325cb Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 18 Mar 2025 12:51:18 +0000 Subject: [PATCH 0371/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index 7d054f3a06..d747e52391 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.3.4 +Version: 2025.3.5 Release: 1%?dist Summary: Front-end to your dev env From ee652643e4b9db247634af8f5e169e6966ac206a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 18 Mar 2025 13:26:20 +0000 Subject: [PATCH 0372/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index d747e52391..4b0c4356ca 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.3.5 +Version: 2025.3.6 Release: 1%?dist Summary: Front-end to your dev env From 731dc89dd17817238a95c7123a949c1a1619f533 Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 18 Mar 2025 21:28:35 +0800 Subject: [PATCH 0373/2977] add: peazip (#3968) Resolve #3887 Resolve #2038 --- anda/apps/peazip/anda.hcl | 5 ++ anda/apps/peazip/peazip.spec | 129 +++++++++++++++++++++++++++++++++++ anda/apps/peazip/update.rhai | 1 + 3 files changed, 135 insertions(+) create mode 100644 anda/apps/peazip/anda.hcl create mode 100644 anda/apps/peazip/peazip.spec create mode 100644 anda/apps/peazip/update.rhai diff --git a/anda/apps/peazip/anda.hcl b/anda/apps/peazip/anda.hcl new file mode 100644 index 0000000000..c6024a40a4 --- /dev/null +++ b/anda/apps/peazip/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "peazip.spec" + } +} diff --git a/anda/apps/peazip/peazip.spec b/anda/apps/peazip/peazip.spec new file mode 100644 index 0000000000..5b70e6aa80 --- /dev/null +++ b/anda/apps/peazip/peazip.spec @@ -0,0 +1,129 @@ +# can't figure out how to apply usual build flags to lazbuild +%define debug_package %nil + +Name: peazip +Version: 10.3.0 +Release: 1%?dist +Summary: Free Zip / Unzip software and Rar file extractor. Cross-platform file and archive manager +License: LGPL-3.0-only +URL: https://peazip.github.io +Source0: https://github.com/peazip/PeaZip/archive/refs/tags/%version.tar.gz +# holy smoke this is written in pascal? +BuildRequires: lazarus-tools +BuildRequires: lazarus-lcl-gtk2 +BuildRequires: lazarus-lcl-gtk3 +BuildRequires: lazarus-lcl-qt5 +BuildRequires: lazarus-lcl-qt6 +Requires: (peazip-gtk2 or peazip-gtk3 or peazip-gtk4 or peazip-qt5 or peazip-qt6) +Requires: 7zip brotli zstd +Suggests: (peazip-gtk4 if gtk4) +Suggests: (peazip-qt5 if qt5-qtbase) +Suggests: (peazip-qt6 if qt6-qtbase) + +%description +PeaZip is a free file archiver utility and rar extractor for Linux, macOS, and +Windows, which works with 200+ archive types and variants (7z, ace, arc, bz2, +cab, gz, iso, paq, pea, rar, tar, wim, zip, zipx...), handles spanned archives +(001, r01, z01...), supports multiple archive encryption standards, file +hashing, exports tasks as console scripts. + +%package gtk2 +Summary: GTK2 version of peazip +Requires: peazip +RemovePathPostFixes: .gtk2 +%description gtk2 +GTK2 version of peazip. +%package gtk3 +Summary: GTK3 version of peazip +Requires: peazip +RemovePathPostFixes: .gtk3 +%description gtk3 +GTK3 version of peazip. +%package qt5 +Summary: Qt5 version of peazip +Requires: peazip +RemovePathPostFixes: .qt5 +%description qt5 +Qt5 version of peazip. +%package qt6 +Summary: Qt6 version of peazip +Requires: peazip +RemovePathPostFixes: .qt6 +%description qt6 +Qt6 version of peazip. + + +%package -n pea +Summary: Engine for PEA file format support +%description -n pea +Engine for PEA file format support. + +%package -n pea-gtk2 +Summary: GTK2 version of pea +Requires: pea +RemovePathPostFixes: .gtk2 +%description -n pea-gtk2 +GTK2 version of pea. +%package -n pea-gtk3 +Summary: GTK3 version of pea +Requires: pea +RemovePathPostFixes: .gtk3 +%description -n pea-gtk3 +GTK3 version of pea. +%package -n pea-qt5 +Summary: Qt5 version of pea +Requires: pea +RemovePathPostFixes: .qt5 +%description -n pea-qt5 +Qt5 version of pea. +%package -n pea-qt6 +Summary: Qt6 version of pea +Requires: pea +RemovePathPostFixes: .qt6 +%description -n pea-qt6 +Qt6 version of pea. + +%prep +%autosetup -n PeaZip-%version + +%build +cd peazip-sources +lazbuild --add-package dev/metadarkstyle/metadarkstyle.lpk +lazbuild --ws=gtk2 dev/project_peach.lpi && cp dev/peazip ../peazip.gtk2 +lazbuild --ws=gtk3 dev/project_peach.lpi && cp dev/peazip ../peazip.gtk3 +lazbuild --ws=qt5 dev/project_peach.lpi && cp dev/peazip ../peazip.qt5 +lazbuild --ws=qt6 dev/project_peach.lpi && cp dev/peazip ../peazip.qt6 +lazbuild --ws=gtk2 dev/project_pea.lpi && cp dev/pea ../pea.gtk2 +lazbuild --ws=gtk3 dev/project_pea.lpi && cp dev/pea ../pea.gtk3 +lazbuild --ws=qt5 dev/project_pea.lpi && cp dev/pea ../pea.qt5 +lazbuild --ws=qt6 dev/project_pea.lpi && cp dev/pea ../pea.qt6 + +%install +install -Dm755 peazip.* -t %buildroot%_bindir +install -Dm755 pea.* -t %buildroot%_bindir + +%files +%doc README.md +%license LICENSE SECURITY.md + +%files -n pea +%doc README.md +%license LICENSE SECURITY.md + +%files gtk2 +%_bindir/peazip.gtk2 +%files gtk3 +%_bindir/peazip.gtk3 +%files qt5 +%_bindir/peazip.qt5 +%files qt6 +%_bindir/peazip.qt6 + +%files -n pea-gtk2 +%_bindir/pea.gtk2 +%files -n pea-gtk3 +%_bindir/pea.gtk3 +%files -n pea-qt5 +%_bindir/pea.qt5 +%files -n pea-qt6 +%_bindir/pea.qt6 diff --git a/anda/apps/peazip/update.rhai b/anda/apps/peazip/update.rhai new file mode 100644 index 0000000000..ff9f1ef11b --- /dev/null +++ b/anda/apps/peazip/update.rhai @@ -0,0 +1 @@ +rpm.version(get("https://raw.githubusercontent.com/peazip/peazip.github.io/master/autoupdate.txt")); From bb9da9b37581a837c1ea117e0c68a348f4dcb29d Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 18 Mar 2025 10:22:05 -0500 Subject: [PATCH 0374/2977] fix(peazip): Dep on p7zip (#3996) * p Signed-off-by: Gilver * Bump release Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/apps/peazip/peazip.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/peazip/peazip.spec b/anda/apps/peazip/peazip.spec index 5b70e6aa80..c3a2c34ee9 100644 --- a/anda/apps/peazip/peazip.spec +++ b/anda/apps/peazip/peazip.spec @@ -3,7 +3,7 @@ Name: peazip Version: 10.3.0 -Release: 1%?dist +Release: 2%?dist Summary: Free Zip / Unzip software and Rar file extractor. Cross-platform file and archive manager License: LGPL-3.0-only URL: https://peazip.github.io @@ -15,7 +15,7 @@ BuildRequires: lazarus-lcl-gtk3 BuildRequires: lazarus-lcl-qt5 BuildRequires: lazarus-lcl-qt6 Requires: (peazip-gtk2 or peazip-gtk3 or peazip-gtk4 or peazip-qt5 or peazip-qt6) -Requires: 7zip brotli zstd +Requires: p7zip brotli zstd Suggests: (peazip-gtk4 if gtk4) Suggests: (peazip-qt5 if qt5-qtbase) Suggests: (peazip-qt6 if qt6-qtbase) From 14271af6271f0512b7a84e83917441286e4c4d50 Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 18 Mar 2025 10:41:48 -0500 Subject: [PATCH 0375/2977] refactor(heroic): Changes for aarch64 preparation, Git clone to install Git hooks (#3987) * refactor: Heroic changes related to aarch64 and other functionality * Bump release Signed-off-by: Gilver * Cursed Signed-off-by: Gilver * Less(?) cursed Signed-off-by: Gilver * Yeet Signed-off-by: Gilver --------- Signed-off-by: Gilver --- .../heroic-games-launcher/afterPack.diff | 7 - .../heroic-games-launcher.spec | 125 ++++++++++-------- anda/games/heroic-games-launcher/update.rhai | 15 ++- 3 files changed, 83 insertions(+), 64 deletions(-) delete mode 100644 anda/games/heroic-games-launcher/afterPack.diff diff --git a/anda/games/heroic-games-launcher/afterPack.diff b/anda/games/heroic-games-launcher/afterPack.diff deleted file mode 100644 index 31ec723967..0000000000 --- a/anda/games/heroic-games-launcher/afterPack.diff +++ /dev/null @@ -1,7 +0,0 @@ ---- a/electron-builder.yml -+++ b/electron-builder.yml -@@ -3,3 +3,3 @@ appId: com.heroicgameslauncher.hgl - productName: Heroic --afterSign: sign/afterSign.js -+afterPack: sign/afterSign.js - files: diff --git a/anda/games/heroic-games-launcher/heroic-games-launcher.spec b/anda/games/heroic-games-launcher/heroic-games-launcher.spec index 5d1c90e2bd..a78b9b5a5d 100644 --- a/anda/games/heroic-games-launcher/heroic-games-launcher.spec +++ b/anda/games/heroic-games-launcher/heroic-games-launcher.spec @@ -1,105 +1,118 @@ %global debug_package %{nil} %global __provides_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$ -%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$ +%ifnarch aarch64 +%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*)|(.*\\aarch64*\\.so.*))$ +%elifarch aarch64 +%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*)|(.*\\x86_64*\\.so.*)|(.*\\x86-64*\\.so.*))$ +%endif %define _build_id_links none -%global git_name HeroicGamesLauncher +%global org_name Heroic-Games-Launcher +%global git_name %(echo %{org_name} | sed 's/-//g') +%global reverse_dns com.heroicgameslauncher.hgl +%global shortname heroic +%global legendary_version 0.20.36 +%global gogdl_version 1.1.2 +%global nile_version 1.1.2 +%global comet_version 0.2.0 -Name: heroic-games-launcher +Name: %{shortname}-games-launcher Version: 2.16.1 -Release: 1%?dist +Release: 2%?dist Summary: A games launcher for GOG, Amazon, and Epic Games License: GPL-3.0-only AND MIT AND BSD-3-Clause URL: https://heroicgameslauncher.com -Source0: https://github.com/Heroic-Games-Launcher/%{git_name}/archive/refs/tags/v%{version}.tar.gz -Source1: https://raw.githubusercontent.com/Heroic-Games-Launcher/%{git_name}/refs/heads/main/flatpak/com.heroicgameslauncher.hgl.desktop -### Makes it actually sign the package, though will say it was skipped first. -Patch0: afterPack.diff -BuildRequires: bsdtar +BuildRequires: anda-srpm-macros BuildRequires: desktop-file-utils -### Electron builder builds some things with GCC(++) and Make +### Electron builder builds some things with GCC(++), Git, and Make BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: libxcrypt-compat +BuildRequires: git BuildRequires: make BuildRequires: nodejs BuildRequires: pnpm BuildRequires: python3 +BuildRequires: sed Requires: alsa-lib -Requires: atk -Requires: at-spi2-core Requires: gtk3 Requires: hicolor-icon-theme -Requires: libXext -Requires: libXfixes Requires: nss Requires: python3 Requires: which Recommends: gamemode Recommends: mangohud Recommends: umu-launcher -# Woarkaround for GNOME issues with libei -Recommends: (extest if gnome-shell) -Provides: bundled(gogdl) -Provides: bundled(legendary) -Provides: bundled(nile) -ExclusiveArch: x86_64 -AutoReq: no +Provides: bundled(comet) = %{comet_version} +Provides: bundled(gogdl) = %{gogdl_version} +Provides: bundled(legendary) = %{legendary_version} +Provides: bundled(nile) = %{nile_version} Packager: Gilver E. %description Heroic is a Free and Open Source Epic, GOG, and Amazon Prime Games launcher for Linux, Windows, and macOS. %prep -%autosetup -n %{git_name}-%{version} -p1 -sed -i 's/Exec=.*%u/Exec=\/usr\/share\/heroic\/heroic %u/g' %{SOURCE1} -sed -i 's/Icon=.*/Icon=heroic/g' %{SOURCE1} +%git_clone https://github.com/%{org_name}/%{git_name} v%{version} +sed -i 's/Exec=.*%u/Exec=\/usr\/share\/%{shortname}\/%{shortname} %U/g' flatpak/%{reverse_dns}.desktop +sed -i 's/Icon=.*/Icon=%{shortname}/g' flatpak/%{reverse_dns}.desktop %build pnpm install pnpm run download-helper-binaries -### RPM doesn't work and it needs a package format to generate icons, AppImage isn't a good option for packaging because it will try to self update -pnpm dist:linux pacman +pnpm dist:linux %install -mkdir -p %{buildroot}%{_datadir}/heroic -mv dist/linux-unpacked/* %{buildroot}%{_datadir}/heroic +mkdir -p %{buildroot}%{_datadir}/%{shortname} +mv $(find . -iname "*LICENSE*" -not -path "./node_modules/*" -and -not -path "./public/*") . +%ifarch aarch64 +### Needs testing once aarch64 Heroic is complete: +#rm -rf dist/linux-unpacked/resources/app.asar.unpacked/build/bin/x64 +mv dist/linux-arm64-unpacked/* %{buildroot}%{_datadir}/%{shortname} +%else +rm -rf dist/linux-unpacked/resources/app.asar.unpacked/build/bin/arm64 +mv dist/linux-unpacked/* %{buildroot}%{_datadir}/%{shortname} +%endif mkdir -p %{buildroot}%{_bindir} -ln -sr %{_datadir}/heroic/heroic %{buildroot}%{_bindir}/%{name} -install -Dm644 public/icon.png %{buildroot}%{_datadir}/pixmaps/heroic.png -install -Dm644 dist/.icon-set/icon_16x16.png %{buildroot}%{_iconsdir}/hicolor/16x16/heroic.png -install -Dm644 dist/.icon-set/icon_32x32.png %{buildroot}%{_iconsdir}/hicolor/32x32/heroic.png -install -Dm644 dist/.icon-set/icon_48x48.png %{buildroot}%{_iconsdir}/hicolor/48x48/heroic.png -install -Dm644 dist/.icon-set/icon_64x64.png %{buildroot}%{_iconsdir}/hicolor/64x64/heroic.png -install -Dm644 dist/.icon-set/icon_128x128.png %{buildroot}%{_iconsdir}/hicolor/128x128/heroic.png -install -Dm644 dist/.icon-set/icon_256x256.png %{buildroot}%{_iconsdir}/hicolor/256x256/heroic.png -install -Dm644 dist/.icon-set/icon_512x512.png %{buildroot}%{_iconsdir}/hicolor/512x512/heroic.png -install -Dm644 dist/.icon-set/icon_1024.png %{buildroot}%{_iconsdir}/hicolor/1024x1024/heroic.png -install -Dm644 %{SOURCE1} %{buildroot}%{_datadir}/applications/heroic.desktop +# Make names executable +ln -sr %{_datadir}/%{shortname}/%{shortname} %{buildroot}%{_bindir}/%{name} +ln -sr %{_datadir}/%{shortname}/%{shortname} %{buildroot}%{_bindir}/%{shortname} +install -Dm644 dist/.icon-set/icon_16x16.png %{buildroot}%{_iconsdir}/hicolor/16x16/%{shortname}.png +install -Dm644 dist/.icon-set/icon_32x32.png %{buildroot}%{_iconsdir}/hicolor/32x32/%{shortname}.png +install -Dm644 dist/.icon-set/icon_48x48.png %{buildroot}%{_iconsdir}/hicolor/48x48/%{shortname}.png +install -Dm644 dist/.icon-set/icon_64x64.png %{buildroot}%{_iconsdir}/hicolor/64x64/%{shortname}.png +install -Dm644 dist/.icon-set/icon_128x128.png %{buildroot}%{_iconsdir}/hicolor/128x128/%{shortname}.png +install -Dm644 dist/.icon-set/icon_256x256.png %{buildroot}%{_iconsdir}/hicolor/256x256/%{shortname}.png +install -Dm644 dist/.icon-set/icon_512x512.png %{buildroot}%{_iconsdir}/hicolor/512x512/%{shortname}.png +install -Dm644 dist/.icon-set/icon_1024.png %{buildroot}%{_iconsdir}/hicolor/1024x1024/%{shortname}.png +install -Dm644 flatpak/%{reverse_dns}.desktop %{buildroot}%{_datadir}/applications/%{shortname}.desktop %check -desktop-file-validate %{buildroot}%{_datadir}/applications/heroic.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/%{shortname}.desktop %files %doc README.md %doc CODE_OF_CONDUCT.md %license COPYING -%_datadir/heroic -%_datadir/pixmaps/heroic.png -%_bindir/heroic-games-launcher -%_datadir/applications/heroic.desktop -%_iconsdir/hicolor/16x16/heroic.png -%_iconsdir/hicolor/32x32/heroic.png -%_iconsdir/hicolor/48x48/heroic.png -%_iconsdir/hicolor/64x64/heroic.png -%_iconsdir/hicolor/128x128/heroic.png -%_iconsdir/hicolor/256x256/heroic.png -%_iconsdir/hicolor/512x512/heroic.png -%_iconsdir/hicolor/1024x1024/heroic.png +%license LICENSE +%license legendary.LICENSE +%license LICENSE.electron.txt +%license LICENSES.chromium.html +%dir %{_datadir}/%{shortname} +%{_datadir}/%{shortname}/* +%{_bindir}/%{shortname} +%{_bindir}/%{name} +%{_datadir}/applications/%{shortname}.desktop +%{_iconsdir}/hicolor/16x16/%{shortname}.png +%{_iconsdir}/hicolor/32x32/%{shortname}.png +%{_iconsdir}/hicolor/48x48/%{shortname}.png +%{_iconsdir}/hicolor/64x64/%{shortname}.png +%{_iconsdir}/hicolor/128x128/%{shortname}.png +%{_iconsdir}/hicolor/256x256/%{shortname}.png +%{_iconsdir}/hicolor/512x512/%{shortname}.png +%{_iconsdir}/hicolor/1024x1024/%{shortname}.png %changelog -* Thu Jan 30 2025 Gilver E. -- Initial package * Sun Mar 02 2025 Gilver E. - Update to 2.16.0 - Fix incorrect RPM dependencies - +* Thu Jan 30 2025 Gilver E. +- Initial package diff --git a/anda/games/heroic-games-launcher/update.rhai b/anda/games/heroic-games-launcher/update.rhai index 9e0e58fde7..958a12b74a 100644 --- a/anda/games/heroic-games-launcher/update.rhai +++ b/anda/games/heroic-games-launcher/update.rhai @@ -1 +1,14 @@ -rpm.version(gh("Heroic-Games-Launcher/HeroicGamesLauncher")); +let v = gh_rawfile("Heroic-Games-Launcher/HeroicGamesLauncher", "main", "package.json").json()["version"]; +rpm.version(v); +// Versions for bundled binaries. Most important for Legendary as Fedora packages this. +if rpm.changed() { + let ts = gh_rawfile("Heroic-Games-Launcher/HeroicGamesLauncher", `v${v}`, "meta/downloadHelperBinaries.ts"); + let lv = find("legendary: '([\\d.]+)'", ts, 1); + let gv = find("gogdl: 'v([\\d.]+)'", ts, 1); + let nv = find("nile: 'v([\\d.]+)'", ts, 1); + let cv = find("comet: 'v([\\d.]+)'", ts, 1); + rpm.global("legendary_version", lv); + rpm.global("gogdl_version", gv); + rpm.global("nile_version", nv); + rpm.global("comet_version", cv); +} From c73efa0841eff63e05afa29db7e14504951abb7b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 18 Mar 2025 18:25:50 +0000 Subject: [PATCH 0376/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index a07e1e47b1..c749c822da 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.608 +Version: 0.0.609 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 3a3532ad57..362fa53d08 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.608 +Version: 0.0.609 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 928eeaf40f93bff8c2c34cbeeaa9c1d7d86e1436 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 18 Mar 2025 18:57:13 +0000 Subject: [PATCH 0377/2977] bump: preview stable --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 8e0d2ef0b0..24376035fb 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.178.3-pre +%global ver 0.177.11 # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 0bbf8c015e..32a395a0b5 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.177.10 +Version: 0.177.11 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From ab42b670232e6b1dd7220f48412128ac83ea82b3 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 18 Mar 2025 19:18:00 +0000 Subject: [PATCH 0378/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 24376035fb..bce2b0fb35 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.177.11 +%global ver 0.178.4-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From e169758a2d3817c94be9a3846c2b107d4afe27fb Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 18 Mar 2025 19:59:53 +0000 Subject: [PATCH 0379/2977] bump: compat-nvidia-repo nvidia-driver nvidia-kmod-common nvidia-kmod nvidia-modprobe nvidia-persistenced nvidia-settings nvidia-xconfig --- anda/lib/nvidia/compat-nvidia-repo/compat-nvidia-repo.spec | 2 +- anda/system/nvidia/nvidia-driver/nvidia-driver.spec | 4 ++-- anda/system/nvidia/nvidia-kmod-common/nvidia-kmod-common.spec | 2 +- anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec | 2 +- anda/system/nvidia/nvidia-modprobe/nvidia-modprobe.spec | 2 +- .../nvidia/nvidia-persistenced/nvidia-persistenced.spec | 4 ++-- anda/system/nvidia/nvidia-settings/nvidia-settings.spec | 2 +- anda/system/nvidia/nvidia-xconfig/nvidia-xconfig.spec | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/anda/lib/nvidia/compat-nvidia-repo/compat-nvidia-repo.spec b/anda/lib/nvidia/compat-nvidia-repo/compat-nvidia-repo.spec index 227d553864..98ab04cc4f 100644 --- a/anda/lib/nvidia/compat-nvidia-repo/compat-nvidia-repo.spec +++ b/anda/lib/nvidia/compat-nvidia-repo/compat-nvidia-repo.spec @@ -1,5 +1,5 @@ Name: compat-nvidia-repo -Version: 570.124.04 +Version: 570.133.07 Epoch: 3 Release: 1%?dist Summary: Compatibility package required by official CUDA packages diff --git a/anda/system/nvidia/nvidia-driver/nvidia-driver.spec b/anda/system/nvidia/nvidia-driver/nvidia-driver.spec index 7cdcbb8b22..399d1fa899 100644 --- a/anda/system/nvidia/nvidia-driver/nvidia-driver.spec +++ b/anda/system/nvidia/nvidia-driver/nvidia-driver.spec @@ -9,8 +9,8 @@ %endif Name: nvidia-driver -Version: 570.124.04 -Release: 2%?dist +Version: 570.133.07 +Release: 1%?dist Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Epoch: 3 License: NVIDIA License diff --git a/anda/system/nvidia/nvidia-kmod-common/nvidia-kmod-common.spec b/anda/system/nvidia/nvidia-kmod-common/nvidia-kmod-common.spec index f0e3f8768c..481f74c369 100644 --- a/anda/system/nvidia/nvidia-kmod-common/nvidia-kmod-common.spec +++ b/anda/system/nvidia/nvidia-kmod-common/nvidia-kmod-common.spec @@ -7,7 +7,7 @@ %global __strip /bin/true Name: nvidia-kmod-common -Version: 570.124.04 +Version: 570.133.07 Release: 1%?dist Summary: Common file for NVIDIA's proprietary driver kernel modules Epoch: 3 diff --git a/anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec b/anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec index 27c5f3e36d..b3b105a003 100644 --- a/anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec +++ b/anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec @@ -4,7 +4,7 @@ %global debug_package %{nil} Name: nvidia-kmod -Version: 570.124.04 +Version: 570.133.07 Release: 1%?dist Summary: NVIDIA display driver kernel module Epoch: 3 diff --git a/anda/system/nvidia/nvidia-modprobe/nvidia-modprobe.spec b/anda/system/nvidia/nvidia-modprobe/nvidia-modprobe.spec index 582b8edf32..d4dd58e8fb 100644 --- a/anda/system/nvidia/nvidia-modprobe/nvidia-modprobe.spec +++ b/anda/system/nvidia/nvidia-modprobe/nvidia-modprobe.spec @@ -1,5 +1,5 @@ Name: nvidia-modprobe -Version: 570.124.04 +Version: 570.133.07 Release: 1%?dist Summary: NVIDIA kernel module loader Epoch: 3 diff --git a/anda/system/nvidia/nvidia-persistenced/nvidia-persistenced.spec b/anda/system/nvidia/nvidia-persistenced/nvidia-persistenced.spec index f20353016f..2fc9a67972 100644 --- a/anda/system/nvidia/nvidia-persistenced/nvidia-persistenced.spec +++ b/anda/system/nvidia/nvidia-persistenced/nvidia-persistenced.spec @@ -1,6 +1,6 @@ Name: nvidia-persistenced -Version: 570.124.04 -Release: 2%?dist +Version: 570.133.07 +Release: 1%?dist Summary: A daemon to maintain persistent software state in the NVIDIA driver Epoch: 3 License: GPLv2+ diff --git a/anda/system/nvidia/nvidia-settings/nvidia-settings.spec b/anda/system/nvidia/nvidia-settings/nvidia-settings.spec index 1f80fc5669..78ca2ad729 100644 --- a/anda/system/nvidia/nvidia-settings/nvidia-settings.spec +++ b/anda/system/nvidia/nvidia-settings/nvidia-settings.spec @@ -1,5 +1,5 @@ Name: nvidia-settings -Version: 570.124.04 +Version: 570.133.07 Release: 1%?dist Summary: Configure the NVIDIA graphics driver Epoch: 3 diff --git a/anda/system/nvidia/nvidia-xconfig/nvidia-xconfig.spec b/anda/system/nvidia/nvidia-xconfig/nvidia-xconfig.spec index a963802bcb..f17dc8d421 100644 --- a/anda/system/nvidia/nvidia-xconfig/nvidia-xconfig.spec +++ b/anda/system/nvidia/nvidia-xconfig/nvidia-xconfig.spec @@ -1,5 +1,5 @@ Name: nvidia-xconfig -Version: 570.124.04 +Version: 570.133.07 Release: 1%?dist Summary: NVIDIA X configuration file editor Epoch: 3 From 39d288860be40f968759e08158fd6476311de1b6 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 18 Mar 2025 22:36:50 +0000 Subject: [PATCH 0380/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index c749c822da..5d95e1c5aa 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.609 +Version: 0.0.610 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 362fa53d08..b6e4d3e695 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.609 +Version: 0.0.610 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From cab1bd6c3dd178211f50cb3d30730ba80ecf0588 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 19 Mar 2025 01:22:45 +0000 Subject: [PATCH 0381/2977] bump: codium --- anda/devs/codium/codium.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/codium/codium.spec b/anda/devs/codium/codium.spec index ba73762df1..0904923d57 100644 --- a/anda/devs/codium/codium.spec +++ b/anda/devs/codium/codium.spec @@ -12,7 +12,7 @@ %endif Name: codium -Version: 1.98.2.25072 +Version: 1.98.2.25078 Release: 1%?dist Summary: Code editing. Redefined. License: MIT From 351e7b4b03c1fd71820ef33f88eee139c6859335 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 19 Mar 2025 01:42:20 +0000 Subject: [PATCH 0382/2977] bump(nightly): mpv nightly nightly nim-nightly rpi-utils spotx-bash --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/tools/rpi-utils/rpi-utils.spec | 4 ++-- anda/tools/spotx-bash/spotx-bash.spec | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index c5c20aefd1..762aa61730 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 6c4218252278c582c7a40654c66f8216aac43326 +%global commit 8aa7d783d2dfc890102d349371bd2a9da67beb36 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250316 +%global commit_date 20250319 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 8f1860ba5d..e57e3ff35a 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 742bca713d2c5d2633df9ee99d358d8a104919fb +%global commit bd7c5cc95f872d241ddc8aea4c81c540c6d9c19f %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-03-17 +%global fulldate 2025-03-18 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 0f6466e492..5e49f0ac5d 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit cd5d7e82d0037dfb4dd5abb83dfac22a2dcc0f70 +%global commit 68a572873b2ee2dc6fc34894754b2083d7c2262f %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250318 +%global commit_date 20250319 %global ver 0.179.0 %bcond_with check diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 631c6196fc..c22ba06132 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 2b699bca530317873d0b3bf2ee2e59ef221010f0 +%global commit 7c5d0055100caaa24ec570554690fb65fbdf3970 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250316 +%global commit_date 20250319 %global debug_package %nil Name: nim-nightly diff --git a/anda/tools/rpi-utils/rpi-utils.spec b/anda/tools/rpi-utils/rpi-utils.spec index cc36bbea14..f76040199d 100644 --- a/anda/tools/rpi-utils/rpi-utils.spec +++ b/anda/tools/rpi-utils/rpi-utils.spec @@ -1,5 +1,5 @@ -%global commit bd817cb48f7a7c1db017c7782b4586ea3e2090dd -%global commit_date 20250318 +%global commit 92900c5c733c8b91a67b1772d4f0a25104f2b05d +%global commit_date 20250319 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define _unpackaged_files_terminate_build 0 diff --git a/anda/tools/spotx-bash/spotx-bash.spec b/anda/tools/spotx-bash/spotx-bash.spec index be4e1c13ac..487f8f98fc 100644 --- a/anda/tools/spotx-bash/spotx-bash.spec +++ b/anda/tools/spotx-bash/spotx-bash.spec @@ -1,5 +1,5 @@ -%global commit e4b4b0dea09fd9152aaf9b3da3ee3e0aa9fc7f2f -%global commit_date 20250318 +%global commit e6f41414072c283d9437168d00f7193fcbcecb52 +%global commit_date 20250319 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: spotx-bash From 94095283468e6ba9bb2f5fa8ed68a3158c27b230 Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 18 Mar 2025 21:25:54 -0500 Subject: [PATCH 0383/2977] chore/feat(heroic): Rename LICENSE to distinguish it as a bundled dependency license (#4006) Signed-off-by: Gilver --- anda/games/heroic-games-launcher/heroic-games-launcher.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/anda/games/heroic-games-launcher/heroic-games-launcher.spec b/anda/games/heroic-games-launcher/heroic-games-launcher.spec index a78b9b5a5d..03912476f0 100644 --- a/anda/games/heroic-games-launcher/heroic-games-launcher.spec +++ b/anda/games/heroic-games-launcher/heroic-games-launcher.spec @@ -63,6 +63,7 @@ pnpm dist:linux %install mkdir -p %{buildroot}%{_datadir}/%{shortname} mv $(find . -iname "*LICENSE*" -not -path "./node_modules/*" -and -not -path "./public/*") . +mv LICENSE LICENSE.fonts %ifarch aarch64 ### Needs testing once aarch64 Heroic is complete: #rm -rf dist/linux-unpacked/resources/app.asar.unpacked/build/bin/x64 @@ -92,10 +93,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{shortname}.desktop %doc README.md %doc CODE_OF_CONDUCT.md %license COPYING -%license LICENSE %license legendary.LICENSE -%license LICENSE.electron.txt %license LICENSES.chromium.html +%license LICENSE.electron.txt +%license LICENSE.fonts %dir %{_datadir}/%{shortname} %{_datadir}/%{shortname}/* %{_bindir}/%{shortname} From 77a33def9a3e03b9e16dd13e6ad803c2664117be Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Tue, 18 Mar 2025 19:27:29 -0700 Subject: [PATCH 0384/2977] fix: limine (#4005) (#4011) Signed-off-by: madomado (cherry picked from commit 612f8532aec42a24a036e78ece3ba92eeeadbe8b) Co-authored-by: madomado --- anda/system/limine/limine.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/system/limine/limine.spec b/anda/system/limine/limine.spec index 5352753dcb..a6b01c1f5b 100644 --- a/anda/system/limine/limine.spec +++ b/anda/system/limine/limine.spec @@ -6,6 +6,7 @@ License: BSD-2-Clause URL: https://limine-bootloader.org Source0: https://github.com/limine-bootloader/limine/releases/download/v%version/limine-%version.tar.gz Source1: https://raw.githubusercontent.com/limine-bootloader/limine/v%version/README.md +Packager: madonuko BuildRequires: nasm mtools llvm lld clang make %description @@ -23,13 +24,12 @@ cp %SOURCE1 . %install %make_install + %files -%doc README.md CONFIG.md PHILOSOPHY.md PROTOCOL.md COPYING USAGE.md +%doc README.md 3RDPARTY.md FAQ.md CONFIG.md PROTOCOL.md COPYING USAGE.md +%doc %_datadir/doc/limine/LICENSES/LicenseRef-scancode-bsd-no-disclaimer-unmodified.txt %license COPYING %_bindir/limine %_includedir/limine.h %_datadir/limine/ %_mandir/man1/limine.1.gz - -%changelog -%autochangelog From 2170930f5995a560b98b8361420dd5a78a79217f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 19 Mar 2025 10:28:45 +0000 Subject: [PATCH 0385/2977] bump: arduino-language-server --- .../arduino-language-server/arduino-language-server.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/tools/arduino-language-server/arduino-language-server.spec b/anda/tools/arduino-language-server/arduino-language-server.spec index 101cd852ad..97934e1247 100644 --- a/anda/tools/arduino-language-server/arduino-language-server.spec +++ b/anda/tools/arduino-language-server/arduino-language-server.spec @@ -1,6 +1,6 @@ # https://github.com/arduino/arduino-language-server %global goipath github.com/arduino/arduino-language-server -Version: 0.7.6 +Version: 0.7.7 %gometa -f @@ -12,7 +12,7 @@ The Arduino Language Server is the tool that powers the autocompletion of the ne %global godocs README.md Name: arduino-language-server -Release: 2%?dist +Release: 1%?dist Summary: An Arduino Language Server based on Clangd for Arduino code autocompletion License: AGPL-3.0 Packager: Owen Zimmerman From a7ab2e650b45ae377b1b50ec86fd760d125e720e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 19 Mar 2025 11:59:17 +0000 Subject: [PATCH 0386/2977] bump: zsh-autocomplete --- anda/devs/zsh-autocomplete/zsh-autocomplete.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zsh-autocomplete/zsh-autocomplete.spec b/anda/devs/zsh-autocomplete/zsh-autocomplete.spec index 3a1efafcaf..663cce953d 100644 --- a/anda/devs/zsh-autocomplete/zsh-autocomplete.spec +++ b/anda/devs/zsh-autocomplete/zsh-autocomplete.spec @@ -1,7 +1,7 @@ %define debug_package %nil Name: zsh-autocomplete -Version: 24.09.04 +Version: 25.03.19 Release: 1%?dist Summary: Real-time type-ahead completion for Zsh License: MIT From 5263942944b81a124373f56e27c85371e463b184 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 19 Mar 2025 16:46:07 +0000 Subject: [PATCH 0387/2977] bump: preview stable --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index bce2b0fb35..6b42418e17 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.178.4-pre +%global ver 0.178.4 # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 32a395a0b5..e8a03465ed 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.177.11 +Version: 0.178.4 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From d86273387fb33cfc2830087a2b99909b1fc52c4e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 19 Mar 2025 16:56:13 +0000 Subject: [PATCH 0388/2977] bump: discord-canary-openasar discord-canary preview --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- anda/devs/zed/preview/zed-preview.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 5d95e1c5aa..5572b5a831 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.610 +Version: 0.0.611 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index b6e4d3e695..8ad2b5fd7c 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.610 +Version: 0.0.611 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 6b42418e17..5d77892ac0 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.178.4 +%global ver 0.179.0-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From ef3b913c111b856002d372b8c2fd6ad13a49a72a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 19 Mar 2025 17:37:58 +0000 Subject: [PATCH 0389/2977] bump: unity-session --- anda/desktops/lomiri-unity/unity-session/unity-session.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/unity-session/unity-session.spec b/anda/desktops/lomiri-unity/unity-session/unity-session.spec index 329c74deef..0f77250c98 100644 --- a/anda/desktops/lomiri-unity/unity-session/unity-session.spec +++ b/anda/desktops/lomiri-unity/unity-session/unity-session.spec @@ -1,4 +1,4 @@ -%define _ubuntu_rel 2ubuntu1 +%define _ubuntu_rel 2ubuntu2 Name: unity-session Summary: Lightdm profile for Unity 7 From 0a7bb48c88169d74750e45357520ec446ecffdca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Garc=C3=ADa?= <4411661+GarciaLnk@users.noreply.github.com> Date: Wed, 19 Mar 2025 17:56:54 +0000 Subject: [PATCH 0390/2977] fix(keyd): proper sysusers.d entry format (#4014) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alberto García <4411661+GarciaLnk@users.noreply.github.com> --- anda/tools/keyd/keyd.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/tools/keyd/keyd.spec b/anda/tools/keyd/keyd.spec index dac5e79f8a..fce4b28ea3 100644 --- a/anda/tools/keyd/keyd.spec +++ b/anda/tools/keyd/keyd.spec @@ -1,6 +1,6 @@ Name: keyd Version: 2.5.0 -Release: 2%?dist +Release: 3%?dist Summary: Key remapping daemon for linux URL: https://github.com/rvaiya/keyd License: MIT @@ -15,7 +15,7 @@ level input primitives (evdev, uinput). %prep %autosetup cat< keyd.conf -g keyd +g keyd - EOF %build From 2a20fd92c4d79fe51dcd5934966f2f3a0db91f03 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 19 Mar 2025 20:41:17 +0000 Subject: [PATCH 0391/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 5572b5a831..5b69d26252 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.611 +Version: 0.0.612 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 8ad2b5fd7c..b9ac3b79b4 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.611 +Version: 0.0.612 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 7dbdb6129b49f7f2ce37e278640f3137f487a95c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 19 Mar 2025 21:31:24 +0000 Subject: [PATCH 0392/2977] bump: stable --- anda/devs/zed/stable/zed.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index e8a03465ed..072885e5bb 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.178.4 +Version: 0.178.5 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From 55907a7571d99bd69dadc79e708ade59068e4b5b Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 20 Mar 2025 05:47:10 +0800 Subject: [PATCH 0393/2977] fix(coolercontrol): no more tauri rip (#3958) * fix(coolercontrol): no more tauri rip Signed-off-by: madomado * Update coolercontrol.spec Signed-off-by: madomado * Update coolercontrol.spec Signed-off-by: madomado * Update coolercontrol.spec Signed-off-by: madomado * Update coolercontrol.spec Signed-off-by: madomado * Update coolercontrol.spec Signed-off-by: madomado * Update coolercontrol.spec Signed-off-by: madomado --------- Signed-off-by: madomado --- anda/apps/coolercontrol/coolercontrol.spec | 34 ++++++++-------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/anda/apps/coolercontrol/coolercontrol.spec b/anda/apps/coolercontrol/coolercontrol.spec index eddcdae8ba..0da852c577 100644 --- a/anda/apps/coolercontrol/coolercontrol.spec +++ b/anda/apps/coolercontrol/coolercontrol.spec @@ -21,19 +21,19 @@ Requires: hicolor-icon-theme Requires: webkit2gtk4.1 Requires: libappindicator-gtk3 Requires: coolercontrold -BuildRequires: git-core make nodejs-npm libdrm-devel curl wget file mold +BuildRequires: nodejs-npm libdrm-devel curl wget file mold BuildRequires: systemd-rpm-macros anda-srpm-macros cargo >= 1.75.0 cargo-rpm-macros -BuildRequires: autoconf automake binutils bison flex gcc gcc-c++ gdb libtool pkgconf strace -BuildRequires: pkgconfig(webkit2gtk-4.1) pkgconfig(openssl) pkgconfig(librsvg-2.0) -BuildRequires: libappindicator-gtk3-devel -BuildRequires: python3-devel python3-wheel python3-liquidctl python3-setproctitle python3-fastapi python3-uvicorn python3-pip +BuildRequires: binutils bison cmake flex gcc gcc-c++ libtool strace BuildRequires: libappstream-glib BuildRequires: desktop-file-utils +BuildRequires: cmake(Qt6) +BuildRequires: cmake(Qt6WebEngineWidgets) %description %_desc %package liqctld Summary: CoolerControl daemon for interacting with liquidctl devices on a system level Requires: coolercontrold +BuildRequires: python3-devel python3-wheel python3-liquidctl python3-setproctitle python3-fastapi python3-uvicorn python3-pip %description liqctld %_desc coolercontrol-liqctld is a CoolerControl daemon for interacting with liquidctl devices on a system level, and is installed as the coolercontrol-liqctld application. Its main purpose is to wrap the underlying @@ -43,6 +43,8 @@ It also enables parallel device communication and access to specific device prop %package -n coolercontrold Summary: Monitor and control your cooling devices. Requires: coolercontrol-liqctld +BuildRequires: pkgconfig(webkit2gtk-4.1) pkgconfig(openssl) pkgconfig(librsvg-2.0) +BuildRequires: libappindicator-gtk3-devel %description -n coolercontrold %_desc coolercontrold is the main daemon containing the core logic for interfacing with devices, and installed as "coolercontrold". It is meant to run in the background as a system daemon. It handles all device @@ -57,13 +59,6 @@ pushd coolercontrold %cargo_prep_online & popd -pushd coolercontrol-ui -npm ci --prefer-offline & -pushd src-tauri -%cargo_prep_online & -popd -popd - wait @@ -77,13 +72,10 @@ pushd coolercontrol-liqctld %pyproject_wheel popd -pushd coolercontrol-ui -npm run build & -pushd src-tauri -%{cargo_license_online} > LICENSE.dependencies & +pushd coolercontrol +%cmake +%cmake_build wait -%cargo_build -f custom-protocol -popd popd @@ -99,9 +91,8 @@ install -Dpm755 target/rpm/coolercontrold %buildroot%_bindir/coolercontrold install -Dpm644 LICENSE.dependencies %buildroot%_datadir/licenses/coolercontrold/LICENSE.dependencies popd -pushd coolercontrol-ui/src-tauri -install -Dpm755 target/rpm/coolercontrol %buildroot%_bindir/coolercontrol -install -Dpm644 LICENSE.dependencies %buildroot%_datadir/licenses/%name/LICENSE.dependencies +pushd coolercontrol/ +%cmake_install popd install -Dpm644 packaging/systemd/coolercontrol-liqctld.service %buildroot%_unitdir/coolercontrol-liqctld.service @@ -135,7 +126,6 @@ appstream-util validate-relax --nonet %buildroot%_metainfodir/%rdnn.metainfo.xml %files %doc README.md %license LICENSE -%license LICENSE.dependencies %_bindir/coolercontrol %_datadir/applications/%rdnn.desktop %_datadir/metainfo/%rdnn.metainfo.xml From cba779cf812b1ea6e0e49d6f3a99977f57d09ac3 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 20 Mar 2025 01:02:18 +0000 Subject: [PATCH 0394/2977] bump(branch): gstreamer1-plugin-libav gstreamer1-plugins-ugly --- .../gstreamer1-plugin-libav/gstreamer1-plugin-libav.spec | 2 +- .../gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugin-libav/gstreamer1-plugin-libav.spec b/anda/multimedia/gstreamer1/gstreamer1-plugin-libav/gstreamer1-plugin-libav.spec index ce6a4e2ae7..d72c9fcf3f 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugin-libav/gstreamer1-plugin-libav.spec +++ b/anda/multimedia/gstreamer1/gstreamer1-plugin-libav/gstreamer1-plugin-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-plugin-libav -Version: 1.24.11 +Version: 1.26.0 Release: 1%?dist Summary: GStreamer Libav plugin License: LGPLv2+ diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec b/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec index 11b773c4df..27658010ce 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec +++ b/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec @@ -1,7 +1,7 @@ %global majorminor 1.0 Name: gstreamer1-plugins-ugly -Version: 1.24.11 +Version: 1.26.0 Release: 1%?dist Summary: GStreamer streaming media framework "ugly" plugins License: LGPLv2+ and LGPLv2 From b9158a89ee1f5ec54a89d82972e4b41c68db1031 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 20 Mar 2025 01:41:06 +0000 Subject: [PATCH 0395/2977] bump(nightly): mpv nightly nightly prismlauncher-nightly nim-nightly nvidia-patch spotx-bash --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 6 +++--- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/system/nvidia-patch/nvidia-patch.spec | 4 ++-- anda/tools/spotx-bash/spotx-bash.spec | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 762aa61730..b1928e4ef6 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 8aa7d783d2dfc890102d349371bd2a9da67beb36 +%global commit 6171e4800ca1b613c6c1ac0273b08228b6f3f551 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250319 +%global commit_date 20250320 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index e57e3ff35a..5644953f18 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit bd7c5cc95f872d241ddc8aea4c81c540c6d9c19f +%global commit 88ff566e067682cf7cfd08659173780e6e369212 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-03-18 +%global fulldate 2025-03-19 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 5e49f0ac5d..992e0f8854 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,7 +1,7 @@ -%global commit 68a572873b2ee2dc6fc34894754b2083d7c2262f +%global commit 1cf252f8eb5e371597ccd1cafaee09da6503241c %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250319 -%global ver 0.179.0 +%global commit_date 20250320 +%global ver 0.180.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index f98d688959..c63af8e0a8 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit d0b9073f6031a7d93b3011c53f4e469e8f836a0d +%global commit 71e0c62feea70328f12de24711d9f8c9a1092624 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250317 +%global commit_date 20250320 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index c22ba06132..03f3643bbe 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 7c5d0055100caaa24ec570554690fb65fbdf3970 +%global commit 1d3260757502694a16f424212e93601b014207bf %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250319 +%global commit_date 20250320 %global debug_package %nil Name: nim-nightly diff --git a/anda/system/nvidia-patch/nvidia-patch.spec b/anda/system/nvidia-patch/nvidia-patch.spec index f5f1b712ef..a8f5713bd5 100644 --- a/anda/system/nvidia-patch/nvidia-patch.spec +++ b/anda/system/nvidia-patch/nvidia-patch.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} -%global commit f5128d450c29cdd0bc02ddf17221de9b57d5f6c8 +%global commit 07080317245ac30c38001d2149810b2dee3cce1f %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250312 +%global commit_date 20250320 %global patches %{_datadir}/src/nvidia-patch diff --git a/anda/tools/spotx-bash/spotx-bash.spec b/anda/tools/spotx-bash/spotx-bash.spec index 487f8f98fc..97b76ca756 100644 --- a/anda/tools/spotx-bash/spotx-bash.spec +++ b/anda/tools/spotx-bash/spotx-bash.spec @@ -1,5 +1,5 @@ -%global commit e6f41414072c283d9437168d00f7193fcbcecb52 -%global commit_date 20250319 +%global commit c685b9545a155d56b9a3fb5c61cfcd348f26d151 +%global commit_date 20250320 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: spotx-bash From 7461f7c0ec843842edc6068886c9ebaf80869873 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 20 Mar 2025 02:42:43 +0000 Subject: [PATCH 0396/2977] bump: umu electron --- anda/games/umu/umu-launcher.spec | 2 +- anda/tools/electron/electron.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/games/umu/umu-launcher.spec b/anda/games/umu/umu-launcher.spec index 84b2bedd4d..7d9cef45cc 100644 --- a/anda/games/umu/umu-launcher.spec +++ b/anda/games/umu/umu-launcher.spec @@ -1,5 +1,5 @@ Name: umu-launcher -Version: 1.2.5 +Version: 1.2.6 Release: 1%?dist Summary: A tool for launching non-steam games with proton diff --git a/anda/tools/electron/electron.spec b/anda/tools/electron/electron.spec index 35614b2a3a..d927f4b973 100644 --- a/anda/tools/electron/electron.spec +++ b/anda/tools/electron/electron.spec @@ -12,7 +12,7 @@ %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so Name: electron -Version: 35.0.2 +Version: 35.0.3 Release: 1%?dist Summary: Build cross platform desktop apps with web technologies License: MIT From 8f50bbc36245c0a5351e9c3789fa291e0f110e14 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 20 Mar 2025 03:19:09 +0000 Subject: [PATCH 0397/2977] bump: umu --- anda/games/umu/umu-launcher.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/umu/umu-launcher.spec b/anda/games/umu/umu-launcher.spec index 7d9cef45cc..84b2bedd4d 100644 --- a/anda/games/umu/umu-launcher.spec +++ b/anda/games/umu/umu-launcher.spec @@ -1,5 +1,5 @@ Name: umu-launcher -Version: 1.2.6 +Version: 1.2.5 Release: 1%?dist Summary: A tool for launching non-steam games with proton From c8813bf372fb09db793b76fb088d31ad9caf1a4a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 20 Mar 2025 03:43:54 +0000 Subject: [PATCH 0398/2977] bump: umu --- anda/games/umu/umu-launcher.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/umu/umu-launcher.spec b/anda/games/umu/umu-launcher.spec index 84b2bedd4d..7d9cef45cc 100644 --- a/anda/games/umu/umu-launcher.spec +++ b/anda/games/umu/umu-launcher.spec @@ -1,5 +1,5 @@ Name: umu-launcher -Version: 1.2.5 +Version: 1.2.6 Release: 1%?dist Summary: A tool for launching non-steam games with proton From 9726dc9e32d515efbd717721e6b07a4f1e7821c0 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 20 Mar 2025 12:31:18 +0800 Subject: [PATCH 0399/2977] chore: bump bodhi rawhide ver (#4028) Signed-off-by: madomado --- andax/bump_extras.rhai | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/andax/bump_extras.rhai b/andax/bump_extras.rhai index 3da0cb1c17..03e95abc3c 100644 --- a/andax/bump_extras.rhai +++ b/andax/bump_extras.rhai @@ -6,7 +6,7 @@ fn as_bodhi_ver(branch) { } return `EPEL-${release}`; } else if branch == "frawhide" { - return "F42"; + return "F43"; } else if branch.starts_with("f") { branch.crop(1); return `F${branch}`; From 7e18836476d717d723072f482e99c66e283efe1f Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Wed, 19 Mar 2025 21:38:58 -0700 Subject: [PATCH 0400/2977] fix(umu-launcher): Remove Steam directory (#4027) (#4032) * Remove directory Signed-off-by: Gilver * Update umu-launcher.spec Signed-off-by: Gilver * Bump release Signed-off-by: Gilver * Blegh IDK Signed-off-by: Gilver --------- Signed-off-by: Gilver (cherry picked from commit bcfaf9ed50e9337c1cb11b8c2a622cce02d0f84b) Co-authored-by: Gilver --- anda/games/umu/umu-launcher.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/anda/games/umu/umu-launcher.spec b/anda/games/umu/umu-launcher.spec index 7d9cef45cc..244a5deaeb 100644 --- a/anda/games/umu/umu-launcher.spec +++ b/anda/games/umu/umu-launcher.spec @@ -1,6 +1,6 @@ Name: umu-launcher Version: 1.2.6 -Release: 1%?dist +Release: 2%?dist Summary: A tool for launching non-steam games with proton License: GPL-3.0-only @@ -55,10 +55,9 @@ BuildArch: x86_64 %{make_build} %install -%make_install PYTHONDIR=%python3_sitelib +%make_install PYTHONDIR=%{python3_sitelib} %files %_bindir/umu-run %_mandir/* -%_datadir/steam/compatibilitytools.d/umu-launcher/ %python3_sitelib/umu* From c1be3294f128ddcabbf894a61a0463a5b854ccc1 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Wed, 19 Mar 2025 21:44:04 -0700 Subject: [PATCH 0401/2977] fix(ghostty-nightly): New tarball extracted directory (#4021) (#4035) * Update ghostty-nightly.spec Signed-off-by: Gilver * Update ghostty-nightly.spec Signed-off-by: Gilver --------- Signed-off-by: Gilver (cherry picked from commit 1c1a366dafdde27b40003954169d362f186ff463) Co-authored-by: Gilver --- anda/devs/ghostty/nightly/ghostty-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 5644953f18..c8289e6b62 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -135,7 +135,7 @@ This package contains files for Ghostty's terminfo. Available for debugging use. %prep /usr/bin/minisign -V -m %{SOURCE0} -x %{SOURCE1} -P %{public_key} -%autosetup -n %{base_name}-source +%autosetup -n %{base_name}-%{ver}-main+%{shortcommit} ZIG_GLOBAL_CACHE_DIR="%{cache_dir}" ./nix/build-support/fetch-zig-cache.sh From dce6c47d976e0388be2639e6ff2aa4a4b11b759e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 20 Mar 2025 08:26:26 +0000 Subject: [PATCH 0402/2977] bump: mock-configs --- anda/terra/mock-configs/terra-mock-configs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/terra/mock-configs/terra-mock-configs.spec b/anda/terra/mock-configs/terra-mock-configs.spec index d4db931a9e..b5d2de6a28 100644 --- a/anda/terra/mock-configs/terra-mock-configs.spec +++ b/anda/terra/mock-configs/terra-mock-configs.spec @@ -1,5 +1,5 @@ Name: terra-mock-configs -Version: 1.4.2 +Version: 1.4.3 Release: 1%?dist Epoch: 1 Summary: Mock configs for Terra repos From ac465bfe537393d3b4cbfdc8a35d1a2478dc80f2 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 20 Mar 2025 11:15:25 +0000 Subject: [PATCH 0403/2977] bump: kotlin-native kotlin --- anda/langs/kotlin/kotlin-native/kotlin-native.spec | 2 +- anda/langs/kotlin/kotlin/kotlin.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/langs/kotlin/kotlin-native/kotlin-native.spec b/anda/langs/kotlin/kotlin-native/kotlin-native.spec index 699527370a..9a16a4fdfa 100644 --- a/anda/langs/kotlin/kotlin-native/kotlin-native.spec +++ b/anda/langs/kotlin/kotlin-native/kotlin-native.spec @@ -2,7 +2,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Name: kotlin-native -Version: 2.1.10 +Version: 2.1.20 Release: 1%?dist Summary: LLVM backend for the Kotlin compiler ExclusiveArch: x86_64 diff --git a/anda/langs/kotlin/kotlin/kotlin.spec b/anda/langs/kotlin/kotlin/kotlin.spec index d5671714d1..e9927bb668 100644 --- a/anda/langs/kotlin/kotlin/kotlin.spec +++ b/anda/langs/kotlin/kotlin/kotlin.spec @@ -1,7 +1,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Name: kotlin -Version: 2.1.10 +Version: 2.1.20 Release: 1%?dist Summary: Statically typed programming language From a993965401fc82cdbdc3f8e889c3006e65e55161 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 20 Mar 2025 13:58:40 +0000 Subject: [PATCH 0404/2977] bump: mesa --- anda/lib/mesa/mesa.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index 10118f22ff..04b3105fea 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -75,8 +75,8 @@ Summary: Mesa graphics libraries # This should not break anything by default as the Mesa stream is ***EXPLICITLY*** # disabled by default, and has to be enabled manually. See `terra/release/terra-mesa.repo` for details. Epoch: 1 -Version: 25.0.1 -Release: 6%?dist +Version: 25.0.2 +Release: 1%?dist License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org From e5e31bc01fc471385d35ed6d324bb283bc86dad0 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 20 Mar 2025 23:12:48 +0800 Subject: [PATCH 0405/2977] add: android-udev-rules (#4053) --- anda/misc/android-udev-rules/anda.hcl | 6 +++ .../android-udev-rules.spec | 39 +++++++++++++++++++ anda/misc/android-udev-rules/update.rhai | 1 + 3 files changed, 46 insertions(+) create mode 100644 anda/misc/android-udev-rules/anda.hcl create mode 100644 anda/misc/android-udev-rules/android-udev-rules.spec create mode 100644 anda/misc/android-udev-rules/update.rhai diff --git a/anda/misc/android-udev-rules/anda.hcl b/anda/misc/android-udev-rules/anda.hcl new file mode 100644 index 0000000000..eef4daadda --- /dev/null +++ b/anda/misc/android-udev-rules/anda.hcl @@ -0,0 +1,6 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "android-udev-rules.spec" + } +} diff --git a/anda/misc/android-udev-rules/android-udev-rules.spec b/anda/misc/android-udev-rules/android-udev-rules.spec new file mode 100644 index 0000000000..23a4b8a73a --- /dev/null +++ b/anda/misc/android-udev-rules/android-udev-rules.spec @@ -0,0 +1,39 @@ +#? https://github.com/M0Rf30/android-udev-rules/blob/main/rpm/android-udev-rules.spec +Name: android-udev-rules +Version: 20250314 +Release: 1%{?dist} +Summary: Udev rules to connect Android devices to your linux box +License: GPL-3.0-or-later +URL: https://github.com/M0Rf30/android-udev-rules +Source0: https://raw.githubusercontent.com/M0Rf30/android-udev-rules/%version/51-android.rules +Source1: https://raw.githubusercontent.com/M0Rf30/android-udev-rules/%version/README.md +Source2: https://raw.githubusercontent.com/M0Rf30/android-udev-rules/%version/LICENSE +Source3: https://raw.githubusercontent.com/M0Rf30/android-udev-rules/%version/android-udev.conf +BuildArch: noarch +BuildRequires: rpm_macro(_udevrulesdir) +BuildRequires: rpm_macro(udev_rules_update) +Requires: systemd-udev + +%description +Android udev rules list aimed to be the most comprehensive on the net. +Based on the official Android Studio documentation as well as suggestions from +the Archlinux and Github Communities. + +%prep +cp %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} . + +%install +install -Dm644 51-android.rules -t %buildroot%_udevrulesdir +install -Dm644 android-udev.conf -t %buildroot%_sysusersdir + +%post +%udev_rules_update + +%postun +%udev_rules_update + +%files +%_udevrulesdir/51-android.rules +%_sysusersdir/android-udev.conf +%license LICENSE +%doc README.md diff --git a/anda/misc/android-udev-rules/update.rhai b/anda/misc/android-udev-rules/update.rhai new file mode 100644 index 0000000000..cefbcca2ce --- /dev/null +++ b/anda/misc/android-udev-rules/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("M0Rf30/android-udev-rules")); From 6dd3e7dcbe0600bc7142eca946bcc2908d34bf19 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 20 Mar 2025 23:13:07 +0800 Subject: [PATCH 0406/2977] fix: gping (#4050) * fix: gping Signed-off-by: madomado * remake spec * Update rust-gping.spec Signed-off-by: madomado --------- Signed-off-by: madomado --- anda/langs/rust/gping/rust-gping.spec | 51 +++++++-------------------- 1 file changed, 13 insertions(+), 38 deletions(-) diff --git a/anda/langs/rust/gping/rust-gping.spec b/anda/langs/rust/gping/rust-gping.spec index af09112d5e..3adb117a78 100644 --- a/anda/langs/rust/gping/rust-gping.spec +++ b/anda/langs/rust/gping/rust-gping.spec @@ -1,20 +1,19 @@ -# Generated by rust2rpm 23 -%bcond_without check +%global __brp_mangle_shebangs %{nil} -# shebangs = 21 mold @@ -25,54 +24,30 @@ Ping, but with a graph.} %package -n %{crate} Summary: %{summary} +License: (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND MIT AND (MIT AND Apache-2.0) AND (MIT OR Apache-2.0) AND Unicode-3.0 AND (Unlicense OR MIT) AND Zlib +# LICENSE.dependencies contains a full license breakdown %description -n %{crate} %{_description} %files -n %{crate} -# FIXME: no license files detected +%license LICENSE +%license LICENSE.dependencies %doc readme.md %{_bindir}/gping -%package devel -Summary: %{summary} -BuildArch: noarch - -%description devel %{_description} - -This package contains library source intended for building other packages which -use the "%{crate}" crate. - -%files devel -# FIXME: no license files detected -%doc %{crate_instdir}/readme.md -%{crate_instdir}/ - -%package -n %{name}+default-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+default-devel %{_description} - -This package contains library source intended for building other packages which -use the "default" feature of the "%{crate}" crate. - -%files -n %{name}+default-devel -%ghost %{crate_instdir}/Cargo.toml - %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep_online %build -%cargo_build +%{cargo_license_summary_online} +%{cargo_license_online} > LICENSE.dependencies %install %cargo_install +cp %{S:1} . %if %{with check} %check %cargo_test %endif - -%changelog -%autochangelog From 2146618674c42b6c009adefb489da32f93c84318 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 20 Mar 2025 23:13:19 +0800 Subject: [PATCH 0407/2977] rebuild: rust-jellyfin-rpc-cli (#4052) Signed-off-by: madomado --- anda/langs/rust/jellyfin-rpc/rust-jellyfin-rpc-cli.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/rust/jellyfin-rpc/rust-jellyfin-rpc-cli.spec b/anda/langs/rust/jellyfin-rpc/rust-jellyfin-rpc-cli.spec index d7c72a1b9f..a3263a8a40 100644 --- a/anda/langs/rust/jellyfin-rpc/rust-jellyfin-rpc-cli.spec +++ b/anda/langs/rust/jellyfin-rpc/rust-jellyfin-rpc-cli.spec @@ -6,7 +6,7 @@ Name: rust-jellyfin-rpc-cli Version: 1.3.1 -Release: 1%?dist +Release: 2%?dist Summary: Displays the content you're currently watching on Discord! License: GPL-3.0-or-later From 6ae829be292944157739a6287f30e89a78b1bd9a Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 20 Mar 2025 23:13:31 +0800 Subject: [PATCH 0408/2977] fix(files): apparmor (#3429) * fix(files): apparmor Signed-off-by: madomado * Update apparmor.spec Signed-off-by: madomado * Update apparmor.spec Signed-off-by: madomado * Update apparmor.spec Signed-off-by: madomado * Update apparmor.spec Signed-off-by: madomado --------- Signed-off-by: madomado --- anda/lib/apparmor/apparmor.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/anda/lib/apparmor/apparmor.spec b/anda/lib/apparmor/apparmor.spec index 85d4399eb7..1c25e6c350 100644 --- a/anda/lib/apparmor/apparmor.spec +++ b/anda/lib/apparmor/apparmor.spec @@ -1,6 +1,7 @@ %{?python_enable_dependency_generator} %global __arch_install_post /bin/true +%global _sbindir /usr/sbin %bcond_with tests @@ -291,6 +292,7 @@ make -C utils check %{_mandir}/man5/apparmor.vim.5.gz %{_mandir}/man7/apparmor.7.gz %{_mandir}/man7/apparmor_xattrs.7.gz +%{_mandir}/man8/aa-load.8.gz %{_mandir}/man8/aa-teardown.8.gz %{_mandir}/man8/apparmor_parser.8.gz @@ -303,6 +305,7 @@ make -C utils check %config(noreplace) %{_sysconfdir}/apparmor/logprof.conf %config(noreplace) %{_sysconfdir}/apparmor/notify.conf %config(noreplace) %{_sysconfdir}/apparmor/severity.db +%{_bindir}/aa-easyprof %{_sbindir}/aa-audit %{_sbindir}/aa-autodep %{_sbindir}/aa-cleanprof @@ -318,11 +321,10 @@ make -C utils check %{_sbindir}/aa-status %{_sbindir}/aa-unconfined %{_sbindir}/apparmor_status -%{_bindir}/aa-easyprof %dir %{_datadir}/apparmor %{_datadir}/apparmor/easyprof %{_datadir}/apparmor/apparmor.vim -%{_datadir}/polkit-1/actions/com.ubuntu.pkexec.aa-notify.policy +%{_datadir}/polkit-1/actions/net.apparmor.pkexec.aa-notify.policy %{_mandir}/man5/logprof.conf.5.gz %{_mandir}/man8/aa-audit.8.gz %{_mandir}/man8/aa-autodep.8.gz From bcb9f8ea7cfa1d95d2a6d631fa7133e685729458 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 20 Mar 2025 23:13:46 +0800 Subject: [PATCH 0409/2977] fix(lightly-qt5): update.rhai (#4045) Signed-off-by: madomado --- anda/themes/lightly-qt5/update.rhai | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/themes/lightly-qt5/update.rhai b/anda/themes/lightly-qt5/update.rhai index aa9465c548..445e062962 100644 --- a/anda/themes/lightly-qt5/update.rhai +++ b/anda/themes/lightly-qt5/update.rhai @@ -1,4 +1,4 @@ -fn main() { +fn main(labels) { let branch = bump::as_bodhi_ver(labels.branch); let url = `https://bodhi.fedoraproject.org/updates/?search=qt5-5.&status=stable&releases=${branch}&rows_per_page=1&page=1`; for entry in get(url).json().updates[0].title.split(' ') { @@ -9,4 +9,4 @@ fn main() { } } -open_file("anda/themes/lightly-qt5/VER5.txt").write(`${main()}`); // will trig rebuild when changed +open_file("anda/themes/lightly-qt5/VER5.txt").write(`${main(labels)}`); // will trig rebuild when changed From 5488ba77dfbef7590712f61fa995432b833375f9 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 20 Mar 2025 23:14:00 +0800 Subject: [PATCH 0410/2977] fix(gnome-shell-extension-appmenu-is-back): bump gnome-shell requires (#4048) Signed-off-by: madomado --- .../gnome-shell-extension-appmenu-is-back.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/gnome/gnome-shell-extension-appmenu-is-back/gnome-shell-extension-appmenu-is-back.spec b/anda/desktops/gnome/gnome-shell-extension-appmenu-is-back/gnome-shell-extension-appmenu-is-back.spec index 7c10a07483..fe8aa23070 100644 --- a/anda/desktops/gnome/gnome-shell-extension-appmenu-is-back/gnome-shell-extension-appmenu-is-back.spec +++ b/anda/desktops/gnome/gnome-shell-extension-appmenu-is-back/gnome-shell-extension-appmenu-is-back.spec @@ -13,7 +13,7 @@ BuildArch: noarch Source0: https://github.com/fthx/appmenu-is-back/archive/refs/tags/v%{version}.tar.gz Patch0: https://github.com/fthx/appmenu-is-back/compare/v2..703a31acf900eb7bcab3462baeefa815ec7f13ab.patch -Requires: (gnome-shell >= 46~ with gnome-shell < 48~) +Requires: (gnome-shell >= 47~ with gnome-shell < 49~) Recommends: gnome-extensions-app %description From 7dbc8458d6232cb3b2ccd6c229612cb2689bcd5a Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 20 Mar 2025 23:14:16 +0800 Subject: [PATCH 0411/2977] bump(flashprog): 1.4 (#4049) Signed-off-by: madomado --- anda/tools/flashprog/flashprog.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/flashprog/flashprog.spec b/anda/tools/flashprog/flashprog.spec index 82f60de9df..050d880937 100644 --- a/anda/tools/flashprog/flashprog.spec +++ b/anda/tools/flashprog/flashprog.spec @@ -4,7 +4,7 @@ flashprog is a utility for detecting, reading, writing, verifying and erasing fl It supports a wide range of flash chips (most commonly found in SOIC8, DIP8, SOIC16, WSON8, PLCC32, DIP32, TSOP32, and TSOP40 packages), which use various protocols such as LPC, FWH, parallel flash, or SPI.} Name: flashprog -Version: 1.3 +Version: 1.4 Release: 1%{?dist} Summary: Utility for detecting, reading, writing, verifying and erasing flash chips From f5ca396c7f83b2d0b0c0325b6dd779b02f7feda7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 20 Mar 2025 16:23:32 +0000 Subject: [PATCH 0412/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 5b69d26252..6b678cae99 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.612 +Version: 0.0.613 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index b9ac3b79b4..16476f702a 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.612 +Version: 0.0.613 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 2bdf18113708aa1da67c13cd2ecd5aaf15d30d6b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 20 Mar 2025 16:46:01 +0000 Subject: [PATCH 0413/2977] bump: discord-canary-openasar discord-canary osu-lazer --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- anda/games/osu-lazer/osu-lazer.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 6b678cae99..ec06be9b22 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.613 +Version: 0.0.614 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 16476f702a..2d2c9f56b2 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.613 +Version: 0.0.614 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index 3f97d31c05..e3207bf781 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -1,4 +1,4 @@ -%define osuresver 2025.318.0 +%define osuresver 2025.321.0 %global debug_package %{nil} %define __strip /bin/true From 716ae20129ce97e201f8b3c0db459822768c92d4 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Thu, 20 Mar 2025 10:30:14 -0700 Subject: [PATCH 0414/2977] fix(heroic): Install icons to the correct directory and remove unused files (#4022) (#4080) * Update heroic-games-launcher.spec Signed-off-by: Gilver * Uh fix icon directories Signed-off-by: Gilver * Files list Signed-off-by: Gilver * I need coffee Signed-off-by: Gilver * Update heroic-games-launcher.spec Signed-off-by: Gilver --------- Signed-off-by: Gilver (cherry picked from commit 210088b8438cf49a2267b8a6fd869ceb943fff64) Co-authored-by: Gilver --- .../heroic-games-launcher.spec | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/anda/games/heroic-games-launcher/heroic-games-launcher.spec b/anda/games/heroic-games-launcher/heroic-games-launcher.spec index 03912476f0..35ed2f1365 100644 --- a/anda/games/heroic-games-launcher/heroic-games-launcher.spec +++ b/anda/games/heroic-games-launcher/heroic-games-launcher.spec @@ -17,7 +17,7 @@ Name: %{shortname}-games-launcher Version: 2.16.1 -Release: 2%?dist +Release: 3%?dist Summary: A games launcher for GOG, Amazon, and Epic Games License: GPL-3.0-only AND MIT AND BSD-3-Clause URL: https://heroicgameslauncher.com @@ -63,7 +63,9 @@ pnpm dist:linux %install mkdir -p %{buildroot}%{_datadir}/%{shortname} mv $(find . -iname "*LICENSE*" -not -path "./node_modules/*" -and -not -path "./public/*") . -mv LICENSE LICENSE.fonts +mv LICENSE node-font-list.LICENSE +rm -rf dist/linux-unpacked/resources/app.asar.unpacked/node_modules/font-list/libs/darwin +rm -rf dist/linux-unpacked/resources/app.asar.unpacked/node_modules/font-list/libs/win32 %ifarch aarch64 ### Needs testing once aarch64 Heroic is complete: #rm -rf dist/linux-unpacked/resources/app.asar.unpacked/build/bin/x64 @@ -76,14 +78,14 @@ mkdir -p %{buildroot}%{_bindir} # Make names executable ln -sr %{_datadir}/%{shortname}/%{shortname} %{buildroot}%{_bindir}/%{name} ln -sr %{_datadir}/%{shortname}/%{shortname} %{buildroot}%{_bindir}/%{shortname} -install -Dm644 dist/.icon-set/icon_16x16.png %{buildroot}%{_iconsdir}/hicolor/16x16/%{shortname}.png -install -Dm644 dist/.icon-set/icon_32x32.png %{buildroot}%{_iconsdir}/hicolor/32x32/%{shortname}.png -install -Dm644 dist/.icon-set/icon_48x48.png %{buildroot}%{_iconsdir}/hicolor/48x48/%{shortname}.png -install -Dm644 dist/.icon-set/icon_64x64.png %{buildroot}%{_iconsdir}/hicolor/64x64/%{shortname}.png -install -Dm644 dist/.icon-set/icon_128x128.png %{buildroot}%{_iconsdir}/hicolor/128x128/%{shortname}.png -install -Dm644 dist/.icon-set/icon_256x256.png %{buildroot}%{_iconsdir}/hicolor/256x256/%{shortname}.png -install -Dm644 dist/.icon-set/icon_512x512.png %{buildroot}%{_iconsdir}/hicolor/512x512/%{shortname}.png -install -Dm644 dist/.icon-set/icon_1024.png %{buildroot}%{_iconsdir}/hicolor/1024x1024/%{shortname}.png +install -Dm644 dist/.icon-set/icon_16x16.png %{buildroot}%{_iconsdir}/hicolor/16x16/apps/%{shortname}.png +install -Dm644 dist/.icon-set/icon_32x32.png %{buildroot}%{_iconsdir}/hicolor/32x32/apps/%{shortname}.png +install -Dm644 dist/.icon-set/icon_48x48.png %{buildroot}%{_iconsdir}/hicolor/48x48/apps/%{shortname}.png +install -Dm644 dist/.icon-set/icon_64x64.png %{buildroot}%{_iconsdir}/hicolor/64x64/apps/%{shortname}.png +install -Dm644 dist/.icon-set/icon_128x128.png %{buildroot}%{_iconsdir}/hicolor/128x128/apps/%{shortname}.png +install -Dm644 dist/.icon-set/icon_256x256.png %{buildroot}%{_iconsdir}/hicolor/256x256/apps/%{shortname}.png +install -Dm644 dist/.icon-set/icon_512x512.png %{buildroot}%{_iconsdir}/hicolor/512x512/apps/%{shortname}.png +install -Dm644 dist/.icon-set/icon_1024.png %{buildroot}%{_iconsdir}/hicolor/1024x1024/apps/%{shortname}.png install -Dm644 flatpak/%{reverse_dns}.desktop %{buildroot}%{_datadir}/applications/%{shortname}.desktop %check @@ -96,20 +98,20 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{shortname}.desktop %license legendary.LICENSE %license LICENSES.chromium.html %license LICENSE.electron.txt -%license LICENSE.fonts +%license node-font-list.LICENSE %dir %{_datadir}/%{shortname} %{_datadir}/%{shortname}/* %{_bindir}/%{shortname} %{_bindir}/%{name} %{_datadir}/applications/%{shortname}.desktop -%{_iconsdir}/hicolor/16x16/%{shortname}.png -%{_iconsdir}/hicolor/32x32/%{shortname}.png -%{_iconsdir}/hicolor/48x48/%{shortname}.png -%{_iconsdir}/hicolor/64x64/%{shortname}.png -%{_iconsdir}/hicolor/128x128/%{shortname}.png -%{_iconsdir}/hicolor/256x256/%{shortname}.png -%{_iconsdir}/hicolor/512x512/%{shortname}.png -%{_iconsdir}/hicolor/1024x1024/%{shortname}.png +%{_iconsdir}/hicolor/16x16/apps/%{shortname}.png +%{_iconsdir}/hicolor/32x32/apps/%{shortname}.png +%{_iconsdir}/hicolor/48x48/apps/%{shortname}.png +%{_iconsdir}/hicolor/64x64/apps/%{shortname}.png +%{_iconsdir}/hicolor/128x128/apps/%{shortname}.png +%{_iconsdir}/hicolor/256x256/apps/%{shortname}.png +%{_iconsdir}/hicolor/512x512/apps/%{shortname}.png +%{_iconsdir}/hicolor/1024x1024/apps/%{shortname}.png %changelog * Sun Mar 02 2025 Gilver E. From 5789e24527d4f9a1c0c5c8bb99fb80c4a6147b3d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 20 Mar 2025 17:35:37 +0000 Subject: [PATCH 0415/2977] bump: discord-ptb-openasar discord-ptb --- anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec | 2 +- anda/apps/discord-ptb/discord-ptb.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec index 169a381cfb..a1bacf8ad9 100644 --- a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec +++ b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-ptb-openasar -Version: 0.0.134 +Version: 0.0.135 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-ptb/discord-ptb.spec b/anda/apps/discord-ptb/discord-ptb.spec index 78464ae2e7..1164c6ba3c 100644 --- a/anda/apps/discord-ptb/discord-ptb.spec +++ b/anda/apps/discord-ptb/discord-ptb.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-ptb -Version: 0.0.134 +Version: 0.0.135 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers. URL: https://discord.com From 9b7e00d2911f5c29c978acbf1ee763b26e76cbbe Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 20 Mar 2025 17:55:41 +0000 Subject: [PATCH 0416/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index ec06be9b22..4225084eb6 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.614 +Version: 0.0.615 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 2d2c9f56b2..249e821fb5 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.614 +Version: 0.0.615 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 46b6c3e8d41a7723f89dc4967bed96cf85e0c9b9 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 20 Mar 2025 19:26:27 +0000 Subject: [PATCH 0417/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 5d77892ac0..80afeae051 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.179.0-pre +%global ver 0.179.1-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From aa8a65e9996703559683f9b0c8f41f5d565f2631 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 20 Mar 2025 20:26:29 +0000 Subject: [PATCH 0418/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 4225084eb6..c1a7625bb4 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.615 +Version: 0.0.616 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 249e821fb5..bc534b9719 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.615 +Version: 0.0.616 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From e70326679f6da40e121e7aec9b29a10a3998991f Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 21 Mar 2025 06:31:29 +0800 Subject: [PATCH 0419/2977] fix(ffmpeg): update script (#4044) Signed-off-by: madomado --- anda/multimedia/ffmpeg/update.rhai | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/multimedia/ffmpeg/update.rhai b/anda/multimedia/ffmpeg/update.rhai index 989870ef6c..69e2e89df5 100644 --- a/anda/multimedia/ffmpeg/update.rhai +++ b/anda/multimedia/ffmpeg/update.rhai @@ -8,7 +8,7 @@ if branch.starts_with("f") { } let ffmpeg_ver = get(`https://madoguchi.fyralabs.com/v4/terra${branch}/packages/x265`).json().ver; -open_file("anda/fusion/ffmpeg/VERSION_x265.txt", "w").write(ffmpeg_ver); +open_file("anda/multimedia/ffmpeg/VERSION_x265.txt", "w").write(ffmpeg_ver); let tesseract_ver = bump::bodhi("tesseract", bump::as_bodhi_ver(labels.branch)); -open_file("anda/fusion/ffmpeg/VERSION_tesseract.txt", "w").write(tesseract_ver); +open_file("anda/multimedia/ffmpeg/VERSION_tesseract.txt", "w").write(tesseract_ver); From fde79fa76a98d4d45845c8e6856a644d9f5c2335 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 20 Mar 2025 22:56:01 +0000 Subject: [PATCH 0420/2977] bump: komikku --- anda/apps/komikku/komikku.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/komikku/komikku.spec b/anda/apps/komikku/komikku.spec index ffd50db4e9..dc2ee7c852 100644 --- a/anda/apps/komikku/komikku.spec +++ b/anda/apps/komikku/komikku.spec @@ -5,9 +5,9 @@ %global pure_protobuf_version 2.0.0 Name: komikku -Version: 1.72.0 +Version: 1.73.0 %forgemeta -Release: 2%?dist +Release: 1%?dist Summary: A manga reader for GNOME BuildArch: noarch From 4373257faa2cd4ae1f88b9a9badf97d3c5b7c11f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 20 Mar 2025 23:18:07 +0000 Subject: [PATCH 0421/2977] bump: coolercontrol --- anda/apps/coolercontrol/coolercontrol.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/coolercontrol/coolercontrol.spec b/anda/apps/coolercontrol/coolercontrol.spec index 0da852c577..1661976435 100644 --- a/anda/apps/coolercontrol/coolercontrol.spec +++ b/anda/apps/coolercontrol/coolercontrol.spec @@ -8,7 +8,7 @@ for background device management, as well as a GUI to expertly customize your se %global __brp_mangle_shebangs %{nil} Name: coolercontrol -Version: 2.0.0 +Version: 2.0.1 Release: 1%?dist Summary: Cooling device control for Linux License: GPL-3.0-or-later From 7a445f66b9edea75713ec45da3fb4c85e6937758 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 21 Mar 2025 01:25:20 +0000 Subject: [PATCH 0422/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index a824a3a097..c07311ad1b 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-18 +%global ver 2025-03-21 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 33ff5c7356099a521bee030890bf10edf9c5c4da Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 21 Mar 2025 01:42:49 +0000 Subject: [PATCH 0423/2977] bump(nightly): nightly nightly prismlauncher-nightly --- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index c8289e6b62..382fc9f526 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 88ff566e067682cf7cfd08659173780e6e369212 +%global commit 1980f9aed46e92e8a5ed9df8677ac18635a63dad %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-03-19 +%global fulldate 2025-03-20 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 992e0f8854..60ed2317f4 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 1cf252f8eb5e371597ccd1cafaee09da6503241c +%global commit 9134630841f0a622a1f5c7e7354e8894cc1ae0e5 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250320 +%global commit_date 20250321 %global ver 0.180.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index c63af8e0a8..938a041b75 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 71e0c62feea70328f12de24711d9f8c9a1092624 +%global commit 216034c2833c87ef2e9728711d89d605ff54fd42 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250320 +%global commit_date 20250321 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 From ff99bb8b7196884323c0927ac090daa8c92a13d3 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 21 Mar 2025 03:21:06 +0000 Subject: [PATCH 0424/2977] bump: inputplumber --- anda/games/inputplumber/inputplumber.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index 9da9193455..6b26c38578 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.49.5 +Version: 0.49.6 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later From 6dea9c11d8bf0a2831602ccf7c401abd82b7d902 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 21 Mar 2025 06:27:33 +0000 Subject: [PATCH 0425/2977] bump: opengamepadui --- anda/games/opengamepadui/opengamepadui.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/opengamepadui/opengamepadui.spec b/anda/games/opengamepadui/opengamepadui.spec index 7c1075e7a2..1119c9af65 100644 --- a/anda/games/opengamepadui/opengamepadui.spec +++ b/anda/games/opengamepadui/opengamepadui.spec @@ -1,5 +1,5 @@ Name: opengamepadui -Version: 0.37.0 +Version: 0.37.1 Release: 1%?dist Summary: Open source gamepad-native game launcher and overlay From bf3c55fb4857e9a0d66afddbb246d42dfb192460 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 21 Mar 2025 08:55:45 +0000 Subject: [PATCH 0426/2977] bump: zellij --- anda/langs/rust/zellij/rust-zellij.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/rust/zellij/rust-zellij.spec b/anda/langs/rust/zellij/rust-zellij.spec index 0cfbad8b15..65aa0e5789 100644 --- a/anda/langs/rust/zellij/rust-zellij.spec +++ b/anda/langs/rust/zellij/rust-zellij.spec @@ -5,7 +5,7 @@ %global crate zellij Name: rust-zellij -Version: 0.42.0 +Version: 0.42.1 Release: 1%?dist Summary: Terminal workspace with batteries included From 85d3d51ae5023e28ee1fe2b25f26cc3d7c2fa23c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 21 Mar 2025 12:48:39 +0000 Subject: [PATCH 0427/2977] bump: youki --- anda/langs/rust/youki/youki.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/rust/youki/youki.spec b/anda/langs/rust/youki/youki.spec index 6f0fb7b532..ab3dc5ec9b 100644 --- a/anda/langs/rust/youki/youki.spec +++ b/anda/langs/rust/youki/youki.spec @@ -1,5 +1,5 @@ Name: youki -Version: 0.5.2 +Version: 0.5.3 Release: 1%?dist Summary: A container runtime written in Rust From 0a2b3419d188482d310e9ec716b3fe7c9ccb1565 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 21 Mar 2025 14:55:40 +0000 Subject: [PATCH 0428/2977] bump: osu-lazer --- anda/games/osu-lazer/osu-lazer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index e3207bf781..fed38b4979 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -3,7 +3,7 @@ %define __strip /bin/true Name: osu-lazer -Version: 2025.316.0 +Version: 2025.321.0 Release: 1%?dist Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew. ExclusiveArch: x86_64 From f66d4134b022ef13edb70d40df148515c382838c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 21 Mar 2025 16:24:28 +0000 Subject: [PATCH 0429/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index 4b0c4356ca..74682ca77a 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.3.6 +Version: 2025.3.7 Release: 1%?dist Summary: Front-end to your dev env From 417c2d6c7549dc89d222a2d85ef6a78d6c50e498 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Fri, 21 Mar 2025 09:36:04 -0700 Subject: [PATCH 0430/2977] fix(komikku): Fetch correct archive URL (#4087) (#4093) * Update komikku.spec Signed-off-by: Gilver * Bump release Signed-off-by: Gilver --------- Signed-off-by: Gilver (cherry picked from commit 3de7640a96bd6e608bfc6e87ebdd88be52a332ca) Co-authored-by: Gilver --- anda/apps/komikku/komikku.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/komikku/komikku.spec b/anda/apps/komikku/komikku.spec index dc2ee7c852..25a11427d3 100644 --- a/anda/apps/komikku/komikku.spec +++ b/anda/apps/komikku/komikku.spec @@ -7,14 +7,14 @@ Name: komikku Version: 1.73.0 %forgemeta -Release: 1%?dist +Release: 2%?dist Summary: A manga reader for GNOME BuildArch: noarch License: GPL-3.0-or-later URL: https://valos.gitlab.io/Komikku -Source0: https://codeberg.org/valos/%{appname}/archive/v%{version}.tar.gz#/%{name}-v%{version}.tar.gz +Source0: https://codeberg.org/valos/%{appname}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: desktop-file-utils BuildRequires: intltool From d167b304d58fb5ad5279df296ddf20acc94c1c65 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Fri, 21 Mar 2025 09:37:19 -0700 Subject: [PATCH 0431/2977] fix(uutils-coreutils-replace): Update patch (#4083) (#4096) * Update metadata patch Signed-off-by: Gilver * Create coreutils-drop-conv.diff Signed-off-by: Gilver * Nevermind this is unused??? Signed-off-by: Gilver * Drop dates I guess? Signed-off-by: Gilver * Manual update Signed-off-by: Gilver * Wh Signed-off-by: Gilver --------- Signed-off-by: Gilver (cherry picked from commit 729b0a6f2aa78d8052d82a652bce11ff1dbb51c1) Co-authored-by: Gilver --- .../coreutils-fix-metadata.diff | 41 ++++++++++++------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/anda/system/uutils-coreutils-replace/coreutils-fix-metadata.diff b/anda/system/uutils-coreutils-replace/coreutils-fix-metadata.diff index 2ae3d7b2f0..793737b640 100644 --- a/anda/system/uutils-coreutils-replace/coreutils-fix-metadata.diff +++ b/anda/system/uutils-coreutils-replace/coreutils-fix-metadata.diff @@ -2,39 +2,52 @@ +++ coreutils-*/Cargo.toml @@ -18,6 +18,7 @@ categories = ["command-line-utilities"] - rust-version = "1.79.0" + rust-version = "1.82.0" edition = "2021" +autobins = false - + build = "build.rs" - -@@ -325,7 +326,7 @@ - rand_core = "0.6.4" + +@@ -25,7 +26,11 @@ + all-features = true + + [features] +-default = ["feat_common_core"] ++default = [ ++ "feat_acl", ++ "feat_common_core", ++ "feat_selinux", ++] + ## OS feature shortcodes + macos = ["feat_os_macos"] + unix = ["feat_os_unix"] +@@ -325,7 +330,7 @@ + rand_core = "0.9.0" rayon = "1.10" regex = "1.10.4" --rstest = "0.24.0" -+rstest = ">=0.24" +-rstest = "0.25.0" ++rstest = ">=0.25,<0.28" rust-ini = "0.21.0" same-file = "1.0.6" self_cell = "1.0.4" -@@ -514,7 +515,7 @@ +@@ -516,7 +521,7 @@ rstest = { workspace = true } - + [target.'cfg(any(target_os = "linux", target_os = "android"))'.dev-dependencies] -procfs = { version = "0.17", default-features = false } -+procfs = { version = ">=0.16, <0.18", default-features = false } - ++procfs = { version = ">=0.17, <0.18", default-features = false } + [target.'cfg(unix)'.dev-dependencies] nix = { workspace = true, features = ["process", "signal", "user", "term"] } -@@ -537,11 +538,6 @@ +@@ -538,11 +543,6 @@ name = "coreutils" path = "src/bin/coreutils.rs" -- + -[[bin]] -name = "uudoc" -path = "src/bin/uudoc.rs" -required-features = ["uudoc"] - +- # The default release profile. It contains all optimizations, without # sacrificing debug info. With this profile (like in the standard # release profile), the debug info and the stack traces will still be available. From 2926f99d93f8cc6d53fcf76cfda0fab5515cd717 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 21 Mar 2025 16:49:35 +0000 Subject: [PATCH 0432/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index c1a7625bb4..f21892bb30 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.616 +Version: 0.0.617 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index bc534b9719..b911c978d4 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.616 +Version: 0.0.617 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 1774a52025082f37dc62a2c3627afd5f9b2fe358 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 21 Mar 2025 17:34:38 +0000 Subject: [PATCH 0433/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index f21892bb30..fb180a2b0a 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.617 +Version: 0.0.618 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index b911c978d4..8c83aad9f1 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.617 +Version: 0.0.618 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 568f9f4e73b9944945b0fc799f4023c0af39b086 Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 22 Mar 2025 04:27:09 +0800 Subject: [PATCH 0434/2977] fix(coolercontrol): bake the ui into the daemon properly (#4091) Resolve #4090 --- anda/apps/coolercontrol/coolercontrol.spec | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/anda/apps/coolercontrol/coolercontrol.spec b/anda/apps/coolercontrol/coolercontrol.spec index 1661976435..3242b1bd12 100644 --- a/anda/apps/coolercontrol/coolercontrol.spec +++ b/anda/apps/coolercontrol/coolercontrol.spec @@ -9,7 +9,7 @@ for background device management, as well as a GUI to expertly customize your se Name: coolercontrol Version: 2.0.1 -Release: 1%?dist +Release: 2%?dist Summary: Cooling device control for Linux License: GPL-3.0-or-later URL: https://gitlab.com/coolercontrol/coolercontrol @@ -59,13 +59,16 @@ pushd coolercontrold %cargo_prep_online & popd +pushd coolercontrol-ui +npm ci --prefer-offline & +popd + wait %build -pushd coolercontrold -%{cargo_license_online} > LICENSE.dependencies & -%cargo_build -- & +pushd coolercontrol-ui +npm run build-only & popd pushd coolercontrol-liqctld @@ -74,10 +77,15 @@ popd pushd coolercontrol %cmake -%cmake_build -wait +%cmake_build & popd +pushd coolercontrold +%{cargo_license_online} > LICENSE.dependencies & +wait +cp -rfp ../coolercontrol-ui/dist/* resources/app/ +%cargo_build +popd %install pushd coolercontrol-liqctld From 6e7d2305b8a7faa109cefe53fe2a6f59374c1527 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 21 Mar 2025 21:22:20 +0000 Subject: [PATCH 0435/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 0caa9f90d0..b7c5ef595e 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.16.221236 +Version: 2025.03.21.205828 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From dabc98e3f7a63c911f92dbd87519310a2a033bd8 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 21 Mar 2025 21:46:27 +0000 Subject: [PATCH 0436/2977] bump: xplr --- anda/langs/rust/xplr/rust-xplr.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/langs/rust/xplr/rust-xplr.spec b/anda/langs/rust/xplr/rust-xplr.spec index 321d236d25..f2c9d23fa9 100644 --- a/anda/langs/rust/xplr/rust-xplr.spec +++ b/anda/langs/rust/xplr/rust-xplr.spec @@ -4,8 +4,8 @@ %global crate xplr Name: rust-xplr -Version: 0.21.10 -Release: 1%{?dist} +Version: 1.0.0 +Release: 1%?dist Summary: Hackable, minimal, fast TUI file explorer License: MIT From b00f78d8ea26d9402a7121703f5d4a81a485e03e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 21 Mar 2025 23:18:41 +0000 Subject: [PATCH 0437/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index b7c5ef595e..19c8fd1055 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.21.205828 +Version: 2025.03.21.230450 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 649b005114c657eae0f5210d941496424d4cccba Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 21 Mar 2025 23:30:11 +0000 Subject: [PATCH 0438/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 19c8fd1055..21a275429c 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.21.230450 +Version: 2025.03.21.231404 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 4b073400256ff967957756499e28a103661902c8 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 21 Mar 2025 23:40:24 +0000 Subject: [PATCH 0439/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 21a275429c..7f26ad2ccd 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.21.231404 +Version: 2025.03.21.232322 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 408d2a737399930595638f607c9f2eea60fec706 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 21 Mar 2025 23:50:44 +0000 Subject: [PATCH 0440/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 7f26ad2ccd..e7b2281f0d 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.21.232322 +Version: 2025.03.21.233216 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 57919bad51b96a9c4dc5cb7428ae5d09de4ca664 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 22 Mar 2025 01:20:32 +0000 Subject: [PATCH 0441/2977] bump: ruffle yt-dlp --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index c07311ad1b..35f958cf1a 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-21 +%global ver 2025-03-22 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index e7b2281f0d..4a046167ae 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.21.233216 +Version: 2025.03.21.234211 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From e311e21eb5dd6ebf95e87ca5773c82f07d128107 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 22 Mar 2025 01:40:20 +0000 Subject: [PATCH 0442/2977] bump(nightly): mpv nightly nightly astal --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/lib/astal/astal/astal.spec | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index b1928e4ef6..46d93334a5 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 6171e4800ca1b613c6c1ac0273b08228b6f3f551 +%global commit a55ae5d6cdba0f96968b56e91a3999db40e31e61 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250320 +%global commit_date 20250322 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 382fc9f526..2ac4f451a3 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 1980f9aed46e92e8a5ed9df8677ac18635a63dad +%global commit 747c43ffa0047aa2ef550aa361ba63f4060a85ba %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-03-20 +%global fulldate 2025-03-21 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 60ed2317f4..1887c520a6 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 9134630841f0a622a1f5c7e7354e8894cc1ae0e5 +%global commit 85a761cb2b7cb55fb9fca05828b7750a3f42949d %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250321 +%global commit_date 20250322 %global ver 0.180.0 %bcond_with check diff --git a/anda/lib/astal/astal/astal.spec b/anda/lib/astal/astal/astal.spec index 8763511030..be96704e28 100644 --- a/anda/lib/astal/astal/astal.spec +++ b/anda/lib/astal/astal/astal.spec @@ -1,7 +1,7 @@ -%global commit e5a8e3b60e41d06450284baf7008abe4ac27a53d +%global commit dc0e5d37abe9424c53dcbd2506a4886ffee6296e %global shortcommit %{sub %commit 1 7} -%global commit_date 20250318 +%global commit_date 20250322 Name: astal Version: 0^%commit_date.%shortcommit From 0bdad887c2509117c81eb0a3e01a24c0b9652933 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 22 Mar 2025 02:38:30 +0000 Subject: [PATCH 0443/2977] bump(branch): astal-gtk --- anda/lib/astal/astal-gtk/astal-gtk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/astal/astal-gtk/astal-gtk.spec b/anda/lib/astal/astal-gtk/astal-gtk.spec index f3ee6ae581..47241ed86e 100644 --- a/anda/lib/astal/astal-gtk/astal-gtk.spec +++ b/anda/lib/astal/astal-gtk/astal-gtk.spec @@ -1,5 +1,5 @@ -%global commit e5a8e3b -%global commit_date 20250318 +%global commit dc0e5d3 +%global commit_date 20250322 Name: astal Version: 0^%commit_date.%commit From 48c1c4795c4939388d6a1714c81e6f554b110cb2 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Fri, 21 Mar 2025 23:30:01 -0700 Subject: [PATCH 0444/2977] [f41] Mesa: Update bazzite.patch (#4103) (#4104) * [f41] Mesa: Update bazzite.patch Signed-off-by: Kyle Gospodnetich * Bump release Signed-off-by: Kyle Gospodnetich --------- Signed-off-by: Kyle Gospodnetich (cherry picked from commit 21e0168ecc2f138745c31a991f76098e44c9a2be) Co-authored-by: Kyle Gospodnetich --- anda/lib/mesa/bazzite.patch | 347 +++--------------------------------- anda/lib/mesa/mesa.spec | 2 +- 2 files changed, 28 insertions(+), 321 deletions(-) diff --git a/anda/lib/mesa/bazzite.patch b/anda/lib/mesa/bazzite.patch index 1ad3cd5ac5..6c65577582 100644 --- a/anda/lib/mesa/bazzite.patch +++ b/anda/lib/mesa/bazzite.patch @@ -1,25 +1,7 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Antheas Kapenekakis -Date: Sat, 15 Mar 2025 16:38:53 +0100 -Subject: [NA] Developer files, readme, etc - --- -2.48.1 - - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Antheas Kapenekakis -Date: Sat, 15 Mar 2025 16:39:08 +0100 -Subject: [BEGIN] SteamOS Changes - --- -2.48.1 - - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From eab8a4f9ad407b8c5c29123855a56b3698399be3 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Fri, 14 Jan 2022 15:58:45 +0100 -Subject: STEAMOS: radv: min image count override for FH5 +Subject: [PATCH 1/7] STEAMOS: radv: min image count override for FH5 Otherwise in combination with the vblank time reservation in gamescope the game could get stuck in low power states. @@ -28,10 +10,10 @@ gamescope the game could get stuck in low power states. 1 file changed, 4 insertions(+) diff --git a/src/util/00-radv-defaults.conf b/src/util/00-radv-defaults.conf -index d2dbe4d5e11..1851504036a 100644 +index 72f3438b39d..02d7ada7ad9 100644 --- a/src/util/00-radv-defaults.conf +++ b/src/util/00-radv-defaults.conf -@@ -220,5 +220,9 @@ Application bugs worked around in this file: +@@ -221,5 +221,9 @@ Application bugs worked around in this file: @@ -42,14 +24,14 @@ index d2dbe4d5e11..1851504036a 100644 -- -2.48.1 +2.49.0 -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From fd1d96636308b7216f246634cb75a20e45a3bd1b Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 22 Feb 2024 22:32:45 +0100 -Subject: STEAMOS: Dynamic swapchain override for gamescope limiter for DRI3 - only +Subject: [PATCH 2/7] STEAMOS: Dynamic swapchain override for gamescope limiter + for DRI3 only The original patch (from Bas) contained WSI VK support too but it's been removed because the Gamescope WSI layer already handles that. @@ -149,13 +131,14 @@ index 9061e9755e2..6cc64be298a 100644 const struct loader_dri3_vtable *vtable; -- -2.48.1 +2.49.0 -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From d2fe7734d135f785d4ac164c8fce779553f3ed19 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 24 Feb 2025 17:48:21 +0100 -Subject: radv: stop computing the UUID using the physical device cache key +Subject: [PATCH 3/7] radv: stop computing the UUID using the physical device + cache key Otherwise, the UUID changes for games that have shader-based drirc workarounds and this breaks precompiled shaders on SteamDeck. @@ -194,10 +177,10 @@ index 2de839e5d6d..da732ae503e 100644 static void diff --git a/src/amd/vulkan/radv_physical_device.c b/src/amd/vulkan/radv_physical_device.c -index f24203fcccc..b1a742d48ef 100644 +index 0d3660e7064..826c23a6c46 100644 --- a/src/amd/vulkan/radv_physical_device.c +++ b/src/amd/vulkan/radv_physical_device.c -@@ -264,7 +264,6 @@ radv_device_get_cache_uuid(struct radv_physical_device *pdev, void *uuid) +@@ -206,7 +206,6 @@ radv_device_get_cache_uuid(struct radv_physical_device *pdev, void *uuid) return -1; #endif @@ -206,22 +189,22 @@ index f24203fcccc..b1a742d48ef 100644 memcpy(uuid, sha1, VK_UUID_SIZE); -- -2.48.1 +2.49.0 -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From b6b22ad82dcc2dc47b089a7ac018757809fa1a1c Mon Sep 17 00:00:00 2001 From: Antheas Kapenekakis Date: Sat, 15 Mar 2025 16:39:25 +0100 -Subject: [BEGIN] SteamOS Backports +Subject: [PATCH 4/7] [BEGIN] SteamOS Backports -- -2.48.1 +2.49.0 -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 03830a554fe5e0a49c710e1c4b3b14f117325e5c Mon Sep 17 00:00:00 2001 From: Natalie Vock Date: Fri, 28 Feb 2025 14:21:57 +0100 -Subject: radv/rt: Limit monolithic pipelines to 50 stages +Subject: [PATCH 5/7] radv/rt: Limit monolithic pipelines to 50 stages Beyond that, monolithic pipelines just bloat to incredible sizes, destroying compile times for questionable, if any, runtime perf benefit. @@ -254,298 +237,22 @@ index 5a23dc99cc4..1421688d580 100644 if (rt_stages[i].shader || rt_stages[i].nir) continue; -- -2.48.1 +2.49.0 -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From b013419f74e43edfe1da225b9641dea132d5897a Mon Sep 17 00:00:00 2001 From: Antheas Kapenekakis Date: Sat, 15 Mar 2025 16:39:33 +0100 -Subject: [BEGIN] Our Mesa backports +Subject: [PATCH 6/7] [BEGIN] Our Mesa backports -- -2.48.1 +2.49.0 -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Rhys Perry -Date: Tue, 25 Feb 2025 18:07:30 +0000 -Subject: aco: insert dependency waits in certain situations - -This seems to fix some artifacts, but we're not sure why, so it might not -be a correct or optimal solution. - -fossil-db (navi31): -Totals from 28424 (35.81% of 79377) affected shaders: -Instrs: 30112910 -> 30348977 (+0.78%); split: -0.00%, +0.78% -CodeSize: 159542980 -> 160485336 (+0.59%); split: -0.00%, +0.59% -Latency: 221438396 -> 221500856 (+0.03%); split: -0.00%, +0.03% -InvThroughput: 38154231 -> 38159984 (+0.02%); split: -0.00%, +0.02% - -Signed-off-by: Rhys Perry -Reviewed-by: Georg Lehmann -Backport-to: 25.0 -Part-of: ---- - src/amd/compiler/aco_insert_NOPs.cpp | 101 +++++++++++++++++++++++---- - 1 file changed, 87 insertions(+), 14 deletions(-) - -diff --git a/src/amd/compiler/aco_insert_NOPs.cpp b/src/amd/compiler/aco_insert_NOPs.cpp -index de062be2c74..1005f82812c 100644 ---- a/src/amd/compiler/aco_insert_NOPs.cpp -+++ b/src/amd/compiler/aco_insert_NOPs.cpp -@@ -259,6 +259,9 @@ struct NOP_ctx_gfx11 { - std::bitset<128> sgpr_read_by_valu_as_lanemask; - std::bitset<128> sgpr_read_by_valu_as_lanemask_then_wr_by_salu; - -+ std::bitset<128> sgpr_read_by_valu_as_lanemask2; -+ std::bitset<128> sgpr_read_by_valu_as_lanemask_then_wr_by_valu; -+ - /* WMMAHazards */ - std::bitset<256> vgpr_written_by_wmma; - -@@ -278,8 +281,11 @@ struct NOP_ctx_gfx11 { - valu_since_wr_by_trans.join_min(other.valu_since_wr_by_trans); - trans_since_wr_by_trans.join_min(other.trans_since_wr_by_trans); - sgpr_read_by_valu_as_lanemask |= other.sgpr_read_by_valu_as_lanemask; -+ sgpr_read_by_valu_as_lanemask2 |= other.sgpr_read_by_valu_as_lanemask2; - sgpr_read_by_valu_as_lanemask_then_wr_by_salu |= - other.sgpr_read_by_valu_as_lanemask_then_wr_by_salu; -+ sgpr_read_by_valu_as_lanemask_then_wr_by_valu |= -+ other.sgpr_read_by_valu_as_lanemask_then_wr_by_valu; - vgpr_written_by_wmma |= other.vgpr_written_by_wmma; - sgpr_read_by_valu |= other.sgpr_read_by_valu; - sgpr_read_by_valu_then_wr_by_valu |= other.sgpr_read_by_valu_then_wr_by_valu; -@@ -297,8 +303,11 @@ struct NOP_ctx_gfx11 { - valu_since_wr_by_trans == other.valu_since_wr_by_trans && - trans_since_wr_by_trans == other.trans_since_wr_by_trans && - sgpr_read_by_valu_as_lanemask == other.sgpr_read_by_valu_as_lanemask && -+ sgpr_read_by_valu_as_lanemask2 == other.sgpr_read_by_valu_as_lanemask2 && - sgpr_read_by_valu_as_lanemask_then_wr_by_salu == - other.sgpr_read_by_valu_as_lanemask_then_wr_by_salu && -+ sgpr_read_by_valu_as_lanemask_then_wr_by_valu == -+ other.sgpr_read_by_valu_as_lanemask_then_wr_by_valu && - vgpr_written_by_wmma == other.vgpr_written_by_wmma && - sgpr_read_by_valu == other.sgpr_read_by_valu && - sgpr_read_by_valu_then_wr_by_salu == other.sgpr_read_by_valu_then_wr_by_salu; -@@ -1377,6 +1386,30 @@ handle_valu_partial_forwarding_hazard(State& state, aco_ptr& instr) - return global_state.hazard_found; - } - -+static bool -+instr_reads_lanemask(Instruction* instr, Operand* op) -+{ -+ if (!instr->isVALU()) -+ return false; -+ if (instr->isVOPD()) { -+ *op = Operand(vcc, s1); -+ return instr->opcode == aco_opcode::v_dual_cndmask_b32 || -+ instr->vopd().opy == aco_opcode::v_dual_cndmask_b32; -+ } -+ switch (instr->opcode) { -+ case aco_opcode::v_addc_co_u32: -+ case aco_opcode::v_subb_co_u32: -+ case aco_opcode::v_subbrev_co_u32: -+ case aco_opcode::v_cndmask_b16: -+ case aco_opcode::v_cndmask_b32: -+ case aco_opcode::v_div_fmas_f32: -+ case aco_opcode::v_div_fmas_f64: -+ *op = instr->operands.back(); -+ return !instr->operands.back().isConstant(); -+ default: return false; -+ } -+} -+ - void - handle_instruction_gfx11(State& state, NOP_ctx_gfx11& ctx, aco_ptr& instr, - std::vector>& new_instructions) -@@ -1473,14 +1506,47 @@ handle_instruction_gfx11(State& state, NOP_ctx_gfx11& ctx, aco_ptr& - sa_sdst = 0; - } - -+ /* VALU reading a SGPR as a lane mask and later written as a lane mask shouldn't be read again -+ * as a lane mask without a wait. -+ * -+ * TODO: this fixes #12623 and #11480, but needs further investigation as to why. -+ */ -+ Operand lanemask_op; -+ if (instr_reads_lanemask(instr.get(), &lanemask_op)) { -+ unsigned reg = lanemask_op.physReg().reg(); -+ if (ctx.sgpr_read_by_valu_as_lanemask_then_wr_by_valu[reg] || -+ (state.program->wave_size == 64 && -+ ctx.sgpr_read_by_valu_as_lanemask_then_wr_by_valu[reg + 1])) { -+ bool is_vcc = reg == vcc || reg == vcc_hi; -+ bld.sopp(aco_opcode::s_waitcnt_depctr, is_vcc ? 0xfffd : 0xf1ff); -+ if (is_vcc) -+ wait.va_vcc = 0; -+ else -+ wait.va_sdst = 0; -+ } -+ } -+ - if (va_vdst == 0) { - ctx.valu_since_wr_by_trans.reset(); - ctx.trans_since_wr_by_trans.reset(); -+ ctx.sgpr_read_by_valu_as_lanemask_then_wr_by_valu.reset(); - } - - if (sa_sdst == 0) - ctx.sgpr_read_by_valu_as_lanemask_then_wr_by_salu.reset(); - -+ if (wait.va_sdst == 0) { -+ std::bitset<128> old = ctx.sgpr_read_by_valu_as_lanemask_then_wr_by_valu; -+ ctx.sgpr_read_by_valu_as_lanemask_then_wr_by_valu.reset(); -+ ctx.sgpr_read_by_valu_as_lanemask_then_wr_by_valu[vcc] = old[vcc]; -+ ctx.sgpr_read_by_valu_as_lanemask_then_wr_by_valu[vcc_hi] = old[vcc_hi]; -+ } -+ -+ if (wait.va_vcc == 0) { -+ ctx.sgpr_read_by_valu_as_lanemask_then_wr_by_valu[vcc] = false; -+ ctx.sgpr_read_by_valu_as_lanemask_then_wr_by_valu[vcc_hi] = false; -+ } -+ - if (state.program->wave_size == 64 && instr->isSALU() && - check_written_regs(instr, ctx.sgpr_read_by_valu_as_lanemask)) { - unsigned reg = instr->definitions[0].physReg().reg(); -@@ -1511,21 +1577,28 @@ handle_instruction_gfx11(State& state, NOP_ctx_gfx11& ctx, aco_ptr& - if (!op.isConstant() && op.physReg().reg() < 126) - ctx.sgpr_read_by_valu_as_lanemask.reset(); - } -- switch (instr->opcode) { -- case aco_opcode::v_addc_co_u32: -- case aco_opcode::v_subb_co_u32: -- case aco_opcode::v_subbrev_co_u32: -- case aco_opcode::v_cndmask_b16: -- case aco_opcode::v_cndmask_b32: -- case aco_opcode::v_div_fmas_f32: -- case aco_opcode::v_div_fmas_f64: -- if (instr->operands.back().physReg() != exec) { -- ctx.sgpr_read_by_valu_as_lanemask.set(instr->operands.back().physReg().reg()); -- ctx.sgpr_read_by_valu_as_lanemask.set(instr->operands.back().physReg().reg() + 1); -- } -- break; -- default: break; -+ } -+ -+ if (instr_reads_lanemask(instr.get(), &lanemask_op)) { -+ unsigned reg = lanemask_op.physReg().reg(); -+ if (state.program->wave_size == 64 && reg != exec) { -+ ctx.sgpr_read_by_valu_as_lanemask.set(reg); -+ ctx.sgpr_read_by_valu_as_lanemask.set(reg + 1); - } -+ ctx.sgpr_read_by_valu_as_lanemask2.set(reg); -+ if (state.program->wave_size == 64) -+ ctx.sgpr_read_by_valu_as_lanemask2.set(reg + 1); -+ } -+ -+ if (instr->opcode != aco_opcode::v_readlane_b32_e64 && -+ instr->opcode != aco_opcode::v_readfirstlane_b32 && -+ !instr->definitions.empty() && -+ instr->definitions.back().getTemp().type() == RegType::sgpr) { -+ unsigned reg = instr->definitions.back().physReg().reg(); -+ if (ctx.sgpr_read_by_valu_as_lanemask2[reg]) -+ ctx.sgpr_read_by_valu_as_lanemask_then_wr_by_valu[reg] = true; -+ if (state.program->wave_size == 64 && ctx.sgpr_read_by_valu_as_lanemask2[reg + 1]) -+ ctx.sgpr_read_by_valu_as_lanemask_then_wr_by_valu[reg + 1] = true; - } - } - } else { --- -2.48.1 - - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Ivan A. Melnikov" -Date: Fri, 7 Mar 2025 19:29:31 +0400 -Subject: gallium/radeon: Make sure radeonsi PCI IDs are also included - -When importing libdrm_radeon code [1][2] it was somehow missed -that what libdrm has in one r600_pci_ids.h, Mesa has split -into r600_pci_ids.h and radeonsi_pci_ids.h. So, devices -with ids from radeonsi_pci_ids.h were not considered valid for -radeon_surface_manager_new. - -This commit changes that, thus fixing radeonsi for these -devices. - -[1] commit 1299f5c50a490fadeb60b61677596f13399ee136 -[2] commit 3aa7497cc0bb52c8099fb07b27f9aee5e18e58ca - -Fixes: 1299f5c50a490fadeb60b61677596f13399ee136 -Signed-off-by: Ivan A. Melnikov -Part-of: ---- - src/gallium/winsys/radeon/drm/radeon_surface.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/gallium/winsys/radeon/drm/radeon_surface.c b/src/gallium/winsys/radeon/drm/radeon_surface.c -index 8a3302df684..3c469ad0c6e 100644 ---- a/src/gallium/winsys/radeon/drm/radeon_surface.c -+++ b/src/gallium/winsys/radeon/drm/radeon_surface.c -@@ -132,6 +132,9 @@ static int radeon_get_family(struct radeon_surface_manager *surf_man) - switch (surf_man->device_id) { - #define CHIPSET(pci_id, name, fam) case pci_id: surf_man->family = CHIP_##fam; break; - #include "pci_ids/r600_pci_ids.h" -+#undef CHIPSET -+#define CHIPSET(pci_id, fam) case pci_id: surf_man->family = CHIP_##fam; break; -+#include "pci_ids/radeonsi_pci_ids.h" - #undef CHIPSET - default: - return -EINVAL; --- -2.48.1 - - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Samuel Pitoiset -Date: Tue, 11 Mar 2025 15:29:37 +0100 -Subject: radv/amdgpu: fix device deduplication - -To correctly deduplicate device inside the winsys, it should use the -fd or amdgpu_device_handle. Using the allocated ac_drm_device as key -is obviously broken. - -Not deduplicating devices breaks memory budget and a bunch of games -were broken. - -Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12686 -Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12775 -Fixes: a565f2994fe ("amd: move all uses of libdrm_amdgpu to ac_linux_drm") -Signed-off-by: Samuel Pitoiset -Part-of: ---- - src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c -index be8df8708c8..8b57abeb0b1 100644 ---- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c -+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c -@@ -234,7 +234,7 @@ radv_amdgpu_winsys_create(int fd, uint64_t debug_flags, uint64_t perftest_flags, - goto fail; - } - -- struct hash_entry *entry = _mesa_hash_table_search(winsyses, dev); -+ struct hash_entry *entry = _mesa_hash_table_search(winsyses, (void *)ac_drm_device_get_cookie(dev)); - if (entry) { - ws = (struct radv_amdgpu_winsys *)entry->data; - ++ws->refcount; -@@ -325,7 +325,7 @@ radv_amdgpu_winsys_create(int fd, uint64_t debug_flags, uint64_t perftest_flags, - radv_amdgpu_bo_init_functions(ws); - radv_amdgpu_cs_init_functions(ws); - -- _mesa_hash_table_insert(winsyses, dev, ws); -+ _mesa_hash_table_insert(winsyses, (void *)ac_drm_device_get_cookie(dev), ws); - simple_mtx_unlock(&winsys_creation_mutex); - - return &ws->base; --- -2.48.1 - - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From b45f046a4ebbbb1894e945a4cc2457674d9bf5ba Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Mon, 17 Feb 2025 14:55:29 -0800 -Subject: anv: Mark images with format modifiers set as scanout. +Subject: [PATCH 7/7] anv: Mark images with format modifiers set as scanout. We currently use the presence of struct WSI_IMAGE_CREATE_INFO_MESA.scanout to mark the BO as scanout, but this only handles the linear case, and fails when drm format modifiers are used. @@ -577,5 +284,5 @@ index 1884932bbc7..cbc1b4aad87 100644 * implicit fencing. This matches the behavior in iris i915_batch * submit. An example client is VA-API (iHD), so only dedicated -- -2.48.1 +2.49.0 diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index 04b3105fea..23dfe20769 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -76,7 +76,7 @@ Summary: Mesa graphics libraries # disabled by default, and has to be enabled manually. See `terra/release/terra-mesa.repo` for details. Epoch: 1 Version: 25.0.2 -Release: 1%?dist +Release: 2%?dist License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org From 9c350f71bab79a9f4a1e7bc0d237d98e24d6e4e8 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Sat, 22 Mar 2025 01:16:29 -0700 Subject: [PATCH 0445/2977] fix(peazip): Install desktop file, icons, and file manager integration (#4098) (#4108) * Install desktop file, icons, and file explorer integration Signed-off-by: Gilver * Bump release Signed-off-by: Gilver * Actually that's more correct Signed-off-by: Gilver * Yike Signed-off-by: Gilver --------- Signed-off-by: Gilver (cherry picked from commit 5fb5f91df673cc405e2e738d8e85764fc1c3f186) Co-authored-by: Gilver --- anda/apps/peazip/peazip.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/anda/apps/peazip/peazip.spec b/anda/apps/peazip/peazip.spec index c3a2c34ee9..e5a3190d32 100644 --- a/anda/apps/peazip/peazip.spec +++ b/anda/apps/peazip/peazip.spec @@ -3,7 +3,7 @@ Name: peazip Version: 10.3.0 -Release: 2%?dist +Release: 3%?dist Summary: Free Zip / Unzip software and Rar file extractor. Cross-platform file and archive manager License: LGPL-3.0-only URL: https://peazip.github.io @@ -101,10 +101,19 @@ lazbuild --ws=qt6 dev/project_pea.lpi && cp dev/pea ../pea.qt6 %install install -Dm755 peazip.* -t %buildroot%_bindir install -Dm755 pea.* -t %buildroot%_bindir +install -Dm644 peazip-sources/res/share/batch/freedesktop_integration/peazip.desktop -t %{buildroot}%{_datadir}/applications +install -Dm644 peazip-sources/res/share/batch/freedesktop_integration/*.png -t %{buildroot}%{_datadir}/pixmaps +install -Dm644 peazip-sources/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE6-dolphin/peazip-kde6.desktop -t %{buildroot}%{_datadir}/kio/servicemenus +install -Dm644 peazip-sources/res/share/batch/freedesktop_integration/Nautilus-scripts/PeaZip/* -t %{buildroot}%{_datadir}/nautilus/scripts/PeaZip %files %doc README.md %license LICENSE SECURITY.md +%{_datadir}/applications/peazip.desktop +%{_datadir}/pixmaps/peazip*.png +%{_datadir}/kio/servicemenus/peazip-kde6.desktop +%dir %{_datadir}/nautilus/scripts/PeaZip +%{_datadir}/nautilus/scripts/PeaZip/* %files -n pea %doc README.md From 63e6dc68be34007fde65105689968de3ca91ce86 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Sat, 22 Mar 2025 01:24:33 -0700 Subject: [PATCH 0446/2977] fix(akmod-v4l2loopback): Add missing prep step and fix build steps (#4078) (#4112) Signed-off-by: Gilver (cherry picked from commit dc710cdb0be78ef92c44f42597cb1fa37b377ec7) Co-authored-by: Gilver --- .../v4l2loopback/akmod/v4l2loopback-kmod.spec | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/anda/system/v4l2loopback/akmod/v4l2loopback-kmod.spec b/anda/system/v4l2loopback/akmod/v4l2loopback-kmod.spec index 38fb51cdee..83955b85ba 100644 --- a/anda/system/v4l2loopback/akmod/v4l2loopback-kmod.spec +++ b/anda/system/v4l2loopback/akmod/v4l2loopback-kmod.spec @@ -18,7 +18,7 @@ This module allows you to create \"virtual video devices.\" Normal \(v4l2\) appl Name: %{modulename}-kmod Summary: Kernel module (kmod) for V4L2 loopback devices Version: 0.14.0 -Release: 2%?dist +Release: 3%?dist License: GPL-2.0-or-later URL: https://github.com/v4l2loopback/v4l2loopback Source0: %{url}/archive/v%{version}/%{modulename}-%{version}.tar.gz @@ -40,25 +40,29 @@ Packager: Cappy Ishihara %prep %{?kmodtool_check} -kmodtool --target %{_target_cpu} --repo terra --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null -%autosetup -p1 -n %{modulename}-%{version} +kmodtool --target %{_target_cpu} --repo terra --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null - -%build +%setup -q -c +(cd v4l2loopback-%{version} +) for kernel_version in %{?kernel_versions} ; do - make V=1 %{?_smp_mflags} M=${PWD}/_kmod_build_${kernel_version%%___*} VERSION=v%{version} v4l2loopback + cp -a v4l2loopback-%{version} _kmod_build_${kernel_version%%___*} +done + +%build +for kernel_version in %{?kernel_versions} ; do + make V=1 %{?_smp_mflags} -C ${kernel_version##*___} M=${PWD}/_kmod_build_${kernel_version%%___*} modules done %install for kernel_version in %{?kernel_versions}; do mkdir -p %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ - install -D -m 755 v4l2loopback.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ + install -D -m 755 _kmod_build_${kernel_version%%___*}/v4l2loopback.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ chmod a+x %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/*.ko done - %{?akmod_install} %changelog From aa6e3b3de35f2990300d65079114f36a470cf5f7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 22 Mar 2025 12:31:39 +0000 Subject: [PATCH 0447/2977] bump: chezmoi --- anda/langs/go/chezmoi/chezmoi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/go/chezmoi/chezmoi.spec b/anda/langs/go/chezmoi/chezmoi.spec index 923e5d2613..bf549831eb 100644 --- a/anda/langs/go/chezmoi/chezmoi.spec +++ b/anda/langs/go/chezmoi/chezmoi.spec @@ -4,7 +4,7 @@ # https://github.com/twpayne/chezmoi %global goipath github.com/twpayne/chezmoi -Version: 2.60.1 +Version: 2.61.0 %gometa -f From e2bb9582ae2b65d39e60a72744b88ddea8070b08 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 22 Mar 2025 16:55:44 +0000 Subject: [PATCH 0448/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 4a046167ae..27f09101be 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.21.234211 +Version: 2025.03.22.164419 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 74590448ef046a431467b69edf77b211e1de392e Mon Sep 17 00:00:00 2001 From: madomado Date: Sun, 23 Mar 2025 04:10:28 +0800 Subject: [PATCH 0449/2977] =?UTF-8?q?fix(gcm-core):=20missing=20version?= =?UTF-8?q?=E2=80=A6=3F=3F=20(#4115)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: madomado --- anda/tools/gcm-core/gcm-core.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/anda/tools/gcm-core/gcm-core.spec b/anda/tools/gcm-core/gcm-core.spec index 70ccbc92da..0f6863423a 100644 --- a/anda/tools/gcm-core/gcm-core.spec +++ b/anda/tools/gcm-core/gcm-core.spec @@ -6,11 +6,13 @@ %global forgeurl https://github.com/git-ecosystem/git-credential-manager Name: gcm-core -Version: +Version: 2.6.1 Release: 1%?dist Summary: Secure, cross-platform Git credential storage +%forgemeta + License: MIT URL: %{forgeurl} Source0: %{forgesource} From 2df370e7e9f944db51d7af74978645403dbeb0b8 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 22 Mar 2025 20:23:15 +0000 Subject: [PATCH 0450/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 27f09101be..ce9e4821fb 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.22.164419 +Version: 2025.03.22.200351 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 6bc44478172125f21bbf5b5b86b1d90986a6e589 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 22 Mar 2025 21:50:11 +0000 Subject: [PATCH 0451/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index ce9e4821fb..5c790f0364 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.22.200351 +Version: 2025.03.22.213421 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From db8a4f4258e8bc4237678b9c4f22d913027a2a3d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 22 Mar 2025 22:23:35 +0000 Subject: [PATCH 0452/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 5c790f0364..df496fe200 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.22.213421 +Version: 2025.03.22.215334 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 12a023ab5c292843b73c06703d1be261c747d129 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 22 Mar 2025 23:36:45 +0000 Subject: [PATCH 0453/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index df496fe200..1d0ca7f9a6 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.22.215334 +Version: 2025.03.22.231536 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From a51461e86375274b635619f6ebfa1091d2a40028 Mon Sep 17 00:00:00 2001 From: june <159748074+june-fish@users.noreply.github.com> Date: Sat, 22 Mar 2025 19:59:06 -0500 Subject: [PATCH 0454/2977] fix um_commit (#4120) --- anda/system/cros-keyboard-map/update.rhai | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/cros-keyboard-map/update.rhai b/anda/system/cros-keyboard-map/update.rhai index aef26dd922..b2a2ff53f4 100644 --- a/anda/system/cros-keyboard-map/update.rhai +++ b/anda/system/cros-keyboard-map/update.rhai @@ -1,6 +1,6 @@ if filters.contains("nightly") { rpm.global("tree_commit", gh_commit("WeirdTreeThing/cros-keyboard-map")); - rpm.global("commit", gh_commit("WeirdTreeThing/cros-keyboard-map")); + rpm.global("um_commit", gh_commit("Ultramarine-Linux/cros-keyboard-map")); if rpm.changed() { rpm.release(); rpm.global("commit_date", date()); From 8f62c4a74ce62a04aa8deee8bf0fc4ba89813fa1 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 23 Mar 2025 01:47:53 +0000 Subject: [PATCH 0455/2977] bump(nightly): mpv nightly nightly nim-nightly --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 46d93334a5..b3e7d25244 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit a55ae5d6cdba0f96968b56e91a3999db40e31e61 +%global commit 678419c5f669d0a810714042de233728aef42a6d %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250322 +%global commit_date 20250323 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 2ac4f451a3..ffe7ce8e0f 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 747c43ffa0047aa2ef550aa361ba63f4060a85ba +%global commit b722f537e7212b4252f87123f4e763a4c42983a0 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-03-21 +%global fulldate 2025-03-22 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 1887c520a6..efbd8ac490 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 85a761cb2b7cb55fb9fca05828b7750a3f42949d +%global commit 8294b9f674cd92efbed27ced379b23fc8ba9a216 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250322 +%global commit_date 20250323 %global ver 0.180.0 %bcond_with check diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 03f3643bbe..cc634c74c4 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 1d3260757502694a16f424212e93601b014207bf +%global commit 482662d19855788c61b46b1c8f3236c57cba6fb3 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250320 +%global commit_date 20250323 %global debug_package %nil Name: nim-nightly From dee85c21e5d9b93079ee9404ed5652fe9fd088e8 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 23 Mar 2025 01:52:18 +0000 Subject: [PATCH 0456/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 35f958cf1a..01bc473950 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-22 +%global ver 2025-03-23 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 394c7b410040a05f867553d60351d905ecc8bea0 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 23 Mar 2025 16:55:45 +0000 Subject: [PATCH 0457/2977] bump: ops2deb yt-dlp --- anda/tools/buildsys/ops2deb/ops2deb.spec | 4 ++-- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/tools/buildsys/ops2deb/ops2deb.spec b/anda/tools/buildsys/ops2deb/ops2deb.spec index 6e89648ae4..03903591c8 100644 --- a/anda/tools/buildsys/ops2deb/ops2deb.spec +++ b/anda/tools/buildsys/ops2deb/ops2deb.spec @@ -2,8 +2,8 @@ %define _python_dist_allow_version_zero # upstream issue? Name: python3-ops2deb -Version: 2.5.0 -Release: 1%{?dist} +Version: 2.6.0 +Release: 1%?dist Summary: Generate Debian packages for common devops tools License: MIT URL: https://github.com/upciti/ops2deb diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 1d0ca7f9a6..34f8fbfcde 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.22.231536 +Version: 2025.03.23.163602 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 6ce730583439b172c935175282c81b200ce3949b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 24 Mar 2025 01:25:51 +0000 Subject: [PATCH 0458/2977] bump: ruffle opengamepadui --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- anda/games/opengamepadui/opengamepadui.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 01bc473950..7da132dd9d 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-23 +%global ver 2025-03-24 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/games/opengamepadui/opengamepadui.spec b/anda/games/opengamepadui/opengamepadui.spec index 1119c9af65..bca34085f2 100644 --- a/anda/games/opengamepadui/opengamepadui.spec +++ b/anda/games/opengamepadui/opengamepadui.spec @@ -1,5 +1,5 @@ Name: opengamepadui -Version: 0.37.1 +Version: 0.38.0 Release: 1%?dist Summary: Open source gamepad-native game launcher and overlay From 2b7618baa2daa1423ad4331a8fbbe0a2c3c80327 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 24 Mar 2025 01:45:55 +0000 Subject: [PATCH 0459/2977] bump(nightly): mpv nightly nightly prismlauncher-nightly nim-nightly spotx-bash --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/tools/spotx-bash/spotx-bash.spec | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index b3e7d25244..85ccaa67da 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 678419c5f669d0a810714042de233728aef42a6d +%global commit b31c3d80ab0040cb02a54ee878cb2d95f6ed74e0 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250323 +%global commit_date 20250324 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index ffe7ce8e0f..cf91dff063 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit b722f537e7212b4252f87123f4e763a4c42983a0 +%global commit c58fe676ad6212114455ac89a2703dcc3b8b67b7 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-03-22 +%global fulldate 2025-03-23 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index efbd8ac490..d1cac74ba5 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 8294b9f674cd92efbed27ced379b23fc8ba9a216 +%global commit f19e1e3b5f23ec7f64b692f4530825e0e50e5b95 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250323 +%global commit_date 20250324 %global ver 0.180.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 938a041b75..df478ccacf 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 216034c2833c87ef2e9728711d89d605ff54fd42 +%global commit 9fe78fa86a1a8c6ff1cb43ee940d09e2ac358552 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250321 +%global commit_date 20250324 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index cc634c74c4..079099e624 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 482662d19855788c61b46b1c8f3236c57cba6fb3 +%global commit fcba14707a06271f6e14b6c5641d6d5fbc96ff0d %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250323 +%global commit_date 20250324 %global debug_package %nil Name: nim-nightly diff --git a/anda/tools/spotx-bash/spotx-bash.spec b/anda/tools/spotx-bash/spotx-bash.spec index 97b76ca756..01130a92df 100644 --- a/anda/tools/spotx-bash/spotx-bash.spec +++ b/anda/tools/spotx-bash/spotx-bash.spec @@ -1,5 +1,5 @@ -%global commit c685b9545a155d56b9a3fb5c61cfcd348f26d151 -%global commit_date 20250320 +%global commit c39047718da0206199ba83df28fc41a235b38f86 +%global commit_date 20250324 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: spotx-bash From 760846573a3e8ec67c258b84e317c57425020f22 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 24 Mar 2025 14:18:34 +0000 Subject: [PATCH 0460/2977] bump: stable preview mise --- anda/devs/ghostty/stable/ghostty.spec | 4 ++-- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/devs/ghostty/stable/ghostty.spec b/anda/devs/ghostty/stable/ghostty.spec index 221e247864..212f0db020 100644 --- a/anda/devs/ghostty/stable/ghostty.spec +++ b/anda/devs/ghostty/stable/ghostty.spec @@ -7,8 +7,8 @@ %endif Name: ghostty -Version: 1.1.2 -Release: 3%?dist +Version: 1.1.3 +Release: 1%?dist Summary: A fast, native terminal emulator written in Zig. License: MIT AND MPL-2.0 AND OFL-1.1 AND (WTFPL OR CC0-1.0) AND Apache-2.0 URL: https://ghostty.org/ diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 80afeae051..0a75ada810 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.179.1-pre +%global ver 0.179.2-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index 74682ca77a..5359983da0 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.3.7 +Version: 2025.3.8 Release: 1%?dist Summary: Front-end to your dev env From dd25b41cc1a830d92abdd1eef0ababc2c1f1c3ec Mon Sep 17 00:00:00 2001 From: Antheas Kapenekakis <5252246+antheas@users.noreply.github.com> Date: Mon, 24 Mar 2025 17:41:37 +0100 Subject: [PATCH 0461/2977] fix(mesa): remove broken patch (#4135) --- anda/lib/mesa/bazzite.patch | 74 +++++++++++-------------------------- anda/lib/mesa/mesa.spec | 2 +- 2 files changed, 23 insertions(+), 53 deletions(-) diff --git a/anda/lib/mesa/bazzite.patch b/anda/lib/mesa/bazzite.patch index 6c65577582..7428b94de0 100644 --- a/anda/lib/mesa/bazzite.patch +++ b/anda/lib/mesa/bazzite.patch @@ -1,7 +1,16 @@ -From eab8a4f9ad407b8c5c29123855a56b3698399be3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Antheas Kapenekakis +Date: Sat, 15 Mar 2025 16:39:08 +0100 +Subject: [BEGIN] SteamOS Changes + +-- +2.49.0 + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Fri, 14 Jan 2022 15:58:45 +0100 -Subject: [PATCH 1/7] STEAMOS: radv: min image count override for FH5 +Subject: STEAMOS: radv: min image count override for FH5 Otherwise in combination with the vblank time reservation in gamescope the game could get stuck in low power states. @@ -27,11 +36,11 @@ index 72f3438b39d..02d7ada7ad9 100644 2.49.0 -From fd1d96636308b7216f246634cb75a20e45a3bd1b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 22 Feb 2024 22:32:45 +0100 -Subject: [PATCH 2/7] STEAMOS: Dynamic swapchain override for gamescope limiter - for DRI3 only +Subject: STEAMOS: Dynamic swapchain override for gamescope limiter for DRI3 + only The original patch (from Bas) contained WSI VK support too but it's been removed because the Gamescope WSI layer already handles that. @@ -134,11 +143,10 @@ index 9061e9755e2..6cc64be298a 100644 2.49.0 -From d2fe7734d135f785d4ac164c8fce779553f3ed19 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 24 Feb 2025 17:48:21 +0100 -Subject: [PATCH 3/7] radv: stop computing the UUID using the physical device - cache key +Subject: radv: stop computing the UUID using the physical device cache key Otherwise, the UUID changes for games that have shader-based drirc workarounds and this breaks precompiled shaders on SteamDeck. @@ -192,19 +200,19 @@ index 0d3660e7064..826c23a6c46 100644 2.49.0 -From b6b22ad82dcc2dc47b089a7ac018757809fa1a1c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Antheas Kapenekakis Date: Sat, 15 Mar 2025 16:39:25 +0100 -Subject: [PATCH 4/7] [BEGIN] SteamOS Backports +Subject: [BEGIN] SteamOS Backports -- 2.49.0 -From 03830a554fe5e0a49c710e1c4b3b14f117325e5c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Natalie Vock Date: Fri, 28 Feb 2025 14:21:57 +0100 -Subject: [PATCH 5/7] radv/rt: Limit monolithic pipelines to 50 stages +Subject: radv/rt: Limit monolithic pipelines to 50 stages Beyond that, monolithic pipelines just bloat to incredible sizes, destroying compile times for questionable, if any, runtime perf benefit. @@ -240,49 +248,11 @@ index 5a23dc99cc4..1421688d580 100644 2.49.0 -From b013419f74e43edfe1da225b9641dea132d5897a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Antheas Kapenekakis Date: Sat, 15 Mar 2025 16:39:33 +0100 -Subject: [PATCH 6/7] [BEGIN] Our Mesa backports +Subject: [BEGIN] Our Mesa backports -- 2.49.0 - -From b45f046a4ebbbb1894e945a4cc2457674d9bf5ba Mon Sep 17 00:00:00 2001 -From: Maarten Lankhorst -Date: Mon, 17 Feb 2025 14:55:29 -0800 -Subject: [PATCH 7/7] anv: Mark images with format modifiers set as scanout. - -We currently use the presence of struct WSI_IMAGE_CREATE_INFO_MESA.scanout to mark the BO as scanout, -but this only handles the linear case, and fails when drm format modifiers are used. - -Also handle the case of exportable BO with tiling set to VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT. -This fixes the gamescope handling of using vulkan allocated images for scanout. - -Link: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12633 -Signed-off-by: Maarten Lankhorst -Signed-off-by: Matthew Schwartz - -Normalspeak: fixes battlemage iGPUs in gamescope ---- - src/intel/vulkan/anv_device.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c -index 1884932bbc7..cbc1b4aad87 100644 ---- a/src/intel/vulkan/anv_device.c -+++ b/src/intel/vulkan/anv_device.c -@@ -1533,6 +1533,9 @@ VkResult anv_AllocateMemory( - dedicated_info->image != VK_NULL_HANDLE) { - ANV_FROM_HANDLE(anv_image, image, dedicated_info->image); - -+ if (image->vk.tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) -+ alloc_flags |= ANV_BO_ALLOC_SCANOUT; -+ - /* Apply implicit sync to be compatible with clients relying on - * implicit fencing. This matches the behavior in iris i915_batch - * submit. An example client is VA-API (iHD), so only dedicated --- -2.49.0 - diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index 23dfe20769..26d85220ce 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -76,7 +76,7 @@ Summary: Mesa graphics libraries # disabled by default, and has to be enabled manually. See `terra/release/terra-mesa.repo` for details. Epoch: 1 Version: 25.0.2 -Release: 2%?dist +Release: 3%?dist License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org From a39f3d798cdd14fab71458fd13cd903b8916fae1 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Mon, 24 Mar 2025 09:44:25 -0700 Subject: [PATCH 0462/2977] fix(extest): Remove Mold linker argument (#4136) (#4143) Signed-off-by: Gilver (cherry picked from commit c900c85e21a04fc01d5d3b08b1d9d3b1a4eae62e) Co-authored-by: Gilver --- anda/misc/extest/rust-extest.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/anda/misc/extest/rust-extest.spec b/anda/misc/extest/rust-extest.spec index 5351523df8..7414a2cedc 100644 --- a/anda/misc/extest/rust-extest.spec +++ b/anda/misc/extest/rust-extest.spec @@ -16,12 +16,10 @@ # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ -# Use Mold as the linker -%global build_rustflags %build_rustflags -C link-arg=-fuse-ld=mold Name: extest Version: %{commit_date}git.%{shortcommit} -Release: 1%?dist +Release: 2%?dist Summary: X11 XTEST reimplementation primarily for Steam Controller on Wayland License: MIT From 6f5dfe9c8c515b4b32a5bbf2979e33b236465f01 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Mon, 24 Mar 2025 09:46:31 -0700 Subject: [PATCH 0463/2977] fix(open-huninn-fonts): Renamed license file (#4133) (#4139) * fix(open-huninn-fonts): Renamed license file Signed-off-by: Gilver * Bump release Signed-off-by: Gilver --------- Signed-off-by: Gilver (cherry picked from commit 11ba4dd0d6818d18abaa2453d6e7fdab4609e92f) Co-authored-by: Gilver --- anda/fonts/open-huninn/open-huninn-fonts.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/fonts/open-huninn/open-huninn-fonts.spec b/anda/fonts/open-huninn/open-huninn-fonts.spec index 515b2e7951..761789dff0 100644 --- a/anda/fonts/open-huninn/open-huninn-fonts.spec +++ b/anda/fonts/open-huninn/open-huninn-fonts.spec @@ -1,6 +1,6 @@ Name: open-huninn-fonts Version: 2.1 -Release: 1%?dist +Release: 2%?dist URL: https://github.com/justfont/open-huninn-font Source0: %url/archive/refs/tags/v%version.tar.gz License: OFL-1.1 @@ -23,7 +23,7 @@ install -Dm644 font/jf-openhuninn-%version.ttf %buildroot/%_datadir/fonts/open-h %files %doc README.md -%license license.txt +%license LICENSE /%{_datadir}/fonts/open-huninn/ From 9fbb53524204249687259ad6de2c8247be0281d2 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 24 Mar 2025 18:47:29 +0000 Subject: [PATCH 0464/2977] bump: discord-canary-openasar discord-canary discord-openasar discord --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- anda/apps/discord-openasar/discord-openasar.spec | 2 +- anda/apps/discord/discord.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index fb180a2b0a..69fa08ccda 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.618 +Version: 0.0.619 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 8c83aad9f1..b6fe516edb 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.618 +Version: 0.0.619 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com diff --git a/anda/apps/discord-openasar/discord-openasar.spec b/anda/apps/discord-openasar/discord-openasar.spec index b97c96460a..4d8119e35a 100644 --- a/anda/apps/discord-openasar/discord-openasar.spec +++ b/anda/apps/discord-openasar/discord-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-openasar -Version: 0.0.88 +Version: 0.0.89 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord/discord.spec b/anda/apps/discord/discord.spec index 0f2a326181..a32a0edaf6 100644 --- a/anda/apps/discord/discord.spec +++ b/anda/apps/discord/discord.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord -Version: 0.0.88 +Version: 0.0.89 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: https://discord.com From 8860d0821f6f896fa0cca51629e647857f34e0c0 Mon Sep 17 00:00:00 2001 From: Antheas Kapenekakis <5252246+antheas@users.noreply.github.com> Date: Mon, 24 Mar 2025 21:15:27 +0100 Subject: [PATCH 0465/2977] fix autovram issue (#4148) --- anda/lib/mesa/bazzite.patch | 71 +++++++++++++++++++++++++++++++++++++ anda/lib/mesa/mesa.spec | 2 +- 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/anda/lib/mesa/bazzite.patch b/anda/lib/mesa/bazzite.patch index 7428b94de0..523c8c213f 100644 --- a/anda/lib/mesa/bazzite.patch +++ b/anda/lib/mesa/bazzite.patch @@ -256,3 +256,74 @@ Subject: [BEGIN] Our Mesa backports -- 2.49.0 + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Maarten Lankhorst +Date: Mon, 17 Feb 2025 14:55:29 -0800 +Subject: anv: Mark images with format modifiers set as scanout. + +We currently use the presence of struct WSI_IMAGE_CREATE_INFO_MESA.scanout to mark the BO as scanout, +but this only handles the linear case, and fails when drm format modifiers are used. + +Also handle the case of exportable BO with tiling set to VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT. +This fixes the gamescope handling of using vulkan allocated images for scanout. + +Link: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12633 +Signed-off-by: Maarten Lankhorst +Signed-off-by: Matthew Schwartz + +Normalspeak: fixes battlemage iGPUs in gamescope +--- + src/intel/vulkan/anv_device.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c +index 1884932bbc7..cbc1b4aad87 100644 +--- a/src/intel/vulkan/anv_device.c ++++ b/src/intel/vulkan/anv_device.c +@@ -1533,6 +1533,9 @@ VkResult anv_AllocateMemory( + dedicated_info->image != VK_NULL_HANDLE) { + ANV_FROM_HANDLE(anv_image, image, dedicated_info->image); + ++ if (image->vk.tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) ++ alloc_flags |= ANV_BO_ALLOC_SCANOUT; ++ + /* Apply implicit sync to be compatible with clients relying on + * implicit fencing. This matches the behavior in iris i915_batch + * submit. An example client is VA-API (iHD), so only dedicated +-- +2.49.0 + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Antheas Kapenekakis +Date: Mon, 24 Mar 2025 19:50:51 +0100 +Subject: Revert "winsys/amdgpu: use VM_ALWAYS_VALID for all VRAM and GTT + allocations" + +This reverts commit 8c91624614c1f939974fe0d2d1a3baf83335cecb. + +Messes with AutoVRAM, who would have thought? +--- + src/gallium/winsys/amdgpu/drm/amdgpu_bo.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c +index 24ba28827f8..46461f8ee59 100644 +--- a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c ++++ b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c +@@ -618,11 +618,6 @@ static struct amdgpu_winsys_bo *amdgpu_create_bo(struct amdgpu_winsys *aws, + if (flags & RADEON_FLAG_GTT_WC) + request.flags |= AMDGPU_GEM_CREATE_CPU_GTT_USWC; + +- if (aws->info.has_local_buffers && +- initial_domain & (RADEON_DOMAIN_VRAM_GTT | RADEON_DOMAIN_DOORBELL) && +- flags & RADEON_FLAG_NO_INTERPROCESS_SHARING) +- request.flags |= AMDGPU_GEM_CREATE_VM_ALWAYS_VALID; +- + if (flags & RADEON_FLAG_DISCARDABLE && + aws->info.drm_minor >= 47) + request.flags |= AMDGPU_GEM_CREATE_DISCARDABLE; +-- +2.49.0 + diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index 26d85220ce..f19af8c08b 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -76,7 +76,7 @@ Summary: Mesa graphics libraries # disabled by default, and has to be enabled manually. See `terra/release/terra-mesa.repo` for details. Epoch: 1 Version: 25.0.2 -Release: 3%?dist +Release: 4%?dist License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org From c7cf6ff5db06b7e34559cdf25b82706042f087d9 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 24 Mar 2025 21:37:04 +0000 Subject: [PATCH 0466/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 34f8fbfcde..1a0421c160 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.23.163602 +Version: 2025.03.24.212240 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 61244529f731b2583b11a269624e98be2267bb9b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 24 Mar 2025 21:47:17 +0000 Subject: [PATCH 0467/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 1a0421c160..29d2ab8a2b 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.24.212240 +Version: 2025.03.24.213211 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 6bce48a0e863224fe7cbfd2b0bd2a0f9a7e39bb6 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 24 Mar 2025 22:40:20 +0000 Subject: [PATCH 0468/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 29d2ab8a2b..2961a32646 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.24.213211 +Version: 2025.03.24.222426 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 6a774273c0da4763edeb4a8fb4737b62b1a1f46e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 24 Mar 2025 22:50:23 +0000 Subject: [PATCH 0469/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 2961a32646..4a9e00188e 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.24.222426 +Version: 2025.03.24.223325 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 7e474189c50406c7b6efb10e82ea51365ef473e8 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 24 Mar 2025 23:18:13 +0000 Subject: [PATCH 0470/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 4a9e00188e..2be7775bd4 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.24.223325 +Version: 2025.03.24.224239 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 10259f217b4f0a98c4150cdef2601aeee349a2e5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 24 Mar 2025 23:32:10 +0000 Subject: [PATCH 0471/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 2be7775bd4..c337c2f939 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.24.224239 +Version: 2025.03.24.231227 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 4e8313d768a6f89d2f523347342bfc91ecec7127 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Mar 2025 01:25:46 +0000 Subject: [PATCH 0472/2977] bump: ruffle yt-dlp --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 7da132dd9d..eba02c7fce 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-24 +%global ver 2025-03-25 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index c337c2f939..0fd6e57715 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.24.231227 +Version: 2025.03.25.001035 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 4f1172683b0f3de795b0df2cebf5deda8fc1453e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Mar 2025 01:43:26 +0000 Subject: [PATCH 0473/2977] bump(nightly): nightly nightly prismlauncher-nightly nim-nightly --- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index cf91dff063..777029a63f 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit c58fe676ad6212114455ac89a2703dcc3b8b67b7 +%global commit 5d9bee98e8ef8e36f3e8fb18d0fcedc7b9eef17f %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-03-23 +%global fulldate 2025-03-24 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index d1cac74ba5..306f341ac8 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit f19e1e3b5f23ec7f64b692f4530825e0e50e5b95 +%global commit e9e6529df4c158f299e7077daf33136b345a6074 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250324 +%global commit_date 20250325 %global ver 0.180.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index df478ccacf..89f1ec4be1 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 9fe78fa86a1a8c6ff1cb43ee940d09e2ac358552 +%global commit 064383b8fa157881cd6d8426182a94695cadbdba %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250324 +%global commit_date 20250325 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 079099e624..9716faf652 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit fcba14707a06271f6e14b6c5641d6d5fbc96ff0d +%global commit d15705e05b166077634a6caa96808d34af1f5d5b %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250324 +%global commit_date 20250325 %global debug_package %nil Name: nim-nightly From f2866cf04d3ce835d42409d3816eef23563f91f6 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Mar 2025 05:40:29 +0000 Subject: [PATCH 0474/2977] bump: lomiri-system-settings --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 5994e11388..7c6f9820c0 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit dfc840a2a4e0b0379b40cb6ec9309c5437c79d19 +%global commit 37e8a602be013761ed2a3cabba548e1c30fa3254 %forgemeta Name: lomiri-system-settings From 0dbd2057d133b8074cce896a9981c39b53d2aac8 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Mon, 24 Mar 2025 23:18:56 -0700 Subject: [PATCH 0475/2977] refactor(ivsc-firmware): Specify exclusive arch in anda.hcl (#4131) (#4152) Signed-off-by: Gilver (cherry picked from commit 3154d870efd00e1c01700c31597ad03275042194) Co-authored-by: Gilver --- anda/system/ivsc-firmware/anda.hcl | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/system/ivsc-firmware/anda.hcl b/anda/system/ivsc-firmware/anda.hcl index 3417d3cddf..b7195b71fe 100644 --- a/anda/system/ivsc-firmware/anda.hcl +++ b/anda/system/ivsc-firmware/anda.hcl @@ -1,4 +1,5 @@ project pkg { + arches = ["x86_64"] rpm { spec = "ivsc-firmware.spec" } From 4ec57db33d4d0cb06cf0e6da905e4fae0b967429 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Mon, 24 Mar 2025 23:40:19 -0700 Subject: [PATCH 0476/2977] feat: DKMS NVIDIA Package (#4137) (#4155) * feat: NVIDIA DKMS Package * Revert "feat: NVIDIA DKMS Package" This reverts commit c2b5f4b70aff0bcbe936ad0ec377e3e41cce526a. * feat: NVIDIA DKMS Package * Update dkms-nvidia.spec Signed-off-by: Gilver * Try adding those back...? Signed-off-by: Gilver --------- Signed-off-by: Gilver (cherry picked from commit e904aef40d9e753251ccacefec595c743b86e773) Co-authored-by: Gilver --- anda/system/nvidia/dkms-nvidia/anda.hcl | 8 +++ .../nvidia/dkms-nvidia/dkms-nvidia.conf | 29 ++++++++++ .../nvidia/dkms-nvidia/dkms-nvidia.spec | 55 +++++++++++++++++++ anda/system/nvidia/dkms-nvidia/modules.conf | 1 + anda/system/nvidia/dkms-nvidia/update.rhai | 3 + 5 files changed, 96 insertions(+) create mode 100644 anda/system/nvidia/dkms-nvidia/anda.hcl create mode 100644 anda/system/nvidia/dkms-nvidia/dkms-nvidia.conf create mode 100644 anda/system/nvidia/dkms-nvidia/dkms-nvidia.spec create mode 100644 anda/system/nvidia/dkms-nvidia/modules.conf create mode 100644 anda/system/nvidia/dkms-nvidia/update.rhai diff --git a/anda/system/nvidia/dkms-nvidia/anda.hcl b/anda/system/nvidia/dkms-nvidia/anda.hcl new file mode 100644 index 0000000000..1fc99a9f40 --- /dev/null +++ b/anda/system/nvidia/dkms-nvidia/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "dkms-nvidia.spec" + } + labels { + subrepo = "nvidia" + } +} diff --git a/anda/system/nvidia/dkms-nvidia/dkms-nvidia.conf b/anda/system/nvidia/dkms-nvidia/dkms-nvidia.conf new file mode 100644 index 0000000000..bd53ff3ab3 --- /dev/null +++ b/anda/system/nvidia/dkms-nvidia/dkms-nvidia.conf @@ -0,0 +1,29 @@ +PACKAGE_NAME="nvidia" +PACKAGE_VERSION="__VERSION_STRING" +AUTOINSTALL="yes" + +. /etc/nvidia/kernel.conf + +# Quote make to avoid DKMS replacing it with "make -j$parallel_jobs KERNELRELEASE=$kernelver" +CLEAN="'make' -j$(nproc) -C ${MODULE_VARIANT} clean" +MAKE[0]="'make' -j$(nproc) -C ${MODULE_VARIANT} KERNEL_UNAME=${kernelver} modules" + +BUILT_MODULE_NAME[0]="nvidia" +BUILT_MODULE_LOCATION[0]="${MODULE_VARIANT}" +DEST_MODULE_LOCATION[0]="/extra" + +BUILT_MODULE_NAME[1]="nvidia-modeset" +BUILT_MODULE_LOCATION[1]="${MODULE_VARIANT}" +DEST_MODULE_LOCATION[1]="/extra" + +BUILT_MODULE_NAME[2]="nvidia-drm" +BUILT_MODULE_LOCATION[2]="${MODULE_VARIANT}" +DEST_MODULE_LOCATION[2]="/extra" + +BUILT_MODULE_NAME[3]="nvidia-uvm" +BUILT_MODULE_LOCATION[3]="${MODULE_VARIANT}" +DEST_MODULE_LOCATION[3]="/extra" + +BUILT_MODULE_NAME[4]="nvidia-peermem" +BUILT_MODULE_LOCATION[4]="${MODULE_VARIANT}" +DEST_MODULE_LOCATION[4]="/extra" diff --git a/anda/system/nvidia/dkms-nvidia/dkms-nvidia.spec b/anda/system/nvidia/dkms-nvidia/dkms-nvidia.spec new file mode 100644 index 0000000000..658042d5cf --- /dev/null +++ b/anda/system/nvidia/dkms-nvidia/dkms-nvidia.spec @@ -0,0 +1,55 @@ +## NVIDIA DKMS package, based on the work of Negativo17 with tweaks for Terra. + +%global debug_package %{nil} +%global modulename nvidia + +Name: dkms-%{modulename} +Version: 570.133.07 +Release: 1%{?dist} +Summary: NVIDIA display driver kernel module +Epoch: 3 +License: NVIDIA License +URL: https://www.nvidia.com/object/unix.html +Source0: https://download.nvidia.com/XFree86/Linux-%{_arch}/%{version}/NVIDIA-Linux-%{_arch}-%{version}.run +Source1: %{name}.conf +BuildRequires: sed +Provides: %{modulename}-kmod = %{?epoch:%{epoch}:}%{version} +Requires: %{modulename}-kmod-common = %{?epoch:%{epoch}:}%{version} +Requires: dkms +Conflicts: akmod-nvidia +# Unlike most DKMS packages, this package is NOT noarch! +ExclusiveArch: x86_64 aarch64 + +%description +This package provides the proprietary NVIDIA kernel driver modules. + +%prep +sh %{SOURCE0} -x --target dkms-nvidia-%{version}-%{_arch} +%setup -T -D -n dkms-nvidia-%{version}-%{_arch} + +cp -f %{SOURCE1} dkms.conf + +sed -i -e 's/__VERSION_STRING/%{version}/g' dkms.conf + +%build + +%install +mkdir -p %{buildroot}%{_usrsrc}/%{modulename}-%{version}/ +cp -fr * %{buildroot}%{_usrsrc}/%{modulename}-%{version}/ +rm -f %{buildroot}%{_usrsrc}/%{modulename}-%{version}/*/dkms.conf + +%post +dkms add -m %{modulename} -v %{version} -q --rpm_safe_upgrade || : +# Rebuild and make available for the currently running kernel: +dkms build -m %{modulename} -v %{version} -q || : +dkms install -m %{modulename} -v %{version} -q --force || : + +%preun +# Remove all versions from DKMS registry: +dkms remove -m %{modulename} -v %{version} -q --all --rpm_safe_upgrade || : + +%files +%{_usrsrc}/%{modulename}-%{version} + +%changelog +%autochangelog diff --git a/anda/system/nvidia/dkms-nvidia/modules.conf b/anda/system/nvidia/dkms-nvidia/modules.conf new file mode 100644 index 0000000000..24f6f95c96 --- /dev/null +++ b/anda/system/nvidia/dkms-nvidia/modules.conf @@ -0,0 +1 @@ +NO_WEAK_MODULES="yes" diff --git a/anda/system/nvidia/dkms-nvidia/update.rhai b/anda/system/nvidia/dkms-nvidia/update.rhai new file mode 100644 index 0000000000..e5eff132c0 --- /dev/null +++ b/anda/system/nvidia/dkms-nvidia/update.rhai @@ -0,0 +1,3 @@ +import "andax/nvidia.rhai" as nvidia; + +rpm.version(nvidia::nvidia_driver_version()); From 4f9cb46a303611927bdf077e8f468ba6d1ffff69 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Tue, 25 Mar 2025 00:12:37 -0700 Subject: [PATCH 0477/2977] refactor(intel-ipu6-kmod): Specify exclusive arch in anda.hcl (#4132) (#4159) Signed-off-by: Gilver (cherry picked from commit 4204eb9f6aac7fea941596e76adc761d01d834b1) Co-authored-by: Gilver --- anda/system/intel-ipu6-kmod/anda.hcl | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/system/intel-ipu6-kmod/anda.hcl b/anda/system/intel-ipu6-kmod/anda.hcl index 77b034f644..385a9583bb 100644 --- a/anda/system/intel-ipu6-kmod/anda.hcl +++ b/anda/system/intel-ipu6-kmod/anda.hcl @@ -1,4 +1,5 @@ project pkg { + arches = ["x86_64"] rpm { spec = "intel-ipu6-kmod.spec" } From be369f605108c3573e54a142b11b3598da4dcc1d Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Tue, 25 Mar 2025 07:01:01 -0700 Subject: [PATCH 0478/2977] fix(envision): Disable debug packages on EL, fix licenses (#4134) (#4164) * fix(envision): Disable debug packages on EL Signed-off-by: Gilver * Switch to Cargo, will need to update licenses Signed-off-by: Gilver * Remove recursion, idea what is going on though Signed-off-by: Gilver * Still need to update licenses but WTF Signed-off-by: Gilver * Facepalm emoji Signed-off-by: Gilver * Update envision.spec Signed-off-by: Gilver * Update licenses Signed-off-by: Gilver * This wasn't necessary just wanted to order it better Signed-off-by: Gilver * fix(envision): use cargo macros * Move where the license is so I'm last pusher Signed-off-by: Gilver --------- Signed-off-by: Gilver Co-authored-by: madonuko (cherry picked from commit 90d2407a77d1a7d6e0558b59993c7fa836a08537) Co-authored-by: Gilver --- anda/apps/envision/envision.spec | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/anda/apps/envision/envision.spec b/anda/apps/envision/envision.spec index 09c8920212..1ee430a4db 100644 --- a/anda/apps/envision/envision.spec +++ b/anda/apps/envision/envision.spec @@ -4,19 +4,24 @@ Name: envision-nightly Version: %commit_date.%shortcommit -Release: 1%?dist +Release: 2%?dist Summary: UI for building, configuring and running Monado, the open source OpenXR runtime -License: AGPL-3.0-or-later +SourceLicense: AGPL-3.0-or-later +License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND AGPL-3.0-or-later AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND Apache-2.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND ISC AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND Unicode-3.0 AND (Unlicense OR MIT) AND Zlib URL: https://gitlab.com/gabmus/envision/ Source0: %url/-/archive/%commit/envision-%commit.tar.gz -BuildRequires: meson ninja-build cargo +BuildRequires: anda-srpm-macros +BuildRequires: cargo +BuildRequires: cargo-rpm-macros +BuildRequires: meson +BuildRequires: ninja-build BuildRequires: pkgconfig(glib-2.0) >= 2.66 BuildRequires: pkgconfig(gio-2.0) >= 2.66 BuildRequires: pkgconfig(gtk4) >= 4.10.0 BuildRequires: pkgconfig(vte-2.91-gtk4) >= 0.72.0 BuildRequires: pkgconfig(libadwaita-1) BuildRequires: pkgconfig(libusb-1.0) -BuildRequires: openssl-devel-engine +BuildRequires: pkgconfig(openssl) BuildRequires: openxr-devel BuildRequires: libappstream-glib BuildRequires: desktop-file-utils @@ -30,17 +35,27 @@ Conflicts: envision %prep %autosetup -n envision-%commit +%cargo_prep_online %build +# generate constants.rs from constants.rs.in %meson + +# skip subdir +sed -E "/^subdir\('src'\)/d" -i meson.build + +%meson --reconfigure %meson_build %install %meson_install +%cargo_install +%{cargo_license_online} > LICENSE.dependencies %files %doc README.md %license LICENSE +%license LICENSE.dependencies %_bindir/envision %_datadir/applications/org.gabmus.envision.Devel.desktop %_datadir/envision/ From 2cce4d5119354e593f1ab0f4e5c090875787d3e9 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Mar 2025 15:20:19 +0000 Subject: [PATCH 0479/2977] bump: lomiri-system-settings --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 7c6f9820c0..87b77c6b8d 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit 37e8a602be013761ed2a3cabba548e1c30fa3254 +%global commit 27d158b71a32a27138edf510d8b715acdb092a4e %forgemeta Name: lomiri-system-settings From bd2b5dcdde033c128f689b7397a42fff43abe5ef Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Mar 2025 15:51:10 +0000 Subject: [PATCH 0480/2977] bump: inputplumber --- anda/games/inputplumber/inputplumber.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index 6b26c38578..cf96aa82d6 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.49.6 +Version: 0.49.7 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later From 82c3bb3ee2da2ab496e6d5176300899b091bde37 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Mar 2025 19:17:56 +0000 Subject: [PATCH 0481/2977] bump: eww --- anda/desktops/waylands/eww/eww.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/desktops/waylands/eww/eww.spec b/anda/desktops/waylands/eww/eww.spec index 37ce7d415b..81cd983f21 100644 --- a/anda/desktops/waylands/eww/eww.spec +++ b/anda/desktops/waylands/eww/eww.spec @@ -1,7 +1,7 @@ # Generated by rust2rpm 27 -%global commit 5b4cc3e7a8055afb758421f4a114ef4032806e39 +%global commit a9aa0f96892f20e4741e94f4cd46ca31106e492c %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250216 +%global commit_date 20250325 %global ver v0.6.0 %bcond check 0 From 2ac96a0bcf0d343f1833a01531e2f73b1f4ac562 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Mar 2025 21:45:34 +0000 Subject: [PATCH 0482/2977] bump: limine --- anda/system/limine/limine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/limine/limine.spec b/anda/system/limine/limine.spec index a6b01c1f5b..99da890b5d 100644 --- a/anda/system/limine/limine.spec +++ b/anda/system/limine/limine.spec @@ -1,5 +1,5 @@ Name: limine -Version: 9.2.0 +Version: 9.2.1 Release: 1%?dist Summary: Modern, advanced, portable, multiprotocol bootloader License: BSD-2-Clause From ac68c2316549dbb7244762f0257ac48b6f21770c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Mar 2025 22:37:18 +0000 Subject: [PATCH 0483/2977] bump: lomiri-system-settings --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 87b77c6b8d..e34e619d59 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit 27d158b71a32a27138edf510d8b715acdb092a4e +%global commit 580ec11267742263e164d139fd26ba7ba5b79e92 %forgemeta Name: lomiri-system-settings From ff9a18710fdb6071f5a7a64e7c023fdba54b48e8 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Mar 2025 01:24:26 +0000 Subject: [PATCH 0484/2977] bump: ruffle yt-dlp --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index eba02c7fce..31a31ae6d4 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-25 +%global ver 2025-03-26 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 0fd6e57715..39b71c54b2 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.25.001035 +Version: 2025.03.26.000411 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 26f8bdfbacb965dd7fbdbdfc746ca5b618015122 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Mar 2025 01:42:57 +0000 Subject: [PATCH 0485/2977] bump(nightly): mpv nightly micro nightly nim-nightly rpi-update --- anda/apps/mpv/mpv-nightly.spec | 6 +++--- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/micro/micro-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/tools/rpi-update/rpi-update.spec | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 85ccaa67da..ed7fe0508b 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,7 +1,7 @@ -%global commit b31c3d80ab0040cb02a54ee878cb2d95f6ed74e0 +%global commit af1ac0f685ce1bf4096c52e4943ce9ab2aedf348 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250324 -%global ver 0.39.0 +%global commit_date 20250326 +%global ver 0.40.0 Name: mpv-nightly Version: %ver^%commit_date.%shortcommit diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 777029a63f..1c2a5a14e7 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 5d9bee98e8ef8e36f3e8fb18d0fcedc7b9eef17f +%global commit bcff4e18f430e0e34412f631215f196c9e0c885b %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-03-24 +%global fulldate 2025-03-25 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 diff --git a/anda/devs/micro/micro-nightly.spec b/anda/devs/micro/micro-nightly.spec index 2888822287..f9910c3cfb 100644 --- a/anda/devs/micro/micro-nightly.spec +++ b/anda/devs/micro/micro-nightly.spec @@ -12,8 +12,8 @@ # Naming variable as something other than "commit" is necessary # to stop %%gometa from putting commit hash in release -%global commit_hash 219fb12482055312b29aa35007d0bb33ef918f30 -%global commit_date 20250316 +%global commit_hash f4d62a498b204e73b8f084a5dc1ce82380b8c03a +%global commit_date 20250326 %global shortcommit %{sub %{commit_hash} 1 7} %global ver 2.0.14 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 306f341ac8..479bbe3a73 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit e9e6529df4c158f299e7077daf33136b345a6074 +%global commit 931a6d6f407b294004d091fea780d3a061cfe091 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250325 +%global commit_date 20250326 %global ver 0.180.0 %bcond_with check diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 9716faf652..343595354d 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit d15705e05b166077634a6caa96808d34af1f5d5b +%global commit b82d7e8ba1bf15a24561c97198f8741ffe9f454c %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250325 +%global commit_date 20250326 %global debug_package %nil Name: nim-nightly diff --git a/anda/tools/rpi-update/rpi-update.spec b/anda/tools/rpi-update/rpi-update.spec index c7a59ca958..147fa46ddb 100644 --- a/anda/tools/rpi-update/rpi-update.spec +++ b/anda/tools/rpi-update/rpi-update.spec @@ -1,7 +1,7 @@ %define debug_package %nil -%global commit 7ce981c2125b2dd780f4e88dc320e1570dc4c51e -%global commit_date 20240910 +%global commit bb117f13b1a39b646f6ebebdbb5193bee4a24855 +%global commit_date 20250326 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: rpi-update From 1147e08b91404e80943563b99bc2c85d437a073d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Mar 2025 02:44:47 +0000 Subject: [PATCH 0486/2977] bump: bun --- anda/devs/bun/bun-bin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/bun/bun-bin.spec b/anda/devs/bun/bun-bin.spec index 399a60471d..1500dce1de 100644 --- a/anda/devs/bun/bun-bin.spec +++ b/anda/devs/bun/bun-bin.spec @@ -6,7 +6,7 @@ %endif Name: bun-bin -Version: 1.2.5 +Version: 1.2.6 Release: 1%?dist Summary: Incredibly fast JavaScript runtime, bundler, test runner, and package manager – all in one License: MIT From f6ab97093dfcce97a9176c677398df43cb29838a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Mar 2025 03:21:21 +0000 Subject: [PATCH 0487/2977] bump: electron --- anda/tools/electron/electron.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/electron/electron.spec b/anda/tools/electron/electron.spec index d927f4b973..27df1f26cb 100644 --- a/anda/tools/electron/electron.spec +++ b/anda/tools/electron/electron.spec @@ -12,7 +12,7 @@ %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so Name: electron -Version: 35.0.3 +Version: 35.1.0 Release: 1%?dist Summary: Build cross platform desktop apps with web technologies License: MIT From acb03c2b5a594928d19fd0dc11b4a253bc5a77fb Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Tue, 25 Mar 2025 21:06:52 -0700 Subject: [PATCH 0488/2977] feat(v4l2loopback): Compatibility with Nobara and CachyOS COPR kernel (#4162) (#4170) * Remove requirement Signed-off-by: Gilver * Bump release Signed-off-by: Gilver * This will work if we get a SATM removal Signed-off-by: Gilver --------- Signed-off-by: Gilver (cherry picked from commit 42e432d856d8f4c568c55cc2d3f476bb169f143b) Co-authored-by: Gilver --- anda/system/v4l2loopback/kmod-common/v4l2loopback.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/system/v4l2loopback/kmod-common/v4l2loopback.spec b/anda/system/v4l2loopback/kmod-common/v4l2loopback.spec index 37bb386f78..645d885c72 100644 --- a/anda/system/v4l2loopback/kmod-common/v4l2loopback.spec +++ b/anda/system/v4l2loopback/kmod-common/v4l2loopback.spec @@ -6,7 +6,7 @@ Name: v4l2loopback Summary: Utils for V4L2 loopback devices Version: 0.14.0 -Release: 3%?dist +Release: 4%?dist License: GPL-2.0-or-later URL: https://github.com/v4l2loopback/v4l2loopback Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -16,7 +16,7 @@ BuildRequires: make BuildRequires: help2man BuildRequires: sed BuildRequires: systemd-rpm-macros -Requires: (akmod-%{name} = %{?epoch:%{epoch}:}%{version} or dkms-%{name} = %{?epoch:%{epoch}:}%{version}) +Requires: (%{name}-kmod = %{?epoch:%{epoch}:}%{version} or dkms-%{name} = %{?epoch:%{epoch}:}%{version}) Provides: %{name}-kmod-common = %{?epoch:%{epoch}:}%{version} ### For compatibility with older names Provides: %{name}-utils = %{version}-%{release} From 86e4caf6860caea08a7e679032f57ac3813ad5a4 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Mar 2025 06:31:09 +0000 Subject: [PATCH 0489/2977] bump: opengamepadui --- anda/games/opengamepadui/opengamepadui.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/opengamepadui/opengamepadui.spec b/anda/games/opengamepadui/opengamepadui.spec index bca34085f2..f33b76406f 100644 --- a/anda/games/opengamepadui/opengamepadui.spec +++ b/anda/games/opengamepadui/opengamepadui.spec @@ -1,5 +1,5 @@ Name: opengamepadui -Version: 0.38.0 +Version: 0.39.0 Release: 1%?dist Summary: Open source gamepad-native game launcher and overlay From db6ab031036b1db2b4e1c564ad36f80fcf4ff0dd Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Mar 2025 12:51:25 +0000 Subject: [PATCH 0490/2977] bump: youtube-music --- anda/apps/youtube-music/youtube-music.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/youtube-music/youtube-music.spec b/anda/apps/youtube-music/youtube-music.spec index fa894d1339..86b0b43f2f 100644 --- a/anda/apps/youtube-music/youtube-music.spec +++ b/anda/apps/youtube-music/youtube-music.spec @@ -12,8 +12,8 @@ %global vendor_pnpm 1 Name: youtube-music -Version: 3.7.5 -Release: 4%?dist +Version: 3.8.0 +Release: 1%?dist Summary: YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader) Source1: youtube-music.desktop License: MIT From 8b386958e569af253fbb741eb315270ec88b8992 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Mar 2025 13:27:25 +0000 Subject: [PATCH 0491/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index 5359983da0..dc657876a9 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.3.8 +Version: 2025.3.9 Release: 1%?dist Summary: Front-end to your dev env From b128fc405a10766c8c5d5c9d6cfc99b3cf1a83d5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Mar 2025 16:33:17 +0000 Subject: [PATCH 0492/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 0a75ada810..b2cb6d4ef1 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.179.2-pre +%global ver 0.180.0-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From 0faa96cc3b355e3aea031c64c24ac60591f0b725 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Wed, 26 Mar 2025 09:53:43 -0700 Subject: [PATCH 0493/2977] add: steamtinkerlaunch and steamtinkerlaunch-git (#4174) (#4176) * add: steamtinkerlaunch and steamtinkerlaunch-nightly * Add conflicts * cleanup: Remove unneeded backslash * fixup: Sed command that is less likely to have issues in future updates, rename to Git because this updates to infrequently, fix some dep stuff (cherry picked from commit 767d1ab5182000a1f541c33a3a080fab2d65ffbf) Co-authored-by: Gilver --- anda/games/steamtinkerlaunch/git/anda.hcl | 9 ++ .../git/steamtinkerlaunch-git.spec | 82 +++++++++++++++++++ anda/games/steamtinkerlaunch/git/update.rhai | 8 ++ anda/games/steamtinkerlaunch/stable/anda.hcl | 6 ++ .../stable/steamtinkerlaunch.spec | 75 +++++++++++++++++ .../steamtinkerlaunch/stable/update.rhai | 1 + 6 files changed, 181 insertions(+) create mode 100644 anda/games/steamtinkerlaunch/git/anda.hcl create mode 100644 anda/games/steamtinkerlaunch/git/steamtinkerlaunch-git.spec create mode 100644 anda/games/steamtinkerlaunch/git/update.rhai create mode 100644 anda/games/steamtinkerlaunch/stable/anda.hcl create mode 100644 anda/games/steamtinkerlaunch/stable/steamtinkerlaunch.spec create mode 100644 anda/games/steamtinkerlaunch/stable/update.rhai diff --git a/anda/games/steamtinkerlaunch/git/anda.hcl b/anda/games/steamtinkerlaunch/git/anda.hcl new file mode 100644 index 0000000000..263fbadf27 --- /dev/null +++ b/anda/games/steamtinkerlaunch/git/anda.hcl @@ -0,0 +1,9 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "steamtinkerlaunch-git.spec" + } + labels { + nightly = 1 + } +} diff --git a/anda/games/steamtinkerlaunch/git/steamtinkerlaunch-git.spec b/anda/games/steamtinkerlaunch/git/steamtinkerlaunch-git.spec new file mode 100644 index 0000000000..3d04ee65ce --- /dev/null +++ b/anda/games/steamtinkerlaunch/git/steamtinkerlaunch-git.spec @@ -0,0 +1,82 @@ +%global commit 36e917c383a333caa43e187c06c0aed0c30c0421 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commit_date 20250221 +%global ver 12.12 +%global base_name steamtinkerlaunch +%global _description %{expand: +Steam Tinker Launch is a Linux wrapper tool for use with the Steam client which allows customizing and start tools and options for games quickly on the fly.} + +Name: %{base_name}-git +Version: %{ver}^%{commit_date}git.%{shortcommit} +Release: 1%{?dist} +Summary: Wrapper tool for use with the Steam client for custom launch options +License: GPL-3.0-or-later +URL: https://github.com/sonic2kk/steamtinkerlaunch +Source0: %{url}/archive/%{commit}/%{base_name}-%{commit}.tar.gz +BuildRequires: make +BuildRequires: sed +Requires: bash +Requires: gawk +Requires: git +Requires: procps-ng +Requires: tar +Requires: unzip +Requires: vim-common +Requires: wget +Requires: xdotool +Requires: xprop +Requires: xrandr +Requires: xwininfo +Requires: xxd +Requires: yad >= 7.2 +# Weak deps for various optional features +Recommends: gamemode +Recommends: gameconqueror +# Default to terra-gamescope if available as Fedora's Gamescope package is notoriously broken, otherwise recommend Fedora's +Recommends: (terra-gamescope or gamescope) +Recommends: ImageMagick +Recommends: innoextract +Recommends: jq +Recommends: mangohud +Recommends: net-toolsa +Recommends: p7zip +Recommends: rsync +Recommends: scummvm +Recommends: strace +Recommends: usbutils +Recommends: vkBasalt +# Default to whatever WINE source the user has +Recommends: (winehq-staging or wine) +Recommends: winetricks +Recommends: xdg-utils +# Terra tag policy +Provides: %{base_name}.git +Conflicts: %{base_name} +BuildArch: noarch +Packager: Gilver E. + +%description %_description + +%prep +%autosetup -p1 -n %{base_name}-%{commit} +# We only want the install commands from the Makefile +sed -i 's/.*sed.*//g' Makefile +# Let RPM handle the doc files +sed -i 's/.*doc.*//g' Makefile + +%build + +%install +%make_install PREFIX=%{buildroot}%{_prefix} + +%files +%license LICENSE +%doc README.md +%{_bindir}/steamtinkerlaunch +%{_datadir}/steamtinkerlaunch +%{_datadir}/applications/steamtinkerlaunch.desktop +%{_datadir}/icons/hicolor/scalable/apps/steamtinkerlaunch.svg + +%changelog +* Wed Mar 26 2025 Gilver E. - 12.12 +- Initial package diff --git a/anda/games/steamtinkerlaunch/git/update.rhai b/anda/games/steamtinkerlaunch/git/update.rhai new file mode 100644 index 0000000000..d6f444d26f --- /dev/null +++ b/anda/games/steamtinkerlaunch/git/update.rhai @@ -0,0 +1,8 @@ +rpm.global("commit", gh_commit("sonic2kk/steamtinkerlaunch")); +if rpm.changed() { + rpm.release(); + rpm.global("commit_date", date()); + let v = gh("sonic2kk/steamtinkerlaunch"); + v.crop(1); + rpm.global("ver", v); +} diff --git a/anda/games/steamtinkerlaunch/stable/anda.hcl b/anda/games/steamtinkerlaunch/stable/anda.hcl new file mode 100644 index 0000000000..58d0869f7a --- /dev/null +++ b/anda/games/steamtinkerlaunch/stable/anda.hcl @@ -0,0 +1,6 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "steamtinkerlaunch.spec" + } +} diff --git a/anda/games/steamtinkerlaunch/stable/steamtinkerlaunch.spec b/anda/games/steamtinkerlaunch/stable/steamtinkerlaunch.spec new file mode 100644 index 0000000000..d888d26691 --- /dev/null +++ b/anda/games/steamtinkerlaunch/stable/steamtinkerlaunch.spec @@ -0,0 +1,75 @@ +%global _description %{expand: +Steam Tinker Launch is a Linux wrapper tool for use with the Steam client which allows customizing and start tools and options for games quickly on the fly.} + +Name: steamtinkerlaunch +Version: 12.12 +Release: 1%{?dist} +Summary: Wrapper tool for use with the Steam client for custom launch options +License: GPL-3.0-or-later +URL: https://github.com/sonic2kk/steamtinkerlaunch +Source0: %{url}/archive/refs/tags/v%{version}.tar.gz +BuildRequires: make +BuildRequires: sed +Requires: bash +Requires: gawk +Requires: git +Requires: procps-ng +Requires: tar +Requires: unzip +Requires: vim-common +Requires: wget +Requires: xdotool +Requires: xprop +Requires: xrandr +Requires: xwininfo +Requires: xxd +Requires: yad >= 7.2 +# Weak deps for various optional features +Recommends: gamemode +Recommends: gameconqueror +# Default to terra-gamescope if available as Fedora's Gamescope package is notoriously broken, otherwise recommend Fedora's +Recommends: (terra-gamescope or gamescope) +Recommends: ImageMagick +Recommends: innoextract +Recommends: jq +Recommends: mangohud +Recommends: net-toolsa +Recommends: p7zip +Recommends: rsync +Recommends: scummvm +Recommends: strace +Recommends: usbutils +Recommends: vkBasalt +# Default to whatever WINE source the user has +Recommends: (winehq-staging or wine) +Recommends: winetricks +Recommends: xdg-utils +Conflicts: %{name}-git +BuildArch: noarch +Packager: Gilver E. + +%description %_description + +%prep +%autosetup -p1 -n %{name}-%{version} +# We only want the install commands from the Makefile +sed -i 's/.*sed.*//g' Makefile +# Let RPM handle the doc files +sed -i 's/.*doc.*//g' Makefile + +%build + +%install +%make_install PREFIX=%{buildroot}%{_prefix} + +%files +%license LICENSE +%doc README.md +%{_bindir}/steamtinkerlaunch +%{_datadir}/steamtinkerlaunch +%{_datadir}/applications/steamtinkerlaunch.desktop +%{_datadir}/icons/hicolor/scalable/apps/steamtinkerlaunch.svg + +%changelog +* Wed Mar 26 2025 Gilver E. - 12.12 +- Initial package diff --git a/anda/games/steamtinkerlaunch/stable/update.rhai b/anda/games/steamtinkerlaunch/stable/update.rhai new file mode 100644 index 0000000000..c9a6a93391 --- /dev/null +++ b/anda/games/steamtinkerlaunch/stable/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("sonic2kk/steamtinkerlaunch")); From 24fb6eaacfe383bbb68d3a8f159bfc559369c1de Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Mar 2025 17:33:39 +0000 Subject: [PATCH 0494/2977] bump: stable --- anda/devs/zed/stable/zed.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 072885e5bb..824344dace 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.178.5 +Version: 0.179.2 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From 04903ad6141fa465f15ff99242a8db7a3e0038b4 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Mar 2025 19:17:52 +0000 Subject: [PATCH 0495/2977] bump: protobuf electron --- anda/langs/python/protobuf/python3-protobuf.spec | 4 ++-- anda/tools/electron/electron.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/langs/python/protobuf/python3-protobuf.spec b/anda/langs/python/protobuf/python3-protobuf.spec index b7fa3c44f2..3cc172c3bd 100644 --- a/anda/langs/python/protobuf/python3-protobuf.spec +++ b/anda/langs/python/protobuf/python3-protobuf.spec @@ -2,8 +2,8 @@ %global pypi_name protobuf Name: python-%{pypi_name} -Version: 6.30.1 -Release: 2%?dist +Version: 6.30.2 +Release: 1%?dist Summary: Protocol Buffers License: BSD-3-Clause diff --git a/anda/tools/electron/electron.spec b/anda/tools/electron/electron.spec index 27df1f26cb..98a5f11506 100644 --- a/anda/tools/electron/electron.spec +++ b/anda/tools/electron/electron.spec @@ -12,7 +12,7 @@ %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so Name: electron -Version: 35.1.0 +Version: 35.1.1 Release: 1%?dist Summary: Build cross platform desktop apps with web technologies License: MIT From 74b451cff6cdf1dd03c83010dc8c2d255e2fd9ab Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Mar 2025 21:31:08 +0000 Subject: [PATCH 0496/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 69fa08ccda..ee8794d01d 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.619 +Version: 0.0.620 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index b6fe516edb..a0475c3583 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.619 +Version: 0.0.620 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 81071d44f263f9870b22ad8d56375fbe3951c38f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Mar 2025 21:45:51 +0000 Subject: [PATCH 0497/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index dc657876a9..3fade4d6ee 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.3.9 +Version: 2025.3.10 Release: 1%?dist Summary: Front-end to your dev env From 46519d146609bd89dd7b6e03c803c6010b7b43ea Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 27 Mar 2025 01:27:53 +0000 Subject: [PATCH 0498/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 31a31ae6d4..cc96243b26 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-26 +%global ver 2025-03-27 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 8edc3518ff3e561cc9fb0bfd094dec9758cfeb83 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 27 Mar 2025 01:42:33 +0000 Subject: [PATCH 0499/2977] bump(nightly): envision mpv nightly nightly prismlauncher-nightly nim-nightly --- anda/apps/envision/envision.spec | 6 +++--- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 6 +++--- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/anda/apps/envision/envision.spec b/anda/apps/envision/envision.spec index 1ee430a4db..5f574713c1 100644 --- a/anda/apps/envision/envision.spec +++ b/anda/apps/envision/envision.spec @@ -1,10 +1,10 @@ -%global commit e117986715e1e9ef955009ad7f03ec110aa14940 -%global commit_date 20250303 +%global commit db45103d1bc23d56692571d652f56f8866dc956d +%global commit_date 20250327 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: envision-nightly Version: %commit_date.%shortcommit -Release: 2%?dist +Release: 1%?dist Summary: UI for building, configuring and running Monado, the open source OpenXR runtime SourceLicense: AGPL-3.0-or-later License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND AGPL-3.0-or-later AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND Apache-2.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND ISC AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND Unicode-3.0 AND (Unlicense OR MIT) AND Zlib diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index ed7fe0508b..d89ba6ecfe 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit af1ac0f685ce1bf4096c52e4943ce9ab2aedf348 +%global commit 38439dd531e5d7041f7a44a5a7c11247656a2166 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250326 +%global commit_date 20250327 %global ver 0.40.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 1c2a5a14e7..c62db0205f 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit bcff4e18f430e0e34412f631215f196c9e0c885b +%global commit 494279419af16aba382fc0c25d3edb25dbec1d7f %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-03-25 +%global fulldate 2025-03-26 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.3 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 479bbe3a73..df00ef00c2 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,7 +1,7 @@ -%global commit 931a6d6f407b294004d091fea780d3a061cfe091 +%global commit 47b94e5ef0efae21daa9799d59f4e133384c8019 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250326 -%global ver 0.180.0 +%global commit_date 20250327 +%global ver 0.181.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 89f1ec4be1..b3b11c79f5 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 064383b8fa157881cd6d8426182a94695cadbdba +%global commit 1c0c24763174fe57cfeb6d1855505b7d6e9946e4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250325 +%global commit_date 20250327 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 343595354d..b3f0fedf53 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit b82d7e8ba1bf15a24561c97198f8741ffe9f454c +%global commit 73112d64a3824963f6e74a06b60d6b9b2d189050 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250326 +%global commit_date 20250327 %global debug_package %nil Name: nim-nightly From b4cb5066ddeb2bd1ba66af30a1591cb69d19a439 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Wed, 26 Mar 2025 20:38:36 -0700 Subject: [PATCH 0500/2977] add: dwarfs (#4089) (#4180) * Create drawfs.spec Signed-off-by: Gilver * Create update.rhai Signed-off-by: Gilver * Create anda.hcl Signed-off-by: Gilver * Update drawfs.spec Signed-off-by: Gilver * If I could spell Signed-off-by: Gilver * Fix dep, try to follow build guidelines better Signed-off-by: Gilver * Huh...okay Signed-off-by: Gilver * ? Signed-off-by: Gilver * 'Kay Signed-off-by: Gilver * AAAA Signed-off-by: Gilver * Yeet Ninja Signed-off-by: Gilver --------- Signed-off-by: Gilver (cherry picked from commit 8345d8b3065811b2421db4c6cc1c0bd1c4747764) Co-authored-by: Gilver --- anda/lib/dwarfs/anda.hcl | 5 ++ anda/lib/dwarfs/dwarfs.spec | 120 ++++++++++++++++++++++++++++++++++++ anda/lib/dwarfs/update.rhai | 1 + 3 files changed, 126 insertions(+) create mode 100644 anda/lib/dwarfs/anda.hcl create mode 100644 anda/lib/dwarfs/dwarfs.spec create mode 100644 anda/lib/dwarfs/update.rhai diff --git a/anda/lib/dwarfs/anda.hcl b/anda/lib/dwarfs/anda.hcl new file mode 100644 index 0000000000..7d4a28ea95 --- /dev/null +++ b/anda/lib/dwarfs/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "dwarfs.spec" + } +} diff --git a/anda/lib/dwarfs/dwarfs.spec b/anda/lib/dwarfs/dwarfs.spec new file mode 100644 index 0000000000..58236af673 --- /dev/null +++ b/anda/lib/dwarfs/dwarfs.spec @@ -0,0 +1,120 @@ +%global _description %{expand: +The Deduplicating Warp-speed Advanced Read-only File System. + +A fast high compression read-only file system for Linux and Windows.} + +Name: dwarfs +Version: 0.11.2 +Release: 1%{?dist} +Summary: A fast high compression read-only file system for Linux, Windows and macOS +License: GPL-3.0-or-later +URL: https://github.com/mhx/%{name} +Source0: https://github.com/mhx/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz +BuildRequires: binutils-devel +BuildRequires: bison +BuildRequires: boost-chrono +BuildRequires: boost-context +BuildRequires: boost-devel +BuildRequires: boost-filesystem +BuildRequires: boost-iostreams +BuildRequires: boost-program-options +BuildRequires: boost-regex +BuildRequires: boost-system +BuildRequires: boost-thread +BuildRequires: brotli-devel +BuildRequires: ccache +BuildRequires: clang +BuildRequires: cmake +BuildRequires: date-devel +BuildRequires: double-conversion-devel +BuildRequires: elfutils-devel +BuildRequires: file-devel +BuildRequires: flac-devel +BuildRequires: flex +BuildRequires: fmt-devel +BuildRequires: fuse3 +BuildRequires: fuse3-devel +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: git +BuildRequires: glog-devel +BuildRequires: gmock-devel +BuildRequires: google-benchmark-devel +BuildRequires: gtest-devel +BuildRequires: jemalloc-devel +BuildRequires: json-devel +BuildRequires: libacl-devel +BuildRequires: libarchive-devel +BuildRequires: libdwarf-devel +BuildRequires: libevent-devel +BuildRequires: libunwind-devel +BuildRequires: lz4-devel +BuildRequires: make +BuildRequires: ninja-build +BuildRequires: openssl-devel +BuildRequires: pkgconf +BuildRequires: range-v3-devel +BuildRequires: rubygem-ronn-ng +BuildRequires: utf8cpp-devel +BuildRequires: xxhash-devel +BuildRequires: xz-devel +Requires: bzip2-libs +Requires: gflags +Requires: libattr +Requires: libxml2 +Requires: libzstd +Requires: zlib-ng-compat +Packager: Gilver E. + +%description %_description + +%package devel +Summary: Development files for DWARFS. +Requires: %{name} + +%description devel +This package contains the development files for DWARFS. + +%prep +%autosetup + +%build +%cmake -DWITH_TESTS=ON \ +-DWITH_LIBDWARFS=ON \ +-DWITH_TOOLS=ON \ +-DWITH_FUSE_DRIVER=ON \ +-DBUILD_SHARED_LIBS=ON \ +-DWITH_MAN_OPTION=OFF \ +-DCMAKE_INSTALL_SBINDIR=%{_sbindir} \ +%cmake_build +%ctest -j + +%install +%cmake_install + +%files +%doc README.md +%doc CHANGES.md +%license LICENSE +%{_bindir}/dwarfsck +%{_bindir}/dwarfsextract +%{_bindir}/mkdwarfs +%{_sbindir}/dwarfs +%{_sbindir}/mount.dwarfs +%{_libdir}/libdwarfs_*.so.* +%{_mandir}/man1/dwarfs.1* +%{_mandir}/man1/dwarfsck.1* +%{_mandir}/man1/dwarfsextract.1* +%{_mandir}/man1/mkdwarfs.1* +%{_mandir}/man5/dwarfs-format.5* + +%files devel +%dir %{_libdir}/cmake/dwarfs +%{_libdir}/cmake/dwarfs/*.cmake +%{_libdir}/libdwarfs_*.so +%{_includedir}/dwarfs/*.h +%{_includedir}/dwarfs/*/*.h + +%changelog +* Thu Mar 20 2025 Gilver E. +- Initial package diff --git a/anda/lib/dwarfs/update.rhai b/anda/lib/dwarfs/update.rhai new file mode 100644 index 0000000000..663c6df68a --- /dev/null +++ b/anda/lib/dwarfs/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("mhx/dwarfs")); From ac357ac3c22da39b6368e1935dd531a83034bbca Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 27 Mar 2025 05:50:35 +0000 Subject: [PATCH 0501/2977] bump: electron --- anda/tools/electron/electron.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/electron/electron.spec b/anda/tools/electron/electron.spec index 98a5f11506..27ed43af68 100644 --- a/anda/tools/electron/electron.spec +++ b/anda/tools/electron/electron.spec @@ -12,7 +12,7 @@ %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so Name: electron -Version: 35.1.1 +Version: 35.1.2 Release: 1%?dist Summary: Build cross platform desktop apps with web technologies License: MIT From 98090dacb6d3b180c337fd0591939b14d2d07c9f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 27 Mar 2025 10:55:45 +0000 Subject: [PATCH 0502/2977] bump: bun --- anda/devs/bun/bun-bin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/bun/bun-bin.spec b/anda/devs/bun/bun-bin.spec index 1500dce1de..50499ecc11 100644 --- a/anda/devs/bun/bun-bin.spec +++ b/anda/devs/bun/bun-bin.spec @@ -6,7 +6,7 @@ %endif Name: bun-bin -Version: 1.2.6 +Version: 1.2.7 Release: 1%?dist Summary: Incredibly fast JavaScript runtime, bundler, test runner, and package manager – all in one License: MIT From 3e422af7d0e71e3bc86e566b610dae976b5ddb4b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 27 Mar 2025 17:38:13 +0000 Subject: [PATCH 0503/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index b2cb6d4ef1..8580c6825a 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.180.0-pre +%global ver 0.180.1-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From 9315ddea25c5a5f59c4d5f674c2036eda3022767 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 27 Mar 2025 17:48:27 +0000 Subject: [PATCH 0504/2977] bump: stable --- anda/devs/zed/stable/zed.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 824344dace..ec8c85fe70 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.179.2 +Version: 0.179.3 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From 086ad67c6873e84e494ba5494425507617e28cf4 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 27 Mar 2025 18:34:04 +0000 Subject: [PATCH 0505/2977] bump: discord-ptb-openasar discord-ptb --- anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec | 2 +- anda/apps/discord-ptb/discord-ptb.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec index a1bacf8ad9..8589146088 100644 --- a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec +++ b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-ptb-openasar -Version: 0.0.135 +Version: 0.0.136 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-ptb/discord-ptb.spec b/anda/apps/discord-ptb/discord-ptb.spec index 1164c6ba3c..16f1bc22c9 100644 --- a/anda/apps/discord-ptb/discord-ptb.spec +++ b/anda/apps/discord-ptb/discord-ptb.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-ptb -Version: 0.0.135 +Version: 0.0.136 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers. URL: https://discord.com From 444ad5b688d869801641ad2cb366b9ab409bf9b3 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 27 Mar 2025 22:50:41 +0000 Subject: [PATCH 0506/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 39b71c54b2..0a4e1d6aa5 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.26.000411 +Version: 2025.03.27.223153 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From ad5f9764d670f216d03478e3d986a6ec9335d009 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 28 Mar 2025 01:42:54 +0000 Subject: [PATCH 0507/2977] bump(nightly): nightly nightly nightly avstplg --- anda/apps/legcord/nightly/legcord-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 6 +++--- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/system/avstplg/avstplg.spec | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/anda/apps/legcord/nightly/legcord-nightly.spec b/anda/apps/legcord/nightly/legcord-nightly.spec index 9999f7496f..558e4da21f 100644 --- a/anda/apps/legcord/nightly/legcord-nightly.spec +++ b/anda/apps/legcord/nightly/legcord-nightly.spec @@ -1,5 +1,5 @@ -%global commit d974d27fb6d424e9c50c95675fa56ae8d952b42b -%global commit_date 20250317 +%global commit 3dda27c303fe4fb1c2a6870ee4f68d2515ec6cd5 +%global commit_date 20250328 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define debug_package %nil diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index c62db0205f..aac17c0531 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,9 +1,9 @@ -%global commit 494279419af16aba382fc0c25d3edb25dbec1d7f +%global commit 0afb922375b2f8329f1c923cb58df75ddd4a6eb1 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-03-26 +%global fulldate 2025-03-27 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV -%global ver 1.1.3 +%global ver 1.1.4 %global base_name ghostty %global reverse_dns com.mitchellh.%{base_name} %if 0%{?fedora} <= 40 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index df00ef00c2..b4d6ef96fd 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 47b94e5ef0efae21daa9799d59f4e133384c8019 +%global commit bb15f4c493c426d950554cd84ca459d7e7cd6dec %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250327 +%global commit_date 20250328 %global ver 0.181.0 %bcond_with check diff --git a/anda/system/avstplg/avstplg.spec b/anda/system/avstplg/avstplg.spec index 4c5b15e060..e77934e578 100644 --- a/anda/system/avstplg/avstplg.spec +++ b/anda/system/avstplg/avstplg.spec @@ -1,5 +1,5 @@ -%global commit e1176e63ccbee51ab59fdb8afaed2bf5af8427d1 -%global commit_date 20240711 +%global commit 11f6a53130182a85908505b9120313f8b817f32c +%global commit_date 20250328 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global debug_package %{nil} %define __os_install_post %{nil} From bedf53f7f13eb275867afa6d996fc4f9dbd1b91e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 28 Mar 2025 02:02:12 +0000 Subject: [PATCH 0508/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index cc96243b26..36a91c3c24 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-27 +%global ver 2025-03-28 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 4273cbae7b43a8523c35871e098b42ee813df67a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 28 Mar 2025 03:02:44 +0000 Subject: [PATCH 0509/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index ee8794d01d..2200df7acd 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.620 +Version: 0.0.621 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index a0475c3583..dca5ba1df2 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.620 +Version: 0.0.621 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From e970f4e21e5219b64e038c9ce029089ecf44eff7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 28 Mar 2025 07:45:26 +0000 Subject: [PATCH 0510/2977] bump: lomiri inputplumber --- anda/desktops/lomiri-unity/lomiri/lomiri.spec | 4 ++-- anda/games/inputplumber/inputplumber.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/desktops/lomiri-unity/lomiri/lomiri.spec b/anda/desktops/lomiri-unity/lomiri/lomiri.spec index e2fae98e87..b52431fb17 100644 --- a/anda/desktops/lomiri-unity/lomiri/lomiri.spec +++ b/anda/desktops/lomiri-unity/lomiri/lomiri.spec @@ -1,9 +1,9 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri -%global commit 0b85fddd0123c86fe6b3464143df86a6d0ad6bb9 +%global commit 248b88c17ebbe4d95808e505d8271f8d1ca9cbe7 %forgemeta Name: lomiri -Version: 0.3.0 +Version: 0.4.0 Release: 1%?dist Summary: A convergent desktop environment by Ubports diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index cf96aa82d6..764ea6d535 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.49.7 +Version: 0.49.8 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later From ed4159134ce11ae8bd67b8f74ec0961c6cf4e440 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 28 Mar 2025 12:26:14 +0000 Subject: [PATCH 0511/2977] bump(branch): kf6-kio --- anda/desktops/kde/kf6-kio/kf6-kio.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/kde/kf6-kio/kf6-kio.spec b/anda/desktops/kde/kf6-kio/kf6-kio.spec index 8226b72536..5d9832fd41 100644 --- a/anda/desktops/kde/kf6-kio/kf6-kio.spec +++ b/anda/desktops/kde/kf6-kio/kf6-kio.spec @@ -5,7 +5,7 @@ Name: kf6-%{framework}.switcheroo Version: %{majmin_ver_kf6}.0 -Release: 1%{?dist}.switcheroo +Release: 2%{?dist}.switcheroo Summary: KDE Frameworks 6 Tier 3 solution for filesystem abstraction License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT From 02229eab9f838a7755a999f33c37aa6f4c77c86e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 28 Mar 2025 12:49:59 +0000 Subject: [PATCH 0512/2977] bump: lomiri-system-settings --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index e34e619d59..f7b2492cb9 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit 580ec11267742263e164d139fd26ba7ba5b79e92 +%global commit 9cac44dcea0e385faeb44b7dbff79e768b872e3a %forgemeta Name: lomiri-system-settings From d2fdb52450e7522e04de14a0ad570c8dc4b7c5df Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 28 Mar 2025 13:17:19 +0000 Subject: [PATCH 0513/2977] bump: lomiri-system-settings --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index f7b2492cb9..dfe6028707 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit 9cac44dcea0e385faeb44b7dbff79e768b872e3a +%global commit 155c3ea4d41960dce892f7e4645b4c1d96524930 %forgemeta Name: lomiri-system-settings From cae0ea0f791cb06327b782b196cffb2b1dc5b79a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 28 Mar 2025 13:39:01 +0000 Subject: [PATCH 0514/2977] bump: preview stable --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 8580c6825a..b336c947c6 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.180.1-pre +%global ver 0.180.2-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index ec8c85fe70..405a418a69 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.179.3 +Version: 0.179.4 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From 4da29b6c60c5546ab1141c5b077fee3cd0f4a057 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 28 Mar 2025 13:59:20 +0000 Subject: [PATCH 0515/2977] bump: komikku --- anda/apps/komikku/komikku.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/komikku/komikku.spec b/anda/apps/komikku/komikku.spec index 25a11427d3..80da412b4a 100644 --- a/anda/apps/komikku/komikku.spec +++ b/anda/apps/komikku/komikku.spec @@ -5,9 +5,9 @@ %global pure_protobuf_version 2.0.0 Name: komikku -Version: 1.73.0 +Version: 1.74.0 %forgemeta -Release: 2%?dist +Release: 1%?dist Summary: A manga reader for GNOME BuildArch: noarch From c7d0f1870d5744695172101633ae881ee1bec4d4 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Fri, 28 Mar 2025 08:47:58 -0700 Subject: [PATCH 0516/2977] fix(komikku): Version format (#4188) (#4190) * fix(komikku): Version format Signed-off-by: Gilver * Fixies Signed-off-by: Gilver * Macro Signed-off-by: Gilver * That was a terrible typo Signed-off-by: Gilver * Update komikku.spec Signed-off-by: Gilver --------- Signed-off-by: Gilver (cherry picked from commit 7a6fd8217acb5af719d5bb53464e6b217ada6811) Co-authored-by: Gilver --- anda/apps/komikku/komikku.spec | 7 ++++--- anda/apps/komikku/update.rhai | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/anda/apps/komikku/komikku.spec b/anda/apps/komikku/komikku.spec index 80da412b4a..1be117bedb 100644 --- a/anda/apps/komikku/komikku.spec +++ b/anda/apps/komikku/komikku.spec @@ -3,18 +3,19 @@ %global gtk4_version 4.14.4 %global libadwaita_version 1.5.1 %global pure_protobuf_version 2.0.0 +%global raw_ver v1.74.0 Name: komikku -Version: 1.74.0 +Version: %(echo %{raw_ver} | sed 's/v//g') %forgemeta -Release: 1%?dist +Release: 2%?dist Summary: A manga reader for GNOME BuildArch: noarch License: GPL-3.0-or-later URL: https://valos.gitlab.io/Komikku -Source0: https://codeberg.org/valos/%{appname}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://codeberg.org/valos/%{appname}/archive/%{raw_ver}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: desktop-file-utils BuildRequires: intltool diff --git a/anda/apps/komikku/update.rhai b/anda/apps/komikku/update.rhai index c0a1b21997..57bb2f5bba 100644 --- a/anda/apps/komikku/update.rhai +++ b/anda/apps/komikku/update.rhai @@ -1,3 +1,3 @@ let latest_tag = get("https://codeberg.org/api/v1/repos/valos/Komikku/tags").json_arr()[0].name; let new_version = find("([\\.\\d]+)", latest_tag, 1); -rpm.version(new_version); +rpm.global("raw_ver", new_version); From 0d17ff45752914804f8764289c84ed26789d8170 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 28 Mar 2025 15:56:54 +0000 Subject: [PATCH 0517/2977] bump: komikku --- anda/apps/komikku/komikku.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/komikku/komikku.spec b/anda/apps/komikku/komikku.spec index 1be117bedb..133429a547 100644 --- a/anda/apps/komikku/komikku.spec +++ b/anda/apps/komikku/komikku.spec @@ -3,7 +3,7 @@ %global gtk4_version 4.14.4 %global libadwaita_version 1.5.1 %global pure_protobuf_version 2.0.0 -%global raw_ver v1.74.0 +%global raw_ver 1.74.0 Name: komikku Version: %(echo %{raw_ver} | sed 's/v//g') From 8ac0bc985dacec673f35b0b936b852bbe5f0d43f Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Fri, 28 Mar 2025 09:52:23 -0700 Subject: [PATCH 0518/2977] fix(komikku): Explicitly list CMake as a build dep, fix update.rhai (#4193) (#4195) * fix(komikku): Explicitly list CMake as a build dep Signed-off-by: Gilver * ?????????????????????????????? Signed-off-by: Gilver * I GOT IT Signed-off-by: Gilver * Update komikku.spec Signed-off-by: Gilver --------- Signed-off-by: Gilver (cherry picked from commit c339dfee818ebf04e14af98a40987737c3df1f3d) Co-authored-by: Gilver --- anda/apps/komikku/komikku.spec | 7 ++++--- anda/apps/komikku/update.rhai | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/anda/apps/komikku/komikku.spec b/anda/apps/komikku/komikku.spec index 133429a547..ce41513933 100644 --- a/anda/apps/komikku/komikku.spec +++ b/anda/apps/komikku/komikku.spec @@ -3,12 +3,12 @@ %global gtk4_version 4.14.4 %global libadwaita_version 1.5.1 %global pure_protobuf_version 2.0.0 -%global raw_ver 1.74.0 +%global raw_ver v1.74.0 Name: komikku -Version: %(echo %{raw_ver} | sed 's/v//g') +Version: 1.74.0 %forgemeta -Release: 2%?dist +Release: 3%?dist Summary: A manga reader for GNOME BuildArch: noarch @@ -23,6 +23,7 @@ BuildRequires: libappstream-glib BuildRequires: meson >= 0.59.0 BuildRequires: python3-devel >= 3.8 BuildRequires: blueprint-compiler +BuildRequires: cmake BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.35.9 BuildRequires: pkgconfig(gtk4) >= %{gtk4_version} diff --git a/anda/apps/komikku/update.rhai b/anda/apps/komikku/update.rhai index 57bb2f5bba..13da8a9cef 100644 --- a/anda/apps/komikku/update.rhai +++ b/anda/apps/komikku/update.rhai @@ -1,3 +1,4 @@ let latest_tag = get("https://codeberg.org/api/v1/repos/valos/Komikku/tags").json_arr()[0].name; let new_version = find("([\\.\\d]+)", latest_tag, 1); -rpm.global("raw_ver", new_version); +rpm.global("raw_ver", latest_tag); +rpm.version(new_version); From 9070d4f213783a37b399581b7de99507886e48d0 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 28 Mar 2025 20:41:31 +0000 Subject: [PATCH 0519/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index 3fade4d6ee..8fd264d710 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.3.10 +Version: 2025.3.11 Release: 1%?dist Summary: Front-end to your dev env From 937da656e50bf81529f5c2a2aa0e66e1ef11a7e9 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 28 Mar 2025 22:34:11 +0000 Subject: [PATCH 0520/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 0a4e1d6aa5..8d5ecb40bb 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.27.223153 +Version: 2025.03.28.221325 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From b2d5774b797f2cbad88e149d5f7842141d78dfb7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 28 Mar 2025 23:31:26 +0000 Subject: [PATCH 0521/2977] bump: lomiri-system-settings --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index dfe6028707..183af58004 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit 155c3ea4d41960dce892f7e4645b4c1d96524930 +%global commit f84b3ca18b6dc92ca66edc3c8ad47f8475b6e705 %forgemeta Name: lomiri-system-settings From a4c4b25b75c50e5ef9cea124c9811b14b765592b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 29 Mar 2025 01:41:51 +0000 Subject: [PATCH 0522/2977] bump(nightly): mpv nightly nightly nim-nightly --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index d89ba6ecfe..3e2b722ace 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 38439dd531e5d7041f7a44a5a7c11247656a2166 +%global commit 5ba7ee513751dd005379a06fb627303e6fe1b3dd %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250327 +%global commit_date 20250329 %global ver 0.40.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index aac17c0531..944a7d6e36 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 0afb922375b2f8329f1c923cb58df75ddd4a6eb1 +%global commit 1067cd3d8a061eb5b23bc1a4c46ca10af4481941 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-03-27 +%global fulldate 2025-03-28 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index b4d6ef96fd..6a6b4c8e90 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit bb15f4c493c426d950554cd84ca459d7e7cd6dec +%global commit f86977e2a7e8081ac739d1d4a7ba8e036fb23b1e %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250328 +%global commit_date 20250329 %global ver 0.181.0 %bcond_with check diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index b3f0fedf53..cbf61d2b47 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 73112d64a3824963f6e74a06b60d6b9b2d189050 +%global commit ecdcffed4b4c3bf1e016d62ceae49009fc8b125c %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250327 +%global commit_date 20250329 %global debug_package %nil Name: nim-nightly From 354ad01b009a443094dcf7195bd406da382c8102 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 29 Mar 2025 02:42:49 +0000 Subject: [PATCH 0523/2977] bump: abuild cbfstool --- anda/tools/abuild/abuild.spec | 2 +- anda/tools/cbfstool/cbfstool.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/tools/abuild/abuild.spec b/anda/tools/abuild/abuild.spec index 28d368421f..912bd11f26 100644 --- a/anda/tools/abuild/abuild.spec +++ b/anda/tools/abuild/abuild.spec @@ -1,5 +1,5 @@ Name: abuild -Version: 24.12 +Version: 25.03 Release: 1%?dist Summary: coreboot autobuild script builds coreboot images for all available targets. URL: https://doc.coreboot.org/util/abuild/index.html diff --git a/anda/tools/cbfstool/cbfstool.spec b/anda/tools/cbfstool/cbfstool.spec index c778075293..196602f21f 100644 --- a/anda/tools/cbfstool/cbfstool.spec +++ b/anda/tools/cbfstool/cbfstool.spec @@ -1,5 +1,5 @@ Name: cbfstool -Version: 24.12 +Version: 25.03 Release: 1%?dist Summary: Management utility for CBFS formatted ROM images URL: https://doc.coreboot.org/lib/fw_config.html#cbfs From 2dbe61162494403606c2ccde606069b49811ee27 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 29 Mar 2025 06:24:02 +0000 Subject: [PATCH 0524/2977] bump: walker --- .../waylands/walker/golang-github-abenz1267-walker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec b/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec index 0b82a98047..5ae6a7178f 100644 --- a/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec +++ b/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec @@ -12,7 +12,7 @@ # https://github.com/abenz1267/walker %global goipath github.com/abenz1267/walker -Version: 0.12.16 +Version: 0.12.17 %gometa -f From f3ad8cbc036d54a02ac143ff38de31d998ad3221 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 29 Mar 2025 07:28:23 +0000 Subject: [PATCH 0525/2977] bump: walker --- .../waylands/walker/golang-github-abenz1267-walker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec b/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec index 5ae6a7178f..6c52bcf294 100644 --- a/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec +++ b/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec @@ -12,7 +12,7 @@ # https://github.com/abenz1267/walker %global goipath github.com/abenz1267/walker -Version: 0.12.17 +Version: 0.12.18 %gometa -f From 24384a846de1a54e3146f85f5dc70f7d96e3183c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 29 Mar 2025 18:23:35 +0000 Subject: [PATCH 0526/2977] bump: srpm-macros --- anda/terra/srpm-macros/anda-srpm-macros.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/terra/srpm-macros/anda-srpm-macros.spec b/anda/terra/srpm-macros/anda-srpm-macros.spec index 1df4f68ed7..92b728a0d2 100644 --- a/anda/terra/srpm-macros/anda-srpm-macros.spec +++ b/anda/terra/srpm-macros/anda-srpm-macros.spec @@ -1,5 +1,5 @@ Name: anda-srpm-macros -Version: 0.2.8 +Version: 0.2.9 Release: 1%?dist Summary: SRPM macros for extra Fedora packages From 5444208711f524a02edea7b7195cb8c1cbe65bdd Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Sat, 29 Mar 2025 12:21:21 -0700 Subject: [PATCH 0527/2977] fix(lomiri-system-settings): Update patches (#4199) (#4203) * fix(lomiri-system-settings): Drop patches Signed-off-by: Gilver * Guess one is relevant Signed-off-by: Gilver --------- Signed-off-by: Gilver (cherry picked from commit bc4d25dda9a125b9d4d98ebe27c9c3214bf3ccea) Co-authored-by: Gilver --- .../lomiri-system-settings/lomiri-system-settings.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 183af58004..557588c329 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -4,13 +4,12 @@ Name: lomiri-system-settings Version: 1.3.0 -Release: 1%?dist +Release: 2%?dist Summary: The system settings application for Lomiri License: GPLv3 URL: https://gitlab.com/ubports/development/core/lomiri-system-settings Source0: %{url}/-/archive/%commit/lomiri-system-settings-%commit.tar.gz -Patch0: https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/1001_use-maliit-keyboard-for-language-plugin.patch -Patch1: https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/2001_disable-current-language-switching.patch +Patch0: https://sources.debian.org/data/main/l/lomiri-system-settings/1.3.0-4/debian/patches/2011_build-without-trust-store.patch BuildRequires: cmake BuildRequires: gcc-c++ From 38c6c35952cdac52e25fd3ffdd33bbb88794fbaa Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 29 Mar 2025 19:57:45 +0000 Subject: [PATCH 0528/2977] bump: anda --- anda/tools/buildsys/anda/rust-anda.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/anda/rust-anda.spec b/anda/tools/buildsys/anda/rust-anda.spec index 0c39143337..2610419a9f 100644 --- a/anda/tools/buildsys/anda/rust-anda.spec +++ b/anda/tools/buildsys/anda/rust-anda.spec @@ -5,7 +5,7 @@ %global crate anda Name: rust-anda -Version: 0.4.10 +Version: 0.4.11 Release: 1%?dist Summary: Andaman Build toolchain From 6a6982cad1acd4792172736e7c7bdabc1beeb86b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 30 Mar 2025 01:38:01 +0000 Subject: [PATCH 0529/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 36a91c3c24..72183b3ade 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-28 +%global ver 2025-03-30 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 5c7548194a706507ff42ef804b5230db0c21ed06 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 30 Mar 2025 01:49:59 +0000 Subject: [PATCH 0530/2977] bump(nightly): nightly prismlauncher-nightly nim-nightly --- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 6a6b4c8e90..4d716b669d 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit f86977e2a7e8081ac739d1d4a7ba8e036fb23b1e +%global commit 548a8d75e6e93c41261bc24b227ca11bb3ba4b99 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250329 +%global commit_date 20250330 %global ver 0.181.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index b3b11c79f5..db43ff028d 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 1c0c24763174fe57cfeb6d1855505b7d6e9946e4 +%global commit 6b93e7aa62dcd2c0447388cbd65580a7a79ec5c8 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250327 +%global commit_date 20250330 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index cbf61d2b47..c2ab5265f2 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit ecdcffed4b4c3bf1e016d62ceae49009fc8b125c +%global commit 0f5732bc8c35b8f11b55d34da1cbd3b3937b6f4d %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250329 +%global commit_date 20250330 %global debug_package %nil Name: nim-nightly From 60f5fbf94c77c55143b32bc512383bddbe1a08d9 Mon Sep 17 00:00:00 2001 From: xiaoshihou Date: Sun, 30 Mar 2025 23:31:18 +0800 Subject: [PATCH 0531/2977] add: git-biance, act, atac (#4184) * add: git-biance * add: act, atac * Update anda/langs/rust/atac/atac.spec Co-authored-by: madomado Signed-off-by: xiaoshihou * fix: apply reviewer changes * fix: add packager, less verbose pkg name * Update anda/langs/go/act/act.spec Co-authored-by: Gilver Signed-off-by: xiaoshihou * Update anda/langs/go/act/act.spec Co-authored-by: Gilver Signed-off-by: xiaoshihou * revert: non-working go_build_online * Update anda/langs/go/act/act.spec Co-authored-by: Gilver Signed-off-by: xiaoshihou * fix: remove redundant sections * fix: remove redundant description * ref: just package it manually... * fix: apply oniguruma cflag fix as suggested * fix: skip #! check * fix(act): feed in the version * fix: name conflict * wip: rename the act package * chore: remove non doc file * fix: add build dep --------- Signed-off-by: xiaoshihou Co-authored-by: madomado Co-authored-by: Gilver --- anda/devs/atac/anda.hcl | 5 ++ anda/devs/atac/atac.spec | 42 ++++++++++++++++ anda/devs/atac/update.rhai | 1 + anda/devs/git-biance/anda.hcl | 5 ++ anda/devs/git-biance/git-biance.spec | 41 ++++++++++++++++ anda/devs/git-biance/update.rhai | 1 + anda/langs/go/gh-act/anda.hcl | 5 ++ anda/langs/go/gh-act/gh-act.spec | 72 ++++++++++++++++++++++++++++ anda/langs/go/gh-act/update.rhai | 1 + 9 files changed, 173 insertions(+) create mode 100644 anda/devs/atac/anda.hcl create mode 100644 anda/devs/atac/atac.spec create mode 100644 anda/devs/atac/update.rhai create mode 100644 anda/devs/git-biance/anda.hcl create mode 100644 anda/devs/git-biance/git-biance.spec create mode 100644 anda/devs/git-biance/update.rhai create mode 100644 anda/langs/go/gh-act/anda.hcl create mode 100644 anda/langs/go/gh-act/gh-act.spec create mode 100644 anda/langs/go/gh-act/update.rhai diff --git a/anda/devs/atac/anda.hcl b/anda/devs/atac/anda.hcl new file mode 100644 index 0000000000..326f9fa7dc --- /dev/null +++ b/anda/devs/atac/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "atac.spec" + } +} diff --git a/anda/devs/atac/atac.spec b/anda/devs/atac/atac.spec new file mode 100644 index 0000000000..5cd4481ef3 --- /dev/null +++ b/anda/devs/atac/atac.spec @@ -0,0 +1,42 @@ +%global crate atac + +%if 0%{?fedora} >= 42 +%global build_cflags %{__build_flags_lang_c} %{?_distro_extra_cflags} -std=gnu18 +%endif +%global __brp_mangle_shebangs %{nil} + +Name: atac +Version: 0.19.0 +Release: 1%?dist +Summary: Arguably a Terminal API Client + +License: MIT +URL: https://crates.io/crates/atac +Source: %{crates_source} + +Packager: xiaoshihou +BuildRequires: anda-srpm-macros cargo-rpm-macros mold + +%global _description %{expand: +Arguably a Terminal API Client. Feature-full, free, open-source, offline +and account-less.} + +%description -n %{crate} %{_description} + +%files -n %{crate} +%license LICENSE +%license LICENSE.dependencies +%doc README.md +%{_bindir}/%{crate} + + +%prep +%autosetup -n %{crate}-%{version} -p1 +%cargo_prep_online + +%build +%{cargo_license_summary_online} +%{cargo_license_online} > LICENSE.dependencies + +%install +%cargo_install diff --git a/anda/devs/atac/update.rhai b/anda/devs/atac/update.rhai new file mode 100644 index 0000000000..ffe2bc5881 --- /dev/null +++ b/anda/devs/atac/update.rhai @@ -0,0 +1 @@ +rpm.version(crates("atac")); diff --git a/anda/devs/git-biance/anda.hcl b/anda/devs/git-biance/anda.hcl new file mode 100644 index 0000000000..30e78c3b04 --- /dev/null +++ b/anda/devs/git-biance/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "git-biance.spec" + } +} diff --git a/anda/devs/git-biance/git-biance.spec b/anda/devs/git-biance/git-biance.spec new file mode 100644 index 0000000000..3188598f56 --- /dev/null +++ b/anda/devs/git-biance/git-biance.spec @@ -0,0 +1,41 @@ +%global crate git-biance + +Name: git-biance +Version: 0.1.2 +Release: 1%?dist +Summary: Visualize code contributions in a GitHub-style graph. + +License: GPL-3.0 +URL: https://crates.io/crates/git-biance +Source: %{crates_source} + +Packager: xiaoshihou +BuildRequires: anda-srpm-macros cargo-rpm-macros mold + +%global _description %{expand: +biance（鞭策，biān cè，spur）is a small rust +program that shows and visualizes code contributions +in a git repository. +} + +%description %{_description} + +%description -n %{crate} %{_description} + +%files -n %{crate} +%license LICENSE +%license LICENSE.dependencies +%doc README.md README-zh.md +%{_bindir}/%{crate} + + +%prep +%autosetup -n %{crate}-%{version} -p1 +%cargo_prep_online + +%build +%{cargo_license_summary_online} +%{cargo_license_online} > LICENSE.dependencies + +%install +%cargo_install diff --git a/anda/devs/git-biance/update.rhai b/anda/devs/git-biance/update.rhai new file mode 100644 index 0000000000..942124dadf --- /dev/null +++ b/anda/devs/git-biance/update.rhai @@ -0,0 +1 @@ +rpm.version(crates("git-biance")); diff --git a/anda/langs/go/gh-act/anda.hcl b/anda/langs/go/gh-act/anda.hcl new file mode 100644 index 0000000000..3f970c527c --- /dev/null +++ b/anda/langs/go/gh-act/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "gh-act.spec" + } +} diff --git a/anda/langs/go/gh-act/gh-act.spec b/anda/langs/go/gh-act/gh-act.spec new file mode 100644 index 0000000000..784ff75a6c --- /dev/null +++ b/anda/langs/go/gh-act/gh-act.spec @@ -0,0 +1,72 @@ +# Generated by go2rpm 1.15.0 +%bcond check 1 +%bcond bootstrap 0 + +%if %{with bootstrap} +%global debug_package %{nil} +%endif + +%if %{with bootstrap} +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^golang\\(.*\\)$ +%endif + +# https://github.com/nektos/act +%global goipath github.com/nektos/act +Version: 0.2.75 + +%gometa -f + +%global common_description %{expand: +Run your GitHub Actions locally +} + +%global golicenses LICENSE pkg/lookpath/LICENSE +%global godocs README.md + +Name: gh-act +Release: %autorelease +Summary: None + +License: MIT AND ISC AND BSD-3-Clause AND Apache-2.0 AND BSD-2-Clause +URL: %{gourl} +Source: %{gosource} +Packager: xiaoshihou +BuildRequires: anda-srpm-macros + +%description %{common_description} + +%gopkg + +%prep +%autosetup -p1 -n act-%{version} +%go_prep_online + +%if %{without bootstrap} +%build +%define gomodulesmode GO111MODULE=on +%define __gobuild_extldflags -X main.version=%version +%gobuild -o %{gobuilddir}/bin/gh-act %{goipath} +%endif + +%install +%if %{without bootstrap} +install -m 0755 -vd %{buildroot}%{_bindir} +install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ +%endif + +%if %{without bootstrap} +%if %{with check} +%check +%gocheck +%endif +%endif + +%if %{without bootstrap} +%files +%license LICENSE pkg/lookpath/LICENSE +%doc CONTRIBUTING.md IMAGES.md README.md +%{_bindir}/gh-act +%endif + +%changelog +%autochangelog diff --git a/anda/langs/go/gh-act/update.rhai b/anda/langs/go/gh-act/update.rhai new file mode 100644 index 0000000000..1338f20ec2 --- /dev/null +++ b/anda/langs/go/gh-act/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("nektos/act")); From 500f1c8608bee0e88539e4f388ab458ad30faaa3 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 30 Mar 2025 16:21:17 +0000 Subject: [PATCH 0532/2977] bump: sops --- anda/tools/sops/sops.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/sops/sops.spec b/anda/tools/sops/sops.spec index dc19ea0be3..0babfb493a 100644 --- a/anda/tools/sops/sops.spec +++ b/anda/tools/sops/sops.spec @@ -1,6 +1,6 @@ %define debug_package %nil Name: sops -Version: 3.9.4 +Version: 3.10.0 Release: 1%?dist Summary: Simple and flexible tool for managing secrets License: MPL-2.0 From fba99942a4370f976908bea5e0fa1c6d1e6696ff Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 30 Mar 2025 16:55:38 +0000 Subject: [PATCH 0533/2977] bump: sops --- anda/tools/sops/sops.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/sops/sops.spec b/anda/tools/sops/sops.spec index 0babfb493a..dc19ea0be3 100644 --- a/anda/tools/sops/sops.spec +++ b/anda/tools/sops/sops.spec @@ -1,6 +1,6 @@ %define debug_package %nil Name: sops -Version: 3.10.0 +Version: 3.9.4 Release: 1%?dist Summary: Simple and flexible tool for managing secrets License: MPL-2.0 From 23e3e32676037b994d4fe991976d13ca0b03dd7c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 30 Mar 2025 17:45:30 +0000 Subject: [PATCH 0534/2977] bump: walker sops --- .../waylands/walker/golang-github-abenz1267-walker.spec | 2 +- anda/tools/sops/sops.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec b/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec index 6c52bcf294..738d5c473c 100644 --- a/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec +++ b/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec @@ -12,7 +12,7 @@ # https://github.com/abenz1267/walker %global goipath github.com/abenz1267/walker -Version: 0.12.18 +Version: 0.12.19 %gometa -f diff --git a/anda/tools/sops/sops.spec b/anda/tools/sops/sops.spec index dc19ea0be3..0babfb493a 100644 --- a/anda/tools/sops/sops.spec +++ b/anda/tools/sops/sops.spec @@ -1,6 +1,6 @@ %define debug_package %nil Name: sops -Version: 3.9.4 +Version: 3.10.0 Release: 1%?dist Summary: Simple and flexible tool for managing secrets License: MPL-2.0 From 4a356112fb0b0da76b670b6dc36cd85580d2fd74 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 30 Mar 2025 18:22:55 +0000 Subject: [PATCH 0535/2977] bump: rio --- anda/devs/rio/rio.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/rio/rio.spec b/anda/devs/rio/rio.spec index 74288915f5..10422c3d4e 100644 --- a/anda/devs/rio/rio.spec +++ b/anda/devs/rio/rio.spec @@ -3,8 +3,8 @@ A hardware-accelerated terminal emulator focusing to run in desktops and browsers.} Name: rio -Version: 0.2.9 -Release: 3%{?dist} +Version: 0.2.12 +Release: 1%?dist Summary: A hardware-accelerated terminal written in Rust. SourceLicense: MIT License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND Apache-2.0 AND BSD-2-Clause AND BSL-1.0 AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND CC0-1.0 AND ISC AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND (MPL-2.0 OR GPL-3.0-only) AND MPL-2.0+ AND MPL-2.0 AND Unicode-3.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND Zlib From c567ac95b2746b85cbbb21590f787626af00dace Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 30 Mar 2025 22:55:35 +0000 Subject: [PATCH 0536/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 8d5ecb40bb..fa9fe86e66 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.28.221325 +Version: 2025.03.30.223900 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 3d4224622caa6d078fd276ac8507986df4692d26 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 30 Mar 2025 23:17:41 +0000 Subject: [PATCH 0537/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index fa9fe86e66..8fd6ddc5b1 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.30.223900 +Version: 2025.03.30.230422 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From f1acae2a8c3e90770fff60ca3c4a461488429404 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 30 Mar 2025 23:36:15 +0000 Subject: [PATCH 0538/2977] bump: kanata --- anda/tools/kanata/rust-kanata.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/tools/kanata/rust-kanata.spec b/anda/tools/kanata/rust-kanata.spec index 509066965c..d674d64dae 100644 --- a/anda/tools/kanata/rust-kanata.spec +++ b/anda/tools/kanata/rust-kanata.spec @@ -4,8 +4,8 @@ %global crate kanata Name: rust-kanata -Version: 1.8.0 -Release: %autorelease +Version: 1.8.1 +Release: 1%?dist Summary: Multi-layer keyboard customization License: LGPL-3.0-only From 51aac5e1743258671ef4fb96c4445ed893e0675e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 30 Mar 2025 23:45:31 +0000 Subject: [PATCH 0539/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 8fd6ddc5b1..bddebe4885 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.30.230422 +Version: 2025.03.30.232830 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From bcd005b323f4de89c5be8bb3e62d61c4bfbe7a8d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 31 Mar 2025 00:47:49 +0000 Subject: [PATCH 0540/2977] bump(weekly): gstreamer1-plugin-icamerasrc ivsc-firmware --- .../gstreamer1-plugin-icamerasrc.spec | 4 ++-- anda/system/ivsc-firmware/ivsc-firmware.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugin-icamerasrc/gstreamer1-plugin-icamerasrc.spec b/anda/multimedia/gstreamer1/gstreamer1-plugin-icamerasrc/gstreamer1-plugin-icamerasrc.spec index a4aeada267..9999dfa92c 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugin-icamerasrc/gstreamer1-plugin-icamerasrc.spec +++ b/anda/multimedia/gstreamer1/gstreamer1-plugin-icamerasrc/gstreamer1-plugin-icamerasrc.spec @@ -1,5 +1,5 @@ -%global fulldate 2024-11-29 -%global commit ee8526451ca1bb4957702de2f46138b63151f34c +%global fulldate 2025-03-25 +%global commit 7f90219b0cdc00b263415e09eb8c3687daf06ab9 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global shortcommit %(c=%{commit}; echo ${c:0:7}) diff --git a/anda/system/ivsc-firmware/ivsc-firmware.spec b/anda/system/ivsc-firmware/ivsc-firmware.spec index 64e540e8a3..b3ddd3d699 100644 --- a/anda/system/ivsc-firmware/ivsc-firmware.spec +++ b/anda/system/ivsc-firmware/ivsc-firmware.spec @@ -1,5 +1,5 @@ %global debug_package %{nil} -%global commit 74a01d1208a352ed85d76f959c68200af4ead918 +%global commit 3377801f46b86e03c464bfb03ca3c486e9b0db00 %global commitdate 20230811 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From 799f47df5fd76e59a3d6e6b4ba7a28523894931f Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Sun, 30 Mar 2025 18:31:00 -0700 Subject: [PATCH 0541/2977] fix(kanata): Update patch (#4211) (#4214) (cherry picked from commit c5eee1a06c8f53b47def63da64d338d7621c5d3c) Co-authored-by: Gilver --- anda/tools/kanata/kanata-fix-metadata-auto.diff | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/anda/tools/kanata/kanata-fix-metadata-auto.diff b/anda/tools/kanata/kanata-fix-metadata-auto.diff index 6dad0fb43f..f7446e4b7a 100644 --- a/anda/tools/kanata/kanata-fix-metadata-auto.diff +++ b/anda/tools/kanata/kanata-fix-metadata-auto.diff @@ -1,5 +1,5 @@ ---- kanata-1.8.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ kanata-1.8.0/Cargo.toml 2025-02-24T02:18:17.384667+00:00 +--- kanata-*/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ kanata-*/Cargo.toml 2025-02-24T02:18:17.384667+00:00 @@ -124,23 +124,9 @@ "kanata-parser/gui", "win_sendinput_send_scancodes", @@ -34,15 +34,15 @@ ] win_sendinput_send_scancodes = ["kanata-parser/win_sendinput_send_scancodes"] zippychord = ["kanata-parser/zippychord"] -@@ -189,91 +173,3 @@ +@@ -192,91 +176,2 @@ [target.'cfg(target_os = "linux")'.dependencies.signal-hook] version = "0.3.14" - +- -[target.'cfg(target_os = "macos")'.dependencies.core-graphics] -version = "0.24.0" - -[target.'cfg(target_os = "macos")'.dependencies.karabiner-driverkit] --version = "0.1.4" +-version = "0.1.5" - -[target.'cfg(target_os = "macos")'.dependencies.libc] -version = "0.2" From baf1a1bf335f7e609a56c9241be8d43a7b155168 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 31 Mar 2025 01:37:37 +0000 Subject: [PATCH 0542/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 72183b3ade..5e5836e900 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-30 +%global ver 2025-03-31 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 2f5c374ee91a658071975d02c866159e15a65f13 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 31 Mar 2025 01:48:37 +0000 Subject: [PATCH 0543/2977] bump(nightly): nightly prismlauncher-nightly --- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 4d716b669d..ab1ebef806 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 548a8d75e6e93c41261bc24b227ca11bb3ba4b99 +%global commit e42406f9d5d63103ab86b500ebc88e89fd01cec0 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250330 +%global commit_date 20250331 %global ver 0.181.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index db43ff028d..aaf08e9511 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 6b93e7aa62dcd2c0447388cbd65580a7a79ec5c8 +%global commit 070947911076325d1bd5ccc5e3269db7722b2ea5 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250330 +%global commit_date 20250331 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 From 2838f86de931a7c5f93e0df769310490e80c952e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 31 Mar 2025 12:37:36 +0000 Subject: [PATCH 0544/2977] bump: limine --- anda/system/limine/limine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/limine/limine.spec b/anda/system/limine/limine.spec index 99da890b5d..692b0a83de 100644 --- a/anda/system/limine/limine.spec +++ b/anda/system/limine/limine.spec @@ -1,5 +1,5 @@ Name: limine -Version: 9.2.1 +Version: 9.2.2 Release: 1%?dist Summary: Modern, advanced, portable, multiprotocol bootloader License: BSD-2-Clause From ebd71d0d76ba7ed101291aa1023fe7533e1c5e8e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 31 Mar 2025 13:40:00 +0000 Subject: [PATCH 0545/2977] bump: lomiri-system-settings --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 557588c329..b8ccd6d988 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit f84b3ca18b6dc92ca66edc3c8ad47f8475b6e705 +%global commit a0b260b8a453f15841035e3d55200f6afc22051c %forgemeta Name: lomiri-system-settings From 69dd7975a363e0675ef5bb870c5ef41e0032a707 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 31 Mar 2025 14:50:36 +0000 Subject: [PATCH 0546/2977] bump: dwarfs --- anda/lib/dwarfs/dwarfs.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/dwarfs/dwarfs.spec b/anda/lib/dwarfs/dwarfs.spec index 58236af673..aece47a2d6 100644 --- a/anda/lib/dwarfs/dwarfs.spec +++ b/anda/lib/dwarfs/dwarfs.spec @@ -4,8 +4,8 @@ The Deduplicating Warp-speed Advanced Read-only File System. A fast high compression read-only file system for Linux and Windows.} Name: dwarfs -Version: 0.11.2 -Release: 1%{?dist} +Version: 0.11.3 +Release: 1%?dist Summary: A fast high compression read-only file system for Linux, Windows and macOS License: GPL-3.0-or-later URL: https://github.com/mhx/%{name} From 2c4b87b980d7b31630acc481156e1da6a7ed60fd Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 31 Mar 2025 17:49:19 +0000 Subject: [PATCH 0547/2977] bump: discord-openasar discord --- anda/apps/discord-openasar/discord-openasar.spec | 2 +- anda/apps/discord/discord.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-openasar/discord-openasar.spec b/anda/apps/discord-openasar/discord-openasar.spec index 4d8119e35a..269959579d 100644 --- a/anda/apps/discord-openasar/discord-openasar.spec +++ b/anda/apps/discord-openasar/discord-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-openasar -Version: 0.0.89 +Version: 0.0.90 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord/discord.spec b/anda/apps/discord/discord.spec index a32a0edaf6..e4d6d85f1d 100644 --- a/anda/apps/discord/discord.spec +++ b/anda/apps/discord/discord.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord -Version: 0.0.89 +Version: 0.0.90 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: https://discord.com From 16ce46dfb758798677c78c6315f0bd0df61e0666 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 31 Mar 2025 18:34:56 +0000 Subject: [PATCH 0548/2977] bump: bun sops --- anda/devs/bun/bun-bin.spec | 2 +- anda/tools/sops/sops.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/bun/bun-bin.spec b/anda/devs/bun/bun-bin.spec index 50499ecc11..bb1d4f313d 100644 --- a/anda/devs/bun/bun-bin.spec +++ b/anda/devs/bun/bun-bin.spec @@ -6,7 +6,7 @@ %endif Name: bun-bin -Version: 1.2.7 +Version: 1.2.8 Release: 1%?dist Summary: Incredibly fast JavaScript runtime, bundler, test runner, and package manager – all in one License: MIT diff --git a/anda/tools/sops/sops.spec b/anda/tools/sops/sops.spec index 0babfb493a..77db1e0aa9 100644 --- a/anda/tools/sops/sops.spec +++ b/anda/tools/sops/sops.spec @@ -1,6 +1,6 @@ %define debug_package %nil Name: sops -Version: 3.10.0 +Version: 3.10.1 Release: 1%?dist Summary: Simple and flexible tool for managing secrets License: MPL-2.0 From dea666b7c478409861e26c30ebdfafddc89ce187 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 31 Mar 2025 18:50:42 +0000 Subject: [PATCH 0549/2977] bump: preview stable --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index b336c947c6..9e71c7bf94 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.180.2-pre +%global ver 0.179.5 # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 405a418a69..80f1a4230d 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.179.4 +Version: 0.179.5 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From f0b08e7c40c586b66262171f78e9898fa3e31974 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 31 Mar 2025 19:14:47 +0000 Subject: [PATCH 0550/2977] bump: lowfi yt-dlp --- anda/devs/lowfi/rust-lowfi.spec | 4 ++-- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/devs/lowfi/rust-lowfi.spec b/anda/devs/lowfi/rust-lowfi.spec index 300c00cf98..51e9268911 100644 --- a/anda/devs/lowfi/rust-lowfi.spec +++ b/anda/devs/lowfi/rust-lowfi.spec @@ -2,8 +2,8 @@ %global crate lowfi Name: rust-lowfi -Version: 1.5.6 -Release: 1%{?dist} +Version: 1.6.0 +Release: 1%?dist Summary: Extremely simple lofi player License: MIT diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index bddebe4885..227525549b 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.30.232830 +Version: 2025.03.31.190509 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 5d480067ada46921f1cea10fb7df17a5e9289033 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 31 Mar 2025 19:28:44 +0000 Subject: [PATCH 0551/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 227525549b..b6635375bb 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.31.190509 +Version: 2025.03.31.191444 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 06274adfc0e82e10ed3c03f66e9e0c10aba5163a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 31 Mar 2025 19:38:42 +0000 Subject: [PATCH 0552/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index b6635375bb..c17012d791 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.31.191444 +Version: 2025.03.31.192347 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 9b41def18479c0d6e23b88bc63194bbf6561b817 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 31 Mar 2025 19:49:01 +0000 Subject: [PATCH 0553/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index c17012d791..57b5571485 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.31.192347 +Version: 2025.03.31.193317 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From a2bd485c56abea4afc70a4eb745869b954eba0d7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 31 Mar 2025 19:59:02 +0000 Subject: [PATCH 0554/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 57b5571485..fb974856c0 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.31.193317 +Version: 2025.03.31.194603 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 3fdcaf9d233a56f1cef6e442bbe18501b286c4e0 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 31 Mar 2025 21:17:17 +0000 Subject: [PATCH 0555/2977] bump: sass --- anda/misc/sass/sass.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/misc/sass/sass.spec b/anda/misc/sass/sass.spec index 3ba3225a66..c8aab6fcf2 100644 --- a/anda/misc/sass/sass.spec +++ b/anda/misc/sass/sass.spec @@ -4,7 +4,7 @@ %define _build_id_links none Name: sass -Version: 1.86.0 +Version: 1.86.1 Release: 1%?dist Summary: The reference implementation of Sass, written in Dart License: MIT From ea7a085669ebfa426a99e6992fd073d3acab114a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 31 Mar 2025 21:31:21 +0000 Subject: [PATCH 0556/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index fb974856c0..015198b2a3 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.31.194603 +Version: 2025.03.31.212130 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From d499a8c52af27829d8ca3acc517a84be830ad3a5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 31 Mar 2025 21:55:37 +0000 Subject: [PATCH 0557/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 015198b2a3..10a8c9939b 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.31.212130 +Version: 2025.03.31.213838 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 07a1703e543cdeed02e91a7791f766cf69117c92 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 1 Apr 2025 01:54:46 +0000 Subject: [PATCH 0558/2977] bump(nightly): mpv nightly prismlauncher-nightly --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 3e2b722ace..8c55c86148 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 5ba7ee513751dd005379a06fb627303e6fe1b3dd +%global commit 5870c95e895460af9e0aa12ad7ff575e4cf2196c %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250329 +%global commit_date 20250401 %global ver 0.40.0 Name: mpv-nightly diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index ab1ebef806..6e59cee81f 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit e42406f9d5d63103ab86b500ebc88e89fd01cec0 +%global commit 7984f0f11c900cc397d42bf1f2f4c33b72178f93 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250331 +%global commit_date 20250401 %global ver 0.181.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index aaf08e9511..9a523828d8 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 070947911076325d1bd5ccc5e3269db7722b2ea5 +%global commit 1d45850b6d5ccf00f77bc827235c5c5a5467683c %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250331 +%global commit_date 20250401 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 From 98255d451993010eddbe0ecd67cd471c228d7143 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 1 Apr 2025 02:05:03 +0000 Subject: [PATCH 0559/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 5e5836e900..b1dcd53039 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-03-31 +%global ver 2025-04-01 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 65fe80893a235324df8cb5ea815873e2abbb8d9c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 1 Apr 2025 03:16:28 +0000 Subject: [PATCH 0560/2977] bump: gh-act --- anda/langs/go/gh-act/gh-act.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/langs/go/gh-act/gh-act.spec b/anda/langs/go/gh-act/gh-act.spec index 784ff75a6c..e32dbfb0a1 100644 --- a/anda/langs/go/gh-act/gh-act.spec +++ b/anda/langs/go/gh-act/gh-act.spec @@ -12,7 +12,7 @@ # https://github.com/nektos/act %global goipath github.com/nektos/act -Version: 0.2.75 +Version: 0.2.76 %gometa -f @@ -24,7 +24,7 @@ Run your GitHub Actions locally %global godocs README.md Name: gh-act -Release: %autorelease +Release: 1%?dist Summary: None License: MIT AND ISC AND BSD-3-Clause AND Apache-2.0 AND BSD-2-Clause From 18d5e8d04d854e313cd762fe264ae0b8f6bb1437 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 1 Apr 2025 09:24:41 +0000 Subject: [PATCH 0561/2977] bump: session arduino-create-agent --- .../mate/indicators/session/ayatana-indicator-session.spec | 2 +- anda/tools/arduino-create-agent/arduino-create-agent.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/desktops/mate/indicators/session/ayatana-indicator-session.spec b/anda/desktops/mate/indicators/session/ayatana-indicator-session.spec index c35f995bc6..9ff7fc8609 100644 --- a/anda/desktops/mate/indicators/session/ayatana-indicator-session.spec +++ b/anda/desktops/mate/indicators/session/ayatana-indicator-session.spec @@ -1,6 +1,6 @@ Name: ayatana-indicator-session Summary: Ayatana Indicator Session Applet -Version: 24.5.0 +Version: 24.5.1 Release: 1%?dist License: GPL-3.0 URL: https://github.com/AyatanaIndicators/ayatana-indicator-session diff --git a/anda/tools/arduino-create-agent/arduino-create-agent.spec b/anda/tools/arduino-create-agent/arduino-create-agent.spec index 553bca4a4d..44ca64a82a 100644 --- a/anda/tools/arduino-create-agent/arduino-create-agent.spec +++ b/anda/tools/arduino-create-agent/arduino-create-agent.spec @@ -1,6 +1,6 @@ # https://github.com/arduino/arduino-create-agent %global goipath github.com/arduino/arduino-create-agent -Version: 1.6.1 +Version: 1.7.0 %gometa -f @@ -13,7 +13,7 @@ It allows you to use the Arduino Cloud to seamlessly upload code to any USB conn %global godocs README.md Name: arduino-create-agent -Release: 2%?dist +Release: 1%?dist Summary: Arduino Cloud Agent License: AGPL-3.0 Packager: Owen Zimmerman From de2b1fb6725d53b5cf3bc134593a787237837cfa Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 1 Apr 2025 12:38:24 +0000 Subject: [PATCH 0562/2977] bump: lomiri-system-settings espanso-wayland espanso-x11 --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- anda/tools/espanso-wayland/espanso-wayland.spec | 4 ++-- anda/tools/espanso-x11/espanso-x11.spec | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index b8ccd6d988..6c145190f8 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit a0b260b8a453f15841035e3d55200f6afc22051c +%global commit 43297ddc3db71de1b85917788d4e90ab63fbe768 %forgemeta Name: lomiri-system-settings diff --git a/anda/tools/espanso-wayland/espanso-wayland.spec b/anda/tools/espanso-wayland/espanso-wayland.spec index 0b35355a70..1814333854 100644 --- a/anda/tools/espanso-wayland/espanso-wayland.spec +++ b/anda/tools/espanso-wayland/espanso-wayland.spec @@ -1,6 +1,6 @@ Name: espanso-wayland -Version: 2.2.2 -Release: 2%?dist +Version: 2.2.3 +Release: 1%?dist Summary: Cross-platform Text Expander written in Rust for Wayland License: GPL-3.0 URL: https://espanso.org diff --git a/anda/tools/espanso-x11/espanso-x11.spec b/anda/tools/espanso-x11/espanso-x11.spec index 99ab16fc59..286534bb70 100644 --- a/anda/tools/espanso-x11/espanso-x11.spec +++ b/anda/tools/espanso-x11/espanso-x11.spec @@ -1,6 +1,6 @@ Name: espanso-x11 -Version: 2.2.2 -Release: 2%?dist +Version: 2.2.3 +Release: 1%?dist Summary: Cross-platform Text Expander written in Rust for X11 License: GPL-3.0 URL: https://espanso.org From e1b117a82c7732212ae87e638e7922c712bc6104 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 1 Apr 2025 15:19:40 +0000 Subject: [PATCH 0563/2977] bump: inputplumber --- anda/games/inputplumber/inputplumber.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index 764ea6d535..ac07bc26a4 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.49.8 +Version: 0.50.0 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later From e55e036bef84d49ba602defafae608b64c63714b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 1 Apr 2025 16:52:04 +0000 Subject: [PATCH 0564/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 2200df7acd..e5e5e8022c 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.621 +Version: 0.0.622 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index dca5ba1df2..27d7a46bc4 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.621 +Version: 0.0.622 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From aa15ecf6347e456d1740c28dcf7d072202a91928 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Tue, 1 Apr 2025 10:58:34 -0700 Subject: [PATCH 0565/2977] fix(ivsc-firmware): Macro and date (#4212) (#4218) * fix(spec): Macro and date Signed-off-by: Gilver * fix(anda.hcl): Needs to be nightly for an accurate date Signed-off-by: Gilver --------- Signed-off-by: Gilver (cherry picked from commit 208dfcb2b92dcbbfbf385387a9b74c1ffae6ce8e) Co-authored-by: Gilver --- anda/system/ivsc-firmware/anda.hcl | 3 --- anda/system/ivsc-firmware/ivsc-firmware.spec | 8 ++++++-- anda/system/ivsc-firmware/update.rhai | 5 ----- 3 files changed, 6 insertions(+), 10 deletions(-) delete mode 100644 anda/system/ivsc-firmware/update.rhai diff --git a/anda/system/ivsc-firmware/anda.hcl b/anda/system/ivsc-firmware/anda.hcl index b7195b71fe..abbf8c7165 100644 --- a/anda/system/ivsc-firmware/anda.hcl +++ b/anda/system/ivsc-firmware/anda.hcl @@ -3,7 +3,4 @@ project pkg { rpm { spec = "ivsc-firmware.spec" } - labels { - weekly = 1 - } } diff --git a/anda/system/ivsc-firmware/ivsc-firmware.spec b/anda/system/ivsc-firmware/ivsc-firmware.spec index b3ddd3d699..50da419b2e 100644 --- a/anda/system/ivsc-firmware/ivsc-firmware.spec +++ b/anda/system/ivsc-firmware/ivsc-firmware.spec @@ -1,16 +1,20 @@ %global debug_package %{nil} %global commit 3377801f46b86e03c464bfb03ca3c486e9b0db00 -%global commitdate 20230811 +%global commit_date 20250326 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: ivsc-firmware Summary: Intel iVSC firmware URL: https://github.com/intel/ivsc-firmware -Version: %{commitdate}.%{shortcommit} +Version: 0^%{commit_date}git.%{shortcommit} Release: 1%?dist License: Proprietary Source0: https://github.com/intel/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz Requires: ipu6-camera-bins +# Fix the stupid issue when changing versioning schemes +%if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 +Provides: %{name} = %{commit_date}.%{shortcommit} +%endif ExclusiveArch: x86_64 %description diff --git a/anda/system/ivsc-firmware/update.rhai b/anda/system/ivsc-firmware/update.rhai deleted file mode 100644 index 528a6c084b..0000000000 --- a/anda/system/ivsc-firmware/update.rhai +++ /dev/null @@ -1,5 +0,0 @@ -rpm.global("commit", gh_commit("intel/ivsc-firmware")); -if rpm.changed() { - rpm.release(); - rpm.global("commit_date", date()); -} From 733f74ab6e53772e31e779e31d3eb80bcbdb2555 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 1 Apr 2025 18:25:36 +0000 Subject: [PATCH 0566/2977] bump: wpaperd --- anda/desktops/waylands/wpaperd/wpaperd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/waylands/wpaperd/wpaperd.spec b/anda/desktops/waylands/wpaperd/wpaperd.spec index 495ff7d603..70ca93274f 100644 --- a/anda/desktops/waylands/wpaperd/wpaperd.spec +++ b/anda/desktops/waylands/wpaperd/wpaperd.spec @@ -2,7 +2,7 @@ %bcond check 1 Name: wpaperd -Version: 1.1.1 +Version: 1.2.0 Release: 1%?dist Summary: Modern wallpaper daemon for Wayland License: (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-2-Clause AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-3-Clause AND CC0-1.0 AND (CC0-1.0 OR Apache-2.0) AND (CC0-1.0 OR Artistic-2.0) AND GPL-3.0+ AND ISC AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR NCSA) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) From 34148293ae21a531480827b7c2e38202562fc4c7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 2 Apr 2025 01:45:00 +0000 Subject: [PATCH 0567/2977] bump(nightly): mpv nightly prismlauncher-nightly nim-nightly server --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/stardust/server/stardust-server.spec | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 8c55c86148..9ea34a215c 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 5870c95e895460af9e0aa12ad7ff575e4cf2196c +%global commit 36ea2354be055701f2a9444f73fc887390b0c4e4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250401 +%global commit_date 20250402 %global ver 0.40.0 Name: mpv-nightly diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 6e59cee81f..879a05fb47 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 7984f0f11c900cc397d42bf1f2f4c33b72178f93 +%global commit dc83f1ad38cd5b3cd3c3a5d165937bed8201e9ce %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250401 +%global commit_date 20250402 %global ver 0.181.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 9a523828d8..9995d81c01 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 1d45850b6d5ccf00f77bc827235c5c5a5467683c +%global commit 1e5d21be61d537538f265f613bb81b5be9f95b92 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250401 +%global commit_date 20250402 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index c2ab5265f2..e3b7a259e3 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 0f5732bc8c35b8f11b55d34da1cbd3b3937b6f4d +%global commit f9c8775783c98094615a90760b2ae9a4aca03c70 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250330 +%global commit_date 20250402 %global debug_package %nil Name: nim-nightly diff --git a/anda/stardust/server/stardust-server.spec b/anda/stardust/server/stardust-server.spec index 732835de42..f77eab6e01 100644 --- a/anda/stardust/server/stardust-server.spec +++ b/anda/stardust/server/stardust-server.spec @@ -1,12 +1,12 @@ -%global commit c830becbff8907809c87dc0949f9a0abd4d77ed6 -%global commit_date 20241102 +%global commit 3e31905b5bc9bd78e285099ed94a4b31fdc6810b +%global commit_date 20250402 %global shortcommit %(c=%{commit}; echo ${c:0:7}) # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ Name: stardust-xr-server Version: %commit_date.%shortcommit -Release: 2%?dist +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/%commit/server-%commit.tar.gz From 35348a7036608b9d23e3457fc2b1edec0c677f02 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 2 Apr 2025 02:00:04 +0000 Subject: [PATCH 0568/2977] bump: ruffle asar inputplumber mise --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- anda/devs/asar/asar.spec | 2 +- anda/games/inputplumber/inputplumber.spec | 2 +- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index b1dcd53039..511850bbc3 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-01 +%global ver 2025-04-02 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/devs/asar/asar.spec b/anda/devs/asar/asar.spec index fdebd68ffd..21d004d1f7 100644 --- a/anda/devs/asar/asar.spec +++ b/anda/devs/asar/asar.spec @@ -7,7 +7,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: asar -Version: 3.3.1 +Version: 3.4.0 Release: 1%?dist Summary: Simple extensive tar-like archive format with indexing License: MIT diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index ac07bc26a4..ab80cfd74b 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.50.0 +Version: 0.51.0 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index 8fd264d710..59f7900966 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.3.11 +Version: 2025.4.0 Release: 1%?dist Summary: Front-end to your dev env From 21259fb0abe8c870befb6b19b243342b3cc8c161 Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 1 Apr 2025 21:40:29 -0500 Subject: [PATCH 0569/2977] feat(ivsc-firmware): Include the doc files and a changelog (#4221) * feat(ivsc-firmware): Include the doc files and a changelog Signed-off-by: Gilver * cleanup: This spec always does weird crap? Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/system/ivsc-firmware/ivsc-firmware.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/anda/system/ivsc-firmware/ivsc-firmware.spec b/anda/system/ivsc-firmware/ivsc-firmware.spec index 50da419b2e..12c9102513 100644 --- a/anda/system/ivsc-firmware/ivsc-firmware.spec +++ b/anda/system/ivsc-firmware/ivsc-firmware.spec @@ -7,7 +7,7 @@ Name: ivsc-firmware Summary: Intel iVSC firmware URL: https://github.com/intel/ivsc-firmware Version: 0^%{commit_date}git.%{shortcommit} -Release: 1%?dist +Release: 2%?dist License: Proprietary Source0: https://github.com/intel/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz Requires: ipu6-camera-bins @@ -36,8 +36,12 @@ done popd %files +%doc README.md +%doc SECURITY.md %license LICENSE %{_prefix}/lib/firmware/vsc/ %changelog -%autochangelog +* Tue Apr 1 2025 Gilver E. - 0^20250326git.3377801-2%{?dist} - FINAL +- Final update as the project is archived +- Include the doc files From 9e38cf10a93d50bac1cd8c59a57f998542c38926 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Tue, 1 Apr 2025 19:45:42 -0700 Subject: [PATCH 0570/2977] fix(ipu6-camera-bins): Setup and install steps (#4217) (#4225) * Update ipu6-camera-bins.spec Signed-off-by: Gilver * Update update.rhai Signed-off-by: Gilver * fix: Make nightly due to the date function Signed-off-by: Gilver * Update ipu6-camera-bins.spec Signed-off-by: Gilver * The funny Signed-off-by: Gilver * Right Signed-off-by: Gilver * Update ipu6-camera-bins.spec Signed-off-by: Gilver * fix: Install and build * fix: Ifcond typo * feat: Ifcond * Fixes for build and obsoletes * Idiot moment * Mega idiot can't read moment * Add build dep just in case * chore: Update description/summary * cleanup: Stray dot?? * fix: Not really noarch and readelf is just trash on .a files * cleanup: Nest the %if? * chore: Bump obsolete release Signed-off-by: Gilver --------- Signed-off-by: Gilver (cherry picked from commit 6ed095130c738c04d40ec96ef626b6b14ee6316b) Co-authored-by: Gilver --- anda/lib/ipu6-camera-bins/anda.hcl | 2 +- .../ipu6-camera-bins/ipu6-camera-bins.spec | 65 ++++++++++++------- anda/lib/ipu6-camera-bins/update.rhai | 4 ++ 3 files changed, 48 insertions(+), 23 deletions(-) diff --git a/anda/lib/ipu6-camera-bins/anda.hcl b/anda/lib/ipu6-camera-bins/anda.hcl index 94e4030f11..fe9fc31319 100644 --- a/anda/lib/ipu6-camera-bins/anda.hcl +++ b/anda/lib/ipu6-camera-bins/anda.hcl @@ -4,6 +4,6 @@ project pkg { spec = "ipu6-camera-bins.spec" } labels { - weekly = 1 + nightly = 1 } } diff --git a/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec b/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec index 3322f90c00..db32edb5b1 100644 --- a/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec +++ b/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec @@ -1,29 +1,43 @@ %global debug_package %{nil} %global commit 3c1cdd3e634bb4668a900d75efd4d6292b8c7d1d -%global commitdate 20240507 +%global commit_date 20240507 %global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global ver 1.0.1 Name: ipu6-camera-bins -Summary: Binary libraries for Intel IPU6 -Version: %{commitdate}.%{shortcommit} +Summary: Libraries for Intel IPU6 +Version: %{ver}^%{commit_date}git.%{shortcommit} Release: 1%?dist License: Proprietary URL: https://github.com/intel/ipu6-camera-bins -Source0: https://github.com/intel/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +Source0: %{url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz BuildRequires: systemd-rpm-macros BuildRequires: chrpath -#Requires: gstreamer1-plugin-icamerasrc +BuildRequires: sed +Requires: gstreamer1-plugin-icamerasrc Requires: v4l2-relayd Requires: intel-ipu6-kmod Requires: intel-vsc-firmware >= 20240513 Obsoletes: ipu6-camera-bins-firmware < 0.0-11 +# < 6.10 is falling out of third party and official support on Fedora +%if 0%{?fedora} +# Versioning scheme quirk +%if 0%{?fedora} <= 43 +Obsoletes: ivsc-firmware < 20250326.3377801-3 +%endif +Obsoletes: ivsc-firmware < 0^20250326git.3377801-3 +%endif ### For Akmods package Provides: intel-ipu6-kmod-common = %{version} +# Fix the stupid issue when changing versioning schemes +%if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 +Provides: %{name} = %{commit_date}.%{shortcommit} +%endif ExclusiveArch: x86_64 +Packager: Gilver E. %description -Provides binaries for Intel IPU6, including libraries and firmware. - +Provides binary libraries for Intel IPU6. %package devel Summary: IPU6 development files @@ -33,33 +47,40 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This provides the header files for IPU6 development. %prep -%setup -q -n %{name}-%{commit} -chrpath --delete lib/*.so.* -sed -i \ - -e "s|libdir=\${exec_prefix}/lib|libdir=\${prefix}/%{_lib}|g" \ - lib/pkgconfig/*.pc +%autosetup -n %{name}-%{commit} +chrpath --delete lib/*.so.0 +chmod +x lib/*.so.0 +# The firmware is part of linux-firmware! +rm -r lib/firmware %build %install mkdir -p %{buildroot}%{_includedir}/ -mkdir -p %{buildroot}%{_libdir}/ cp -pr include/* %{buildroot}%{_includedir}/ -cp -pr lib/lib* lib/pkgconfig %{buildroot}%{_libdir}/ -chmod 755 %{buildroot}%{_libdir}/$target/*.so* - +install -Dm755 lib/*.so* -t %{buildroot}%{_libdir} +install -Dm644 lib/*.a -t %{buildroot}%{_libdir} +install -Dm644 lib/pkgconfig/* -t %{buildroot}%{_libdir}/pkgconfig +pushd %{buildroot}%{_libdir} + for i in *.so.0; do + ln -s $i `echo $i | sed -e "s|\.so\.0|\.so|"` + done + for i in pkgconfig/*.pc; do + sed -i -e "s|libdir=\${prefix}/lib|libdir=%{_libdir}|g" "$i" + done +popd %files %license LICENSE -%doc README.md SECURITY.md -%{_libdir}/*.so* +%doc README.md +%doc SECURITY.md +%{_libdir}/*.so.* %files devel -%{_includedir}/* -%{_libdir}/pkgconfig/* +%{_includedir}/ipu6* +%{_libdir}/pkgconfig/*.pc %{_libdir}/*.a -%{_libdir}/*.so* - +%{_libdir}/*.so %changelog %autochangelog diff --git a/anda/lib/ipu6-camera-bins/update.rhai b/anda/lib/ipu6-camera-bins/update.rhai index df3627ccdd..81924f3613 100644 --- a/anda/lib/ipu6-camera-bins/update.rhai +++ b/anda/lib/ipu6-camera-bins/update.rhai @@ -2,4 +2,8 @@ rpm.global("commit", gh_commit("intel/ipu6-camera-bins")); if rpm.changed() { rpm.release(); rpm.global("commit_date", date()); + let v = gh("intel/ipu6-camera-bins"); + v.truncate(6); + v.crop(1); + rpm.global("ver", v); } From 6d95de528b49f863a57205e1bacc2a97fc1b27eb Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 2 Apr 2025 14:41:00 +0000 Subject: [PATCH 0571/2977] bump: datetime --- .../mate/indicators/datetime/ayatana-indicator-datetime.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/mate/indicators/datetime/ayatana-indicator-datetime.spec b/anda/desktops/mate/indicators/datetime/ayatana-indicator-datetime.spec index 94dafb8502..d66ec12981 100644 --- a/anda/desktops/mate/indicators/datetime/ayatana-indicator-datetime.spec +++ b/anda/desktops/mate/indicators/datetime/ayatana-indicator-datetime.spec @@ -1,6 +1,6 @@ Name: ayatana-indicator-datetime Summary: A GTK implementation of the StatusNotifierItem Specification -Version: 24.5.1 +Version: 25.4.0 Release: 1%?dist License: GPL-3.0 URL: https://github.com/AyatanaIndicators/ayatana-indicator-datetime From 5351a2bb18c629ea094f6c8529c7ccfae5c5a15d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 2 Apr 2025 16:48:20 +0000 Subject: [PATCH 0572/2977] bump: mesa --- anda/lib/mesa/mesa.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index f19af8c08b..297d16abca 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -75,8 +75,8 @@ Summary: Mesa graphics libraries # This should not break anything by default as the Mesa stream is ***EXPLICITLY*** # disabled by default, and has to be enabled manually. See `terra/release/terra-mesa.repo` for details. Epoch: 1 -Version: 25.0.2 -Release: 4%?dist +Version: 25.0.3 +Release: 1%?dist License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org From ca73b03ccbf4aa9f0e536c3b693503e5748ea5b1 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 2 Apr 2025 19:14:39 +0000 Subject: [PATCH 0573/2977] bump: preview stable --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 9e71c7bf94..2798758836 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.179.5 +%global ver 0.181.0-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 80f1a4230d..5335882a80 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.179.5 +Version: 0.180.2 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From 33be229eb47f5f7499da3873b96fb5dc51a50b74 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 2 Apr 2025 21:45:52 +0000 Subject: [PATCH 0574/2977] bump: electron --- anda/tools/electron/electron.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/electron/electron.spec b/anda/tools/electron/electron.spec index 27ed43af68..8cad9ab159 100644 --- a/anda/tools/electron/electron.spec +++ b/anda/tools/electron/electron.spec @@ -12,7 +12,7 @@ %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so Name: electron -Version: 35.1.2 +Version: 35.1.3 Release: 1%?dist Summary: Build cross platform desktop apps with web technologies License: MIT From 41f3bc769532c9bffd386f8ea35fb57fcd9cb210 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 2 Apr 2025 23:31:02 +0000 Subject: [PATCH 0575/2977] bump: sass --- anda/misc/sass/sass.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/misc/sass/sass.spec b/anda/misc/sass/sass.spec index c8aab6fcf2..87fc9b3be5 100644 --- a/anda/misc/sass/sass.spec +++ b/anda/misc/sass/sass.spec @@ -4,7 +4,7 @@ %define _build_id_links none Name: sass -Version: 1.86.1 +Version: 1.86.2 Release: 1%?dist Summary: The reference implementation of Sass, written in Dart License: MIT From 89d57c89c3d502a6beb103532531c1669ada07d9 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 2 Apr 2025 23:45:25 +0000 Subject: [PATCH 0576/2977] bump: lomiri-system-settings --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 6c145190f8..4039f348bb 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit 43297ddc3db71de1b85917788d4e90ab63fbe768 +%global commit 26be81378ee8d880531927ff74a9b0acb65040c1 %forgemeta Name: lomiri-system-settings From cd220f64a7c288d993ef36cafdfacc062d9eb9d0 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 3 Apr 2025 01:24:44 +0000 Subject: [PATCH 0577/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 511850bbc3..b8df93b29a 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-02 +%global ver 2025-04-03 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 3b15636724645372ffb1802f04d9ddd039935d25 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 3 Apr 2025 01:43:24 +0000 Subject: [PATCH 0578/2977] bump(nightly): mpv nightly nightly prismlauncher-nightly nim-nightly --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 6 +++--- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 9ea34a215c..b3ece9ca98 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 36ea2354be055701f2a9444f73fc887390b0c4e4 +%global commit 07571859ac28f4b9c048680a4fb454d146040cb1 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250402 +%global commit_date 20250403 %global ver 0.40.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 944a7d6e36..d89772071e 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 1067cd3d8a061eb5b23bc1a4c46ca10af4481941 +%global commit 6f1b22aca5ca775efdb5f3b2bf58888820145adf %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-03-28 +%global fulldate 2025-04-02 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 879a05fb47..45f86a9025 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,7 +1,7 @@ -%global commit dc83f1ad38cd5b3cd3c3a5d165937bed8201e9ce +%global commit d3e4de7c72ac1628257174bcc4cb7a324c5c9184 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250402 -%global ver 0.181.0 +%global commit_date 20250403 +%global ver 0.182.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 9995d81c01..e0615a492b 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 1e5d21be61d537538f265f613bb81b5be9f95b92 +%global commit e883e9f359bc509dfe42ff17b0c437f7e8209be5 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250402 +%global commit_date 20250403 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index e3b7a259e3..1389a7622d 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit f9c8775783c98094615a90760b2ae9a4aca03c70 +%global commit 4352fa2ef0cbba953d9a90b90873e8dd0364b72e %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250402 +%global commit_date 20250403 %global debug_package %nil Name: nim-nightly From 5946ae21e3f755c5fbae5f9e33e568b4f7dbb5ce Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Wed, 2 Apr 2025 23:09:54 -0500 Subject: [PATCH 0579/2977] Fix: cbfstool (#4231) * Fix: cbfstool * changelog --- anda/tools/cbfstool/cbfstool.spec | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/anda/tools/cbfstool/cbfstool.spec b/anda/tools/cbfstool/cbfstool.spec index 196602f21f..ff103bfb22 100644 --- a/anda/tools/cbfstool/cbfstool.spec +++ b/anda/tools/cbfstool/cbfstool.spec @@ -4,7 +4,10 @@ Release: 1%?dist Summary: Management utility for CBFS formatted ROM images URL: https://doc.coreboot.org/lib/fw_config.html#cbfs License: GPLv2 -BuildRequires: gcc g++ gcc-gnat make cmake ncurses-devel iasl git +BuildRequires: gcc g++ gcc-gnat make cmake ncurses-devel iasl anda-srpm-macros +%if 0%{?fedora} >= 42 +BuildRequires: gcc14 gcc14-c++ +%endif Requires: glibc Packager: Owen Zimmerman @@ -12,17 +15,23 @@ Packager: Owen Zimmerman Management utility for CBFS formatted ROM images. %prep -git clone https://review.coreboot.org/coreboot.git -b %version +%git_clone https://review.coreboot.org/coreboot.git %build -make -C coreboot/util/cbfstool +%if 0%{?fedora} >= 42 +export CC=gcc-14 +export CXX=g++-14 +%endif +%make_build -C util/cbfstool %install -install -Dm 777 coreboot/util/cbfstool/cbfstool %buildroot%_bindir/cbfstool +install -Dm 777 util/cbfstool/cbfstool %buildroot%_bindir/cbfstool %files /usr/bin/cbfstool %changelog +* Wed Apr 02 2025 Owen Zimmerman +- Add macros and specify fedora version release exports * Sun Aug 25 2024 Owen Zimmerman -- Initial Package \ No newline at end of file +- Initial Package From 8c70bbea959403dca0d7559a9280a99344a02d15 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Thu, 3 Apr 2025 00:06:31 -0500 Subject: [PATCH 0580/2977] Fix: cbfstool again (#4237) * Fix: cbfstool * changelog * Add cbfstool version to git clone --- anda/tools/cbfstool/cbfstool.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/tools/cbfstool/cbfstool.spec b/anda/tools/cbfstool/cbfstool.spec index ff103bfb22..5e34ffb6d4 100644 --- a/anda/tools/cbfstool/cbfstool.spec +++ b/anda/tools/cbfstool/cbfstool.spec @@ -1,6 +1,6 @@ Name: cbfstool Version: 25.03 -Release: 1%?dist +Release: 2%?dist Summary: Management utility for CBFS formatted ROM images URL: https://doc.coreboot.org/lib/fw_config.html#cbfs License: GPLv2 @@ -15,7 +15,7 @@ Packager: Owen Zimmerman Management utility for CBFS formatted ROM images. %prep -%git_clone https://review.coreboot.org/coreboot.git +%git_clone https://review.coreboot.org/coreboot.git %version %build %if 0%{?fedora} >= 42 From 30ddee9cd5934625ce3502489fd791960d8cea50 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 3 Apr 2025 07:17:51 +0000 Subject: [PATCH 0581/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index e5e5e8022c..b4eb67c04d 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.622 +Version: 0.0.623 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 27d7a46bc4..6359e10ca0 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.622 +Version: 0.0.623 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 65d9c28030f495a9bd96613f0b1c3bd66ff21880 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 3 Apr 2025 10:33:18 +0000 Subject: [PATCH 0582/2977] bump: topgrade --- anda/tools/topgrade/topgrade.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/tools/topgrade/topgrade.spec b/anda/tools/topgrade/topgrade.spec index 5c186e69f7..483f9d8cbf 100644 --- a/anda/tools/topgrade/topgrade.spec +++ b/anda/tools/topgrade/topgrade.spec @@ -3,8 +3,8 @@ Name: topgrade # renovate: datasource=github-releases depName=topgrade-rs/topgrade -Version: 16.0.2 -Release: 1%{?dist} +Version: 16.0.3 +Release: 1%?dist Summary: Upgrade all the things SourceLicense: GPL-3.0-or-later From b3441aa8f9fa55f3c54275faacff1540d360a383 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 3 Apr 2025 12:50:27 +0000 Subject: [PATCH 0583/2977] bump: lomiri-system-settings --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 4039f348bb..38dfd957f7 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit 26be81378ee8d880531927ff74a9b0acb65040c1 +%global commit 4cc7ee0242c78302bd3b620aadfb8c3c4aba0b14 %forgemeta Name: lomiri-system-settings From 255cd1973d4fd9bf10e8cdd9ccf67507cc2f522b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 3 Apr 2025 14:17:52 +0000 Subject: [PATCH 0584/2977] bump: lomiri-download-manager --- .../lomiri-download-manager/lomiri-download-manager.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/desktops/lomiri-unity/lomiri-download-manager/lomiri-download-manager.spec b/anda/desktops/lomiri-unity/lomiri-download-manager/lomiri-download-manager.spec index ba57eccb1c..ce8b0875e7 100644 --- a/anda/desktops/lomiri-unity/lomiri-download-manager/lomiri-download-manager.spec +++ b/anda/desktops/lomiri-unity/lomiri-download-manager/lomiri-download-manager.spec @@ -1,9 +1,9 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-download-manager -%global commit 682c4928a91da598767e0be2496d9c35af7db035 +%global commit 76419e042a99d6a4efbc7e601360715f3ca06ea3 %forgemeta Name: lomiri-download-manager -Version: 0.1.3 +Version: 0.2.0 Release: 1%?dist Summary: Upload Download Manager for Lomiri License: LGPLv3 From a208d77df59634bb679551f42d3cc3c3b8045a3b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 3 Apr 2025 16:32:18 +0000 Subject: [PATCH 0585/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 2798758836..3307b54c58 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.181.0-pre +%global ver 0.181.1-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From 73f8c6b0ba146f0dc1e0b80e0a0c02f8fbd4e422 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 3 Apr 2025 18:25:31 +0000 Subject: [PATCH 0586/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 10a8c9939b..a8ee594ae1 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.03.31.213838 +Version: 2025.04.03.175553 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 82c5b33c40eb9b254cbfbb12bf9b803828f46b28 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 3 Apr 2025 19:17:18 +0000 Subject: [PATCH 0587/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index a8ee594ae1..1fcbf27027 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.03.175553 +Version: 2025.04.03.190239 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From d91f6e67350ca73fd4d41bb445b33c7ee63a0059 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 3 Apr 2025 19:59:02 +0000 Subject: [PATCH 0588/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 3307b54c58..73dd56d586 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.181.1-pre +%global ver 0.181.2-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From 4e54a6148df7386574e9645566ae546cfddc890b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 4 Apr 2025 01:25:36 +0000 Subject: [PATCH 0589/2977] bump: sass --- anda/misc/sass/sass.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/misc/sass/sass.spec b/anda/misc/sass/sass.spec index 87fc9b3be5..59954f441e 100644 --- a/anda/misc/sass/sass.spec +++ b/anda/misc/sass/sass.spec @@ -4,7 +4,7 @@ %define _build_id_links none Name: sass -Version: 1.86.2 +Version: 1.86.3 Release: 1%?dist Summary: The reference implementation of Sass, written in Dart License: MIT From 31851fda23610d7690beceaf081257496ff847cd Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 4 Apr 2025 01:43:18 +0000 Subject: [PATCH 0590/2977] bump(nightly): nightly nightly nim-nightly magnetar nvidia-patch --- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/stardust/magnetar/stardust-magnetar.spec | 4 ++-- anda/system/nvidia-patch/nvidia-patch.spec | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index d89772071e..15bd6bdb8e 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 6f1b22aca5ca775efdb5f3b2bf58888820145adf +%global commit 17a19e4837d631e0b0496aac625f95f519195212 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-04-02 +%global fulldate 2025-04-04 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 45f86a9025..a950b3d353 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit d3e4de7c72ac1628257174bcc4cb7a324c5c9184 +%global commit c04c5812b6295ab683fbf1900499330cbc2b3058 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250403 +%global commit_date 20250404 %global ver 0.182.0 %bcond_with check diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 1389a7622d..aedd3bf7cd 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 4352fa2ef0cbba953d9a90b90873e8dd0364b72e +%global commit 10c9ebad9303d9c4be393da913f4e12650783539 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250403 +%global commit_date 20250404 %global debug_package %nil Name: nim-nightly diff --git a/anda/stardust/magnetar/stardust-magnetar.spec b/anda/stardust/magnetar/stardust-magnetar.spec index f88d40193f..d2e3deef8d 100644 --- a/anda/stardust/magnetar/stardust-magnetar.spec +++ b/anda/stardust/magnetar/stardust-magnetar.spec @@ -1,5 +1,5 @@ -%global commit d00c5ecf0bcaf2b4382ec3b4f3373ea5b761ee7b -%global commit_date 20241230 +%global commit 63ff648bb64c23023a0047ea3ff2c0b6b1fd3caf +%global commit_date 20250404 %global shortcommit %(c=%{commit}; echo ${c:0:7}) # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ diff --git a/anda/system/nvidia-patch/nvidia-patch.spec b/anda/system/nvidia-patch/nvidia-patch.spec index a8f5713bd5..b2f20eb1d4 100644 --- a/anda/system/nvidia-patch/nvidia-patch.spec +++ b/anda/system/nvidia-patch/nvidia-patch.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} -%global commit 07080317245ac30c38001d2149810b2dee3cce1f +%global commit 40bcef23ea2fa20466ef696bf00c47ad3c78bc3d %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250320 +%global commit_date 20250404 %global patches %{_datadir}/src/nvidia-patch From 7f32606b565d53723562083448e8be1674e4bd3b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 4 Apr 2025 02:46:27 +0000 Subject: [PATCH 0591/2977] bump: gitoxide --- anda/langs/rust/gitoxide/rust-gitoxide.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/rust/gitoxide/rust-gitoxide.spec b/anda/langs/rust/gitoxide/rust-gitoxide.spec index 0a09638e14..a1add469b8 100644 --- a/anda/langs/rust/gitoxide/rust-gitoxide.spec +++ b/anda/langs/rust/gitoxide/rust-gitoxide.spec @@ -5,7 +5,7 @@ %global crate gitoxide Name: rust-gitoxide -Version: 0.41.0 +Version: 0.42.0 Release: 1%?dist Summary: Command-line application for interacting with git repositories From 8c59da45ad17304e87e970e56f38acfc54e9014e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 4 Apr 2025 04:29:01 +0000 Subject: [PATCH 0592/2977] bump: args-hxx --- anda/lib/args-hxx/args-hxx.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/args-hxx/args-hxx.spec b/anda/lib/args-hxx/args-hxx.spec index e23e40dbe5..53c28571ce 100644 --- a/anda/lib/args-hxx/args-hxx.spec +++ b/anda/lib/args-hxx/args-hxx.spec @@ -1,7 +1,7 @@ %define debug_package %nil Name: args-hxx -Version: 6.4.6 +Version: 6.4.7 Release: 1%?dist Summary: A simple header-only C++ argument parser library License: MIT From f2b4e22e6f2f0c121973a8ab583940ae38037bd0 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 4 Apr 2025 07:45:45 +0000 Subject: [PATCH 0593/2977] bump: electron --- anda/tools/electron/electron.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/electron/electron.spec b/anda/tools/electron/electron.spec index 8cad9ab159..f28277433d 100644 --- a/anda/tools/electron/electron.spec +++ b/anda/tools/electron/electron.spec @@ -12,7 +12,7 @@ %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so Name: electron -Version: 35.1.3 +Version: 35.1.4 Release: 1%?dist Summary: Build cross platform desktop apps with web technologies License: MIT From c54c745b13f9b45b64bab85d57a8821018412fc4 Mon Sep 17 00:00:00 2001 From: Gilver Date: Fri, 4 Apr 2025 04:13:13 -0500 Subject: [PATCH 0594/2977] fix(lomiri-ui-toolkit): Update patches and Python subpackage build/install steps (#4229) * fix(lomiri-ui-toolkit): Update patches Signed-off-by: Gilver * fix: Remove `python3` subpackage? Signed-off-by: Gilver * Revert "fix: Remove `python3` subpackage?" This reverts commit 00d98e978b7c1fed4ba8c7cedc903fbc15c873c0. * I fixed it, it was Debian specific changes * Oops no * NO??? * Update lomiri-ui-toolkit.spec Signed-off-by: Gilver * Update lomiri-ui-toolkit.spec Signed-off-by: Gilver * Update lomiri-ui-toolkit.spec Signed-off-by: Gilver * So confused Signed-off-by: Gilver * Un-array? Signed-off-by: Gilver * Update lomiri-ui-toolkit.spec Signed-off-by: Gilver * Update lomiri-ui-toolkit.spec Signed-off-by: Gilver * Update lomiri-ui-toolkit.spec Signed-off-by: Gilver * Enough Signed-off-by: Gilver --------- Signed-off-by: Gilver --- .../lomiri-ui-toolkit/lomiri-ui-toolkit.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/anda/desktops/lomiri-unity/lomiri-ui-toolkit/lomiri-ui-toolkit.spec b/anda/desktops/lomiri-unity/lomiri-ui-toolkit/lomiri-ui-toolkit.spec index 3fdcdb363a..cfaf42d970 100644 --- a/anda/desktops/lomiri-unity/lomiri-ui-toolkit/lomiri-ui-toolkit.spec +++ b/anda/desktops/lomiri-unity/lomiri-ui-toolkit/lomiri-ui-toolkit.spec @@ -10,8 +10,7 @@ Summary: QML components to ease the creation of beautiful applications in License: LGPL-3.0 URL: https://gitlab.com/ubports/development/core/lomiri-ui-toolkit Source0: %{url}/-/archive/%commit/lomiri-ui-toolkit-%commit.tar.gz -Patch0: https://sources.debian.org/data/main/l/lomiri-ui-toolkit/1.3.5010%2Bdfsg-1/debian/patches/0002-fix-tests-on-qt-5.15.5.patch -Patch1: https://sources.debian.org/data/main/l/lomiri-ui-toolkit/1.3.5010%2Bdfsg-1/debian/patches/2003_stop-using-Ubuntu-fonts.patch +Patch0: https://sources.debian.org/data/main/l/lomiri-ui-toolkit/1.3.5110+dfsg-2/debian/patches/2003_stop-using-Ubuntu-fonts.patch BuildRequires: pkgconfig BuildRequires: make @@ -31,9 +30,11 @@ BuildRequires: qt5-qtfeedback BuildRequires: qt5-qtsystems-devel BuildRequires: qt5-qtdeclarative-devel BuildRequires: qt5-pim-devel +BuildRequires: python3-devel BuildRequires: python3-rpm-macros BuildRequires: qt5-qtsvg-devel BuildRequires: fdupes +BuildRequires: python3dist(setuptools) Requires: qt5-qtgraphicaleffects Requires: qt5-qtfeedback @@ -82,7 +83,9 @@ Examples for Lomiri-ui-toolkit. %build %{qmake_qt5} 'CONFIG+=ubuntu-uitk-compat' 'CONFIG+=test' - +pushd tests/autopilot +%py3_build +popd %make_build %install @@ -92,6 +95,11 @@ rm -rf %{buildroot}%{_qt5_qmldir}/Extinct %fdupes %buildroot%_libdir/qt5/qml/Lomiri/Components/ %fdupes %buildroot%_libdir/qt5/examples/%name/examples/ +pushd tests/autopilot +%py3_install +mv lomiriuitoolkit/{tests,_custom_proxy_objects} %{buildroot}%{python3_sitelib}/lomiriuitoolkit/ +popd + %find_lang %{name} %find_lang %{name}-gallery @@ -135,6 +143,8 @@ rm -rf %{buildroot}%{_qt5_qmldir}/Extinct %doc README.md %dir %{python3_sitelib}/lomiriuitoolkit %{python3_sitelib}/lomiriuitoolkit/*.py +%dir %{python3_sitelib}/lomiriuitoolkit-%{version}-py%{python3_version}.egg-info +%{python3_sitelib}/lomiriuitoolkit-%{version}-py%{python3_version}.egg-info/* %{python3_sitelib}/lomiriuitoolkit/_custom_proxy_objects/ %{python3_sitelib}/lomiriuitoolkit/__pycache__/ %{python3_sitelib}/lomiriuitoolkit/tests/ From 3fa0ee8daee6a63dfb4cbe554d7918b6c1cdd1e0 Mon Sep 17 00:00:00 2001 From: Gilver Date: Fri, 4 Apr 2025 04:15:21 -0500 Subject: [PATCH 0595/2977] fix(ipu6-camera-bins): Sed command (#4228) * fix(ipu6-camera-bins): Sed command Signed-off-by: Gilver * Bump release Signed-off-by: Gilver * Backslash not needed there Signed-off-by: Gilver * Literally JUST did this locally what Signed-off-by: Gilver * While I'm here Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec b/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec index db32edb5b1..165f71a563 100644 --- a/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec +++ b/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec @@ -7,17 +7,17 @@ Name: ipu6-camera-bins Summary: Libraries for Intel IPU6 Version: %{ver}^%{commit_date}git.%{shortcommit} -Release: 1%?dist +Release: 2%?dist License: Proprietary URL: https://github.com/intel/ipu6-camera-bins Source0: %{url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz -BuildRequires: systemd-rpm-macros BuildRequires: chrpath BuildRequires: sed +BuildRequires: systemd-rpm-macros Requires: gstreamer1-plugin-icamerasrc -Requires: v4l2-relayd Requires: intel-ipu6-kmod Requires: intel-vsc-firmware >= 20240513 +Requires: v4l2-relayd Obsoletes: ipu6-camera-bins-firmware < 0.0-11 # < 6.10 is falling out of third party and official support on Fedora %if 0%{?fedora} @@ -66,7 +66,7 @@ pushd %{buildroot}%{_libdir} ln -s $i `echo $i | sed -e "s|\.so\.0|\.so|"` done for i in pkgconfig/*.pc; do - sed -i -e "s|libdir=\${prefix}/lib|libdir=%{_libdir}|g" "$i" + sed -i -e "s|libdir=\${exec_prefix}/lib|libdir=%{_libdir}|g" "$i" done popd From e1ddc865b7a17845bd487a13775eceedfa6905e6 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 4 Apr 2025 11:55:57 +0000 Subject: [PATCH 0596/2977] bump: komikku --- anda/apps/komikku/komikku.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/apps/komikku/komikku.spec b/anda/apps/komikku/komikku.spec index ce41513933..3256accc7f 100644 --- a/anda/apps/komikku/komikku.spec +++ b/anda/apps/komikku/komikku.spec @@ -3,12 +3,12 @@ %global gtk4_version 4.14.4 %global libadwaita_version 1.5.1 %global pure_protobuf_version 2.0.0 -%global raw_ver v1.74.0 +%global raw_ver v1.75.0 Name: komikku -Version: 1.74.0 +Version: 1.75.0 %forgemeta -Release: 3%?dist +Release: 1%?dist Summary: A manga reader for GNOME BuildArch: noarch From 5495675c4e9fae0976f85eea77a7ddac8f43bca7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 4 Apr 2025 12:36:54 +0000 Subject: [PATCH 0597/2977] bump: lomiri-download-manager --- .../lomiri-download-manager/lomiri-download-manager.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/desktops/lomiri-unity/lomiri-download-manager/lomiri-download-manager.spec b/anda/desktops/lomiri-unity/lomiri-download-manager/lomiri-download-manager.spec index ce8b0875e7..ef7f41d87c 100644 --- a/anda/desktops/lomiri-unity/lomiri-download-manager/lomiri-download-manager.spec +++ b/anda/desktops/lomiri-unity/lomiri-download-manager/lomiri-download-manager.spec @@ -1,9 +1,9 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-download-manager -%global commit 76419e042a99d6a4efbc7e601360715f3ca06ea3 +%global commit 7f4c49f125209235b9a808a6e72d1fdfdd2b01ca %forgemeta Name: lomiri-download-manager -Version: 0.2.0 +Version: 0.2.1 Release: 1%?dist Summary: Upload Download Manager for Lomiri License: LGPLv3 From 22782971abd25be460fc52cc96921851e30e31f0 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 4 Apr 2025 15:28:03 +0000 Subject: [PATCH 0598/2977] bump: emulationstation-de --- anda/games/emulationstation-de/emulationstation-de.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/games/emulationstation-de/emulationstation-de.spec b/anda/games/emulationstation-de/emulationstation-de.spec index 5f8a365fa9..83ba65284a 100644 --- a/anda/games/emulationstation-de/emulationstation-de.spec +++ b/anda/games/emulationstation-de/emulationstation-de.spec @@ -8,8 +8,8 @@ %bcond_with kms Name: emulationstation-de -Version: 3.1.1 -Release: 1%{?dist} +Version: 3.2.0 +Release: 1%?dist Summary: ES-DE is a frontend for browsing and launching games from your multi-platform collection. Packager: Cappy Ishihara License: MIT From 8ae25c7ad7104e3b7806c81ab8bb10a1b1d36494 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 4 Apr 2025 15:55:25 +0000 Subject: [PATCH 0599/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 73dd56d586..38b012077e 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.181.2-pre +%global ver 0.181.3-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From 5a07350d2b04fbd947cc653a8f679b000ae0348b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 4 Apr 2025 17:16:57 +0000 Subject: [PATCH 0600/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index b4eb67c04d..8f5dd84534 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.623 +Version: 0.0.624 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 6359e10ca0..5674be7beb 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.623 +Version: 0.0.624 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 51af03aa5fb2559d9030ae572aca4c297ef38412 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 4 Apr 2025 21:16:24 +0000 Subject: [PATCH 0601/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 8f5dd84534..53323d3df7 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.624 +Version: 0.0.625 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 5674be7beb..1bd3f78472 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.624 +Version: 0.0.625 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From b7f36d5a3e9c2c08fe9f94afe5f6fe80adac95ba Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 4 Apr 2025 22:17:13 +0000 Subject: [PATCH 0602/2977] bump: codium --- anda/devs/codium/codium.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/codium/codium.spec b/anda/devs/codium/codium.spec index 0904923d57..80ac79027f 100644 --- a/anda/devs/codium/codium.spec +++ b/anda/devs/codium/codium.spec @@ -12,7 +12,7 @@ %endif Name: codium -Version: 1.98.2.25078 +Version: 1.99.02277 Release: 1%?dist Summary: Code editing. Redefined. License: MIT From ec42c61f979dbd1eb4ae8b52a9104dda93a2f1b3 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 5 Apr 2025 01:23:55 +0000 Subject: [PATCH 0603/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index b8df93b29a..66db331d30 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-03 +%global ver 2025-04-05 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 844c2c378e53100c7f5eef203fee8d18aa4e151c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 5 Apr 2025 01:41:53 +0000 Subject: [PATCH 0604/2977] bump(nightly): nightly nightly nightly prismlauncher-nightly spotx-bash --- anda/apps/legcord/nightly/legcord-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 2 +- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/tools/spotx-bash/spotx-bash.spec | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/anda/apps/legcord/nightly/legcord-nightly.spec b/anda/apps/legcord/nightly/legcord-nightly.spec index 558e4da21f..06f7a3f830 100644 --- a/anda/apps/legcord/nightly/legcord-nightly.spec +++ b/anda/apps/legcord/nightly/legcord-nightly.spec @@ -1,5 +1,5 @@ -%global commit 3dda27c303fe4fb1c2a6870ee4f68d2515ec6cd5 -%global commit_date 20250328 +%global commit f1ae18c3363013ed93bea3d2d4af22ddb2b077d0 +%global commit_date 20250405 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define debug_package %nil diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 15bd6bdb8e..f0d7956b33 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,4 +1,4 @@ -%global commit 17a19e4837d631e0b0496aac625f95f519195212 +%global commit c0eaa4b158c418499b9963e84c9ce2787a09d473 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global fulldate 2025-04-04 %global commit_date %(echo %{fulldate} | sed 's/-//g') diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index a950b3d353..0d7a4b9157 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit c04c5812b6295ab683fbf1900499330cbc2b3058 +%global commit 69d7ea7b606f2321307623795c152ccffc1d01e5 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250404 +%global commit_date 20250405 %global ver 0.182.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index e0615a492b..be3a3238dc 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit e883e9f359bc509dfe42ff17b0c437f7e8209be5 +%global commit c1b460fa05fd110179dcacfbeb819c34547a2b3b %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250403 +%global commit_date 20250405 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/tools/spotx-bash/spotx-bash.spec b/anda/tools/spotx-bash/spotx-bash.spec index 01130a92df..c5c78abc09 100644 --- a/anda/tools/spotx-bash/spotx-bash.spec +++ b/anda/tools/spotx-bash/spotx-bash.spec @@ -1,5 +1,5 @@ -%global commit c39047718da0206199ba83df28fc41a235b38f86 -%global commit_date 20250324 +%global commit 2a9a5df99ab8fb5d52d371242d8f4e2744973917 +%global commit_date 20250405 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: spotx-bash From e544bb106ff569b7eeb36c2cf59bfa904db171f4 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 5 Apr 2025 03:21:01 +0000 Subject: [PATCH 0605/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 53323d3df7..cc7f98d1f7 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.625 +Version: 0.0.626 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 1bd3f78472..ac3cbad82a 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.625 +Version: 0.0.626 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 85b6a50df0b5804093e7c1439dcfb903d7436b00 Mon Sep 17 00:00:00 2001 From: Gilver Date: Fri, 4 Apr 2025 22:34:53 -0500 Subject: [PATCH 0606/2977] chore(zenpower3): Bump commit to fix on kernel 6.14 (#4246) Signed-off-by: Gilver --- anda/system/zenpower3/zenpower3.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/zenpower3/zenpower3.spec b/anda/system/zenpower3/zenpower3.spec index de65ea7976..b0c25eb753 100644 --- a/anda/system/zenpower3/zenpower3.spec +++ b/anda/system/zenpower3/zenpower3.spec @@ -4,7 +4,7 @@ # There will probably not be an update script for this package, since this kernel module # is kind of dead, I will update them manually when needed. -%global commit c176fdb0d5bcba6ba2aba99ea36812e40f47751f +%global commit 138fa0637b46a0b0a087f2ba4e9146d2f9ba2475 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: %{prjname} From d4fc6f449517398b73ffb3622a1460c12c11b662 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 5 Apr 2025 03:46:46 +0000 Subject: [PATCH 0607/2977] bump: codium --- anda/devs/codium/codium.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/codium/codium.spec b/anda/devs/codium/codium.spec index 80ac79027f..ad553b1320 100644 --- a/anda/devs/codium/codium.spec +++ b/anda/devs/codium/codium.spec @@ -12,7 +12,7 @@ %endif Name: codium -Version: 1.99.02277 +Version: 1.99.02283 Release: 1%?dist Summary: Code editing. Redefined. License: MIT From 3471913e69297483194b24e465da066ad21ee277 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 5 Apr 2025 03:42:52 -0500 Subject: [PATCH 0608/2977] fix(ipu6-camera-bins): Version provides for devel (#4260) Somehow this only caused an issue on F42 so I only *just now* caught it?? Sigh. Signed-off-by: Gilver --- anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec b/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec index 165f71a563..6477285cdf 100644 --- a/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec +++ b/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec @@ -7,7 +7,7 @@ Name: ipu6-camera-bins Summary: Libraries for Intel IPU6 Version: %{ver}^%{commit_date}git.%{shortcommit} -Release: 2%?dist +Release: 3%?dist License: Proprietary URL: https://github.com/intel/ipu6-camera-bins Source0: %{url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz @@ -42,6 +42,9 @@ Provides binary libraries for Intel IPU6. %package devel Summary: IPU6 development files Requires: %{name}%{?_isa} = %{version}-%{release} +%if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 +Provides: %{name}-devel = %{commit_date}.%{shortcommit} +%endif %description devel This provides the header files for IPU6 development. From 555dff2a425dac0e81d158a3b634ab9c9c004090 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 5 Apr 2025 10:36:45 +0000 Subject: [PATCH 0609/2977] bump: codium --- anda/devs/codium/codium.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/codium/codium.spec b/anda/devs/codium/codium.spec index ad553b1320..5a4bfe4197 100644 --- a/anda/devs/codium/codium.spec +++ b/anda/devs/codium/codium.spec @@ -12,7 +12,7 @@ %endif Name: codium -Version: 1.99.02283 +Version: 1.99.02289 Release: 1%?dist Summary: Code editing. Redefined. License: MIT From 08cc1b23474260fa4da2fa94b503550720db7a2b Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 5 Apr 2025 09:46:20 -0500 Subject: [PATCH 0610/2977] fix?(ipu6*, ivsc*): Add an epoch (#4264) * Update ipu6-camera-bins.spec Signed-off-by: Gilver * Update ivsc-firmware.spec Signed-off-by: Gilver * Update ivsc-firmware.spec Signed-off-by: Gilver * Bump the date WTF?? Signed-off-by: Gilver * I would like one upgrade path please Signed-off-by: Gilver * Update ipu6-camera-bins.spec Signed-off-by: Gilver * Drop release since the date bump technically bumped this? Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec | 13 +++++++++---- anda/system/ivsc-firmware/ivsc-firmware.spec | 8 ++++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec b/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec index 6477285cdf..68701efc3a 100644 --- a/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec +++ b/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec @@ -1,13 +1,16 @@ %global debug_package %{nil} %global commit 3c1cdd3e634bb4668a900d75efd4d6292b8c7d1d -%global commit_date 20240507 +%global commit_date 20241127 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 1.0.1 Name: ipu6-camera-bins Summary: Libraries for Intel IPU6 Version: %{ver}^%{commit_date}git.%{shortcommit} -Release: 3%?dist +Release: 1%?dist +%if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 +Epoch: 1 +%endif License: Proprietary URL: https://github.com/intel/ipu6-camera-bins Source0: %{url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz @@ -31,7 +34,8 @@ Obsoletes: ivsc-firmware < 0^20250326git.3377801-3 Provides: intel-ipu6-kmod-common = %{version} # Fix the stupid issue when changing versioning schemes %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 -Provides: %{name} = %{commit_date}.%{shortcommit} +Provides: %{name} = %{?epoch:%{epoch}:}%{commit_date}.%{shortcommit}-%{release} +Obsoletes: %{name} < %{?epoch:%{epoch}:}%{commit_date}.%{shortcommit}-2 %endif ExclusiveArch: x86_64 Packager: Gilver E. @@ -43,7 +47,8 @@ Provides binary libraries for Intel IPU6. Summary: IPU6 development files Requires: %{name}%{?_isa} = %{version}-%{release} %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 -Provides: %{name}-devel = %{commit_date}.%{shortcommit} +Provides: %{name}-devel = %{?epoch:%{epoch}:}%{commit_date}.%{shortcommit}-%{release} +Obsoletes: %{name}-devel < %{?epoch:%{epoch}:}%{commit_date}.%{shortcommit}-2 %endif %description devel diff --git a/anda/system/ivsc-firmware/ivsc-firmware.spec b/anda/system/ivsc-firmware/ivsc-firmware.spec index 12c9102513..5af20b271e 100644 --- a/anda/system/ivsc-firmware/ivsc-firmware.spec +++ b/anda/system/ivsc-firmware/ivsc-firmware.spec @@ -7,13 +7,17 @@ Name: ivsc-firmware Summary: Intel iVSC firmware URL: https://github.com/intel/ivsc-firmware Version: 0^%{commit_date}git.%{shortcommit} -Release: 2%?dist +Release: 3%?dist +%if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 +Epoch: 1 +%endif License: Proprietary Source0: https://github.com/intel/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz Requires: ipu6-camera-bins # Fix the stupid issue when changing versioning schemes %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 -Provides: %{name} = %{commit_date}.%{shortcommit} +Provides: %{name} = %{?epoch:%{epoch}:}%{commit_date}.%{shortcommit}-%{release} +Obsoletes: %{name} < %{?epoch:%{epoch}:}20230811.74a01d1-2 %endif ExclusiveArch: x86_64 From 914c9df0f97d9e30b524d0edb1ba4d89c743d5fc Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 5 Apr 2025 10:27:04 -0500 Subject: [PATCH 0611/2977] fix(ipu6-camera-bins): Epoch in requirement (#4268) Signed-off-by: Gilver --- anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec b/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec index 68701efc3a..997e0b3720 100644 --- a/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec +++ b/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec @@ -7,7 +7,7 @@ Name: ipu6-camera-bins Summary: Libraries for Intel IPU6 Version: %{ver}^%{commit_date}git.%{shortcommit} -Release: 1%?dist +Release: 2%?dist %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 Epoch: 1 %endif @@ -45,7 +45,7 @@ Provides binary libraries for Intel IPU6. %package devel Summary: IPU6 development files -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 Provides: %{name}-devel = %{?epoch:%{epoch}:}%{commit_date}.%{shortcommit}-%{release} Obsoletes: %{name}-devel < %{?epoch:%{epoch}:}%{commit_date}.%{shortcommit}-2 From 74a5ba9592b51ab7c5a12451cf6ad18961e2f221 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 5 Apr 2025 11:35:45 -0500 Subject: [PATCH 0612/2977] chore(ipu6-camera-bins): Resolve dependency hell (#4273) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OMG I love circular dependencies. 💕 Signed-off-by: Gilver --- anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec b/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec index 997e0b3720..c6b7bfe49b 100644 --- a/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec +++ b/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec @@ -7,7 +7,7 @@ Name: ipu6-camera-bins Summary: Libraries for Intel IPU6 Version: %{ver}^%{commit_date}git.%{shortcommit} -Release: 2%?dist +Release: 3%?dist %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 Epoch: 1 %endif @@ -17,7 +17,7 @@ Source0: %{url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz BuildRequires: chrpath BuildRequires: sed BuildRequires: systemd-rpm-macros -Requires: gstreamer1-plugin-icamerasrc +#Requires: gstreamer1-plugin-icamerasrc Requires: intel-ipu6-kmod Requires: intel-vsc-firmware >= 20240513 Requires: v4l2-relayd From f914964c4cbdd3bcb8005eba0cf1e0979a8c8ef1 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 5 Apr 2025 16:43:18 +0000 Subject: [PATCH 0613/2977] bump: coolercontrol --- anda/apps/coolercontrol/coolercontrol.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/coolercontrol/coolercontrol.spec b/anda/apps/coolercontrol/coolercontrol.spec index 3242b1bd12..b872e9546d 100644 --- a/anda/apps/coolercontrol/coolercontrol.spec +++ b/anda/apps/coolercontrol/coolercontrol.spec @@ -8,8 +8,8 @@ for background device management, as well as a GUI to expertly customize your se %global __brp_mangle_shebangs %{nil} Name: coolercontrol -Version: 2.0.1 -Release: 2%?dist +Version: 2.1.0 +Release: 1%?dist Summary: Cooling device control for Linux License: GPL-3.0-or-later URL: https://gitlab.com/coolercontrol/coolercontrol From d836a2c4098f3b8aa3386750d1d3f18db41d5630 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 5 Apr 2025 18:42:26 +0000 Subject: [PATCH 0614/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 1fcbf27027..cc0f363f97 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.03.190239 +Version: 2025.04.05.183011 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 7b024c8bfa8c006521f173bc815e1067fbb271f0 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 5 Apr 2025 20:21:57 +0000 Subject: [PATCH 0615/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index cc0f363f97..a7bcc36432 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.05.183011 +Version: 2025.04.05.201008 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 00464697ee7cc177e331c30a28e75eb7828029c8 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 6 Apr 2025 01:48:48 +0000 Subject: [PATCH 0616/2977] bump(nightly): nightly nightly spotx-bash --- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/tools/spotx-bash/spotx-bash.spec | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index f0d7956b33..e7ea49703c 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit c0eaa4b158c418499b9963e84c9ce2787a09d473 +%global commit 6f7977fef186faa9b9afe7707dc21a2eff59883b %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-04-04 +%global fulldate 2025-04-05 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 0d7a4b9157..c97acaa6a3 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 69d7ea7b606f2321307623795c152ccffc1d01e5 +%global commit a2fbe82c42601221482e8422d7f8db5fee649b8e %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250405 +%global commit_date 20250406 %global ver 0.182.0 %bcond_with check diff --git a/anda/tools/spotx-bash/spotx-bash.spec b/anda/tools/spotx-bash/spotx-bash.spec index c5c78abc09..719061f340 100644 --- a/anda/tools/spotx-bash/spotx-bash.spec +++ b/anda/tools/spotx-bash/spotx-bash.spec @@ -1,5 +1,5 @@ -%global commit 2a9a5df99ab8fb5d52d371242d8f4e2744973917 -%global commit_date 20250405 +%global commit 8673572ed98e2e807ece8de05ac551c7689b8ae5 +%global commit_date 20250406 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: spotx-bash From db015c69cbcf5dd72f29a92f3dd56aee710326cd Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 6 Apr 2025 09:45:51 +0000 Subject: [PATCH 0617/2977] bump: walker --- .../waylands/walker/golang-github-abenz1267-walker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec b/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec index 738d5c473c..711787fc22 100644 --- a/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec +++ b/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec @@ -12,7 +12,7 @@ # https://github.com/abenz1267/walker %global goipath github.com/abenz1267/walker -Version: 0.12.19 +Version: 0.12.20 %gometa -f From 853cd9e81dc41e813505a39e4fa940508561e9db Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 6 Apr 2025 15:19:35 +0000 Subject: [PATCH 0618/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index a7bcc36432..d673abb708 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.05.201008 +Version: 2025.04.06.150600 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From d5ce2cae4d0b3d21043e01295f1fd365b67b70a8 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 6 Apr 2025 15:56:10 +0000 Subject: [PATCH 0619/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index d673abb708..ac2e997ca3 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.06.150600 +Version: 2025.04.06.154204 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 5eba9ae87ccebba1eebfda99ecb148f1a451c663 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 6 Apr 2025 18:43:08 +0000 Subject: [PATCH 0620/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index ac2e997ca3..a67dde908c 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.06.154204 +Version: 2025.04.06.183116 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 7b90ab7beea9461b50baa4d208104c8f2bef2d06 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 6 Apr 2025 18:55:38 +0000 Subject: [PATCH 0621/2977] bump: chezmoi yt-dlp --- anda/langs/go/chezmoi/chezmoi.spec | 2 +- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/langs/go/chezmoi/chezmoi.spec b/anda/langs/go/chezmoi/chezmoi.spec index bf549831eb..15967e5e86 100644 --- a/anda/langs/go/chezmoi/chezmoi.spec +++ b/anda/langs/go/chezmoi/chezmoi.spec @@ -4,7 +4,7 @@ # https://github.com/twpayne/chezmoi %global goipath github.com/twpayne/chezmoi -Version: 2.61.0 +Version: 2.62.0 %gometa -f diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index a67dde908c..9b5c988372 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.06.183116 +Version: 2025.04.06.184623 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 73d5c935c2f3388d431f9718ad5000d4c08f0ec4 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 6 Apr 2025 19:13:27 +0000 Subject: [PATCH 0622/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 9b5c988372..5b61ce9f6b 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.06.184623 +Version: 2025.04.06.185524 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From ecefa67d9166ffe4413260fc160ac0f5e8dc1d4c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 6 Apr 2025 19:25:27 +0000 Subject: [PATCH 0623/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 5b61ce9f6b..36a181b70b 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.06.185524 +Version: 2025.04.06.190447 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 2e128ccc1dc6207524ae57b560cf03edac704f51 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 6 Apr 2025 21:37:04 +0000 Subject: [PATCH 0624/2977] bump: prismlauncher --- anda/games/prismlauncher/prismlauncher.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/prismlauncher/prismlauncher.spec b/anda/games/prismlauncher/prismlauncher.spec index 5c8f30aa28..5d549af5f7 100644 --- a/anda/games/prismlauncher/prismlauncher.spec +++ b/anda/games/prismlauncher/prismlauncher.spec @@ -22,7 +22,7 @@ Name: prismlauncher %else Name: prismlauncher-qt5 %endif -Version: 9.2 +Version: 9.3 Release: 1%?dist Summary: Minecraft launcher with ability to manage multiple instances # see COPYING.md for more information From 9561bea028871cd3323ebf4b8c6bb060800e6d21 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 6 Apr 2025 21:57:31 +0000 Subject: [PATCH 0625/2977] bump: inputplumber --- anda/games/inputplumber/inputplumber.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index ab80cfd74b..500afa39d7 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.51.0 +Version: 0.51.1 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later From ec011ee039b81eda2c462e6c506f9e957c29a36b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 6 Apr 2025 23:36:21 +0000 Subject: [PATCH 0626/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 36a181b70b..dae03cc7a2 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.06.190447 +Version: 2025.04.06.232513 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From d01bfd9112d4f1fa45c090df17de2ab42d0a046e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 6 Apr 2025 23:46:26 +0000 Subject: [PATCH 0627/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index dae03cc7a2..2cd9153f64 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.06.232513 +Version: 2025.04.06.233415 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From caa9f0d00ab7541d6c9e6892c5383e95426193e4 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 7 Apr 2025 01:45:13 +0000 Subject: [PATCH 0628/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 66db331d30..00d7300a16 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-05 +%global ver 2025-04-07 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 4a5c2bf293250a737ece5158273ebfff0d740b19 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 7 Apr 2025 01:47:00 +0000 Subject: [PATCH 0629/2977] bump(nightly): envision mpv nightly prismlauncher-nightly spotx-bash --- anda/apps/envision/envision.spec | 4 ++-- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/tools/spotx-bash/spotx-bash.spec | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/anda/apps/envision/envision.spec b/anda/apps/envision/envision.spec index 5f574713c1..6d8b2c4414 100644 --- a/anda/apps/envision/envision.spec +++ b/anda/apps/envision/envision.spec @@ -1,5 +1,5 @@ -%global commit db45103d1bc23d56692571d652f56f8866dc956d -%global commit_date 20250327 +%global commit 25c90d175f83e4a4439b4c58e2ce687843ae3c1b +%global commit_date 20250407 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: envision-nightly diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index b3ece9ca98..6e1457386e 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 07571859ac28f4b9c048680a4fb454d146040cb1 +%global commit b09e06a92041b1031eff69e6807507261244e568 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250403 +%global commit_date 20250407 %global ver 0.40.0 Name: mpv-nightly diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index c97acaa6a3..8a6b0e2385 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit a2fbe82c42601221482e8422d7f8db5fee649b8e +%global commit 8cfb9beb171a413d8180040b8cc50eebcedb23a6 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250406 +%global commit_date 20250407 %global ver 0.182.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index be3a3238dc..788956fb61 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit c1b460fa05fd110179dcacfbeb819c34547a2b3b +%global commit 6dd8bd0708f2ee644f40235f395c7c394b942a98 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250405 +%global commit_date 20250407 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/tools/spotx-bash/spotx-bash.spec b/anda/tools/spotx-bash/spotx-bash.spec index 719061f340..57b6f7df39 100644 --- a/anda/tools/spotx-bash/spotx-bash.spec +++ b/anda/tools/spotx-bash/spotx-bash.spec @@ -1,5 +1,5 @@ -%global commit 8673572ed98e2e807ece8de05ac551c7689b8ae5 -%global commit_date 20250406 +%global commit a814894e8cca3282a0ad79f30896ec4b01544d4e +%global commit_date 20250407 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: spotx-bash From 533335826afaa7be3181d68399e5dbccf0dac148 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 7 Apr 2025 02:58:06 +0000 Subject: [PATCH 0630/2977] bump: asar --- anda/devs/asar/asar.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/asar/asar.spec b/anda/devs/asar/asar.spec index 21d004d1f7..9a4d1169b9 100644 --- a/anda/devs/asar/asar.spec +++ b/anda/devs/asar/asar.spec @@ -7,7 +7,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: asar -Version: 3.4.0 +Version: 3.4.1 Release: 1%?dist Summary: Simple extensive tar-like archive format with indexing License: MIT From 235fb9fc219929d73f72c87ac73e902d4e24df78 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 7 Apr 2025 12:27:42 +0000 Subject: [PATCH 0631/2977] bump(branch): kf6-kio --- anda/desktops/kde/kf6-kio/kf6-kio.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/desktops/kde/kf6-kio/kf6-kio.spec b/anda/desktops/kde/kf6-kio/kf6-kio.spec index 5d9832fd41..2fb6fae601 100644 --- a/anda/desktops/kde/kf6-kio/kf6-kio.spec +++ b/anda/desktops/kde/kf6-kio/kf6-kio.spec @@ -1,11 +1,11 @@ %global framework kio %global stable_kf6 stable -%global majmin_ver_kf6 6.12 +%global majmin_ver_kf6 6.13 Name: kf6-%{framework}.switcheroo Version: %{majmin_ver_kf6}.0 -Release: 2%{?dist}.switcheroo +Release: 1%{?dist}.switcheroo Summary: KDE Frameworks 6 Tier 3 solution for filesystem abstraction License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT From 2b452ac43767e21271e1a2d679e9aaae9ddd0d80 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 7 Apr 2025 13:29:23 +0000 Subject: [PATCH 0632/2977] bump: preview stable --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 38b012077e..5b52789ee7 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.181.3-pre +%global ver 0.180.3 # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 5335882a80..aff2e0fedf 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.180.2 +Version: 0.180.3 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From 388df3b7400be11022ded6cc26e0c7b07175c552 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 7 Apr 2025 13:46:22 +0000 Subject: [PATCH 0633/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 5b52789ee7..30ac6bce5a 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.180.3 +%global ver 0.181.4-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From f8f00fe20e2872bf2f8448107f53eaa795c3310b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 7 Apr 2025 16:59:04 +0000 Subject: [PATCH 0634/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index cc7f98d1f7..7d104c1908 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.626 +Version: 0.0.627 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index ac3cbad82a..e3dc6863ff 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.626 +Version: 0.0.627 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 91a5b15212d49e4c9c5f2907e2dbe7324b346dde Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 7 Apr 2025 17:23:01 +0000 Subject: [PATCH 0635/2977] bump: walker prismlauncher --- .../waylands/walker/golang-github-abenz1267-walker.spec | 2 +- anda/games/prismlauncher/prismlauncher.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec b/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec index 711787fc22..0db46672ea 100644 --- a/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec +++ b/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec @@ -12,7 +12,7 @@ # https://github.com/abenz1267/walker %global goipath github.com/abenz1267/walker -Version: 0.12.20 +Version: 0.12.21 %gometa -f diff --git a/anda/games/prismlauncher/prismlauncher.spec b/anda/games/prismlauncher/prismlauncher.spec index 5d549af5f7..817e6063de 100644 --- a/anda/games/prismlauncher/prismlauncher.spec +++ b/anda/games/prismlauncher/prismlauncher.spec @@ -22,7 +22,7 @@ Name: prismlauncher %else Name: prismlauncher-qt5 %endif -Version: 9.3 +Version: 9.4 Release: 1%?dist Summary: Minecraft launcher with ability to manage multiple instances # see COPYING.md for more information From 164a2a98240541bfa87c9bac1b22d9d2d99d3c7f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 7 Apr 2025 23:45:33 +0000 Subject: [PATCH 0636/2977] bump: inputplumber --- anda/games/inputplumber/inputplumber.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index 500afa39d7..7c695684f4 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.51.1 +Version: 0.52.0 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later From fc6f4827a68228546e06d65cddb29ed377769c27 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 8 Apr 2025 01:25:04 +0000 Subject: [PATCH 0637/2977] bump: ruffle inputplumber --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- anda/games/inputplumber/inputplumber.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 00d7300a16..b72f44c3c2 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-07 +%global ver 2025-04-08 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index 7c695684f4..d545ef8898 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.52.0 +Version: 0.52.1 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later From c5e6296c3be13cf7c59e53750ddc0bb2c7a7572e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 8 Apr 2025 01:44:16 +0000 Subject: [PATCH 0638/2977] bump(nightly): envision mpv nightly nightly gamescope-session prismlauncher-nightly kmod-common --- anda/apps/envision/envision.spec | 4 ++-- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/gamescope-session/gamescope-session.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/system/xpadneo/kmod-common/xpadneo.spec | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/anda/apps/envision/envision.spec b/anda/apps/envision/envision.spec index 6d8b2c4414..8c25d8ed73 100644 --- a/anda/apps/envision/envision.spec +++ b/anda/apps/envision/envision.spec @@ -1,5 +1,5 @@ -%global commit 25c90d175f83e4a4439b4c58e2ce687843ae3c1b -%global commit_date 20250407 +%global commit 2f5ec57a0a95bdf889094d459a4a3fcb4de2dd97 +%global commit_date 20250408 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: envision-nightly diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 6e1457386e..3c50fbe306 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit b09e06a92041b1031eff69e6807507261244e568 +%global commit 4a0684db333247b83eee90cabc00abe08c816fbd %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250407 +%global commit_date 20250408 %global ver 0.40.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index e7ea49703c..65b805786b 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 6f7977fef186faa9b9afe7707dc21a2eff59883b +%global commit f1472362aff4267eda41e750e6dc28090c6174c9 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-04-05 +%global fulldate 2025-04-07 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 8a6b0e2385..cfe4bd2b4b 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 8cfb9beb171a413d8180040b8cc50eebcedb23a6 +%global commit 1264e7a200e62f5f1df757aa9a2b0fd2ebeb231c %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250407 +%global commit_date 20250408 %global ver 0.182.0 %bcond_with check diff --git a/anda/games/gamescope-session/gamescope-session.spec b/anda/games/gamescope-session/gamescope-session.spec index 22f091ae92..62fa2e02dc 100644 --- a/anda/games/gamescope-session/gamescope-session.spec +++ b/anda/games/gamescope-session/gamescope-session.spec @@ -1,8 +1,8 @@ %define debug_package %nil -%global commit 533e51f2f50aebc4457d04372ab9b05a9c56ac10 +%global commit 50304917b71ad220082565c5029e9393e6464a1f %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250126 +%global commit_date 20250408 Name: gamescope-session Version: %commit_date.%shortcommit diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 788956fb61..e985aaa2ad 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 6dd8bd0708f2ee644f40235f395c7c394b942a98 +%global commit 734db2bedcb9ebd12667031e423d16fd1118a39f %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250407 +%global commit_date 20250408 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/system/xpadneo/kmod-common/xpadneo.spec b/anda/system/xpadneo/kmod-common/xpadneo.spec index f682dd3e75..7e9ebd7d67 100644 --- a/anda/system/xpadneo/kmod-common/xpadneo.spec +++ b/anda/system/xpadneo/kmod-common/xpadneo.spec @@ -1,11 +1,11 @@ -%global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 +%global commit 4a3a623b5facca8184e9070317fea03adc3a9e8f %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20241224 +%global commitdate 20250408 %global ver 0.9.7 Name: xpadneo Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 4%{?dist} +Release: 1%?dist Summary: Advanced Linux Driver for Xbox One Wireless Gamepad common files License: GPL-3.0 URL: https://atar-axis.github.io/%{name} From 703221698a63df03d33254a6d38031e376bbe73f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 8 Apr 2025 02:44:37 +0000 Subject: [PATCH 0639/2977] bump(branch): akmod dkms --- anda/system/xpadneo/akmod/xpadneo-kmod.spec | 4 ++-- anda/system/xpadneo/dkms/dkms-xpadneo.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec index ddf279cb16..4c7e993a49 100644 --- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec +++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec @@ -1,6 +1,6 @@ -%global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 +%global commit 4a3a623b5facca8184e9070317fea03adc3a9e8f %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20241224 +%global commitdate 20250408 %global ver 0.9.7 %define buildforkernels akmod %global debug_package %{nil} diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec index 5fe28ad089..7b2c294d15 100644 --- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec @@ -1,6 +1,6 @@ -%global commit 8d20a23e38883f45c78f48c8574ac93945b4cb03 +%global commit 4a3a623b5facca8184e9070317fea03adc3a9e8f %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20241224 +%global commitdate 20250408 %global ver 0.9.7 %global debug_package %{nil} %global modulename xpadneo From 733d361f752c9025fff8157174357e33a3f3a1c0 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 8 Apr 2025 13:55:51 +0000 Subject: [PATCH 0640/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 30ac6bce5a..bd4210176e 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.181.4-pre +%global ver 0.181.5-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From 51e0ba3e315ed1ff5edc6d342d341d3b45667a0e Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 8 Apr 2025 22:26:05 +0800 Subject: [PATCH 0641/2977] bump: envision (#4281) Signed-off-by: madomado --- anda/apps/envision/envision.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/envision/envision.spec b/anda/apps/envision/envision.spec index 8c25d8ed73..dac551fe7b 100644 --- a/anda/apps/envision/envision.spec +++ b/anda/apps/envision/envision.spec @@ -1,4 +1,4 @@ -%global commit 2f5ec57a0a95bdf889094d459a4a3fcb4de2dd97 +%global commit 7a02fcc5d109d2d06bb115f93811424bd88343aa %global commit_date 20250408 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From b334422e470e8d58bbc3f95af778dfc7f5364b84 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 8 Apr 2025 16:32:51 +0000 Subject: [PATCH 0642/2977] bump: apparmor --- anda/lib/apparmor/apparmor.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/apparmor/apparmor.spec b/anda/lib/apparmor/apparmor.spec index 1c25e6c350..50286362a1 100644 --- a/anda/lib/apparmor/apparmor.spec +++ b/anda/lib/apparmor/apparmor.spec @@ -6,7 +6,7 @@ %bcond_with tests Name: apparmor -Version: 4.1.0~beta5 +Version: 4.1.0 Release: 1%?dist Summary: AppArmor userspace components From 46a144cad4980e6913c92f3193acca033291ceec Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 8 Apr 2025 16:52:20 +0000 Subject: [PATCH 0643/2977] bump: stable --- anda/devs/zed/stable/zed.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index aff2e0fedf..e5fc8ad8b0 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.180.3 +Version: 0.180.4 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From c8a920291abf56807a96b1a6c26417f1460bf92d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 8 Apr 2025 18:47:52 +0000 Subject: [PATCH 0644/2977] bump: dwarfs --- anda/lib/dwarfs/dwarfs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/dwarfs/dwarfs.spec b/anda/lib/dwarfs/dwarfs.spec index aece47a2d6..b3f5f148b8 100644 --- a/anda/lib/dwarfs/dwarfs.spec +++ b/anda/lib/dwarfs/dwarfs.spec @@ -4,7 +4,7 @@ The Deduplicating Warp-speed Advanced Read-only File System. A fast high compression read-only file system for Linux and Windows.} Name: dwarfs -Version: 0.11.3 +Version: 0.12.0 Release: 1%?dist Summary: A fast high compression read-only file system for Linux, Windows and macOS License: GPL-3.0-or-later From 8696758c73ec2afe796aa0dfd041f7027ab7c159 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 9 Apr 2025 01:25:57 +0000 Subject: [PATCH 0645/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index b72f44c3c2..75b8dfc131 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-08 +%global ver 2025-04-09 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 3ec3c45cd6191934e0d6b4264a346c73f559ed0f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 9 Apr 2025 01:44:23 +0000 Subject: [PATCH 0646/2977] bump(nightly): envision nightly mpv nightly nightly prismlauncher-nightly nim-nightly vala-nightly astal backtrace --- anda/apps/envision/envision.spec | 4 ++-- anda/apps/legcord/nightly/legcord-nightly.spec | 4 ++-- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/langs/vala/vala-nightly/vala-nightly.spec | 4 ++-- anda/lib/astal/astal/astal.spec | 4 ++-- anda/lib/backtrace/libbacktrace-nightly.spec | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/anda/apps/envision/envision.spec b/anda/apps/envision/envision.spec index dac551fe7b..9b4edd9483 100644 --- a/anda/apps/envision/envision.spec +++ b/anda/apps/envision/envision.spec @@ -1,5 +1,5 @@ -%global commit 7a02fcc5d109d2d06bb115f93811424bd88343aa -%global commit_date 20250408 +%global commit 139f72e2941c4e91091acef6c86712fec566425b +%global commit_date 20250409 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: envision-nightly diff --git a/anda/apps/legcord/nightly/legcord-nightly.spec b/anda/apps/legcord/nightly/legcord-nightly.spec index 06f7a3f830..4ac30f773f 100644 --- a/anda/apps/legcord/nightly/legcord-nightly.spec +++ b/anda/apps/legcord/nightly/legcord-nightly.spec @@ -1,5 +1,5 @@ -%global commit f1ae18c3363013ed93bea3d2d4af22ddb2b077d0 -%global commit_date 20250405 +%global commit 2bccfe6e9af5cbcc78fc154bfe038810fd97da19 +%global commit_date 20250409 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define debug_package %nil diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 3c50fbe306..fe80ba3a0c 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 4a0684db333247b83eee90cabc00abe08c816fbd +%global commit 43ce03c519f6ca7e61c73616d4aa10ecb4a380d2 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250408 +%global commit_date 20250409 %global ver 0.40.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 65b805786b..b655887a5e 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit f1472362aff4267eda41e750e6dc28090c6174c9 +%global commit 046e92865b4f2863815b7f7af52aab75d4bac63a %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-04-07 +%global fulldate 2025-04-09 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index cfe4bd2b4b..ae591fd22d 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 1264e7a200e62f5f1df757aa9a2b0fd2ebeb231c +%global commit 301fc7cd7b3259963efbc60f4dba788b45a6988b %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250408 +%global commit_date 20250409 %global ver 0.182.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index e985aaa2ad..8b27ee5a90 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 734db2bedcb9ebd12667031e423d16fd1118a39f +%global commit a3b8846465a217a2658b6d120eb4556ecca73a24 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250408 +%global commit_date 20250409 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index aedd3bf7cd..02a1c0cecb 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 10c9ebad9303d9c4be393da913f4e12650783539 +%global commit 29a2e25d1e47deaa7fbaaf5aaf78ab5be430c731 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250404 +%global commit_date 20250409 %global debug_package %nil Name: nim-nightly diff --git a/anda/langs/vala/vala-nightly/vala-nightly.spec b/anda/langs/vala/vala-nightly/vala-nightly.spec index 03d6085120..0dd98c44fb 100644 --- a/anda/langs/vala/vala-nightly/vala-nightly.spec +++ b/anda/langs/vala/vala-nightly/vala-nightly.spec @@ -3,11 +3,11 @@ %global priority 90 %global real_name vala -%global commit 843551ed85dcfcfdf803fa6961ccd5498a9cee8a +%global commit 05c8cc1239061019fa8fe36f9344ee32e0da5535 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global repo https://gitlab.gnome.org/GNOME/%{real_name}.git -%global commit_date 20250303 +%global commit_date 20250409 %global snapshot_info %{commit_date}.%{shortcommit} Name: vala-nightly diff --git a/anda/lib/astal/astal/astal.spec b/anda/lib/astal/astal/astal.spec index be96704e28..6d26255771 100644 --- a/anda/lib/astal/astal/astal.spec +++ b/anda/lib/astal/astal/astal.spec @@ -1,7 +1,7 @@ -%global commit dc0e5d37abe9424c53dcbd2506a4886ffee6296e +%global commit 3ac89cab8a2a9f5ef86dc9fdc3a3dce2188ca8f7 %global shortcommit %{sub %commit 1 7} -%global commit_date 20250322 +%global commit_date 20250409 Name: astal Version: 0^%commit_date.%shortcommit diff --git a/anda/lib/backtrace/libbacktrace-nightly.spec b/anda/lib/backtrace/libbacktrace-nightly.spec index 41a7db26f4..f52bdb582f 100644 --- a/anda/lib/backtrace/libbacktrace-nightly.spec +++ b/anda/lib/backtrace/libbacktrace-nightly.spec @@ -1,8 +1,8 @@ %global debug_package %nil -%global commit 0034e33946824057b48c5e686a3aefc761b37384 +%global commit f1104f3270095831df536a2539f4cc408365105c %global shortcommit %(c=%commit; echo ${c:0:7}) -%global commit_date 20250211 +%global commit_date 20250409 %global _desc %{expand: A C library that may be linked into a C/C++ program to produce symbolic backtraces. From 26d729a57d46607121fcc53b33a6d58871a17295 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 9 Apr 2025 02:46:09 +0000 Subject: [PATCH 0647/2977] bump(branch): astal-gtk --- anda/lib/astal/astal-gtk/astal-gtk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/astal/astal-gtk/astal-gtk.spec b/anda/lib/astal/astal-gtk/astal-gtk.spec index 47241ed86e..06c4134713 100644 --- a/anda/lib/astal/astal-gtk/astal-gtk.spec +++ b/anda/lib/astal/astal-gtk/astal-gtk.spec @@ -1,5 +1,5 @@ -%global commit dc0e5d3 -%global commit_date 20250322 +%global commit 3ac89ca +%global commit_date 20250409 Name: astal Version: 0^%commit_date.%commit From 103c3c8cf1df67f761a11b1389e7ad56f488be1a Mon Sep 17 00:00:00 2001 From: madomado Date: Wed, 9 Apr 2025 11:47:20 +0800 Subject: [PATCH 0648/2977] fix(prismlauncher): use mock (#4285) --- anda/games/prismlauncher-nightly/anda.hcl | 1 + anda/games/prismlauncher/anda.hcl | 3 +++ 2 files changed, 4 insertions(+) diff --git a/anda/games/prismlauncher-nightly/anda.hcl b/anda/games/prismlauncher-nightly/anda.hcl index c776dc73ee..7d609cf7e9 100644 --- a/anda/games/prismlauncher-nightly/anda.hcl +++ b/anda/games/prismlauncher-nightly/anda.hcl @@ -5,5 +5,6 @@ project pkg { } labels { nightly = "1" + mock = 1 } } diff --git a/anda/games/prismlauncher/anda.hcl b/anda/games/prismlauncher/anda.hcl index 59962c6daf..3a35d4fe52 100644 --- a/anda/games/prismlauncher/anda.hcl +++ b/anda/games/prismlauncher/anda.hcl @@ -3,4 +3,7 @@ project pkg { spec = "prismlauncher.spec" extra_repos = ["https://packages.adoptium.net/artifactory/rpm/fedora/\\$releasever/\\$basearch"] } + labels { + mock = 1 + } } From 6ef3e3804da8a551d86b073c1398c311d25649ba Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Tue, 8 Apr 2025 23:06:29 -0500 Subject: [PATCH 0649/2977] Fix: abuild macro (#4286) Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/tools/abuild/abuild.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/tools/abuild/abuild.spec b/anda/tools/abuild/abuild.spec index 912bd11f26..123879607b 100644 --- a/anda/tools/abuild/abuild.spec +++ b/anda/tools/abuild/abuild.spec @@ -4,7 +4,7 @@ Release: 1%?dist Summary: coreboot autobuild script builds coreboot images for all available targets. URL: https://doc.coreboot.org/util/abuild/index.html License: GPLv2 -BuildRequires: git +BuildRequires: anda-srpm-macros BuildArch: noarch Packager: Owen Zimmerman @@ -12,14 +12,14 @@ Packager: Owen Zimmerman %summary %prep -git clone https://review.coreboot.org/coreboot.git -b %version +%git_clone https://review.coreboot.org/coreboot.git %version %install -install -Dm 777 coreboot/util/abuild/abuild %buildroot%_bindir/abuild +install -Dm 777 util/abuild/abuild %buildroot%_bindir/abuild %files /usr/bin/abuild %changelog * Sat Feb 01 2025 Owen Zimmerman -- Initial Package \ No newline at end of file +- Initial Package From 2e2bd094c9750cb51b8785639dd7fee0a8b8bb30 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 9 Apr 2025 07:25:40 +0000 Subject: [PATCH 0650/2977] bump: bun --- anda/devs/bun/bun-bin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/bun/bun-bin.spec b/anda/devs/bun/bun-bin.spec index bb1d4f313d..a2d0ae2f40 100644 --- a/anda/devs/bun/bun-bin.spec +++ b/anda/devs/bun/bun-bin.spec @@ -6,7 +6,7 @@ %endif Name: bun-bin -Version: 1.2.8 +Version: 1.2.9 Release: 1%?dist Summary: Incredibly fast JavaScript runtime, bundler, test runner, and package manager – all in one License: MIT From 888d172d67ad98d7e68f830faf193d12649fa825 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 9 Apr 2025 13:29:16 +0000 Subject: [PATCH 0651/2977] bump: unity-session crystal --- anda/desktops/lomiri-unity/unity-session/unity-session.spec | 2 +- anda/langs/crystal/crystal/crystal.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/desktops/lomiri-unity/unity-session/unity-session.spec b/anda/desktops/lomiri-unity/unity-session/unity-session.spec index 0f77250c98..d9321ff55e 100644 --- a/anda/desktops/lomiri-unity/unity-session/unity-session.spec +++ b/anda/desktops/lomiri-unity/unity-session/unity-session.spec @@ -1,4 +1,4 @@ -%define _ubuntu_rel 2ubuntu2 +%define _ubuntu_rel 2ubuntu3 Name: unity-session Summary: Lightdm profile for Unity 7 diff --git a/anda/langs/crystal/crystal/crystal.spec b/anda/langs/crystal/crystal/crystal.spec index e073326742..ab5250c788 100644 --- a/anda/langs/crystal/crystal/crystal.spec +++ b/anda/langs/crystal/crystal/crystal.spec @@ -1,7 +1,7 @@ %define debug_package %nil Name: crystal -Version: 1.15.1 +Version: 1.16.0 Release: 1%?dist Summary: The Crystal Programming Language License: Apache-2.0 From 94fd63eb0eba4e22a512d0b4c2d75c73c6d4b420 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 9 Apr 2025 14:47:41 +0000 Subject: [PATCH 0652/2977] bump: preview stable --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index bd4210176e..f3f8c2d775 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.181.5-pre +%global ver 0.181.5 # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index e5fc8ad8b0..a6bbaf80d7 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.180.4 +Version: 0.181.5 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From 82a2b984e156eade86f84c3c99be5e1b0a56da71 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 9 Apr 2025 16:24:54 +0000 Subject: [PATCH 0653/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index f3f8c2d775..fdf744eb28 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.181.5 +%global ver 0.182.0-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From 7807b339f12176bc24e925829155884aa8d94446 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 9 Apr 2025 16:48:49 +0000 Subject: [PATCH 0654/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 7d104c1908..78ff70ad6f 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.627 +Version: 0.0.629 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index e3dc6863ff..ac7ec93a66 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.627 +Version: 0.0.629 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 0b4a7be6bad18709dac8392cd1e3273bc095bd6c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 9 Apr 2025 17:23:41 +0000 Subject: [PATCH 0655/2977] bump: codium --- anda/devs/codium/codium.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/codium/codium.spec b/anda/devs/codium/codium.spec index 5a4bfe4197..61dcbfd96d 100644 --- a/anda/devs/codium/codium.spec +++ b/anda/devs/codium/codium.spec @@ -12,7 +12,7 @@ %endif Name: codium -Version: 1.99.02289 +Version: 1.99.12392 Release: 1%?dist Summary: Code editing. Redefined. License: MIT From 2aa63219c8074db8dd6255580fafb5c6f5fa6ffe Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 9 Apr 2025 18:00:26 +0000 Subject: [PATCH 0656/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 78ff70ad6f..bf108043a3 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.629 +Version: 0.0.630 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index ac7ec93a66..a50ee4dfca 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.629 +Version: 0.0.630 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From a073b32b7672547b7a2e3b810e7f8288b6149588 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 9 Apr 2025 19:37:51 +0000 Subject: [PATCH 0657/2977] bump: electron --- anda/tools/electron/electron.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/electron/electron.spec b/anda/tools/electron/electron.spec index f28277433d..e019c8d5f1 100644 --- a/anda/tools/electron/electron.spec +++ b/anda/tools/electron/electron.spec @@ -12,7 +12,7 @@ %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so Name: electron -Version: 35.1.4 +Version: 35.1.5 Release: 1%?dist Summary: Build cross platform desktop apps with web technologies License: MIT From dbec14cf8b24d12b864b4e98af9559641091bbcb Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 9 Apr 2025 20:24:41 +0000 Subject: [PATCH 0658/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index 59f7900966..15d2a3197e 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.4.0 +Version: 2025.4.1 Release: 1%?dist Summary: Front-end to your dev env From 3f6acfb391fa0a0ac48d6e10c84962d03480aea2 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 9 Apr 2025 21:29:05 +0000 Subject: [PATCH 0659/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index bf108043a3..5c611fc69c 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.630 +Version: 0.0.631 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index a50ee4dfca..bdfc1dd863 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.630 +Version: 0.0.631 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From cc2ebc544833db347c4743aea45da83cd10e866e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 9 Apr 2025 22:00:32 +0000 Subject: [PATCH 0660/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 5c611fc69c..715d0dc871 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.631 +Version: 0.0.632 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index bdfc1dd863..6953b3a326 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.631 +Version: 0.0.632 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 6f4c9299d042ab6ad12dc7253653430278144938 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 10 Apr 2025 01:44:18 +0000 Subject: [PATCH 0661/2977] bump(nightly): mpv micro nightly prismlauncher-nightly telescope --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/micro/micro-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/stardust/telescope/stardust-telescope.spec | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index fe80ba3a0c..03cdc0b982 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 43ce03c519f6ca7e61c73616d4aa10ecb4a380d2 +%global commit 3d5949366cd1519b63ebdd4e2fccee7b0fae708a %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250409 +%global commit_date 20250410 %global ver 0.40.0 Name: mpv-nightly diff --git a/anda/devs/micro/micro-nightly.spec b/anda/devs/micro/micro-nightly.spec index f9910c3cfb..950d5112aa 100644 --- a/anda/devs/micro/micro-nightly.spec +++ b/anda/devs/micro/micro-nightly.spec @@ -12,8 +12,8 @@ # Naming variable as something other than "commit" is necessary # to stop %%gometa from putting commit hash in release -%global commit_hash f4d62a498b204e73b8f084a5dc1ce82380b8c03a -%global commit_date 20250326 +%global commit_hash d36e7f40578e571814d7de91ef861517b525fe57 +%global commit_date 20250410 %global shortcommit %{sub %{commit_hash} 1 7} %global ver 2.0.14 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index ae591fd22d..85362d811d 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 301fc7cd7b3259963efbc60f4dba788b45a6988b +%global commit 0e72a7e6ce4586b0c211be0d1ed33217c11ee6d1 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250409 +%global commit_date 20250410 %global ver 0.182.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 8b27ee5a90..5184c96519 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit a3b8846465a217a2658b6d120eb4556ecca73a24 +%global commit 9364753d512fb190922665464b34becbda24dd91 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250409 +%global commit_date 20250410 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/stardust/telescope/stardust-telescope.spec b/anda/stardust/telescope/stardust-telescope.spec index fcdd4a82ff..ac668565a4 100644 --- a/anda/stardust/telescope/stardust-telescope.spec +++ b/anda/stardust/telescope/stardust-telescope.spec @@ -1,7 +1,7 @@ %define debug_package %nil -%global commit 29362efdde07b0869a824cd6402501778c081b0e -%global commit_date 20250228 +%global commit b82639f4e3e0c9bfdf2d3b12819fae46b0f446e9 +%global commit_date 20250410 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: stardust-xr-telescope From 3c4919cd48632f1b98310f8040f6592a000703c9 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 10 Apr 2025 01:54:37 +0000 Subject: [PATCH 0662/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 75b8dfc131..0433f3e880 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-09 +%global ver 2025-04-10 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 7f52579b6b85f609617ad2f4053328292e3b09da Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 10 Apr 2025 05:19:21 +0000 Subject: [PATCH 0663/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 715d0dc871..f6a5a16f40 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.632 +Version: 0.0.633 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 6953b3a326..ccf748a3ab 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.632 +Version: 0.0.633 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 2b70b103bc8796bfbe27bd172ca0730ef319612c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 10 Apr 2025 14:19:37 +0000 Subject: [PATCH 0664/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index fdf744eb28..7ad9767ccb 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.182.0-pre +%global ver 0.182.1-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From dfb48664b3e67f582483ccca54658ceb0f48031c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 10 Apr 2025 17:21:12 +0000 Subject: [PATCH 0665/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index f6a5a16f40..8269b77001 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.633 +Version: 0.0.634 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index ccf748a3ab..88aabc756c 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.633 +Version: 0.0.634 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 65eaf7b2d4b0b6d4802936c6d87ec846645d89ac Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 10 Apr 2025 18:49:58 +0000 Subject: [PATCH 0666/2977] bump: codium --- anda/devs/codium/codium.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/codium/codium.spec b/anda/devs/codium/codium.spec index 61dcbfd96d..65c291f057 100644 --- a/anda/devs/codium/codium.spec +++ b/anda/devs/codium/codium.spec @@ -12,7 +12,7 @@ %endif Name: codium -Version: 1.99.12392 +Version: 1.99.22418 Release: 1%?dist Summary: Code editing. Redefined. License: MIT From e3e3511ab5095999910b8230de297ba93215850b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 10 Apr 2025 19:00:04 +0000 Subject: [PATCH 0667/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 8269b77001..5b3d991f02 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.634 +Version: 0.0.635 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 88aabc756c..da6cea1899 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.634 +Version: 0.0.635 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 5f6d85b837dadfb895a9e26c5755b4f5ba747cf3 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 10 Apr 2025 20:27:48 +0000 Subject: [PATCH 0668/2977] bump: katsu --- anda/tools/buildsys/katsu/katsu.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/katsu/katsu.spec b/anda/tools/buildsys/katsu/katsu.spec index 6a86e30fd5..3b1afaac0e 100644 --- a/anda/tools/buildsys/katsu/katsu.spec +++ b/anda/tools/buildsys/katsu/katsu.spec @@ -6,7 +6,7 @@ %global cargo_install_lib 0 Name: katsu -Version: 0.9.0 +Version: 0.9.1 Release: 1%?dist Summary: Vicious image builder Packager: madonuko From f799aa150b7b0db305ddf2489c1f0050bb6aacaf Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 10 Apr 2025 21:31:38 +0000 Subject: [PATCH 0669/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 5b3d991f02..4fd9896cb9 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.635 +Version: 0.0.636 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index da6cea1899..bf7a523708 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.635 +Version: 0.0.636 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 124d0f04c8401a3fe1d188bab79d6f5fbc8e0265 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 10 Apr 2025 21:45:30 +0000 Subject: [PATCH 0670/2977] bump: katsu --- anda/tools/buildsys/katsu/katsu.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/katsu/katsu.spec b/anda/tools/buildsys/katsu/katsu.spec index 3b1afaac0e..e5a910b1f5 100644 --- a/anda/tools/buildsys/katsu/katsu.spec +++ b/anda/tools/buildsys/katsu/katsu.spec @@ -6,7 +6,7 @@ %global cargo_install_lib 0 Name: katsu -Version: 0.9.1 +Version: 0.9.2 Release: 1%?dist Summary: Vicious image builder Packager: madonuko From 6ac965dcaa10fd622c610a733535fbcf65e6eb5c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 10 Apr 2025 23:48:04 +0000 Subject: [PATCH 0671/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 7ad9767ccb..25cc96740a 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.182.1-pre +%global ver 0.182.2-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From 797ca413f3923e2509b001dc653300207c815e28 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 11 Apr 2025 01:45:04 +0000 Subject: [PATCH 0672/2977] bump(nightly): nightly nightly nightly prismlauncher-nightly nim-nightly astal backtrace kmod-common rpi-utils --- anda/apps/legcord/nightly/legcord-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/lib/astal/astal/astal.spec | 4 ++-- anda/lib/backtrace/libbacktrace-nightly.spec | 4 ++-- anda/system/xpadneo/kmod-common/xpadneo.spec | 4 ++-- anda/tools/rpi-utils/rpi-utils.spec | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/anda/apps/legcord/nightly/legcord-nightly.spec b/anda/apps/legcord/nightly/legcord-nightly.spec index 4ac30f773f..55679ed223 100644 --- a/anda/apps/legcord/nightly/legcord-nightly.spec +++ b/anda/apps/legcord/nightly/legcord-nightly.spec @@ -1,5 +1,5 @@ -%global commit 2bccfe6e9af5cbcc78fc154bfe038810fd97da19 -%global commit_date 20250409 +%global commit 4280257fc61a6113a397536700374026330241af +%global commit_date 20250411 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define debug_package %nil diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index b655887a5e..750d3ed321 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 046e92865b4f2863815b7f7af52aab75d4bac63a +%global commit b16324ef0be8c5eeef4c0eb23b9972fdb2fa50d5 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-04-09 +%global fulldate 2025-04-11 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 85362d811d..5102241347 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 0e72a7e6ce4586b0c211be0d1ed33217c11ee6d1 +%global commit c124838a73e2d5b3b7fd632be91c114c95038340 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250410 +%global commit_date 20250411 %global ver 0.182.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 5184c96519..c191cd7598 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 9364753d512fb190922665464b34becbda24dd91 +%global commit c430b666578f9c2250d0814f7ea9d50eed9a2ca3 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250410 +%global commit_date 20250411 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 02a1c0cecb..b03997d1d5 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 29a2e25d1e47deaa7fbaaf5aaf78ab5be430c731 +%global commit 918f972369e62d6aa07e173aa1e70aa5c4714fc8 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250409 +%global commit_date 20250411 %global debug_package %nil Name: nim-nightly diff --git a/anda/lib/astal/astal/astal.spec b/anda/lib/astal/astal/astal.spec index 6d26255771..ff6f6759fe 100644 --- a/anda/lib/astal/astal/astal.spec +++ b/anda/lib/astal/astal/astal.spec @@ -1,7 +1,7 @@ -%global commit 3ac89cab8a2a9f5ef86dc9fdc3a3dce2188ca8f7 +%global commit 8f020e6d663d4222234826b51f2eb9e01db340a2 %global shortcommit %{sub %commit 1 7} -%global commit_date 20250409 +%global commit_date 20250411 Name: astal Version: 0^%commit_date.%shortcommit diff --git a/anda/lib/backtrace/libbacktrace-nightly.spec b/anda/lib/backtrace/libbacktrace-nightly.spec index f52bdb582f..f60702c1c4 100644 --- a/anda/lib/backtrace/libbacktrace-nightly.spec +++ b/anda/lib/backtrace/libbacktrace-nightly.spec @@ -1,8 +1,8 @@ %global debug_package %nil -%global commit f1104f3270095831df536a2539f4cc408365105c +%global commit 793921876c981ce49759114d7bb89bb89b2d3a2d %global shortcommit %(c=%commit; echo ${c:0:7}) -%global commit_date 20250409 +%global commit_date 20250411 %global _desc %{expand: A C library that may be linked into a C/C++ program to produce symbolic backtraces. diff --git a/anda/system/xpadneo/kmod-common/xpadneo.spec b/anda/system/xpadneo/kmod-common/xpadneo.spec index 7e9ebd7d67..e56e31b92d 100644 --- a/anda/system/xpadneo/kmod-common/xpadneo.spec +++ b/anda/system/xpadneo/kmod-common/xpadneo.spec @@ -1,6 +1,6 @@ -%global commit 4a3a623b5facca8184e9070317fea03adc3a9e8f +%global commit cd256807c5f916735ae18749c43d5b0bd73240fa %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20250408 +%global commitdate 20250411 %global ver 0.9.7 Name: xpadneo diff --git a/anda/tools/rpi-utils/rpi-utils.spec b/anda/tools/rpi-utils/rpi-utils.spec index f76040199d..c0d5884210 100644 --- a/anda/tools/rpi-utils/rpi-utils.spec +++ b/anda/tools/rpi-utils/rpi-utils.spec @@ -1,5 +1,5 @@ -%global commit 92900c5c733c8b91a67b1772d4f0a25104f2b05d -%global commit_date 20250319 +%global commit c15aa9a02c5086fbd902347e416adb213b5ae0f4 +%global commit_date 20250411 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define _unpackaged_files_terminate_build 0 From 6a9d0817bfe927c182abcc9f88a8edf7496ae75e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 11 Apr 2025 01:57:04 +0000 Subject: [PATCH 0673/2977] bump: ruffle preview --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- anda/devs/zed/preview/zed-preview.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 0433f3e880..283c9bc545 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-10 +%global ver 2025-04-11 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 25cc96740a..33be949e2e 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.182.2-pre +%global ver 0.182.3-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From c22a29dd17a0e3c5b8ca6700998825f5550c99a5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 11 Apr 2025 02:45:50 +0000 Subject: [PATCH 0674/2977] bump(branch): astal-gtk akmod dkms --- anda/lib/astal/astal-gtk/astal-gtk.spec | 4 ++-- anda/system/xpadneo/akmod/xpadneo-kmod.spec | 4 ++-- anda/system/xpadneo/dkms/dkms-xpadneo.spec | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/anda/lib/astal/astal-gtk/astal-gtk.spec b/anda/lib/astal/astal-gtk/astal-gtk.spec index 06c4134713..5549b7d526 100644 --- a/anda/lib/astal/astal-gtk/astal-gtk.spec +++ b/anda/lib/astal/astal-gtk/astal-gtk.spec @@ -1,5 +1,5 @@ -%global commit 3ac89ca -%global commit_date 20250409 +%global commit 8f020e6 +%global commit_date 20250411 Name: astal Version: 0^%commit_date.%commit diff --git a/anda/system/xpadneo/akmod/xpadneo-kmod.spec b/anda/system/xpadneo/akmod/xpadneo-kmod.spec index 4c7e993a49..265368795b 100644 --- a/anda/system/xpadneo/akmod/xpadneo-kmod.spec +++ b/anda/system/xpadneo/akmod/xpadneo-kmod.spec @@ -1,6 +1,6 @@ -%global commit 4a3a623b5facca8184e9070317fea03adc3a9e8f +%global commit cd256807c5f916735ae18749c43d5b0bd73240fa %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20250408 +%global commitdate 20250411 %global ver 0.9.7 %define buildforkernels akmod %global debug_package %{nil} diff --git a/anda/system/xpadneo/dkms/dkms-xpadneo.spec b/anda/system/xpadneo/dkms/dkms-xpadneo.spec index 7b2c294d15..18fce6e59b 100644 --- a/anda/system/xpadneo/dkms/dkms-xpadneo.spec +++ b/anda/system/xpadneo/dkms/dkms-xpadneo.spec @@ -1,6 +1,6 @@ -%global commit 4a3a623b5facca8184e9070317fea03adc3a9e8f +%global commit cd256807c5f916735ae18749c43d5b0bd73240fa %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20250408 +%global commitdate 20250411 %global ver 0.9.7 %global debug_package %{nil} %global modulename xpadneo From 5aa8307268094105c383c9648b612e1c154f98a0 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 11 Apr 2025 04:44:11 +0000 Subject: [PATCH 0675/2977] bump: dwarfs --- anda/lib/dwarfs/dwarfs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/dwarfs/dwarfs.spec b/anda/lib/dwarfs/dwarfs.spec index b3f5f148b8..5dc53e1901 100644 --- a/anda/lib/dwarfs/dwarfs.spec +++ b/anda/lib/dwarfs/dwarfs.spec @@ -4,7 +4,7 @@ The Deduplicating Warp-speed Advanced Read-only File System. A fast high compression read-only file system for Linux and Windows.} Name: dwarfs -Version: 0.12.0 +Version: 0.12.1 Release: 1%?dist Summary: A fast high compression read-only file system for Linux, Windows and macOS License: GPL-3.0-or-later From 70105f1e50c319b2aa708cd65fc5b3a28f3ae9c1 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 11 Apr 2025 05:50:08 +0000 Subject: [PATCH 0676/2977] bump: kmonad --- anda/tools/kmonad/kmonad.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/tools/kmonad/kmonad.spec b/anda/tools/kmonad/kmonad.spec index e4bee0bd80..d0e313bd63 100644 --- a/anda/tools/kmonad/kmonad.spec +++ b/anda/tools/kmonad/kmonad.spec @@ -1,8 +1,8 @@ %global pkg_name kmonad Name: %{pkg_name} -Version: 0.4.3 -Release: 1%{?dist} +Version: 0.4.4 +Release: 1%?dist Summary: An advanced keyboard manager License: MIT From f883119bcff45e217fc6e7c5507075fd25560dc6 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 11 Apr 2025 14:49:39 +0000 Subject: [PATCH 0677/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 4fd9896cb9..1b2c73cf87 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.636 +Version: 0.0.637 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index bf7a523708..7e49f8f8ea 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.636 +Version: 0.0.637 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From f922ecca3edc61bbb255b6b0d16ff2918a9ecefb Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 11 Apr 2025 15:41:53 +0000 Subject: [PATCH 0678/2977] bump: tdlib --- anda/lib/tdlib/tdlib-nightly.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index a94337f94b..70ffa02591 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,6 +1,6 @@ -%global commit b498497bbfd6b80c86f800b3546a0170206317d3 -%global ver 1.8.46 -%global commit_date 20250313 +%global commit a03a90470d6fca9a5a3db747ba3f3e4a465b5fe7 +%global ver 1.8.47 +%global commit_date 20250411 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: tdlib-nightly From 4fd24b6a361ad0ad841ad01ea1c9c11acbfeb0bf Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 11 Apr 2025 16:46:18 +0000 Subject: [PATCH 0679/2977] bump: preview tela-icon-theme --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/themes/tela-icon-theme/tela-icon-theme.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 33be949e2e..aac033e6bf 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.182.3-pre +%global ver 0.182.4-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/themes/tela-icon-theme/tela-icon-theme.spec b/anda/themes/tela-icon-theme/tela-icon-theme.spec index 9c491b1b2e..d0ad1083d4 100644 --- a/anda/themes/tela-icon-theme/tela-icon-theme.spec +++ b/anda/themes/tela-icon-theme/tela-icon-theme.spec @@ -1,5 +1,5 @@ -%global commit f1e1427e8e484deb3018b6607d139805c3947cdb -%global commit_date 20250313 +%global commit b16bc50ca82390cfa135d70e630ae0f63e17cfaa +%global commit_date 20250411 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: tela-icon-theme From b1349d1c45665a21494ea43e81a59be927745c4e Mon Sep 17 00:00:00 2001 From: Pornpipat Popum Date: Sat, 12 Apr 2025 00:23:28 +0700 Subject: [PATCH 0680/2977] add: readymade (#4295) * package readymade (https://github.com/ublue-os/titanoboa/issues/66) * omit branding --- anda/system/readymade/anda.hcl | 5 +++ anda/system/readymade/readymade.spec | 56 ++++++++++++++++++++++++++++ anda/system/readymade/update.rhai | 1 + 3 files changed, 62 insertions(+) create mode 100644 anda/system/readymade/anda.hcl create mode 100644 anda/system/readymade/readymade.spec create mode 100644 anda/system/readymade/update.rhai diff --git a/anda/system/readymade/anda.hcl b/anda/system/readymade/anda.hcl new file mode 100644 index 0000000000..4dec03fdad --- /dev/null +++ b/anda/system/readymade/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "readymade.spec" + } +} diff --git a/anda/system/readymade/readymade.spec b/anda/system/readymade/readymade.spec new file mode 100644 index 0000000000..a526942863 --- /dev/null +++ b/anda/system/readymade/readymade.spec @@ -0,0 +1,56 @@ +Name: readymade +Version: 0.11.2 +Release: 1%?dist +Summary: Install ready-made distribution images! +License: MIT +URL: https://github.com/FyraLabs/readymade +Source0: %{url}/archive/refs/tags/v%{version}.tar.gz +BuildRequires: anda-srpm-macros rust-packaging mold +BuildRequires: pkgconfig(libhelium-1) +BuildRequires: pkgconfig(gnome-desktop-4) +BuildRequires: clang-devel +BuildRequires: cmake + +Requires: efibootmgr + +%description +Readymade is a simple Linux Distribution installer. + +It is created as a replacement to Red Hat's Anaconda installer. + + +%package config-ultramarine +Summary: Readymade Configuration for Ultramarine Linux +License: MIT +Requires: readymade +Provides: readymade-config + +%description config-ultramarine +This package contains the configuration files for Readymade to install Ultramarine Linux. + + +%prep +%autosetup +%cargo_prep_online + +%build + +%install +%cargo_install +./install.sh %buildroot +ln -sf %{_datadir}/applications/com.fyralabs.Readymade.desktop %{buildroot}%{_datadir}/applications/liveinst.desktop + +%find_lang com.fyralabs.Readymade + +%files config-ultramarine +%_sysconfdir/readymade.toml + + +%files -f com.fyralabs.Readymade.lang +%_bindir/readymade +%_datadir/polkit-1/actions/com.fyralabs.pkexec.readymade.policy +%_datadir/applications/com.fyralabs.Readymade.desktop +%_datadir/applications/liveinst.desktop +%_datadir/readymade +%_datadir/icons/hicolor/scalable/apps/com.fyralabs.Readymade.svg + diff --git a/anda/system/readymade/update.rhai b/anda/system/readymade/update.rhai new file mode 100644 index 0000000000..80d9960011 --- /dev/null +++ b/anda/system/readymade/update.rhai @@ -0,0 +1 @@ +rpm.version(gh_tag("FyraLabs/readymade")); From 51e7c4a3130d01adf118733ac7cd24c6264a665e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 11 Apr 2025 17:45:43 +0000 Subject: [PATCH 0681/2977] bump: tela-icon-theme --- anda/themes/tela-icon-theme/tela-icon-theme.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/themes/tela-icon-theme/tela-icon-theme.spec b/anda/themes/tela-icon-theme/tela-icon-theme.spec index d0ad1083d4..8032fbf34b 100644 --- a/anda/themes/tela-icon-theme/tela-icon-theme.spec +++ b/anda/themes/tela-icon-theme/tela-icon-theme.spec @@ -1,4 +1,4 @@ -%global commit b16bc50ca82390cfa135d70e630ae0f63e17cfaa +%global commit 54f5e2f0c5c6ef43218e2230a85a6e203e3e7e2c %global commit_date 20250411 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From 21112235cd80babfcda582cd0f37cd71a7a064f7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 11 Apr 2025 17:55:52 +0000 Subject: [PATCH 0682/2977] bump: tela-icon-theme --- anda/themes/tela-icon-theme/tela-icon-theme.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/themes/tela-icon-theme/tela-icon-theme.spec b/anda/themes/tela-icon-theme/tela-icon-theme.spec index 8032fbf34b..0d8d2f4f66 100644 --- a/anda/themes/tela-icon-theme/tela-icon-theme.spec +++ b/anda/themes/tela-icon-theme/tela-icon-theme.spec @@ -1,4 +1,4 @@ -%global commit 54f5e2f0c5c6ef43218e2230a85a6e203e3e7e2c +%global commit da1c79bff577884693b307bb5fa3f16480d1c242 %global commit_date 20250411 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From f06d91bbeb97d389922f8247195aaa9c95c35739 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 11 Apr 2025 18:27:09 +0000 Subject: [PATCH 0683/2977] bump: tela-icon-theme --- anda/themes/tela-icon-theme/tela-icon-theme.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/themes/tela-icon-theme/tela-icon-theme.spec b/anda/themes/tela-icon-theme/tela-icon-theme.spec index 0d8d2f4f66..aaadf8d5de 100644 --- a/anda/themes/tela-icon-theme/tela-icon-theme.spec +++ b/anda/themes/tela-icon-theme/tela-icon-theme.spec @@ -1,4 +1,4 @@ -%global commit da1c79bff577884693b307bb5fa3f16480d1c242 +%global commit becb1687c8ee0cafc312fd8c231234436735f8e8 %global commit_date 20250411 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From 2d902a37cae50af2259b7f67d0e9d271287f1f2c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 11 Apr 2025 18:57:47 +0000 Subject: [PATCH 0684/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 1b2c73cf87..983b12870f 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.637 +Version: 0.0.638 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 7e49f8f8ea..d92d0291c4 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.637 +Version: 0.0.638 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 100dfa9e1381dbd6af7fca8f2c14b3fbd7f5467c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 11 Apr 2025 20:28:40 +0000 Subject: [PATCH 0685/2977] bump: stable --- anda/devs/zed/stable/zed.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index a6bbaf80d7..72614c0c31 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.181.5 +Version: 0.181.6 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From 0d86a0c76d8fa78c67cbb02d246a9f72aa0f36e3 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 11 Apr 2025 22:38:27 +0000 Subject: [PATCH 0686/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index aac033e6bf..705f5aff56 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.182.4-pre +%global ver 0.182.5-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From 8e1a26d84c6a1e6767c39afe6c54c5b39ff01f43 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 11 Apr 2025 22:59:56 +0000 Subject: [PATCH 0687/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index 15d2a3197e..67812c9404 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.4.1 +Version: 2025.4.2 Release: 1%?dist Summary: Front-end to your dev env From a8c53983d506e69396dd002a8b1957ae98fd9fd1 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 12 Apr 2025 01:42:04 +0000 Subject: [PATCH 0688/2977] bump(nightly): nightly nightly prismlauncher-nightly nim-nightly rpi-utils spotx-bash --- anda/devs/ghostty/nightly/ghostty-nightly.spec | 2 +- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/tools/rpi-utils/rpi-utils.spec | 4 ++-- anda/tools/spotx-bash/spotx-bash.spec | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 750d3ed321..64dd9d4249 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,4 +1,4 @@ -%global commit b16324ef0be8c5eeef4c0eb23b9972fdb2fa50d5 +%global commit 66636195f18d21bd65f8e7ced461f6b6770be189 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global fulldate 2025-04-11 %global commit_date %(echo %{fulldate} | sed 's/-//g') diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 5102241347..e4ae55e0fb 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit c124838a73e2d5b3b7fd632be91c114c95038340 +%global commit d1ffda9bfeccfdf9bea3f76251350bf9cf7f6e1b %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250411 +%global commit_date 20250412 %global ver 0.182.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index c191cd7598..f9c058fd69 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit c430b666578f9c2250d0814f7ea9d50eed9a2ca3 +%global commit a8e5e8dcfc37148d9d1041ff7927845f5ff943f2 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250411 +%global commit_date 20250412 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index b03997d1d5..5ff103c1b6 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 918f972369e62d6aa07e173aa1e70aa5c4714fc8 +%global commit f58cd51fc48c724859469c50e42c8f2fb4e39aad %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250411 +%global commit_date 20250412 %global debug_package %nil Name: nim-nightly diff --git a/anda/tools/rpi-utils/rpi-utils.spec b/anda/tools/rpi-utils/rpi-utils.spec index c0d5884210..922de1a6c4 100644 --- a/anda/tools/rpi-utils/rpi-utils.spec +++ b/anda/tools/rpi-utils/rpi-utils.spec @@ -1,5 +1,5 @@ -%global commit c15aa9a02c5086fbd902347e416adb213b5ae0f4 -%global commit_date 20250411 +%global commit 358ac7085d6a9c3d4ffa62e03c23c8671904c3ec +%global commit_date 20250412 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define _unpackaged_files_terminate_build 0 diff --git a/anda/tools/spotx-bash/spotx-bash.spec b/anda/tools/spotx-bash/spotx-bash.spec index 57b6f7df39..a279606b98 100644 --- a/anda/tools/spotx-bash/spotx-bash.spec +++ b/anda/tools/spotx-bash/spotx-bash.spec @@ -1,5 +1,5 @@ -%global commit a814894e8cca3282a0ad79f30896ec4b01544d4e -%global commit_date 20250407 +%global commit 9093d0e29f0c871ce7a005a8e4cd5ca474438b24 +%global commit_date 20250412 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: spotx-bash From 27f42ca6060bdcdd946b535645437e13046251d5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 12 Apr 2025 01:52:03 +0000 Subject: [PATCH 0689/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 283c9bc545..6eed170c56 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-11 +%global ver 2025-04-12 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From aaca11dc98b26698386e755b76b77d206de4f862 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 12 Apr 2025 09:33:36 +0000 Subject: [PATCH 0690/2977] bump: tdlib --- anda/lib/tdlib/tdlib-nightly.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 70ffa02591..54889aab37 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,6 +1,6 @@ -%global commit a03a90470d6fca9a5a3db747ba3f3e4a465b5fe7 +%global commit daa638a26700cc84e08431418ca96d437fd410bc %global ver 1.8.47 -%global commit_date 20250411 +%global commit_date 20250412 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: tdlib-nightly From 0c79322f9ba3c735519e5787ebc0252b1d30bbbe Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 12 Apr 2025 10:35:18 +0000 Subject: [PATCH 0691/2977] bump: rnote --- anda/langs/rust/rnote/rnote.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/rust/rnote/rnote.spec b/anda/langs/rust/rnote/rnote.spec index 1a0893708c..ddf94bd528 100644 --- a/anda/langs/rust/rnote/rnote.spec +++ b/anda/langs/rust/rnote/rnote.spec @@ -1,7 +1,7 @@ %global build_rustflags %build_rustflags -C link-arg=-fuse-ld=mold Name: rnote -Version: 0.11.0 +Version: 0.12.0 Release: 1%?dist Summary: Sketch and take handwritten notes. License: GPL-3.0 From 416d81854076241ebb49c3b1bd136914a8feff2a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 12 Apr 2025 15:17:01 +0000 Subject: [PATCH 0692/2977] bump: sarasa-gothic --- anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec b/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec index cc01019f5c..f158119a67 100644 --- a/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec +++ b/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec @@ -1,5 +1,5 @@ Name: sarasa-gothic-fonts -Version: 1.0.29 +Version: 1.0.30 Release: 1%?dist URL: https://github.com/be5invis/Sarasa-Gothic Source0: %url/releases/download/v%version/Sarasa-TTC-%version.7z From 832a195442a3583866b1a177fcc456aac4374d14 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 12 Apr 2025 16:42:04 +0000 Subject: [PATCH 0693/2977] bump: onefetch --- anda/langs/rust/onefetch/rust-onefetch.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/rust/onefetch/rust-onefetch.spec b/anda/langs/rust/onefetch/rust-onefetch.spec index b96a5fd539..eb3788fc03 100644 --- a/anda/langs/rust/onefetch/rust-onefetch.spec +++ b/anda/langs/rust/onefetch/rust-onefetch.spec @@ -4,7 +4,7 @@ %global crate onefetch Name: rust-onefetch -Version: 2.23.1 +Version: 2.24.0 Release: 1%?dist Summary: Command-line Git information tool From e9f10b2f5589aef223a8a76e5e6a3d3e326b2ab5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 12 Apr 2025 19:47:23 +0000 Subject: [PATCH 0694/2977] bump: tdlib --- anda/lib/tdlib/tdlib-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 54889aab37..7e8a8bf125 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,4 +1,4 @@ -%global commit daa638a26700cc84e08431418ca96d437fd410bc +%global commit 450d380580be1fb1c969ae8106248415863fc8bc %global ver 1.8.47 %global commit_date 20250412 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From 0785c6b4d45aed6b3eeb976ad9cdbcf6daa93d3c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 12 Apr 2025 19:57:41 +0000 Subject: [PATCH 0695/2977] bump: tdlib limine --- anda/lib/tdlib/tdlib-nightly.spec | 2 +- anda/system/limine/limine.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 7e8a8bf125..094e7795ab 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,4 +1,4 @@ -%global commit 450d380580be1fb1c969ae8106248415863fc8bc +%global commit a7e4cb437784fefee861501b5776688c4bba0038 %global ver 1.8.47 %global commit_date 20250412 %global shortcommit %(c=%{commit}; echo ${c:0:7}) diff --git a/anda/system/limine/limine.spec b/anda/system/limine/limine.spec index 692b0a83de..2213c37482 100644 --- a/anda/system/limine/limine.spec +++ b/anda/system/limine/limine.spec @@ -1,5 +1,5 @@ Name: limine -Version: 9.2.2 +Version: 9.2.3 Release: 1%?dist Summary: Modern, advanced, portable, multiprotocol bootloader License: BSD-2-Clause From de30898748c09a7be062f92988af322d5ad138a3 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 12 Apr 2025 20:23:05 +0000 Subject: [PATCH 0696/2977] bump: tdlib --- anda/lib/tdlib/tdlib-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 094e7795ab..0217accaf0 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,4 +1,4 @@ -%global commit a7e4cb437784fefee861501b5776688c4bba0038 +%global commit caae78edceab921b8f5190c74e7ff8a3f363ec70 %global ver 1.8.47 %global commit_date 20250412 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From c289dd0908bed327ba933764408aa3656e3bcec8 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 12 Apr 2025 21:47:02 +0000 Subject: [PATCH 0697/2977] bump: felix --- anda/langs/rust/felix/rust-felix.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/rust/felix/rust-felix.spec b/anda/langs/rust/felix/rust-felix.spec index dfd2e8a10a..0a600f0fb7 100644 --- a/anda/langs/rust/felix/rust-felix.spec +++ b/anda/langs/rust/felix/rust-felix.spec @@ -3,7 +3,7 @@ %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ Name: rust-felix -Version: 2.16.0 +Version: 2.16.1 Release: 1%?dist Summary: Tui file manager with vim-like key mapping From 2f6a23a25362b84ac7a78db13743c0b2729fb36b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 13 Apr 2025 01:47:01 +0000 Subject: [PATCH 0698/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 6eed170c56..6b8125e4bf 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-12 +%global ver 2025-04-13 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 983132803dd7fd419b0d00d1a6306d5a784226d9 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 13 Apr 2025 03:11:05 +0000 Subject: [PATCH 0699/2977] bump(nightly): mpv micro nightly nim-nightly telescope --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/micro/micro-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/stardust/telescope/stardust-telescope.spec | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 03cdc0b982..c73e32ec64 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 3d5949366cd1519b63ebdd4e2fccee7b0fae708a +%global commit 44816ef8ff64fb72de376d9e157b12785c6abc5e %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250410 +%global commit_date 20250413 %global ver 0.40.0 Name: mpv-nightly diff --git a/anda/devs/micro/micro-nightly.spec b/anda/devs/micro/micro-nightly.spec index 950d5112aa..3fa483289e 100644 --- a/anda/devs/micro/micro-nightly.spec +++ b/anda/devs/micro/micro-nightly.spec @@ -12,8 +12,8 @@ # Naming variable as something other than "commit" is necessary # to stop %%gometa from putting commit hash in release -%global commit_hash d36e7f40578e571814d7de91ef861517b525fe57 -%global commit_date 20250410 +%global commit_hash b88300ef7f0a5756520094194dd1c83b5f8130c3 +%global commit_date 20250413 %global shortcommit %{sub %{commit_hash} 1 7} %global ver 2.0.14 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index e4ae55e0fb..8c1d6b3711 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit d1ffda9bfeccfdf9bea3f76251350bf9cf7f6e1b +%global commit b864a9b0ae633006a44c02b723fe6fad07e84b93 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250412 +%global commit_date 20250413 %global ver 0.182.0 %bcond_with check diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 5ff103c1b6..21388478c8 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit f58cd51fc48c724859469c50e42c8f2fb4e39aad +%global commit 1ef9a656d25f71dec6066e68ce6e9a518d5e9f16 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250412 +%global commit_date 20250413 %global debug_package %nil Name: nim-nightly diff --git a/anda/stardust/telescope/stardust-telescope.spec b/anda/stardust/telescope/stardust-telescope.spec index ac668565a4..5830464444 100644 --- a/anda/stardust/telescope/stardust-telescope.spec +++ b/anda/stardust/telescope/stardust-telescope.spec @@ -1,7 +1,7 @@ %define debug_package %nil -%global commit b82639f4e3e0c9bfdf2d3b12819fae46b0f446e9 -%global commit_date 20250410 +%global commit e33764c69179e35b60ad03931544a87357e1e81f +%global commit_date 20250413 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: stardust-xr-telescope From 52c745df3d74b98fc6f74cf6030bdb60c0712c9b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 13 Apr 2025 05:43:36 +0000 Subject: [PATCH 0700/2977] bump: tdlib --- anda/lib/tdlib/tdlib-nightly.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 0217accaf0..72d5e4f34a 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,6 +1,6 @@ -%global commit caae78edceab921b8f5190c74e7ff8a3f363ec70 +%global commit 579599ed4ca59bf8596ec587d968b6332c9be847 %global ver 1.8.47 -%global commit_date 20250412 +%global commit_date 20250413 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: tdlib-nightly From 8167aeea0553980ad7da9eec3fd58efd9cf5c72a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 13 Apr 2025 07:16:48 +0000 Subject: [PATCH 0701/2977] bump: lomiri-system-settings --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 38dfd957f7..194d18bec2 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit 4cc7ee0242c78302bd3b620aadfb8c3c4aba0b14 +%global commit 7c873b18b44f737fafe3296f84651111d6cbb128 %forgemeta Name: lomiri-system-settings From 4b542c4a3db7314924d5874d794d765af32a9966 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 13 Apr 2025 11:35:47 +0000 Subject: [PATCH 0702/2977] bump: wpaperd --- anda/desktops/waylands/wpaperd/wpaperd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/waylands/wpaperd/wpaperd.spec b/anda/desktops/waylands/wpaperd/wpaperd.spec index 70ca93274f..ffa4147ab8 100644 --- a/anda/desktops/waylands/wpaperd/wpaperd.spec +++ b/anda/desktops/waylands/wpaperd/wpaperd.spec @@ -2,7 +2,7 @@ %bcond check 1 Name: wpaperd -Version: 1.2.0 +Version: 1.2.1 Release: 1%?dist Summary: Modern wallpaper daemon for Wayland License: (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-2-Clause AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-3-Clause AND CC0-1.0 AND (CC0-1.0 OR Apache-2.0) AND (CC0-1.0 OR Artistic-2.0) AND GPL-3.0+ AND ISC AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR NCSA) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) From 99e7a74522e5e5072b09866caa47067d68f7831c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 13 Apr 2025 13:03:45 +0000 Subject: [PATCH 0703/2977] bump: vencord-desktop tdlib --- anda/apps/vencord-desktop/vencord-desktop.spec | 2 +- anda/lib/tdlib/tdlib-nightly.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/vencord-desktop/vencord-desktop.spec b/anda/apps/vencord-desktop/vencord-desktop.spec index 56cc77f1fb..afcef180fd 100644 --- a/anda/apps/vencord-desktop/vencord-desktop.spec +++ b/anda/apps/vencord-desktop/vencord-desktop.spec @@ -6,7 +6,7 @@ Name: vencord-desktop Provides: VencordDesktop = %{version}-%{release} -Version: 1.5.5 +Version: 1.5.6 Release: 1%?dist License: GPL-3.0 Summary: Vesktop is a cross platform desktop app aiming to give you a snappier Discord experience with Vencord pre-installed diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 72d5e4f34a..bcae50086b 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,4 +1,4 @@ -%global commit 579599ed4ca59bf8596ec587d968b6332c9be847 +%global commit 086b549dbbc16c09bbf1b03ad8c87848f37b88a6 %global ver 1.8.47 %global commit_date 20250413 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From 0a76def0a335323fca1bdf2d9a112498df13c27c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 13 Apr 2025 20:58:54 +0000 Subject: [PATCH 0704/2977] bump: tdlib --- anda/lib/tdlib/tdlib-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index bcae50086b..90df776cbd 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,4 +1,4 @@ -%global commit 086b549dbbc16c09bbf1b03ad8c87848f37b88a6 +%global commit 04adfc87deea4c804def118e88c89a08c388b32b %global ver 1.8.47 %global commit_date 20250413 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From 9c76c94d403ea32fe0bfbb60f33f3304e601a476 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 13 Apr 2025 22:56:12 +0000 Subject: [PATCH 0705/2977] bump: chezmoi --- anda/langs/go/chezmoi/chezmoi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/go/chezmoi/chezmoi.spec b/anda/langs/go/chezmoi/chezmoi.spec index 15967e5e86..4f517fd30e 100644 --- a/anda/langs/go/chezmoi/chezmoi.spec +++ b/anda/langs/go/chezmoi/chezmoi.spec @@ -4,7 +4,7 @@ # https://github.com/twpayne/chezmoi %global goipath github.com/twpayne/chezmoi -Version: 2.62.0 +Version: 2.62.1 %gometa -f From 8cad0c4ff85f4f12ecb2c895d4b296be3af8cb57 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 14 Apr 2025 01:42:22 +0000 Subject: [PATCH 0706/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 6b8125e4bf..4f4287a353 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-13 +%global ver 2025-04-14 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From aa1f8439c33e3f1dc6b1765a46cbb033d1223dea Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 14 Apr 2025 01:48:41 +0000 Subject: [PATCH 0707/2977] bump(nightly): mpv nightly nightly prismlauncher-nightly nim-nightly kmod-common --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/system/xone/kmod-common/xone.spec | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index c73e32ec64..1df210430a 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 44816ef8ff64fb72de376d9e157b12785c6abc5e +%global commit 27c08affb14daaaa0ae156dcc073b411296264f1 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250413 +%global commit_date 20250414 %global ver 0.40.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 64dd9d4249..5602a5a0b4 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 66636195f18d21bd65f8e7ced461f6b6770be189 +%global commit f7394c00c12543742185d8ed682d64d2d6fa1586 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-04-11 +%global fulldate 2025-04-13 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 8c1d6b3711..0bf3dd4da0 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit b864a9b0ae633006a44c02b723fe6fad07e84b93 +%global commit 128779f6155ed9a48929b6eac23b10327a15fffb %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250413 +%global commit_date 20250414 %global ver 0.182.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index f9c058fd69..c4ccc8661b 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit a8e5e8dcfc37148d9d1041ff7927845f5ff943f2 +%global commit 42007290a0b86a7cd25af06da0f8ba16211e2eae %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250412 +%global commit_date 20250414 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 21388478c8..1f452f9c93 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 1ef9a656d25f71dec6066e68ce6e9a518d5e9f16 +%global commit 4d9e5e8b6d15107c3de5e7fc2b1c974437ef1cab %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250413 +%global commit_date 20250414 %global debug_package %nil Name: nim-nightly diff --git a/anda/system/xone/kmod-common/xone.spec b/anda/system/xone/kmod-common/xone.spec index 5125561f69..35f7185704 100644 --- a/anda/system/xone/kmod-common/xone.spec +++ b/anda/system/xone/kmod-common/xone.spec @@ -1,6 +1,6 @@ -%global commit aeb27e6d98f7b22b3672701af6171612254a4d0c +%global commit 5e44361880265bc5b0d9645785d3de65ef0b86cf %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20250313 +%global commitdate 20250414 %global ver 0.3 %global _dracutconfdir %{_prefix}/lib/dracut/dracut.conf.d %global firmware_hash 48084d9fa53b9bb04358f3bb127b7495dc8f7bb0b3ca1437bd24ef2b6eabdf66 From 371db0748b70abeb8b595d015c20867c3d3b7fef Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 14 Apr 2025 02:50:36 +0000 Subject: [PATCH 0708/2977] bump(branch): akmod dkms --- anda/system/xone/akmod/xone-kmod.spec | 4 ++-- anda/system/xone/dkms/dkms-xone.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index 79b30e6dbc..740c8eac9a 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -1,6 +1,6 @@ -%global commit aeb27e6d98f7b22b3672701af6171612254a4d0c +%global commit 5e44361880265bc5b0d9645785d3de65ef0b86cf %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20250313 +%global commitdate 20250414 %global ver 0.3 %define buildforkernels akmod %global debug_package %{nil} diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index 6311b65934..27196d8433 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -1,6 +1,6 @@ -%global commit aeb27e6d98f7b22b3672701af6171612254a4d0c +%global commit 5e44361880265bc5b0d9645785d3de65ef0b86cf %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20250313 +%global commitdate 20250414 %global ver 0.3 %global debug_package %{nil} %global modulename xone From 8a96e231bf239992e59bbe30aad48363aa4ba6ca Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 14 Apr 2025 07:55:28 +0000 Subject: [PATCH 0709/2977] bump: peazip --- anda/apps/peazip/peazip.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/peazip/peazip.spec b/anda/apps/peazip/peazip.spec index e5a3190d32..d5dea2257f 100644 --- a/anda/apps/peazip/peazip.spec +++ b/anda/apps/peazip/peazip.spec @@ -2,8 +2,8 @@ %define debug_package %nil Name: peazip -Version: 10.3.0 -Release: 3%?dist +Version: 10.4.0 +Release: 1%?dist Summary: Free Zip / Unzip software and Rar file extractor. Cross-platform file and archive manager License: LGPL-3.0-only URL: https://peazip.github.io From 9255661f0552b9f45b66b677e31d28c8b017e8dc Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 14 Apr 2025 08:47:18 +0000 Subject: [PATCH 0710/2977] bump: lazygit --- anda/langs/go/lazygit/golang-github-jesseduffield-lazygit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/go/lazygit/golang-github-jesseduffield-lazygit.spec b/anda/langs/go/lazygit/golang-github-jesseduffield-lazygit.spec index 32b6e87126..bf6e3c9ba2 100644 --- a/anda/langs/go/lazygit/golang-github-jesseduffield-lazygit.spec +++ b/anda/langs/go/lazygit/golang-github-jesseduffield-lazygit.spec @@ -2,7 +2,7 @@ # https://github.com/jesseduffield/lazygit %global goipath github.com/jesseduffield/lazygit -Version: 0.48.0 +Version: 0.49.0 %gometa -f From af92d7cdaff3b9dd1b735eb88261e77b6b049b3f Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Mon, 14 Apr 2025 03:27:43 -0700 Subject: [PATCH 0711/2977] f42: Update gnome-shell patches for switcherooctl (#4303) (#4304) * f42: Update gnome-shell patches * chore: Fix extra major_version definition * chore: Fix extra line from merge * chore: hardcode gnome-shell in more places (cherry picked from commit d25ac73e34cbfaea533418b5f7056686295ad0fc) Co-authored-by: Kyle Gospodnetich --- ...board-Add-a-catch-around-reload-call.patch | 35 ----- ...Load-keyboard-from-system-settings-i.patch | 136 ------------------ ...Use-gnome-desktop-API-for-getting-de.patch | 128 ----------------- .../gnome-shell-favourite-apps-firefox.patch | 47 ++---- .../gnome/gnome-shell/gnome-shell.spec | 36 +++-- 5 files changed, 35 insertions(+), 347 deletions(-) delete mode 100644 anda/desktops/gnome/gnome-shell/0001-status-keyboard-Add-a-catch-around-reload-call.patch delete mode 100644 anda/desktops/gnome/gnome-shell/0002-status-keyboard-Load-keyboard-from-system-settings-i.patch delete mode 100644 anda/desktops/gnome/gnome-shell/0003-status-keyboard-Use-gnome-desktop-API-for-getting-de.patch diff --git a/anda/desktops/gnome/gnome-shell/0001-status-keyboard-Add-a-catch-around-reload-call.patch b/anda/desktops/gnome/gnome-shell/0001-status-keyboard-Add-a-catch-around-reload-call.patch deleted file mode 100644 index 20717d1caf..0000000000 --- a/anda/desktops/gnome/gnome-shell/0001-status-keyboard-Add-a-catch-around-reload-call.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 78a733bae62f8af15f0771d7efde55473f295e46 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Wed, 16 Aug 2023 18:46:54 -0400 -Subject: [PATCH 1/3] status/keyboard: Add a catch around reload call - -Now that system input settings can get used in the user session -they're getting seen by the tests and the tests are complaining: - -Unhandled promise rejection. To suppress this warning, add an -error handler to your promise chain with .catch() or a try-catch block -around your await expression. - -This commit adds the catch it's asking for. ---- - js/ui/status/keyboard.js | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js -index cfc0a01f6b..4ef2f355d3 100644 ---- a/js/ui/status/keyboard.js -+++ b/js/ui/status/keyboard.js -@@ -204,7 +204,9 @@ class InputSourceSystemSettings extends InputSourceSettings { - this._options = ''; - this._model = ''; - -- this._reload(); -+ this._reload().catch(error => { -+ logError(error, 'Could not reload system input settings'); -+ }); - - Gio.DBus.system.signal_subscribe(this._BUS_NAME, - this._BUS_PROPS_IFACE, --- -2.43.1 - diff --git a/anda/desktops/gnome/gnome-shell/0002-status-keyboard-Load-keyboard-from-system-settings-i.patch b/anda/desktops/gnome/gnome-shell/0002-status-keyboard-Load-keyboard-from-system-settings-i.patch deleted file mode 100644 index 7b0ac52eae..0000000000 --- a/anda/desktops/gnome/gnome-shell/0002-status-keyboard-Load-keyboard-from-system-settings-i.patch +++ /dev/null @@ -1,136 +0,0 @@ -From 0c0cc4ce1d3e08eba3e701d565398e01aa479ff7 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Wed, 16 Aug 2023 11:13:39 -0400 -Subject: [PATCH 2/3] status/keyboard: Load keyboard from system settings if - gsettings unconfigured - -Right now if a user hasn't configured their input sources, the code -falls back to -using the current layout on Xorg and the mutter default with wayland. - -This commit changes the code to instead fall back to using the system -default (as configured by localed). ---- - js/ui/status/keyboard.js | 62 +++++++++++++++++++++++++++++++--------- - 1 file changed, 48 insertions(+), 14 deletions(-) - -diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js -index 4ef2f355d3..d91eb41bc6 100644 ---- a/js/ui/status/keyboard.js -+++ b/js/ui/status/keyboard.js -@@ -22,6 +22,9 @@ import * as Util from '../../misc/util.js'; - export const INPUT_SOURCE_TYPE_XKB = 'xkb'; - export const INPUT_SOURCE_TYPE_IBUS = 'ibus'; - -+const DESKTOP_INPUT_SOURCES_SCHEMA = 'org.gnome.desktop.input-sources'; -+const KEY_INPUT_SOURCES = 'sources'; -+ - export const LayoutMenuItem = GObject.registerClass( - class LayoutMenuItem extends PopupMenu.PopupBaseMenuItem { - _init(displayName, shortName) { -@@ -278,18 +281,16 @@ class InputSourceSystemSettings extends InputSourceSettings { - } - - class InputSourceSessionSettings extends InputSourceSettings { -- constructor() { -+ constructor(settings) { - super(); - -- this._DESKTOP_INPUT_SOURCES_SCHEMA = 'org.gnome.desktop.input-sources'; -- this._KEY_INPUT_SOURCES = 'sources'; - this._KEY_MRU_SOURCES = 'mru-sources'; - this._KEY_KEYBOARD_OPTIONS = 'xkb-options'; - this._KEY_KEYBOARD_MODEL = 'xkb-model'; - this._KEY_PER_WINDOW = 'per-window'; - -- this._settings = new Gio.Settings({schema_id: this._DESKTOP_INPUT_SOURCES_SCHEMA}); -- this._settings.connect(`changed::${this._KEY_INPUT_SOURCES}`, this._emitInputSourcesChanged.bind(this)); -+ this._settings = settings; -+ this._settings.connect(`changed::${KEY_INPUT_SOURCES}`, this._emitInputSourcesChanged.bind(this)); - this._settings.connect(`changed::${this._KEY_KEYBOARD_OPTIONS}`, this._emitKeyboardOptionsChanged.bind(this)); - this._settings.connect(`changed::${this._KEY_KEYBOARD_MODEL}`, this._emitKeyboardModelChanged.bind(this)); - this._settings.connect(`changed::${this._KEY_PER_WINDOW}`, this._emitPerWindowChanged.bind(this)); -@@ -308,7 +309,7 @@ class InputSourceSessionSettings extends InputSourceSettings { - } - - get inputSources() { -- return this._getSourcesList(this._KEY_INPUT_SOURCES); -+ return this._getSourcesList(KEY_INPUT_SOURCES); - } - - get mruSources() { -@@ -363,13 +364,6 @@ export class InputSourceManager extends Signals.EventEmitter { - Meta.KeyBindingFlags.IS_REVERSED, - Shell.ActionMode.ALL, - this._switchInputSource.bind(this)); -- if (Main.sessionMode.isGreeter) -- this._settings = new InputSourceSystemSettings(); -- else -- this._settings = new InputSourceSessionSettings(); -- this._settings.connect('input-sources-changed', this._inputSourcesChanged.bind(this)); -- this._settings.connect('keyboard-options-changed', this._keyboardOptionsChanged.bind(this)); -- this._settings.connect('keyboard-model-changed', this._keyboardModelChanged.bind(this)); - - this._xkbInfo = KeyboardManager.getXkbInfo(); - this._keyboardManager = KeyboardManager.getKeyboardManager(); -@@ -381,16 +375,56 @@ export class InputSourceManager extends Signals.EventEmitter { - this._ibusManager.connect('property-updated', this._ibusPropertyUpdated.bind(this)); - this._ibusManager.connect('set-content-type', this._ibusSetContentType.bind(this)); - -+ this._inputSettings = new Gio.Settings({schema_id: DESKTOP_INPUT_SOURCES_SCHEMA}); -+ this._setupInputSettings(); -+ - global.display.connect('modifiers-accelerator-activated', this._modifiersSwitcher.bind(this)); - - this._sourcesPerWindow = false; - this._focusWindowNotifyId = 0; -- this._settings.connect('per-window-changed', this._sourcesPerWindowChanged.bind(this)); - this._sourcesPerWindowChanged(); - this._disableIBus = false; - this._reloading = false; - } - -+ _sessionHasNoInputSettings() { -+ return this._inputSettings.get_user_value(KEY_INPUT_SOURCES) === null; -+ } -+ -+ _reloadInputSettings() { -+ const hadNoSessionInputSettings = this._hasNoSessionInputSettings; -+ -+ if (Main.sessionMode.isGreeter) -+ this._hasNoSessionInputSettings = true; -+ else -+ this._hasNoSessionInputSettings = this._sessionHasNoInputSettings(); -+ -+ if (this._settings && hadNoSessionInputSettings === this._hasNoSessionInputSettings) -+ return; -+ -+ this._settings?.disconnectObject(this); -+ -+ if (this._hasNoSessionInputSettings) -+ this._settings = new InputSourceSystemSettings(); -+ else -+ this._settings = new InputSourceSessionSettings(this._inputSettings); -+ -+ this._settings.connectObject( -+ 'input-sources-changed', this._inputSourcesChanged.bind(this), -+ 'keyboard-options-changed', this._keyboardOptionsChanged.bind(this), -+ 'keyboard-model-changed', this._keyboardModelChanged.bind(this), -+ 'per-window-changed', this._sourcesPerWindowChanged.bind(this), -+ this); -+ this.reload(); -+ } -+ -+ _setupInputSettings() { -+ if (!Main.sessionMode.isGreeter) -+ this._inputSettings.connect(`changed::${KEY_INPUT_SOURCES}`, this._reloadInputSettings.bind(this)); -+ -+ this._reloadInputSettings(); -+ } -+ - reload() { - this._reloading = true; - this._keyboardManager.setKeyboardOptions(this._settings.keyboardOptions); --- -2.43.1 - diff --git a/anda/desktops/gnome/gnome-shell/0003-status-keyboard-Use-gnome-desktop-API-for-getting-de.patch b/anda/desktops/gnome/gnome-shell/0003-status-keyboard-Use-gnome-desktop-API-for-getting-de.patch deleted file mode 100644 index 3e8af0cabc..0000000000 --- a/anda/desktops/gnome/gnome-shell/0003-status-keyboard-Use-gnome-desktop-API-for-getting-de.patch +++ /dev/null @@ -1,128 +0,0 @@ -From d060baeb69a2a7d80fe403fc8eec90e20aa6cb7f Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Wed, 16 Aug 2023 14:09:50 -0400 -Subject: [PATCH 3/3] status/keyboard: Use gnome-desktop API for getting - default input sources list - -At the moment, gnome-shell tries to figure out the default input sources -from localed. It fails to take into account the system locale and input -methods. - -This commit switches it to use a new function in gnome-desktop, -gnome_get_default_input_sources, which does most of the heavy -lifting itself, instead. ---- - js/ui/status/keyboard.js | 59 ++++++++++++++++++---------------------- - 1 file changed, 27 insertions(+), 32 deletions(-) - -diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js -index d91eb41bc6..19c36031f6 100644 ---- a/js/ui/status/keyboard.js -+++ b/js/ui/status/keyboard.js -@@ -3,6 +3,7 @@ - import Clutter from 'gi://Clutter'; - import Gio from 'gi://Gio'; - import GLib from 'gi://GLib'; -+import GnomeDesktop from 'gi://GnomeDesktop'; - import GObject from 'gi://GObject'; - import IBus from 'gi://IBus'; - import Meta from 'gi://Meta'; -@@ -25,6 +26,8 @@ export const INPUT_SOURCE_TYPE_IBUS = 'ibus'; - const DESKTOP_INPUT_SOURCES_SCHEMA = 'org.gnome.desktop.input-sources'; - const KEY_INPUT_SOURCES = 'sources'; - -+Gio._promisify(GnomeDesktop, 'get_default_input_sources'); -+ - export const LayoutMenuItem = GObject.registerClass( - class LayoutMenuItem extends PopupMenu.PopupBaseMenuItem { - _init(displayName, shortName) { -@@ -202,9 +205,9 @@ class InputSourceSystemSettings extends InputSourceSettings { - this._BUS_IFACE = 'org.freedesktop.locale1'; - this._BUS_PROPS_IFACE = 'org.freedesktop.DBus.Properties'; - -- this._layouts = ''; -- this._variants = ''; -- this._options = ''; -+ this._inputSourceIds = []; -+ this._inputSourceTypes = []; -+ this._options = []; - this._model = ''; - - this._reload().catch(error => { -@@ -221,30 +224,22 @@ class InputSourceSystemSettings extends InputSourceSettings { - } - - async _reload() { -- let props; -+ let inputSourceIds; -+ let inputSourceTypes; -+ let options; -+ let model; - try { -- const result = await Gio.DBus.system.call( -- this._BUS_NAME, -- this._BUS_PATH, -- this._BUS_PROPS_IFACE, -- 'GetAll', -- new GLib.Variant('(s)', [this._BUS_IFACE]), -- null, Gio.DBusCallFlags.NONE, -1, null); -- [props] = result.deepUnpack(); -+ [inputSourceIds, inputSourceTypes, options, model] = -+ await GnomeDesktop.get_default_input_sources(null); - } catch (e) { -- log(`Could not get properties from ${this._BUS_NAME}`); -+ logError(e, 'Could not get default input sources'); - return; - } - -- const layouts = props['X11Layout'].unpack(); -- const variants = props['X11Variant'].unpack(); -- const options = props['X11Options'].unpack(); -- const model = props['X11Model'].unpack(); -- -- if (layouts !== this._layouts || -- variants !== this._variants) { -- this._layouts = layouts; -- this._variants = variants; -+ if (inputSourceIds !== this._inputSourceIds || -+ inputSourceTypes !== this._inputSourceTypes) { -+ this._inputSourceIds = inputSourceIds; -+ this._inputSourceTypes = inputSourceTypes; - this._emitInputSourcesChanged(); - } - if (options !== this._options) { -@@ -258,21 +253,21 @@ class InputSourceSystemSettings extends InputSourceSettings { - } - - get inputSources() { -- let sourcesList = []; -- let layouts = this._layouts.split(','); -- let variants = this._variants.split(','); -- -- for (let i = 0; i < layouts.length && !!layouts[i]; i++) { -- let id = layouts[i]; -- if (variants[i]) -- id += `+${variants[i]}`; -- sourcesList.push({type: INPUT_SOURCE_TYPE_XKB, id}); -+ let sourcesList; -+ -+ if (this._inputSourceIds) { -+ sourcesList = this._inputSourceIds.map((id, index) => { -+ return {type: this._inputSourceTypes[index], id}; -+ }); -+ } else { -+ sourcesList = []; - } -+ - return sourcesList; - } - - get keyboardOptions() { -- return this._options.split(','); -+ return this._options; - } - - get keyboardModel() { --- -2.43.1 - diff --git a/anda/desktops/gnome/gnome-shell/gnome-shell-favourite-apps-firefox.patch b/anda/desktops/gnome/gnome-shell/gnome-shell-favourite-apps-firefox.patch index 326f82714e..cdbfdd5406 100644 --- a/anda/desktops/gnome/gnome-shell/gnome-shell-favourite-apps-firefox.patch +++ b/anda/desktops/gnome/gnome-shell/gnome-shell-favourite-apps-firefox.patch @@ -1,38 +1,9 @@ -From 551b8979483e127471c726fd1db1d52e063a7d81 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= -Date: Wed, 17 Sep 2014 07:11:12 +0200 -Subject: [PATCH] Replace Web with Firefox in default favorites - ---- - data/org.gnome.shell.gschema.xml.in | 2 +- - js/ui/appFavorites.js | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in -index f4fa86d013..86b4bf85ee 100644 ---- a/data/org.gnome.shell.gschema.xml.in -+++ b/data/org.gnome.shell.gschema.xml.in -@@ -50,7 +50,7 @@ - - - -- [ 'org.gnome.Epiphany.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop', 'org.gnome.TextEditor.desktop'] -+ [ 'org.mozilla.firefox.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop', 'org.gnome.TextEditor.desktop'] - List of desktop file IDs for favorite applications - - The applications corresponding to these identifiers -diff --git a/js/ui/appFavorites.js b/js/ui/appFavorites.js -index 576df3800d..1f55a3c881 100644 ---- a/js/ui/appFavorites.js -+++ b/js/ui/appFavorites.js -@@ -51,6 +51,7 @@ const RENAMED_DESKTOP_IDS = { - 'gnotski.desktop': 'org.gnome.Klotski.desktop', - 'gtali.desktop': 'org.gnome.Tali.desktop', - 'iagno.desktop': 'org.gnome.Reversi.desktop', -+ 'firefox.desktop': 'org.mozilla.firefox.desktop', - 'nautilus.desktop': 'org.gnome.Nautilus.desktop', - 'org.gnome.gnome-2048.desktop': 'org.gnome.TwentyFortyEight.desktop', - 'org.gnome.taquin.desktop': 'org.gnome.Taquin.desktop', --- -2.43.0 - +diff --git a/data/default-apps/dash.txt b/data/default-apps/dash.txt +index 65db4babc..f354d621b 100644 +--- a/data/default-apps/dash.txt ++++ b/data/default-apps/dash.txt +@@ -1,2 +1,2 @@ +-org.gnome.Epiphany.desktop ++org.mozilla.firefox.desktop + org.gnome.Calendar.desktop +-- diff --git a/anda/desktops/gnome/gnome-shell/gnome-shell.spec b/anda/desktops/gnome/gnome-shell/gnome-shell.spec index ed28232cfd..b150c89fe7 100644 --- a/anda/desktops/gnome/gnome-shell/gnome-shell.spec +++ b/anda/desktops/gnome/gnome-shell/gnome-shell.spec @@ -25,10 +25,6 @@ Patch: gnome-shell-favourite-apps-firefox.patch # downstream patch to stop trying on configuration errors. Patch: 0001-gdm-Work-around-failing-fingerprint-auth.patch -Patch: 0001-status-keyboard-Add-a-catch-around-reload-call.patch -Patch: 0002-status-keyboard-Load-keyboard-from-system-settings-i.patch -Patch: 0003-status-keyboard-Use-gnome-desktop-API-for-getting-de.patch - # shell-app: improve discrete GPU detection # https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3193 Patch: 3193.patch @@ -40,20 +36,21 @@ Patch: 3193.patch %define gjs_version 1.73.1 %define gtk4_version 4.0.0 %define adwaita_version 1.5.0 -%define mutter_version 47.0 +%define mutter_version 48~rc %define polkit_version 0.100 -%define gsettings_desktop_schemas_version 47~alpha +%define gsettings_desktop_schemas_version 48~rc %define ibus_version 1.5.2 %define gnome_bluetooth_version 1:42.3 %define gstreamer_version 1.4.5 -%define pipewire_version 0.3.0 +%define pipewire_version 0.3.49 %define gnome_settings_daemon_version 3.37.1 +%define major_version %(c=%{version}; echo $c | cut -d. -f1 | cut -d~ -f1) + BuildRequires: pkgconfig(bash-completion) BuildRequires: gcc BuildRequires: meson BuildRequires: git -BuildRequires: pkgconfig(ibus-1.0) >= %{ibus_version} BuildRequires: desktop-file-utils BuildRequires: pkgconfig(libedataserver-1.2) >= %{eds_version} BuildRequires: pkgconfig(gcr-4) @@ -88,9 +85,12 @@ BuildRequires: gnome-bluetooth-libs-devel >= %{gnome_bluetooth_version} %endif # Bootstrap requirements BuildRequires: gtk-doc +# Handle upgrade path +Conflicts: %{name} < 48~rc-3 %ifnarch s390 s390x Recommends: gnome-bluetooth%{?_isa} >= %{gnome_bluetooth_version} %endif +Requires: %{name}-common = %{version}-%{release} Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version} Requires: gcr%{?_isa} Requires: gobject-introspection%{?_isa} >= %{gobject_introspection_version} @@ -115,7 +115,9 @@ Requires: xdg-user-dirs-gtk # needed for schemas Requires: at-spi2-atk%{?_isa} # needed for on-screen keyboard -Requires: ibus%{?_isa} >= %{ibus_version} +Recommends: ibus%{?_isa} >= %{ibus_version} +# needed for gobject-introspection typelib +Requires: ibus-libs%{?_isa} >= %{ibus_version} # needed for "show keyboard layout" Requires: tecla # needed for the user menu @@ -151,6 +153,7 @@ Requires: webkitgtk6.0%{?_isa} ExcludeArch: %{ix86} %endif +Provides: gnome-shell(api) = %{major_version} Provides: desktop-notification-daemon = %{version}-%{release} Provides: PolicyKit-authentication-agent = %{version}-%{release} Provides: bundled(gvc) @@ -178,6 +181,14 @@ advantage of the capabilities of modern graphics hardware and introduces innovative user interface concepts to provide a visually attractive and easy to use experience. +%package common +Summary: Common files used by %{name} +Conflicts: %{name} < 48~rc-3 +BuildArch: noarch + +%description common +%{summary} + %prep %autosetup -S git -n gnome-shell-%{tarball_version} @@ -216,7 +227,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.Porta %{_bindir}/gnome-extensions %{_bindir}/gnome-shell-extension-tool %{_bindir}/gnome-shell-test-tool -%{_datadir}/glib-2.0/schemas/*.xml %{_datadir}/glib-2.0/schemas/00_org.gnome.shell.gschema.override %{_datadir}/applications/org.gnome.Shell.Extensions.desktop %{_datadir}/applications/org.gnome.Shell.desktop @@ -236,8 +246,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.Porta %{_datadir}/dbus-1/interfaces/org.gnome.Shell.PadOsd.xml %{_datadir}/dbus-1/interfaces/org.gnome.Shell.Screencast.xml %{_datadir}/dbus-1/interfaces/org.gnome.Shell.Screenshot.xml +%{_datadir}/dbus-1/interfaces/org.gnome.Shell.ScreenTime.xml %{_datadir}/dbus-1/interfaces/org.gnome.ShellSearchProvider.xml %{_datadir}/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml +%{_datadir}/desktop-directories/X-GNOME-Shell-System.directory +%{_datadir}/desktop-directories/X-GNOME-Shell-Utilities.directory %{_datadir}/icons/hicolor/scalable/apps/org.gnome.Shell.Extensions.svg %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Shell.Extensions-symbolic.svg %{_userunitdir}/org.gnome.Shell-disable-extensions.service @@ -259,5 +272,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.Porta %{_libexecdir}/gnome-shell-portal-helper %endif +%files common +%{_datadir}/glib-2.0/schemas/*.xml + %changelog %autochangelog From 00bb993451119a2d16f569ee9bf558f06184c0eb Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 14 Apr 2025 12:52:54 +0000 Subject: [PATCH 0712/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 705f5aff56..1451b2f9a7 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.182.5-pre +%global ver 0.182.6-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From 988ec94635b95289e21bf9ce332a442b62a7539d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 14 Apr 2025 13:44:16 +0000 Subject: [PATCH 0713/2977] bump(branch): gnome-shell --- anda/desktops/gnome/gnome-shell/gnome-shell.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/desktops/gnome/gnome-shell/gnome-shell.spec b/anda/desktops/gnome/gnome-shell/gnome-shell.spec index b150c89fe7..3713bc283c 100644 --- a/anda/desktops/gnome/gnome-shell/gnome-shell.spec +++ b/anda/desktops/gnome/gnome-shell/gnome-shell.spec @@ -1,6 +1,6 @@ %global tarball_version %%(echo %{version} | tr '~' '.') -%global major_version 47 -%global minor_version 3 +%global major_version 48 +%global minor_version 1 %if 0%{?rhel} %global portal_helper 0 From 05601db288a8731e6344c1fdb069e6951c512fe0 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 14 Apr 2025 13:47:00 +0000 Subject: [PATCH 0714/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 983b12870f..03b6bcfb8f 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.638 +Version: 0.0.639 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index d92d0291c4..12dc073aa6 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.638 +Version: 0.0.639 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From bda37cb7d741c3f9c17a799e6230b6c93beca167 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 14 Apr 2025 14:22:35 +0000 Subject: [PATCH 0715/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 03b6bcfb8f..4697f7846a 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.639 +Version: 0.0.640 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 12dc073aa6..4fd694d669 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.639 +Version: 0.0.640 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 832e9b7c753b13e7088d3d931b1b945786bb9b0c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 14 Apr 2025 17:33:44 +0000 Subject: [PATCH 0716/2977] bump: flutter --- anda/devs/flutter/flutter.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/flutter/flutter.spec b/anda/devs/flutter/flutter.spec index d38b1691f9..0d6efe9b4a 100644 --- a/anda/devs/flutter/flutter.spec +++ b/anda/devs/flutter/flutter.spec @@ -1,5 +1,5 @@ Name: flutter -Version: 3.29.2 +Version: 3.29.3 Release: 1%?dist Summary: SDK for crafting beautiful, fast user experiences from a single codebase License: BSD-3-Clause From c1115105e10f8fa569c1ca8e630dd65ac3393fae Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 14 Apr 2025 18:26:45 +0000 Subject: [PATCH 0717/2977] bump: subtitleedit --- anda/apps/subtitleedit/subtitleedit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/subtitleedit/subtitleedit.spec b/anda/apps/subtitleedit/subtitleedit.spec index 134bc7f3c6..fbaa7d61c9 100644 --- a/anda/apps/subtitleedit/subtitleedit.spec +++ b/anda/apps/subtitleedit/subtitleedit.spec @@ -2,7 +2,7 @@ %global realname subtitleedit Name: %realname.bin -Version: 4.0.11 +Version: 4.0.12 Release: 1%?dist Summary: An advanced subtitle editor and converter License: GPL-3.0-only From 3144c05227dbc50fb7515eb10bf9ab6907e23b2c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 14 Apr 2025 19:20:01 +0000 Subject: [PATCH 0718/2977] bump: sops --- anda/tools/sops/sops.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/sops/sops.spec b/anda/tools/sops/sops.spec index 77db1e0aa9..57363ed205 100644 --- a/anda/tools/sops/sops.spec +++ b/anda/tools/sops/sops.spec @@ -1,6 +1,6 @@ %define debug_package %nil Name: sops -Version: 3.10.1 +Version: 3.10.2 Release: 1%?dist Summary: Simple and flexible tool for managing secrets License: MPL-2.0 From cf615e1ec8fe8800e87549e6867d03d51d7a6a88 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 14 Apr 2025 21:23:28 +0000 Subject: [PATCH 0719/2977] bump: preview stable --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 1451b2f9a7..b179dce9b5 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.182.6-pre +%global ver 0.182.7-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 72614c0c31..6171cea8bf 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.181.6 +Version: 0.181.7 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From 761902237dbc3ed0a0490625e9c3b788551ba960 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 14 Apr 2025 22:24:18 +0000 Subject: [PATCH 0720/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 4697f7846a..a5ac2e8f1a 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.640 +Version: 0.0.641 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 4fd694d669..213d6b3653 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.640 +Version: 0.0.641 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 4a29a0542f0ecb3c322c12deb612cf2886f036cc Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 14 Apr 2025 23:45:33 +0000 Subject: [PATCH 0721/2977] bump: discord-openasar discord --- anda/apps/discord-openasar/discord-openasar.spec | 2 +- anda/apps/discord/discord.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-openasar/discord-openasar.spec b/anda/apps/discord-openasar/discord-openasar.spec index 269959579d..4d8119e35a 100644 --- a/anda/apps/discord-openasar/discord-openasar.spec +++ b/anda/apps/discord-openasar/discord-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-openasar -Version: 0.0.90 +Version: 0.0.89 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord/discord.spec b/anda/apps/discord/discord.spec index e4d6d85f1d..a32a0edaf6 100644 --- a/anda/apps/discord/discord.spec +++ b/anda/apps/discord/discord.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord -Version: 0.0.90 +Version: 0.0.89 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: https://discord.com From 08b9c41e319bfd400c11979b24cedb567cd7a2b8 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 15 Apr 2025 01:38:37 +0000 Subject: [PATCH 0722/2977] bump: ruffle mise --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 4f4287a353..26de8682c6 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-14 +%global ver 2025-04-15 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index 67812c9404..5ffc8d4d7e 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.4.2 +Version: 2025.4.3 Release: 1%?dist Summary: Front-end to your dev env From f8e65aa4468f98433d28932056f129534c05bf0a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 15 Apr 2025 01:47:35 +0000 Subject: [PATCH 0723/2977] bump(nightly): nightly nightly prismlauncher-nightly openbangla-keyboard --- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 6 +++--- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- .../openbangla-keyboard/openbangla-keyboard-nightly.spec | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 5602a5a0b4..465211c7c5 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit f7394c00c12543742185d8ed682d64d2d6fa1586 +%global commit 4aa875bbf641d9c31619217b3dc373d734986247 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-04-13 +%global fulldate 2025-04-14 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 0bf3dd4da0..966e9b7a0f 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,7 +1,7 @@ -%global commit 128779f6155ed9a48929b6eac23b10327a15fffb +%global commit fc1252b0cd5ab50d6f206cbf9258bee6738715a7 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250414 -%global ver 0.182.0 +%global commit_date 20250415 +%global ver 0.183.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index c4ccc8661b..ed887f739f 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 42007290a0b86a7cd25af06da0f8ba16211e2eae +%global commit 41a790d2581764e431f76b36b7d1bf98bcf55d84 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250414 +%global commit_date 20250415 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/misc/openbangla-keyboard/openbangla-keyboard-nightly.spec b/anda/misc/openbangla-keyboard/openbangla-keyboard-nightly.spec index 7fa49e0382..4b6bdb3026 100644 --- a/anda/misc/openbangla-keyboard/openbangla-keyboard-nightly.spec +++ b/anda/misc/openbangla-keyboard/openbangla-keyboard-nightly.spec @@ -1,6 +1,6 @@ %global ver 2.0.0 -%global commit 048372f1dcd01e915373565730e930f541482061 -%global commit_date 20250318 +%global commit 4219a7a6c7a35591713a8624e8a50ef172b9dba1 +%global commit_date 20250415 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: openbangla-keyboard-nightly From 8ccb392473eb3143f63ad9a157e723d95b96c9ed Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 15 Apr 2025 02:57:38 +0000 Subject: [PATCH 0724/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index 5ffc8d4d7e..fb29c8024b 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.4.3 +Version: 2025.4.4 Release: 1%?dist Summary: Front-end to your dev env From ee1e29c7823ef299a876645f0161c61c3808407e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 15 Apr 2025 07:18:51 +0000 Subject: [PATCH 0725/2977] bump: zellij --- anda/langs/rust/zellij/rust-zellij.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/rust/zellij/rust-zellij.spec b/anda/langs/rust/zellij/rust-zellij.spec index 65aa0e5789..7f607f892c 100644 --- a/anda/langs/rust/zellij/rust-zellij.spec +++ b/anda/langs/rust/zellij/rust-zellij.spec @@ -5,7 +5,7 @@ %global crate zellij Name: rust-zellij -Version: 0.42.1 +Version: 0.42.2 Release: 1%?dist Summary: Terminal workspace with batteries included From 01a1eb6e79c0f9815c30d9db4b52b333e2fbb170 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 15 Apr 2025 10:44:47 +0000 Subject: [PATCH 0726/2977] bump: preview stable --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index b179dce9b5..70f8482e58 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.182.7-pre +%global ver 0.182.8-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 6171cea8bf..6b00d2574c 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.181.7 +Version: 0.181.8 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From 5e2b26e3ca591d9a29ea835992bd747b3bc2964a Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 15 Apr 2025 08:09:15 -0500 Subject: [PATCH 0727/2977] fix(xpadneo): Hardcode obsolete version (#4310) * fix(xpadneo): Hardcode obsolete version Signed-off-by: Gilver * Update xpadneo.spec Signed-off-by: Gilver * Was waiting on CI but uhhhh bump release Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/system/xpadneo/kmod-common/xpadneo.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/system/xpadneo/kmod-common/xpadneo.spec b/anda/system/xpadneo/kmod-common/xpadneo.spec index e56e31b92d..7aad7b753d 100644 --- a/anda/system/xpadneo/kmod-common/xpadneo.spec +++ b/anda/system/xpadneo/kmod-common/xpadneo.spec @@ -5,7 +5,7 @@ Name: xpadneo Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 1%?dist +Release: 2%?dist Summary: Advanced Linux Driver for Xbox One Wireless Gamepad common files License: GPL-3.0 URL: https://atar-axis.github.io/%{name} @@ -15,7 +15,7 @@ BuildRequires: sed BuildRequires: systemd-rpm-macros Requires: (akmod-%{name} = %{?epoch:%{epoch}:}%{version} or dkms-%{name} = %{?epoch:%{epoch}:}%{version}) Provides: %{name}-kmod-common = %{?epoch:%{epoch}:}%{version} -Obsoletes: %{name}-kmod-common < %{?epoch:%{epoch}:}%{version}-3%{?dist} +Obsoletes: %{name}-kmod-common < %{?epoch:%{epoch}:}0.9.7^20241224git.8d20a23-4%{?dist} BuildArch: noarch Packager: Gilver E. From 85c8dd16775ea8c5e7be1991f4190e3ed5ac3d0f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 15 Apr 2025 14:19:07 +0000 Subject: [PATCH 0728/2977] bump: tdlib --- anda/lib/tdlib/tdlib-nightly.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 90df776cbd..73633bafda 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,6 +1,6 @@ -%global commit 04adfc87deea4c804def118e88c89a08c388b32b +%global commit ec42a570737be64397632eba84b5e0916e2c8388 %global ver 1.8.47 -%global commit_date 20250413 +%global commit_date 20250415 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: tdlib-nightly From f7173527093a7ccc9e5f172d6fc0cbfa7bc166d1 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 15 Apr 2025 15:19:44 +0000 Subject: [PATCH 0729/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index a5ac2e8f1a..eb300a1393 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.641 +Version: 0.0.642 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 213d6b3653..0cf94afe27 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.641 +Version: 0.0.642 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 9dd520f04a9d17a3999973ced9b7c0bf7d5edca1 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 15 Apr 2025 15:37:53 +0000 Subject: [PATCH 0730/2977] bump: tdlib --- anda/lib/tdlib/tdlib-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 73633bafda..656961130f 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,4 +1,4 @@ -%global commit ec42a570737be64397632eba84b5e0916e2c8388 +%global commit f1b7500310baa496c0b779e4273a3aff0f14f42f %global ver 1.8.47 %global commit_date 20250415 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From e78c6fbf3eafba22ba256adeb1c9f4cf9a94d7c0 Mon Sep 17 00:00:00 2001 From: madomado Date: Wed, 16 Apr 2025 00:32:53 +0800 Subject: [PATCH 0731/2977] fix(gnome-shell): rename back without .switcheroo tag suffix (#4305) * fix(gnome-shell): rename back without .switcheroo tag suffix Signed-off-by: madomado * Update gnome-shell.spec Signed-off-by: madomado --------- Signed-off-by: madomado --- anda/desktops/gnome/gnome-shell/gnome-shell.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/anda/desktops/gnome/gnome-shell/gnome-shell.spec b/anda/desktops/gnome/gnome-shell/gnome-shell.spec index 3713bc283c..1195f5e2a1 100644 --- a/anda/desktops/gnome/gnome-shell/gnome-shell.spec +++ b/anda/desktops/gnome/gnome-shell/gnome-shell.spec @@ -8,12 +8,13 @@ %global portal_helper 1 %endif -Name: gnome-shell.switcheroo +Name: gnome-shell Version: %{major_version}.%{minor_version} -Release: 1%{?dist}.switcheroo +Release: 2%{?dist}.switcheroo Summary: Window management and application launching for GNOME -Provides: gnome-shell = %version-%release +Provides: gnome-shell.switcheroo = %version-%release +Obsoletes: gnome-shell.switcheroo <= 47.3-2 License: GPL-2.0-or-later URL: https://wiki.gnome.org/Projects/GnomeShell Source0: https://download.gnome.org/sources/gnome-shell/%{major_version}/gnome-shell-%{tarball_version}.tar.xz From 96a0c8d3aa29d727b2e90e7e826ad3dd0a8606c0 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 15 Apr 2025 16:44:00 +0000 Subject: [PATCH 0732/2977] bump(branch): gnome-shell --- anda/desktops/gnome/gnome-shell/gnome-shell.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/gnome/gnome-shell/gnome-shell.spec b/anda/desktops/gnome/gnome-shell/gnome-shell.spec index 1195f5e2a1..57d94ca68a 100644 --- a/anda/desktops/gnome/gnome-shell/gnome-shell.spec +++ b/anda/desktops/gnome/gnome-shell/gnome-shell.spec @@ -10,7 +10,7 @@ Name: gnome-shell Version: %{major_version}.%{minor_version} -Release: 2%{?dist}.switcheroo +Release: 1%{?dist}.switcheroo Summary: Window management and application launching for GNOME Provides: gnome-shell.switcheroo = %version-%release From 7c1d8f31d91ed981b9a3c52d54d813870db220b3 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Tue, 15 Apr 2025 10:31:53 -0700 Subject: [PATCH 0733/2977] fix(kf6-kio): rename back without .switcheroo tag suffix (#4316) (#4320) * fix(kf6-kio): rename back without .switcheroo tag suffix Signed-off-by: madomado * Update kf6-kio.spec Signed-off-by: madomado --------- Signed-off-by: madomado (cherry picked from commit 29f55b72368bd47be0c9a5c7e260b358eed65dc4) Co-authored-by: madomado --- anda/desktops/kde/kf6-kio/kf6-kio.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/anda/desktops/kde/kf6-kio/kf6-kio.spec b/anda/desktops/kde/kf6-kio/kf6-kio.spec index 2fb6fae601..eb615ef449 100644 --- a/anda/desktops/kde/kf6-kio/kf6-kio.spec +++ b/anda/desktops/kde/kf6-kio/kf6-kio.spec @@ -3,11 +3,14 @@ %global stable_kf6 stable %global majmin_ver_kf6 6.13 -Name: kf6-%{framework}.switcheroo +Name: kf6-%{framework} Version: %{majmin_ver_kf6}.0 -Release: 1%{?dist}.switcheroo +Release: 2%{?dist}.switcheroo Summary: KDE Frameworks 6 Tier 3 solution for filesystem abstraction +Provides: kf6-%{framework}.switcheroo = %version-%release +Obsoletes: kf6-%{framework}.switcheroo < 6.13.0-2 + License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT URL: https://invent.kde.org/frameworks/%{framework} From 6159cb5d77d264de9829a5c858819cfb86e80b74 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 15 Apr 2025 17:38:24 +0000 Subject: [PATCH 0734/2977] bump(branch): kf6-kio --- anda/desktops/kde/kf6-kio/kf6-kio.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/kde/kf6-kio/kf6-kio.spec b/anda/desktops/kde/kf6-kio/kf6-kio.spec index eb615ef449..39a0e0e4e2 100644 --- a/anda/desktops/kde/kf6-kio/kf6-kio.spec +++ b/anda/desktops/kde/kf6-kio/kf6-kio.spec @@ -5,7 +5,7 @@ Name: kf6-%{framework} Version: %{majmin_ver_kf6}.0 -Release: 2%{?dist}.switcheroo +Release: 1%{?dist}.switcheroo Summary: KDE Frameworks 6 Tier 3 solution for filesystem abstraction Provides: kf6-%{framework}.switcheroo = %version-%release From 43aeb9e58f75c34a72ec1b7ddfb7983d81080ae2 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 15 Apr 2025 20:27:55 +0000 Subject: [PATCH 0735/2977] bump: discord-ptb-openasar discord-ptb --- anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec | 2 +- anda/apps/discord-ptb/discord-ptb.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec index 8589146088..2dd5fbcaea 100644 --- a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec +++ b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-ptb-openasar -Version: 0.0.136 +Version: 0.0.137 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-ptb/discord-ptb.spec b/anda/apps/discord-ptb/discord-ptb.spec index 16f1bc22c9..4506528815 100644 --- a/anda/apps/discord-ptb/discord-ptb.spec +++ b/anda/apps/discord-ptb/discord-ptb.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-ptb -Version: 0.0.136 +Version: 0.0.137 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers. URL: https://discord.com From b988cf8f9968740571ad59349e6b87a14ff57d0d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 15 Apr 2025 21:18:10 +0000 Subject: [PATCH 0736/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 70f8482e58..d3bc34ba75 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.182.8-pre +%global ver 0.182.9-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From d8db7b9ca2bc229c1a46c6edc32457f535c5a15b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 15 Apr 2025 23:48:16 +0000 Subject: [PATCH 0737/2977] bump: discord-openasar discord --- anda/apps/discord-openasar/discord-openasar.spec | 2 +- anda/apps/discord/discord.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-openasar/discord-openasar.spec b/anda/apps/discord-openasar/discord-openasar.spec index 4d8119e35a..3c4390e0c9 100644 --- a/anda/apps/discord-openasar/discord-openasar.spec +++ b/anda/apps/discord-openasar/discord-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-openasar -Version: 0.0.89 +Version: 0.0.91 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord/discord.spec b/anda/apps/discord/discord.spec index a32a0edaf6..4141ee16b1 100644 --- a/anda/apps/discord/discord.spec +++ b/anda/apps/discord/discord.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord -Version: 0.0.89 +Version: 0.0.91 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: https://discord.com From 3eaa772b5aee7b0da2d6093420ff9533ab3439d0 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 16 Apr 2025 01:47:10 +0000 Subject: [PATCH 0738/2977] bump(nightly): mpv nightly micro nightly prismlauncher-nightly nim-nightly openbangla-keyboard kmod-common rpi-update rpi-utils --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/micro/micro-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- .../misc/openbangla-keyboard/openbangla-keyboard-nightly.spec | 4 ++-- anda/system/xone/kmod-common/xone.spec | 4 ++-- anda/tools/rpi-update/rpi-update.spec | 4 ++-- anda/tools/rpi-utils/rpi-utils.spec | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 1df210430a..564e73e5df 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 27c08affb14daaaa0ae156dcc073b411296264f1 +%global commit 4697f7cb86c2e39175276ae5586f37da96f3a135 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250414 +%global commit_date 20250416 %global ver 0.40.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 465211c7c5..6d5101bdec 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 4aa875bbf641d9c31619217b3dc373d734986247 +%global commit 2bcd76c3d9a61c277d5dcaef936ce62cab5adcee %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-04-14 +%global fulldate 2025-04-15 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 diff --git a/anda/devs/micro/micro-nightly.spec b/anda/devs/micro/micro-nightly.spec index 3fa483289e..156ebdbbb4 100644 --- a/anda/devs/micro/micro-nightly.spec +++ b/anda/devs/micro/micro-nightly.spec @@ -12,8 +12,8 @@ # Naming variable as something other than "commit" is necessary # to stop %%gometa from putting commit hash in release -%global commit_hash b88300ef7f0a5756520094194dd1c83b5f8130c3 -%global commit_date 20250413 +%global commit_hash 79fe4ae3e3965e8d55e259b392f6357f1da88526 +%global commit_date 20250416 %global shortcommit %{sub %{commit_hash} 1 7} %global ver 2.0.14 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 966e9b7a0f..a48be8a682 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit fc1252b0cd5ab50d6f206cbf9258bee6738715a7 +%global commit 1eb948654a5f0686bbf73f4b62d83d9c999c236e %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250415 +%global commit_date 20250416 %global ver 0.183.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index ed887f739f..8b4ef33bc7 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 41a790d2581764e431f76b36b7d1bf98bcf55d84 +%global commit df15aacfbb49a72585a5f867febec5ab4319cdfb %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250415 +%global commit_date 20250416 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 1f452f9c93..7f4af21869 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 4d9e5e8b6d15107c3de5e7fc2b1c974437ef1cab +%global commit c06bb6cc03f1a42d515949967c0c9f267e971d04 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250414 +%global commit_date 20250416 %global debug_package %nil Name: nim-nightly diff --git a/anda/misc/openbangla-keyboard/openbangla-keyboard-nightly.spec b/anda/misc/openbangla-keyboard/openbangla-keyboard-nightly.spec index 4b6bdb3026..b23666fc81 100644 --- a/anda/misc/openbangla-keyboard/openbangla-keyboard-nightly.spec +++ b/anda/misc/openbangla-keyboard/openbangla-keyboard-nightly.spec @@ -1,6 +1,6 @@ %global ver 2.0.0 -%global commit 4219a7a6c7a35591713a8624e8a50ef172b9dba1 -%global commit_date 20250415 +%global commit 7072f4c27c29975de36e0480b72a122538d9c29d +%global commit_date 20250416 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: openbangla-keyboard-nightly diff --git a/anda/system/xone/kmod-common/xone.spec b/anda/system/xone/kmod-common/xone.spec index 35f7185704..25597b192d 100644 --- a/anda/system/xone/kmod-common/xone.spec +++ b/anda/system/xone/kmod-common/xone.spec @@ -1,6 +1,6 @@ -%global commit 5e44361880265bc5b0d9645785d3de65ef0b86cf +%global commit ffe1251c7c518574bf409f7e915fab8c532544c0 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20250414 +%global commitdate 20250416 %global ver 0.3 %global _dracutconfdir %{_prefix}/lib/dracut/dracut.conf.d %global firmware_hash 48084d9fa53b9bb04358f3bb127b7495dc8f7bb0b3ca1437bd24ef2b6eabdf66 diff --git a/anda/tools/rpi-update/rpi-update.spec b/anda/tools/rpi-update/rpi-update.spec index 147fa46ddb..1b04838d83 100644 --- a/anda/tools/rpi-update/rpi-update.spec +++ b/anda/tools/rpi-update/rpi-update.spec @@ -1,7 +1,7 @@ %define debug_package %nil -%global commit bb117f13b1a39b646f6ebebdbb5193bee4a24855 -%global commit_date 20250326 +%global commit 5114bb59da5db8c3725966e8f7a2f7b8a158b15a +%global commit_date 20250416 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: rpi-update diff --git a/anda/tools/rpi-utils/rpi-utils.spec b/anda/tools/rpi-utils/rpi-utils.spec index 922de1a6c4..84cf27b23e 100644 --- a/anda/tools/rpi-utils/rpi-utils.spec +++ b/anda/tools/rpi-utils/rpi-utils.spec @@ -1,5 +1,5 @@ -%global commit 358ac7085d6a9c3d4ffa62e03c23c8671904c3ec -%global commit_date 20250412 +%global commit 1050bf173e89501724eb83200ebbffada42f9408 +%global commit_date 20250416 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define _unpackaged_files_terminate_build 0 From ed29934d0706632fc7b97181e6dad1b7d70687f9 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 16 Apr 2025 02:01:45 +0000 Subject: [PATCH 0739/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 26de8682c6..2bf935e8c1 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-15 +%global ver 2025-04-16 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 8db598ad1bc07f50d117bfe95fb42a3b11c7fd87 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 16 Apr 2025 02:48:41 +0000 Subject: [PATCH 0740/2977] bump(branch): akmod dkms --- anda/system/xone/akmod/xone-kmod.spec | 4 ++-- anda/system/xone/dkms/dkms-xone.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index 740c8eac9a..9ecaccaf2c 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -1,6 +1,6 @@ -%global commit 5e44361880265bc5b0d9645785d3de65ef0b86cf +%global commit ffe1251c7c518574bf409f7e915fab8c532544c0 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20250414 +%global commitdate 20250416 %global ver 0.3 %define buildforkernels akmod %global debug_package %{nil} diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index 27196d8433..602035e7c7 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -1,6 +1,6 @@ -%global commit 5e44361880265bc5b0d9645785d3de65ef0b86cf +%global commit ffe1251c7c518574bf409f7e915fab8c532544c0 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20250414 +%global commitdate 20250416 %global ver 0.3 %global debug_package %{nil} %global modulename xone From bd5db90b4635ab923c4e918091f5530cd16601c7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 16 Apr 2025 03:44:59 +0000 Subject: [PATCH 0741/2977] bump: readymade --- anda/system/readymade/readymade.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/readymade/readymade.spec b/anda/system/readymade/readymade.spec index a526942863..2b9d11d196 100644 --- a/anda/system/readymade/readymade.spec +++ b/anda/system/readymade/readymade.spec @@ -1,5 +1,5 @@ Name: readymade -Version: 0.11.2 +Version: 0.12.0 Release: 1%?dist Summary: Install ready-made distribution images! License: MIT From d60d1a3ac1261d4c2e04769cbf1c02ae6b73d821 Mon Sep 17 00:00:00 2001 From: madomado Date: Wed, 16 Apr 2025 12:30:06 +0800 Subject: [PATCH 0742/2977] bump: readymade (#4324) Signed-off-by: madomado --- anda/system/readymade/readymade.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/anda/system/readymade/readymade.spec b/anda/system/readymade/readymade.spec index 2b9d11d196..0f7a5c6f07 100644 --- a/anda/system/readymade/readymade.spec +++ b/anda/system/readymade/readymade.spec @@ -1,8 +1,8 @@ Name: readymade Version: 0.12.0 -Release: 1%?dist +Release: 2%?dist Summary: Install ready-made distribution images! -License: MIT +License: GPL-3.0-or-later URL: https://github.com/FyraLabs/readymade Source0: %{url}/archive/refs/tags/v%{version}.tar.gz BuildRequires: anda-srpm-macros rust-packaging mold @@ -21,7 +21,6 @@ It is created as a replacement to Red Hat's Anaconda installer. %package config-ultramarine Summary: Readymade Configuration for Ultramarine Linux -License: MIT Requires: readymade Provides: readymade-config @@ -40,13 +39,13 @@ This package contains the configuration files for Readymade to install Ultramari ./install.sh %buildroot ln -sf %{_datadir}/applications/com.fyralabs.Readymade.desktop %{buildroot}%{_datadir}/applications/liveinst.desktop -%find_lang com.fyralabs.Readymade %files config-ultramarine %_sysconfdir/readymade.toml -%files -f com.fyralabs.Readymade.lang +%files +%license LICENSE %_bindir/readymade %_datadir/polkit-1/actions/com.fyralabs.pkexec.readymade.policy %_datadir/applications/com.fyralabs.Readymade.desktop From 812bccd4d3ab35e3e906d36a1d097664c97e978c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 16 Apr 2025 08:26:20 +0000 Subject: [PATCH 0743/2977] bump: dwarfs --- anda/lib/dwarfs/dwarfs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/dwarfs/dwarfs.spec b/anda/lib/dwarfs/dwarfs.spec index 5dc53e1901..a8136995da 100644 --- a/anda/lib/dwarfs/dwarfs.spec +++ b/anda/lib/dwarfs/dwarfs.spec @@ -4,7 +4,7 @@ The Deduplicating Warp-speed Advanced Read-only File System. A fast high compression read-only file system for Linux and Windows.} Name: dwarfs -Version: 0.12.1 +Version: 0.12.2 Release: 1%?dist Summary: A fast high compression read-only file system for Linux, Windows and macOS License: GPL-3.0-or-later From f1d19159818bba43dc767061b6c72dda6cb622b4 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 16 Apr 2025 13:28:49 +0000 Subject: [PATCH 0744/2977] bump: mesa --- anda/lib/mesa/mesa.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index 297d16abca..74e3212f20 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -75,7 +75,7 @@ Summary: Mesa graphics libraries # This should not break anything by default as the Mesa stream is ***EXPLICITLY*** # disabled by default, and has to be enabled manually. See `terra/release/terra-mesa.repo` for details. Epoch: 1 -Version: 25.0.3 +Version: branchpoint Release: 1%?dist License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org From fd9c778bd44740f5e3631ac5ebda095d0c3c449d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 16 Apr 2025 13:46:21 +0000 Subject: [PATCH 0745/2977] bump: preview stable --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index d3bc34ba75..8ef3b1009a 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.182.9-pre +%global ver 0.182.9 # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 6b00d2574c..f037c7b649 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.181.8 +Version: 0.182.9 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From e725048da9af237711d72ea1f6cf95e9282342ae Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 16 Apr 2025 14:39:29 +0000 Subject: [PATCH 0746/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 8ef3b1009a..07509a8aab 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.182.9 +%global ver 0.183.0-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From a3f06e7ff6282ad6bbc9c911520e43a970369e06 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 16 Apr 2025 15:55:58 +0000 Subject: [PATCH 0747/2977] bump: compat-nvidia-repo dkms-nvidia nvidia-driver nvidia-kmod-common nvidia-kmod nvidia-modprobe nvidia-persistenced nvidia-settings nvidia-xconfig --- anda/lib/nvidia/compat-nvidia-repo/compat-nvidia-repo.spec | 2 +- anda/system/nvidia/dkms-nvidia/dkms-nvidia.spec | 4 ++-- anda/system/nvidia/nvidia-driver/nvidia-driver.spec | 2 +- anda/system/nvidia/nvidia-kmod-common/nvidia-kmod-common.spec | 2 +- anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec | 2 +- anda/system/nvidia/nvidia-modprobe/nvidia-modprobe.spec | 2 +- .../nvidia/nvidia-persistenced/nvidia-persistenced.spec | 2 +- anda/system/nvidia/nvidia-settings/nvidia-settings.spec | 2 +- anda/system/nvidia/nvidia-xconfig/nvidia-xconfig.spec | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/anda/lib/nvidia/compat-nvidia-repo/compat-nvidia-repo.spec b/anda/lib/nvidia/compat-nvidia-repo/compat-nvidia-repo.spec index 98ab04cc4f..4411d1e5fa 100644 --- a/anda/lib/nvidia/compat-nvidia-repo/compat-nvidia-repo.spec +++ b/anda/lib/nvidia/compat-nvidia-repo/compat-nvidia-repo.spec @@ -1,5 +1,5 @@ Name: compat-nvidia-repo -Version: 570.133.07 +Version: 575.51.02 Epoch: 3 Release: 1%?dist Summary: Compatibility package required by official CUDA packages diff --git a/anda/system/nvidia/dkms-nvidia/dkms-nvidia.spec b/anda/system/nvidia/dkms-nvidia/dkms-nvidia.spec index 658042d5cf..17a866c2a7 100644 --- a/anda/system/nvidia/dkms-nvidia/dkms-nvidia.spec +++ b/anda/system/nvidia/dkms-nvidia/dkms-nvidia.spec @@ -4,8 +4,8 @@ %global modulename nvidia Name: dkms-%{modulename} -Version: 570.133.07 -Release: 1%{?dist} +Version: 575.51.02 +Release: 1%?dist Summary: NVIDIA display driver kernel module Epoch: 3 License: NVIDIA License diff --git a/anda/system/nvidia/nvidia-driver/nvidia-driver.spec b/anda/system/nvidia/nvidia-driver/nvidia-driver.spec index 399d1fa899..f1dfdb241c 100644 --- a/anda/system/nvidia/nvidia-driver/nvidia-driver.spec +++ b/anda/system/nvidia/nvidia-driver/nvidia-driver.spec @@ -9,7 +9,7 @@ %endif Name: nvidia-driver -Version: 570.133.07 +Version: 575.51.02 Release: 1%?dist Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Epoch: 3 diff --git a/anda/system/nvidia/nvidia-kmod-common/nvidia-kmod-common.spec b/anda/system/nvidia/nvidia-kmod-common/nvidia-kmod-common.spec index 481f74c369..d639aff4e9 100644 --- a/anda/system/nvidia/nvidia-kmod-common/nvidia-kmod-common.spec +++ b/anda/system/nvidia/nvidia-kmod-common/nvidia-kmod-common.spec @@ -7,7 +7,7 @@ %global __strip /bin/true Name: nvidia-kmod-common -Version: 570.133.07 +Version: 575.51.02 Release: 1%?dist Summary: Common file for NVIDIA's proprietary driver kernel modules Epoch: 3 diff --git a/anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec b/anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec index b3b105a003..34345a3d90 100644 --- a/anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec +++ b/anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec @@ -4,7 +4,7 @@ %global debug_package %{nil} Name: nvidia-kmod -Version: 570.133.07 +Version: 575.51.02 Release: 1%?dist Summary: NVIDIA display driver kernel module Epoch: 3 diff --git a/anda/system/nvidia/nvidia-modprobe/nvidia-modprobe.spec b/anda/system/nvidia/nvidia-modprobe/nvidia-modprobe.spec index d4dd58e8fb..50f73378a8 100644 --- a/anda/system/nvidia/nvidia-modprobe/nvidia-modprobe.spec +++ b/anda/system/nvidia/nvidia-modprobe/nvidia-modprobe.spec @@ -1,5 +1,5 @@ Name: nvidia-modprobe -Version: 570.133.07 +Version: 575.51.02 Release: 1%?dist Summary: NVIDIA kernel module loader Epoch: 3 diff --git a/anda/system/nvidia/nvidia-persistenced/nvidia-persistenced.spec b/anda/system/nvidia/nvidia-persistenced/nvidia-persistenced.spec index 2fc9a67972..2a0302c6d1 100644 --- a/anda/system/nvidia/nvidia-persistenced/nvidia-persistenced.spec +++ b/anda/system/nvidia/nvidia-persistenced/nvidia-persistenced.spec @@ -1,5 +1,5 @@ Name: nvidia-persistenced -Version: 570.133.07 +Version: 575.51.02 Release: 1%?dist Summary: A daemon to maintain persistent software state in the NVIDIA driver Epoch: 3 diff --git a/anda/system/nvidia/nvidia-settings/nvidia-settings.spec b/anda/system/nvidia/nvidia-settings/nvidia-settings.spec index 78ca2ad729..925fdcd15b 100644 --- a/anda/system/nvidia/nvidia-settings/nvidia-settings.spec +++ b/anda/system/nvidia/nvidia-settings/nvidia-settings.spec @@ -1,5 +1,5 @@ Name: nvidia-settings -Version: 570.133.07 +Version: 575.51.02 Release: 1%?dist Summary: Configure the NVIDIA graphics driver Epoch: 3 diff --git a/anda/system/nvidia/nvidia-xconfig/nvidia-xconfig.spec b/anda/system/nvidia/nvidia-xconfig/nvidia-xconfig.spec index f17dc8d421..a23874a971 100644 --- a/anda/system/nvidia/nvidia-xconfig/nvidia-xconfig.spec +++ b/anda/system/nvidia/nvidia-xconfig/nvidia-xconfig.spec @@ -1,5 +1,5 @@ Name: nvidia-xconfig -Version: 570.133.07 +Version: 575.51.02 Release: 1%?dist Summary: NVIDIA X configuration file editor Epoch: 3 From cfe59c408af7b6ca9d325662e213c755c2725cfe Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 17 Apr 2025 02:03:52 +0800 Subject: [PATCH 0748/2977] add: eza (#4325) --- anda/langs/rust/eza/anda.hcl | 5 + .../langs/rust/eza/eza-fix-metadata-auto.diff | 16 ++ anda/langs/rust/eza/rust-eza.spec | 190 ++++++++++++++++++ anda/langs/rust/eza/update.rhai | 1 + 4 files changed, 212 insertions(+) create mode 100644 anda/langs/rust/eza/anda.hcl create mode 100644 anda/langs/rust/eza/eza-fix-metadata-auto.diff create mode 100644 anda/langs/rust/eza/rust-eza.spec create mode 100644 anda/langs/rust/eza/update.rhai diff --git a/anda/langs/rust/eza/anda.hcl b/anda/langs/rust/eza/anda.hcl new file mode 100644 index 0000000000..07d9abe8bc --- /dev/null +++ b/anda/langs/rust/eza/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "rust-eza.spec" + } +} diff --git a/anda/langs/rust/eza/eza-fix-metadata-auto.diff b/anda/langs/rust/eza/eza-fix-metadata-auto.diff new file mode 100644 index 0000000000..0db687abb9 --- /dev/null +++ b/anda/langs/rust/eza/eza-fix-metadata-auto.diff @@ -0,0 +1,16 @@ +--- eza-0.21.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ eza-0.21.0/Cargo.toml 2025-04-16T03:47:21.617301+00:00 +@@ -231,12 +231,6 @@ + [target.'cfg(target_os = "linux")'.dependencies.proc-mounts] + version = "0.3" + +-[target.'cfg(target_os = "windows")'.dependencies.windows-sys] +-version = "0.59.0" +-features = [ +- "Win32_System_Console", +- "Win32_Foundation", +-] +- + [target."cfg(unix)".dependencies.uzers] + version = "0.12.1" ++ diff --git a/anda/langs/rust/eza/rust-eza.spec b/anda/langs/rust/eza/rust-eza.spec new file mode 100644 index 0000000000..e31f15c57f --- /dev/null +++ b/anda/langs/rust/eza/rust-eza.spec @@ -0,0 +1,190 @@ +# Generated by rust2rpm 27 +%bcond check 1 + +%global crate eza + +Name: rust-eza +Version: 0.21.0 +Release: 1%?dist +Summary: Modern replacement for ls + +License: EUPL-1.2 +URL: https://crates.io/crates/eza +Source: %{crates_source} +# Automatically generated patch to strip dependencies and normalize metadata +Patch: eza-fix-metadata-auto.diff + +BuildRequires: anda-srpm-macros cargo-rpm-macros >= 24 + +%global _description %{expand: +A modern replacement for ls.} + +%description %{_description} + +%package -n %{crate} +Summary: %{summary} +License: (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND EUPL-1.2 AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR CC0-1.0) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND Unicode-3.0 AND (Unlicense OR MIT) +# LICENSE.dependencies contains a full license breakdown + +%description -n %{crate} %{_description} + +%files -n %{crate} +%license LICENSE.txt +%license LICENSES/CC-BY-4.0.txt +%license LICENSE.dependencies +%doc CHANGELOG.md +%doc CODE_OF_CONDUCT.md +%doc CONTRIBUTING.md +%doc INSTALL.md +%doc README.md +%doc SECURITY.md +%doc TESTING.md +%{_bindir}/eza + +%package devel +Summary: %{summary} +BuildArch: noarch + +%description devel %{_description} + +This package contains library source intended for building other packages which +use the "%{crate}" crate. + +%files devel +%license %{crate_instdir}/LICENSE.txt +%license %{crate_instdir}/LICENSES/CC-BY-4.0.txt +%doc %{crate_instdir}/CHANGELOG.md +%doc %{crate_instdir}/CODE_OF_CONDUCT.md +%doc %{crate_instdir}/CONTRIBUTING.md +%doc %{crate_instdir}/INSTALL.md +%doc %{crate_instdir}/README.md +%doc %{crate_instdir}/SECURITY.md +%doc %{crate_instdir}/TESTING.md +%{crate_instdir}/ + +%package -n %{name}+default-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+default-devel %{_description} + +This package contains library source intended for building other packages which +use the "default" feature of the "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+git-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+git-devel %{_description} + +This package contains library source intended for building other packages which +use the "git" feature of the "%{crate}" crate. + +%files -n %{name}+git-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+git2-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+git2-devel %{_description} + +This package contains library source intended for building other packages which +use the "git2" feature of the "%{crate}" crate. + +%files -n %{name}+git2-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+nix-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+nix-devel %{_description} + +This package contains library source intended for building other packages which +use the "nix" feature of the "%{crate}" crate. + +%files -n %{name}+nix-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+nix-generated-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+nix-generated-devel %{_description} + +This package contains library source intended for building other packages which +use the "nix-generated" feature of the "%{crate}" crate. + +%files -n %{name}+nix-generated-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+nix-local-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+nix-local-devel %{_description} + +This package contains library source intended for building other packages which +use the "nix-local" feature of the "%{crate}" crate. + +%files -n %{name}+nix-local-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+powertest-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+powertest-devel %{_description} + +This package contains library source intended for building other packages which +use the "powertest" feature of the "%{crate}" crate. + +%files -n %{name}+powertest-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+vendored-libgit2-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+vendored-libgit2-devel %{_description} + +This package contains library source intended for building other packages which +use the "vendored-libgit2" feature of the "%{crate}" crate. + +%files -n %{name}+vendored-libgit2-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+vendored-openssl-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+vendored-openssl-devel %{_description} + +This package contains library source intended for building other packages which +use the "vendored-openssl" feature of the "%{crate}" crate. + +%files -n %{name}+vendored-openssl-devel +%ghost %{crate_instdir}/Cargo.toml + +%prep +%autosetup -n %{crate}-%{version} -p1 +%cargo_prep_online + +%build +%{cargo_license_summary_online} +%{cargo_license_online} > LICENSE.dependencies + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%changelog +%autochangelog diff --git a/anda/langs/rust/eza/update.rhai b/anda/langs/rust/eza/update.rhai new file mode 100644 index 0000000000..ebffb9da1d --- /dev/null +++ b/anda/langs/rust/eza/update.rhai @@ -0,0 +1 @@ +rpm.version(crates("eza")); From 58e68674dd7eca8b90f1b409b17641c87d67a053 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 16 Apr 2025 18:35:49 +0000 Subject: [PATCH 0749/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index eb300a1393..40caf83e4e 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.642 +Version: 0.0.643 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 0cf94afe27..8b63dad56c 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.642 +Version: 0.0.643 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 50c45b3c4802375486e80d17874d2bfc27e0fb71 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 16 Apr 2025 18:51:32 +0000 Subject: [PATCH 0750/2977] bump: codium --- anda/devs/codium/codium.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/codium/codium.spec b/anda/devs/codium/codium.spec index 65c291f057..b83b45d802 100644 --- a/anda/devs/codium/codium.spec +++ b/anda/devs/codium/codium.spec @@ -12,7 +12,7 @@ %endif Name: codium -Version: 1.99.22418 +Version: 1.99.32562 Release: 1%?dist Summary: Code editing. Redefined. License: MIT From d5086267cb71978eaa051786bfe7f48dd47482a6 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 16 Apr 2025 20:27:59 +0000 Subject: [PATCH 0751/2977] bump: preview crystal --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/langs/crystal/crystal/crystal.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 07509a8aab..45970a1653 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.183.0-pre +%global ver 0.183.1-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/langs/crystal/crystal/crystal.spec b/anda/langs/crystal/crystal/crystal.spec index ab5250c788..08c7941c76 100644 --- a/anda/langs/crystal/crystal/crystal.spec +++ b/anda/langs/crystal/crystal/crystal.spec @@ -1,7 +1,7 @@ %define debug_package %nil Name: crystal -Version: 1.16.0 +Version: 1.16.1 Release: 1%?dist Summary: The Crystal Programming Language License: Apache-2.0 From 9691d48dedf9e9babfdda8ff9d1e6f08854120b1 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 17 Apr 2025 01:45:42 +0000 Subject: [PATCH 0752/2977] bump(nightly): mpv nightly prismlauncher-nightly nim-nightly rpi-utils --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 6 +++--- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/tools/rpi-utils/rpi-utils.spec | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 564e73e5df..48eed10117 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 4697f7cb86c2e39175276ae5586f37da96f3a135 +%global commit df1e71a7cc67c079f8012ac2ddd590a851652057 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250416 +%global commit_date 20250417 %global ver 0.40.0 Name: mpv-nightly diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index a48be8a682..02e42a991c 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,7 +1,7 @@ -%global commit 1eb948654a5f0686bbf73f4b62d83d9c999c236e +%global commit a7a7335da4ebeb6ebd5c644f108edf2441f7d77b %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250416 -%global ver 0.183.0 +%global commit_date 20250417 +%global ver 0.184.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 8b4ef33bc7..fe9bd16262 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit df15aacfbb49a72585a5f867febec5ab4319cdfb +%global commit 202095c4665d8cb2f3647e5f603e5864b572249e %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250416 +%global commit_date 20250417 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 7f4af21869..c88ccf7d7d 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit c06bb6cc03f1a42d515949967c0c9f267e971d04 +%global commit 3d14381473fd478432cb8fab04d0501b26db775b %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250416 +%global commit_date 20250417 %global debug_package %nil Name: nim-nightly diff --git a/anda/tools/rpi-utils/rpi-utils.spec b/anda/tools/rpi-utils/rpi-utils.spec index 84cf27b23e..f7622b5b5d 100644 --- a/anda/tools/rpi-utils/rpi-utils.spec +++ b/anda/tools/rpi-utils/rpi-utils.spec @@ -1,5 +1,5 @@ -%global commit 1050bf173e89501724eb83200ebbffada42f9408 -%global commit_date 20250416 +%global commit f92b9735ba3141103c73cd0bf9781644caa91e42 +%global commit_date 20250417 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define _unpackaged_files_terminate_build 0 From 1a79c6a7eefa50f20681f7a4a35242078daf88ac Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 17 Apr 2025 02:00:17 +0000 Subject: [PATCH 0753/2977] bump: ruffle mesa --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- anda/lib/mesa/mesa.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 2bf935e8c1..cd21f5400a 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-16 +%global ver 2025-04-17 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index 74e3212f20..0f6dbf0ada 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -75,7 +75,7 @@ Summary: Mesa graphics libraries # This should not break anything by default as the Mesa stream is ***EXPLICITLY*** # disabled by default, and has to be enabled manually. See `terra/release/terra-mesa.repo` for details. Epoch: 1 -Version: branchpoint +Version: 25.0.4 Release: 1%?dist License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org From 57af12839d64d6f59d268d234895d8b059e263e0 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 17 Apr 2025 07:35:24 +0000 Subject: [PATCH 0754/2977] bump: dart --- anda/langs/dart/dart.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/dart/dart.spec b/anda/langs/dart/dart.spec index 533c0f4e4f..4d7d253609 100644 --- a/anda/langs/dart/dart.spec +++ b/anda/langs/dart/dart.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: dart -Version: 3.7.2 +Version: 3.7.3 Release: 1%?dist Summary: The Dart Language License: BSD-3-Clause From 42b45294e0b8f73a24167e379bef9a40f0d52b16 Mon Sep 17 00:00:00 2001 From: Gilver Date: Thu, 17 Apr 2025 03:12:00 -0500 Subject: [PATCH 0755/2977] fix(nvidia-driver): Update spec for 575.51.02 (#4331) * fix(nvidia-driver): Update spec for 575.51.02 Signed-off-by: Gilver * Fixup requires Signed-off-by: Gilver --------- Signed-off-by: Gilver --- .../nvidia/nvidia-driver/nvidia-driver.spec | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/anda/system/nvidia/nvidia-driver/nvidia-driver.spec b/anda/system/nvidia/nvidia-driver/nvidia-driver.spec index f1dfdb241c..ccae6e4e9b 100644 --- a/anda/system/nvidia/nvidia-driver/nvidia-driver.spec +++ b/anda/system/nvidia/nvidia-driver/nvidia-driver.spec @@ -73,6 +73,9 @@ Requires: libglvnd-glx%{?_isa} >= 1.0 Requires: libglvnd-opengl%{?_isa} >= 1.0 Requires: libnvidia-ml%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: vulkan-loader +# dlopened +Requires: libnvidia-gpucomp%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: libnvidia-ml = %{?epoch:%{epoch}:}%{version}-%{release} Conflicts: nvidia-x11-drv-libs Conflicts: nvidia-x11-drv-470xx-libs @@ -91,6 +94,9 @@ Requires: libnvidia-ml = %{?epoch:%{epoch}:}%{version}-%{release} %ifarch x86_64 aarch64 Requires: libnvidia-cfg = %{?epoch:%{epoch}:}%{version}-%{release} %endif +# dlopened: +Requires: libnvidia-gpucomp%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: libnvidia-ml = %{?epoch:%{epoch}:}%{version}-%{release} Conflicts: xorg-x11-drv-nvidia-cuda-libs Conflicts: xorg-x11-drv-nvidia-470xx-cuda-libs @@ -102,7 +108,7 @@ This package provides the CUDA libraries for %{name}-cuda. Summary: NVIDIA OpenGL-based Framebuffer Capture libraries Provides: nvidia-driver-NvFBCOpenGL = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: nvidia-driver-NvFBCOpenGL < %{?epoch:%{epoch}:}%{version}-%{release} -# Loads libnvidia-encode.so at runtime +# dlopened: Requires: %{name}-cuda-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description -n libnvidia-fbc @@ -111,6 +117,13 @@ optionally encode the composited framebuffer of an X screen. NvFBC are private APIs that are only available to NVIDIA approved partners for use in remote graphics scenarios. +%package -n libnvidia-gpucomp +Summary: NVIDIA library for shader compilation (nvgpucomp) + +%description -n libnvidia-gpucomp +This package contains the private libnvidia-gpucomp runtime library which is used by +other driver components. + %package -n libnvidia-ml Summary: NVIDIA Management Library (NVML) Provides: cuda-nvml%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -444,6 +457,7 @@ appstream-util validate --nonet %{buildroot}%{_metainfodir}/com.nvidia.driver.me %endif %ifarch x86_64 %{_datadir}/vulkansc/icd.d/nvidia_icd.%{_target_cpu}.json +%{_libdir}/libnvidia-present.so.%{version} %{_libdir}/libnvidia-vksc-core.so.1 %{_libdir}/libnvidia-vksc-core.so.%{version} %dir %{_libdir}/nvidia @@ -472,6 +486,9 @@ appstream-util validate --nonet %{buildroot}%{_metainfodir}/com.nvidia.driver.me %ifarch x86_64 aarch64 %{_libdir}/libcudadebugger.so.1 %{_libdir}/libcudadebugger.so.%{version} +%{_libdir}/libnvidia-nvvm70.so.4 +%{_libdir}/libnvidia-sandboxutils.so.1 +%{_libdir}/libnvidia-sandboxutils.so.%{version} %endif %ifarch x86_64 %if 0%{?rhel} == 8 @@ -487,6 +504,9 @@ appstream-util validate --nonet %{buildroot}%{_metainfodir}/com.nvidia.driver.me %{_libdir}/libnvidia-fbc.so.1 %{_libdir}/libnvidia-fbc.so.%{version} +%files -n libnvidia-gpucomp +%{_libdir}/libnvidia-gpucomp.so.%{version} + %files -n libnvidia-ml %{_libdir}/libnvidia-ml.so.1 %{_libdir}/libnvidia-ml.so.%{version} From e8567075c06b933df34e07e6a4f2cfa80311c658 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 17 Apr 2025 08:27:26 +0000 Subject: [PATCH 0756/2977] bump: bun --- anda/devs/bun/bun-bin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/bun/bun-bin.spec b/anda/devs/bun/bun-bin.spec index a2d0ae2f40..7c03e7451c 100644 --- a/anda/devs/bun/bun-bin.spec +++ b/anda/devs/bun/bun-bin.spec @@ -6,7 +6,7 @@ %endif Name: bun-bin -Version: 1.2.9 +Version: 1.2.10 Release: 1%?dist Summary: Incredibly fast JavaScript runtime, bundler, test runner, and package manager – all in one License: MIT From fd2017504e6df7365587a916ad77e14284e0108c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 17 Apr 2025 08:58:24 +0000 Subject: [PATCH 0757/2977] bump: vala-panel-appmenu --- anda/langs/vala/vala-panel-appmenu/vala-panel-appmenu.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/langs/vala/vala-panel-appmenu/vala-panel-appmenu.spec b/anda/langs/vala/vala-panel-appmenu/vala-panel-appmenu.spec index 0f507b28db..1a7fed9d90 100644 --- a/anda/langs/vala/vala-panel-appmenu/vala-panel-appmenu.spec +++ b/anda/langs/vala/vala-panel-appmenu/vala-panel-appmenu.spec @@ -1,9 +1,9 @@ %global forgeurl https://gitlab.com/vala-panel-project/vala-panel-appmenu -%global commit 8c8e788bf04c8c2911b72a24e3b79842d5b2b286 +%global commit beacc0fd6fc279726d8a87c2704f283d58fec830 %forgemeta Name: vala-panel-appmenu -Version: 24.05 +Version: 25.04 Release: 1%?dist License: LGPL-3.0-or-later Summary: Application Menu plugin for vala-panel From 37c8463eb5d6aa4a06b9ff3cebe03e4676e4e9da Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 17 Apr 2025 10:20:52 +0000 Subject: [PATCH 0758/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 45970a1653..c111550b19 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.183.1-pre +%global ver 0.183.3-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From 3638840fbe48f6e3d4c9238ecb916b3bbaa152ec Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 17 Apr 2025 14:26:55 +0000 Subject: [PATCH 0759/2977] bump: preview stable --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index c111550b19..b8c135f81c 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.183.3-pre +%global ver 0.183.4-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index f037c7b649..b64c4daa3c 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.182.9 +Version: 0.182.10 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From 32f09a6b241c95719e7375f9f0329cf5b2656fa1 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 17 Apr 2025 14:42:40 +0000 Subject: [PATCH 0760/2977] bump: anki-qt5 anki --- anda/apps/anki-qt5/anki-qt5.spec | 2 +- anda/apps/anki/anki.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/anki-qt5/anki-qt5.spec b/anda/apps/anki-qt5/anki-qt5.spec index 15d5bb5248..766df4cd1d 100644 --- a/anda/apps/anki-qt5/anki-qt5.spec +++ b/anda/apps/anki-qt5/anki-qt5.spec @@ -1,5 +1,5 @@ Name: anki-qt5 -Version: 25.02 +Version: 25.02.1 Release: 1%?dist Summary: Flashcard program for using space repetition learning License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5 diff --git a/anda/apps/anki/anki.spec b/anda/apps/anki/anki.spec index 64193322c7..2e6cf9ce21 100644 --- a/anda/apps/anki/anki.spec +++ b/anda/apps/anki/anki.spec @@ -1,5 +1,5 @@ Name: anki -Version: 25.02 +Version: 25.02.1 Release: 1%?dist Summary: Flashcard program for using space repetition learning License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5 From 9ea5d7d49d368611be80df82e4b87a8de56ae304 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 17 Apr 2025 15:47:15 +0000 Subject: [PATCH 0761/2977] bump: fluent-theme --- anda/themes/fluent-theme/fluent-theme.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/themes/fluent-theme/fluent-theme.spec b/anda/themes/fluent-theme/fluent-theme.spec index 8f0d302773..e42cd8bf72 100644 --- a/anda/themes/fluent-theme/fluent-theme.spec +++ b/anda/themes/fluent-theme/fluent-theme.spec @@ -1,7 +1,7 @@ -%global tag 2024-06-12 +%global tag 2025-04-17 Name: fluent-theme -Version: 20240612 +Version: 20250417 Release: 1%?dist Summary: Fluent design theme for GNOME/GTK based desktop environments From 3ca40c32847d7a697b184de560e25226e233beac Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 17 Apr 2025 19:14:38 +0000 Subject: [PATCH 0762/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 40caf83e4e..68263c209f 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.643 +Version: 0.0.645 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 8b63dad56c..a758f6a4d7 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.643 +Version: 0.0.645 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 326c9ef276e272b0265c0542594014a62d01d779 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 17 Apr 2025 19:59:28 +0000 Subject: [PATCH 0763/2977] bump: lomiri --- anda/desktops/lomiri-unity/lomiri/lomiri.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/desktops/lomiri-unity/lomiri/lomiri.spec b/anda/desktops/lomiri-unity/lomiri/lomiri.spec index b52431fb17..25087c52ba 100644 --- a/anda/desktops/lomiri-unity/lomiri/lomiri.spec +++ b/anda/desktops/lomiri-unity/lomiri/lomiri.spec @@ -1,9 +1,9 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri -%global commit 248b88c17ebbe4d95808e505d8271f8d1ca9cbe7 +%global commit 5911df7b4f25210e4d88d3e959e04538fe64387f %forgemeta Name: lomiri -Version: 0.4.0 +Version: 0.4.1 Release: 1%?dist Summary: A convergent desktop environment by Ubports From 29840b578c3bf02b1401b3dd22e6f2c2c3b91210 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 17 Apr 2025 20:42:16 +0000 Subject: [PATCH 0764/2977] bump: inputplumber --- anda/games/inputplumber/inputplumber.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index d545ef8898..c6900877cf 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.52.1 +Version: 0.52.2 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later From 6a50de4eeee965acfad698e4e71a17b4f277a1ee Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 17 Apr 2025 21:17:44 +0000 Subject: [PATCH 0765/2977] bump: inputplumber --- anda/games/inputplumber/inputplumber.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index c6900877cf..9574a5f745 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.52.2 +Version: 0.53.0 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later From c1f64eaf379142c11a15895cb602b37a56f7fc82 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 17 Apr 2025 23:19:28 +0000 Subject: [PATCH 0766/2977] bump: preview stable --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index b8c135f81c..261d613960 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.183.4-pre +%global ver 0.183.5-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index b64c4daa3c..5f566db735 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.182.10 +Version: 0.182.11 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From ddc0e659fa22a4957e0f502ddceeb4ae51470f2e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 17 Apr 2025 23:55:39 +0000 Subject: [PATCH 0767/2977] bump: discord-ptb-openasar discord-ptb yt-dlp --- anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec | 2 +- anda/apps/discord-ptb/discord-ptb.spec | 2 +- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec index 2dd5fbcaea..2874e4ce91 100644 --- a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec +++ b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-ptb-openasar -Version: 0.0.137 +Version: 0.0.138 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-ptb/discord-ptb.spec b/anda/apps/discord-ptb/discord-ptb.spec index 4506528815..c7653426fc 100644 --- a/anda/apps/discord-ptb/discord-ptb.spec +++ b/anda/apps/discord-ptb/discord-ptb.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-ptb -Version: 0.0.137 +Version: 0.0.138 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers. URL: https://discord.com diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 2cd9153f64..8c8547ad57 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.06.233415 +Version: 2025.04.17.233446 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 002784ee58210872278c211f04096ae3bbac35b9 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 18 Apr 2025 01:25:43 +0000 Subject: [PATCH 0768/2977] bump: ruffle yt-dlp --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index cd21f5400a..8a97dd2d2d 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-17 +%global ver 2025-04-18 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 8c8547ad57..5f98b5ccac 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.17.233446 +Version: 2025.04.17.235112 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 2708a1cbb313230688055b1ec48f0076e4822b21 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 18 Apr 2025 01:43:10 +0000 Subject: [PATCH 0769/2977] bump(nightly): mpv nightly prismlauncher-nightly nim-nightly astal kmod-common --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/lib/astal/astal/astal.spec | 4 ++-- anda/system/xone/kmod-common/xone.spec | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 48eed10117..acff124209 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit df1e71a7cc67c079f8012ac2ddd590a851652057 +%global commit 94bc7315bdcc5226f4704012fdcf0acd84bf3516 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250417 +%global commit_date 20250418 %global ver 0.40.0 Name: mpv-nightly diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 02e42a991c..fdd97055b5 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit a7a7335da4ebeb6ebd5c644f108edf2441f7d77b +%global commit f6d13645cec3755a6b3eea9713b076747669ce83 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250417 +%global commit_date 20250418 %global ver 0.184.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index fe9bd16262..36409ab8c1 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 202095c4665d8cb2f3647e5f603e5864b572249e +%global commit 564f120c228b184b18ac20509ec8268b42664e9e %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250417 +%global commit_date 20250418 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index c88ccf7d7d..3209550093 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 3d14381473fd478432cb8fab04d0501b26db775b +%global commit af9219ada72078c4cbc294168374a373d2b3c8e3 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250417 +%global commit_date 20250418 %global debug_package %nil Name: nim-nightly diff --git a/anda/lib/astal/astal/astal.spec b/anda/lib/astal/astal/astal.spec index ff6f6759fe..bd520ed598 100644 --- a/anda/lib/astal/astal/astal.spec +++ b/anda/lib/astal/astal/astal.spec @@ -1,7 +1,7 @@ -%global commit 8f020e6d663d4222234826b51f2eb9e01db340a2 +%global commit d4dd7fcaa25b885d1327d66aac440ddc7e043090 %global shortcommit %{sub %commit 1 7} -%global commit_date 20250411 +%global commit_date 20250418 Name: astal Version: 0^%commit_date.%shortcommit diff --git a/anda/system/xone/kmod-common/xone.spec b/anda/system/xone/kmod-common/xone.spec index 25597b192d..730a05def8 100644 --- a/anda/system/xone/kmod-common/xone.spec +++ b/anda/system/xone/kmod-common/xone.spec @@ -1,6 +1,6 @@ -%global commit ffe1251c7c518574bf409f7e915fab8c532544c0 +%global commit ecdd59e42560b157de1db69184b2a9002ac21b65 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20250416 +%global commitdate 20250418 %global ver 0.3 %global _dracutconfdir %{_prefix}/lib/dracut/dracut.conf.d %global firmware_hash 48084d9fa53b9bb04358f3bb127b7495dc8f7bb0b3ca1437bd24ef2b6eabdf66 From f4dd9ef93a8195ded854cc17f299aee0f9e62cbf Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 18 Apr 2025 02:43:48 +0000 Subject: [PATCH 0770/2977] bump(branch): astal-gtk akmod dkms --- anda/lib/astal/astal-gtk/astal-gtk.spec | 4 ++-- anda/system/xone/akmod/xone-kmod.spec | 4 ++-- anda/system/xone/dkms/dkms-xone.spec | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/anda/lib/astal/astal-gtk/astal-gtk.spec b/anda/lib/astal/astal-gtk/astal-gtk.spec index 5549b7d526..15db2c1eae 100644 --- a/anda/lib/astal/astal-gtk/astal-gtk.spec +++ b/anda/lib/astal/astal-gtk/astal-gtk.spec @@ -1,5 +1,5 @@ -%global commit 8f020e6 -%global commit_date 20250411 +%global commit d4dd7fc +%global commit_date 20250418 Name: astal Version: 0^%commit_date.%commit diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index 9ecaccaf2c..8d57d837a6 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -1,6 +1,6 @@ -%global commit ffe1251c7c518574bf409f7e915fab8c532544c0 +%global commit ecdd59e42560b157de1db69184b2a9002ac21b65 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20250416 +%global commitdate 20250418 %global ver 0.3 %define buildforkernels akmod %global debug_package %{nil} diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index 602035e7c7..4d74b9fcbf 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -1,6 +1,6 @@ -%global commit ffe1251c7c518574bf409f7e915fab8c532544c0 +%global commit ecdd59e42560b157de1db69184b2a9002ac21b65 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20250416 +%global commitdate 20250418 %global ver 0.3 %global debug_package %{nil} %global modulename xone From 6bb4c2c86c5a292a7c6096e02447cc04b7b8219b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 18 Apr 2025 02:46:57 +0000 Subject: [PATCH 0771/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index fb29c8024b..6bb31948b0 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.4.4 +Version: 2025.4.5 Release: 1%?dist Summary: Front-end to your dev env From 3a8ed821a09cbd02b7859d946716052cd8f2d9c7 Mon Sep 17 00:00:00 2001 From: Gilver Date: Fri, 18 Apr 2025 02:14:25 -0500 Subject: [PATCH 0772/2977] fix(lomiri-app-launch): Patch to use the correct standard for atomic builtins (#4272) * fix(lomiri-app-launch): GCC15 currently doesn't support atomic builtins Signed-off-by: Gilver * This...might need Clang Signed-off-by: Gilver * Didn't help but ruled it out? Signed-off-by: Gilver * Of this is it I swear Signed-off-by: Gilver * C too? Signed-off-by: Gilver * Testing something... Signed-off-by: Gilver * Update lomiri-app-launch.spec Signed-off-by: Gilver * ? Signed-off-by: Gilver * Update lomiri-app-launch.spec Signed-off-by: Gilver * Update lomiri-app-launch.spec Signed-off-by: Gilver * Try GCC14 again but with libatomic present...? Signed-off-by: Gilver * Update lomiri-app-launch.spec Signed-off-by: Gilver * Update lomiri-app-launch.spec Signed-off-by: Gilver * Oop Signed-off-by: Gilver * Update lomiri-app-launch.spec Signed-off-by: Gilver * Update lomiri-app-launch.spec Signed-off-by: Gilver * Update lomiri-app-launch.spec Signed-off-by: Gilver * Update lomiri-app-launch.spec Signed-off-by: Gilver * Add files via upload Signed-off-by: Gilver * Update lomiri-app-launch.spec Signed-off-by: Gilver * Remove local dir mistake fffffffffff Signed-off-by: Gilver * Update 2004-std-workaround.patch Signed-off-by: Gilver * Update 2004-std-workaround.patch Signed-off-by: Gilver * Update lomiri-app-launch.spec Signed-off-by: Gilver * So stupid but please God Signed-off-by: Gilver --------- Signed-off-by: Gilver --- .../lomiri-app-launch/2004-std-workaround.patch | 11 +++++++++++ .../lomiri-app-launch/lomiri-app-launch.spec | 9 +++++---- 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 anda/desktops/lomiri-unity/lomiri-app-launch/2004-std-workaround.patch diff --git a/anda/desktops/lomiri-unity/lomiri-app-launch/2004-std-workaround.patch b/anda/desktops/lomiri-unity/lomiri-app-launch/2004-std-workaround.patch new file mode 100644 index 0000000000..7ae0684784 --- /dev/null +++ b/anda/desktops/lomiri-unity/lomiri-app-launch/2004-std-workaround.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt 2025-04-18 01:46:49.810910663 -0500 ++++ b/CMakeLists.txt 2025-04-18 02:07:05.663396088 -0500 +@@ -77,7 +77,7 @@ + -pthread + ) + +-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") + + pkg_check_modules(GLIB2 REQUIRED glib-2.0) diff --git a/anda/desktops/lomiri-unity/lomiri-app-launch/lomiri-app-launch.spec b/anda/desktops/lomiri-unity/lomiri-app-launch/lomiri-app-launch.spec index 6775a051e4..e7cb74c9dd 100644 --- a/anda/desktops/lomiri-unity/lomiri-app-launch/lomiri-app-launch.spec +++ b/anda/desktops/lomiri-unity/lomiri-app-launch/lomiri-app-launch.spec @@ -4,16 +4,19 @@ Name: lomiri-app-launch Version: 0.1.11 -Release: 1%?dist +Release: 2%?dist Summary: Provides the Lomiri App Launch user space daemon License: GPL-3.0 URL: https://gitlab.com/ubports/development/core/lomiri-app-launch Source0: %{url}/-/archive/%commit/lomiri-app-launch-%commit.tar.gz +Patch0: https://sources.debian.org/data/main/l/lomiri-app-launch/0.1.11-1/debian/patches/2003_remove-werror.patch +Patch1: 2004-std-workaround.patch BuildRequires: cmake BuildRequires: pkgconfig -BuildRequires: g++ BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: libatomic BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(lttng-ust) @@ -49,8 +52,6 @@ This package contains development files needed for lomiri-app-launch. %autosetup -n lomiri-app-launch-%commit %build -sed -i 's/-Werror//' ./CMakeLists.txt - # For some reason the macro of cmake fails on both clang and gcc cmake -DLOMIRI_APP_LAUNCH_ARCH=%{_arch} -DENABLE_COVERAGE=OFF -DENABLE_TESTS=OFF -B redhat-linux-build -DCMAKE_INSTALL_PREFIX:PATH=/usr -DENABLE_MIRCLIENT=off -DUSE_SYSTEMD=ON %cmake_build From bbdfb2e0a15b6dd3bcca51bba8a105cf90f4550d Mon Sep 17 00:00:00 2001 From: Gilver Date: Fri, 18 Apr 2025 02:33:15 -0500 Subject: [PATCH 0773/2977] feat(xone): Additional firmware needed for the pairing button of some controllers (#4335) * feat(xone): Additional firmware needed for the pairing button of some controllers Signed-off-by: Gilver * Add release to changelog Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/system/xone/kmod-common/xone.spec | 30 ++++++++++++++++++++------ 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/anda/system/xone/kmod-common/xone.spec b/anda/system/xone/kmod-common/xone.spec index 730a05def8..213568c720 100644 --- a/anda/system/xone/kmod-common/xone.spec +++ b/anda/system/xone/kmod-common/xone.spec @@ -3,11 +3,12 @@ %global commitdate 20250418 %global ver 0.3 %global _dracutconfdir %{_prefix}/lib/dracut/dracut.conf.d -%global firmware_hash 48084d9fa53b9bb04358f3bb127b7495dc8f7bb0b3ca1437bd24ef2b6eabdf66 +%global firmware_hash0 48084d9fa53b9bb04358f3bb127b7495dc8f7bb0b3ca1437bd24ef2b6eabdf66 +%global firmware_hash1 080ce4091e53a4ef3e5fe29939f51fd91f46d6a88be6d67eb6e99a5723b3a223 Name: xone Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 1%?dist +Release: 2%?dist Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories common files License: GPL-2.0-or-later URL: https://github.com/dlundqvist/xone @@ -15,8 +16,9 @@ Source0: %{url}/archive/%{commit}.tar.gz#/xone-%{shortcommit}.tar.gz Source1: modules.conf ### Windows driver and firmware file: Source2: http://download.windowsupdate.com/c/msdownload/update/driver/drvs/2017/07/1cd6a87c-623f-4407-a52d-c31be49e925c_e19f60808bdcbfbd3c3df6be3e71ffc52e43261e.cab +Source3: https://catalog.s.download.windowsupdate.com/d/msdownload/update/driver/drvs/2015/12/20810869_8ce2975a7fbaa06bcfb0d8762a6275a1cf7c1dd3.cab ### Microsoft TOU copy: -Source3: https://www.microsoft.com/en-us/legal/terms-of-use +Source4: https://www.microsoft.com/en-us/legal/terms-of-use BuildRequires: cabextract BuildRequires: sed BuildRequires: systemd-rpm-macros @@ -54,12 +56,22 @@ Proprietary firmware for XBox controller dongles. %prep %autosetup -p1 -n %{name}-%{commit} -/usr/bin/cp %{SOURCE3} . +/usr/bin/cp %{SOURCE4} . /usr/bin/sed -nE '/^BUILT_MODULE_NAME/{s@^.+"(.+)"@\1@; s|-|_|g; p}' dkms.conf > %{name}.conf -# Firmware: +### Firmware: +# The .bin files have the same name so put them in subdirs +mkdir firm{0..1} + +pushd firm0 cabextract -F FW_ACC_00U.bin %{SOURCE2} -echo %{firmware_hash} FW_ACC_00U.bin | sha256sum -c +echo %{firmware_hash0} FW_ACC_00U.bin | sha256sum -c +popd + +pushd firm1 +cabextract -F FW_ACC_00U.bin %{SOURCE3} +echo %{firmware_hash1} FW_ACC_00U.bin | sha256sum -c +popd %install # xone-gip-headset module should have the snd-pcm and snd-seq modules be preloaded or it will give errors on boot due to injecting late. @@ -70,7 +82,8 @@ install -Dpm644 %{SOURCE1} %{buildroot}%{_dracutconfdir}/60-%{name}-snd.conf install -Dpm644 install/modprobe.conf %{buildroot}%{_modprobedir}/60-%{name}.conf # Firmware: -install -Dpm644 FW_ACC_00U.bin %{buildroot}%{_prefix}/lib/firmware/xow_dongle.bin +install -Dpm644 firm0/FW_ACC_00U.bin %{buildroot}%{_prefix}/lib/firmware/xow_dongle.bin +install -Dpm644 firm1/FW_ACC_00U.bin %{buildroot}%{_prefix}/lib/firmware/xow_dongle_045e_02e6.bin # Akmods modules install -Dm644 %{name}.conf -t %{buildroot}%{_modulesloaddir} @@ -87,6 +100,7 @@ install -Dm644 %{name}.conf -t %{buildroot}%{_modulesloaddir} %files firmware %license terms-of-use %{_prefix}/lib/firmware/xow_dongle.bin +%{_prefix}/lib/firmware/xow_dongle_045e_02e6.bin %post /usr/bin/dracut -f @@ -99,5 +113,7 @@ echo "The firmware for the wireless dongle is subject to Microsoft's Terms of Us echo 'https://www.microsoft.com/en-us/legal/terms-of-use' %changelog +* Thu Apr 17 2025 Gilver E. - 0.3^20250418git.ecdd59e-2%{?dist} +- Added additional firmware needed for dongle pairing on some controllers * Thu Feb 27 2025 Gilver E. - Initial package From 93c3ba9292cc213e3ad67bc19237bc56055c1f5b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 18 Apr 2025 07:38:31 +0000 Subject: [PATCH 0774/2977] bump: anki-bin --- anda/apps/anki-bin/anki-bin.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/apps/anki-bin/anki-bin.spec b/anda/apps/anki-bin/anki-bin.spec index d5b553cf7c..d301686613 100644 --- a/anda/apps/anki-bin/anki-bin.spec +++ b/anda/apps/anki-bin/anki-bin.spec @@ -1,9 +1,9 @@ -%global xurl https://files.pythonhosted.org/packages/68/9c/7685bd012e597332f8ce379a31b0d58dd4eae960da96ff43e9fcd978c93f/anki-25.02-cp39-abi3-manylinux_2_35_x86_64.whl -%global aurl https://files.pythonhosted.org/packages/da/36/741cef7b7fce943d187784549fd8de8152986067d9226f384959c07770a7/anki-25.02-cp39-abi3-manylinux_2_35_aarch64.whl -%global qurl https://files.pythonhosted.org/packages/2c/bc/763589b97aa5c91acf3d834beaa473c25ca7f335c7b40954fd0d5fd41ddc/aqt-25.02-py3-none-any.whl +%global xurl https://files.pythonhosted.org/packages/c7/cb/fa787ddcea10823b8a77713f6dd4d6cea6b17fe632bede3bf2d988dff7dc/anki-25.02.1-cp39-abi3-manylinux_2_35_x86_64.whl +%global aurl https://files.pythonhosted.org/packages/6b/b2/514364b7a8de44a9f22ddc9ec50439e0fe404f0e7e63b64dbb3ca8ebac21/anki-25.02.1-cp39-abi3-manylinux_2_35_aarch64.whl +%global qurl https://files.pythonhosted.org/packages/66/3f/ffa764b5262c8166c84e701cc333a62f8108d8200647be4a8230c1397e3e/aqt-25.02.1-py3-none-any.whl Name: anki-bin -Version: 25.02 +Version: 25.02.1 Release: 1%?dist Summary: Flashcard program for using space repetition learning (Installed with wheel) License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5 From e90ed689c396f609a98f4afa847cc6eac3ed963d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 18 Apr 2025 10:55:28 +0000 Subject: [PATCH 0775/2977] bump: osu-lazer --- anda/games/osu-lazer/osu-lazer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index fed38b4979..7a6ce4ff5d 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -3,7 +3,7 @@ %define __strip /bin/true Name: osu-lazer -Version: 2025.321.0 +Version: 2025.418.0 Release: 1%?dist Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew. ExclusiveArch: x86_64 From 75d782586771b5d5054dffec3b3574dfde589d0a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 18 Apr 2025 13:46:34 +0000 Subject: [PATCH 0776/2977] bump: chezmoi --- anda/langs/go/chezmoi/chezmoi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/go/chezmoi/chezmoi.spec b/anda/langs/go/chezmoi/chezmoi.spec index 4f517fd30e..4a7eabe21c 100644 --- a/anda/langs/go/chezmoi/chezmoi.spec +++ b/anda/langs/go/chezmoi/chezmoi.spec @@ -4,7 +4,7 @@ # https://github.com/twpayne/chezmoi %global goipath github.com/twpayne/chezmoi -Version: 2.62.1 +Version: 2.62.2 %gometa -f From 87e99d4b9796fd5707779009e808adb30e600972 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 18 Apr 2025 14:18:19 +0000 Subject: [PATCH 0777/2977] bump: osu-lazer --- anda/games/osu-lazer/osu-lazer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index 7a6ce4ff5d..9bc567f241 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -3,7 +3,7 @@ %define __strip /bin/true Name: osu-lazer -Version: 2025.418.0 +Version: 2025.418.1 Release: 1%?dist Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew. ExclusiveArch: x86_64 From 9b4999b3ae2fbf9a44cdef177989f25d90bff32c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 18 Apr 2025 15:21:22 +0000 Subject: [PATCH 0778/2977] bump: libva-nvidia-driver --- .../nvidia/libva-nvidia-driver/libva-nvidia-driver.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/system/nvidia/libva-nvidia-driver/libva-nvidia-driver.spec b/anda/system/nvidia/libva-nvidia-driver/libva-nvidia-driver.spec index 4b1ba9be71..86f00080fd 100644 --- a/anda/system/nvidia/libva-nvidia-driver/libva-nvidia-driver.spec +++ b/anda/system/nvidia/libva-nvidia-driver/libva-nvidia-driver.spec @@ -1,5 +1,5 @@ -%global commit0 c519e97ef7af581c109f49b6973269fb16d1bc54 -%global date 20250206 +%global commit0 0ef97c1849fac3e07cdf39ffe4cd9aa9f352896f +%global date 20250418 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global upstream_name nvidia-vaapi-driver From f9553a3fd5690b8cd13b6b68fc73a86ec14d611c Mon Sep 17 00:00:00 2001 From: Gilver Date: Fri, 18 Apr 2025 10:36:24 -0500 Subject: [PATCH 0779/2977] feat(xone): Remove custom version for firmware package as it now contains multiple sources (#4344) Signed-off-by: Gilver --- anda/system/xone/kmod-common/xone.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/anda/system/xone/kmod-common/xone.spec b/anda/system/xone/kmod-common/xone.spec index 213568c720..adfce86af8 100644 --- a/anda/system/xone/kmod-common/xone.spec +++ b/anda/system/xone/kmod-common/xone.spec @@ -8,7 +8,7 @@ Name: xone Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 2%?dist +Release: 3%?dist Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories common files License: GPL-2.0-or-later URL: https://github.com/dlundqvist/xone @@ -23,7 +23,7 @@ BuildRequires: cabextract BuildRequires: sed BuildRequires: systemd-rpm-macros Requires: wireless-regdb -Requires: %{name}-firmware = 1.0.46.1 +Requires: %{name}-firmware = %{version}-%{release} Requires: (akmod-%{name} = %{?epoch:%{epoch}:}%{version} or dkms-%{name} = %{?epoch:%{epoch}:}%{version}) Requires(post): dracut Provides: %{name}-kmod-common = %{?epoch:%{epoch}:}%{version} @@ -45,7 +45,6 @@ BuildArch: noarch Akmods modules for the akmod-%{name} package. %package firmware -Version: 1.0.46.1 Summary: Firmware for the XBox One controller dongle License: Proprietary Requires: wireless-regdb From f2c16df59cb45f81668efcc09e6dc92f87c502bc Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 18 Apr 2025 16:31:23 +0000 Subject: [PATCH 0780/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 68263c209f..f1092b47ef 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.645 +Version: 0.0.646 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index a758f6a4d7..3a14e015bf 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.645 +Version: 0.0.646 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 62333efda9b9bdba35558e5282598f8cb82f64c1 Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 19 Apr 2025 02:22:32 +0800 Subject: [PATCH 0781/2977] fix(subtitleedit): dejavu mono dep (#4349) Signed-off-by: madomado --- anda/apps/subtitleedit/subtitleedit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/subtitleedit/subtitleedit.spec b/anda/apps/subtitleedit/subtitleedit.spec index fbaa7d61c9..fbb4c7a780 100644 --- a/anda/apps/subtitleedit/subtitleedit.spec +++ b/anda/apps/subtitleedit/subtitleedit.spec @@ -3,7 +3,7 @@ Name: %realname.bin Version: 4.0.12 -Release: 1%?dist +Release: 2%?dist Summary: An advanced subtitle editor and converter License: GPL-3.0-only URL: https://www.nikse.dk/SubtitleEdit @@ -13,7 +13,7 @@ Packager: madonuko Provides: %realname = %evr Conflicts: %realname BuildRequires: unzip anda-srpm-macros -Requires: mono dejavu-fonts +Requires: dejavu-sans-mono-fonts %description %summary. From df277f9ec82ceb2d6c76aa17dbd182ad9b534eb4 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 18 Apr 2025 18:49:57 +0000 Subject: [PATCH 0782/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 5f98b5ccac..216f5d095e 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.17.235112 +Version: 2025.04.18.183913 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 7ae04fcf7cbfb8b3d819995f7627d9a47905752c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 18 Apr 2025 19:20:06 +0000 Subject: [PATCH 0783/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 216f5d095e..3adc886b06 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.18.183913 +Version: 2025.04.18.190518 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From f096a80e527182b74cf4beb920ed7ac1aee5dcd5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 18 Apr 2025 20:14:16 +0000 Subject: [PATCH 0784/2977] bump(branch): ffmpeg ffmpeg --- anda/multimedia/ffmpeg/VERSION_tesseract.txt | 2 +- anda/multimedia/ffmpeg/ffmpeg.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/multimedia/ffmpeg/VERSION_tesseract.txt b/anda/multimedia/ffmpeg/VERSION_tesseract.txt index c7ba1e87f7..acf69b48b8 100644 --- a/anda/multimedia/ffmpeg/VERSION_tesseract.txt +++ b/anda/multimedia/ffmpeg/VERSION_tesseract.txt @@ -1 +1 @@ -5.5.0 \ No newline at end of file +5.1.0 \ No newline at end of file diff --git a/anda/multimedia/ffmpeg/ffmpeg.spec b/anda/multimedia/ffmpeg/ffmpeg.spec index a9a82f4b2a..b3ecb029fe 100644 --- a/anda/multimedia/ffmpeg/ffmpeg.spec +++ b/anda/multimedia/ffmpeg/ffmpeg.spec @@ -104,8 +104,8 @@ ExclusiveArch: armv7hnl Summary: Digital VCR and streaming server Name: ffmpeg%{?flavor} -Version: 7.1 -Release: 1%{?dist} +Version: 7.1.1 +Release: 1%?dist License: %{ffmpeg_license} URL: https://ffmpeg.org/ %if 0%{?date} From 947ae6d73cfcc627cc05a70d9ae090c10646f55e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 18 Apr 2025 20:45:43 +0000 Subject: [PATCH 0785/2977] bump: electron --- anda/tools/electron/electron.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/electron/electron.spec b/anda/tools/electron/electron.spec index e019c8d5f1..507fe29e8e 100644 --- a/anda/tools/electron/electron.spec +++ b/anda/tools/electron/electron.spec @@ -12,7 +12,7 @@ %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so Name: electron -Version: 35.1.5 +Version: 35.2.0 Release: 1%?dist Summary: Build cross platform desktop apps with web technologies License: MIT From 4e4b1515a112c779b46bc83f5fb318c9ce3c31b3 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 18 Apr 2025 22:37:55 +0000 Subject: [PATCH 0786/2977] bump: discord-canary-openasar discord-canary preview --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- anda/devs/zed/preview/zed-preview.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index f1092b47ef..a2d668b1db 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.646 +Version: 0.0.647 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 3a14e015bf..02e4e92f8d 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.646 +Version: 0.0.647 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 261d613960..66014d3364 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.183.5-pre +%global ver 0.183.6-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From d8af7461f0144773d3ee95bdaf8e1b7e50b4dbbd Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 18 Apr 2025 23:00:06 +0000 Subject: [PATCH 0787/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index a2d668b1db..feb13ffc86 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.647 +Version: 0.0.648 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 02e4e92f8d..5c5863e48a 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.647 +Version: 0.0.648 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 4333ceb23e38e535d7ff94ad34f07317be8cee05 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 18 Apr 2025 23:48:36 +0000 Subject: [PATCH 0788/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 3adc886b06..0fd6662be9 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.18.190518 +Version: 2025.04.18.233601 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 679414675790f3dbee6c4ac35aec9878c57a3188 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 18 Apr 2025 23:58:32 +0000 Subject: [PATCH 0789/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 0fd6662be9..70dabf542d 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.18.233601 +Version: 2025.04.18.234728 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From a1757f613fb3f48fb949b2c6906928bfa04646be Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 19 Apr 2025 01:41:25 +0000 Subject: [PATCH 0790/2977] bump(nightly): mpv nightly nightly prismlauncher-nightly nim-nightly vala-nightly kmod-common --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/langs/vala/vala-nightly/vala-nightly.spec | 4 ++-- anda/system/xone/kmod-common/xone.spec | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index acff124209..be9926a1ac 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 94bc7315bdcc5226f4704012fdcf0acd84bf3516 +%global commit 3600c716ea240a78cd75bbff6765b78a88171ded %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250418 +%global commit_date 20250419 %global ver 0.40.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 6d5101bdec..66f3da53b7 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 2bcd76c3d9a61c277d5dcaef936ce62cab5adcee +%global commit 6a876ef8ec3e2aeb3d15df0dfb0e07677e49ff03 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-04-15 +%global fulldate 2025-04-18 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index fdd97055b5..5a88ec3214 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit f6d13645cec3755a6b3eea9713b076747669ce83 +%global commit 8102a16747d4e39aac62bc00f4597341f8c1f80a %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250418 +%global commit_date 20250419 %global ver 0.184.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 36409ab8c1..9efdf36c1f 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 564f120c228b184b18ac20509ec8268b42664e9e +%global commit 3df98dd5e75047a6bad13da14fe6bfc84aef17c4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250418 +%global commit_date 20250419 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 3209550093..2a4593e3d1 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit af9219ada72078c4cbc294168374a373d2b3c8e3 +%global commit 032da90ed1eda03b837145d711b756cb897c099e %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250418 +%global commit_date 20250419 %global debug_package %nil Name: nim-nightly diff --git a/anda/langs/vala/vala-nightly/vala-nightly.spec b/anda/langs/vala/vala-nightly/vala-nightly.spec index 0dd98c44fb..e7cdf10ece 100644 --- a/anda/langs/vala/vala-nightly/vala-nightly.spec +++ b/anda/langs/vala/vala-nightly/vala-nightly.spec @@ -3,11 +3,11 @@ %global priority 90 %global real_name vala -%global commit 05c8cc1239061019fa8fe36f9344ee32e0da5535 +%global commit 34978cd533f2ab687985ae22dfd98ddb12888558 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global repo https://gitlab.gnome.org/GNOME/%{real_name}.git -%global commit_date 20250409 +%global commit_date 20250419 %global snapshot_info %{commit_date}.%{shortcommit} Name: vala-nightly diff --git a/anda/system/xone/kmod-common/xone.spec b/anda/system/xone/kmod-common/xone.spec index adfce86af8..cba440d47a 100644 --- a/anda/system/xone/kmod-common/xone.spec +++ b/anda/system/xone/kmod-common/xone.spec @@ -1,6 +1,6 @@ -%global commit ecdd59e42560b157de1db69184b2a9002ac21b65 +%global commit c682b0cd4fd56d2d9639b64787034a375535eb4b %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20250418 +%global commitdate 20250419 %global ver 0.3 %global _dracutconfdir %{_prefix}/lib/dracut/dracut.conf.d %global firmware_hash0 48084d9fa53b9bb04358f3bb127b7495dc8f7bb0b3ca1437bd24ef2b6eabdf66 @@ -8,7 +8,7 @@ Name: xone Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 3%?dist +Release: 1%?dist Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories common files License: GPL-2.0-or-later URL: https://github.com/dlundqvist/xone From 06bc47e0ac7757eacd4cddaa11bf072efd0fa400 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 19 Apr 2025 01:53:11 +0000 Subject: [PATCH 0791/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 70dabf542d..6ee319e1b9 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.18.234728 +Version: 2025.04.19.000224 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 16c9c8011c9000c370efc21d94af8c9f33fc08eb Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 19 Apr 2025 02:40:14 +0000 Subject: [PATCH 0792/2977] bump(branch): akmod dkms --- anda/system/xone/akmod/xone-kmod.spec | 4 ++-- anda/system/xone/dkms/dkms-xone.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index 8d57d837a6..b102d1b539 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -1,6 +1,6 @@ -%global commit ecdd59e42560b157de1db69184b2a9002ac21b65 +%global commit c682b0cd4fd56d2d9639b64787034a375535eb4b %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20250418 +%global commitdate 20250419 %global ver 0.3 %define buildforkernels akmod %global debug_package %{nil} diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index 4d74b9fcbf..ef3be6c570 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -1,6 +1,6 @@ -%global commit ecdd59e42560b157de1db69184b2a9002ac21b65 +%global commit c682b0cd4fd56d2d9639b64787034a375535eb4b %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20250418 +%global commitdate 20250419 %global ver 0.3 %global debug_package %{nil} %global modulename xone From 5401ab57c1fb7298d4b98ffafe9ab8651ebe650d Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Fri, 18 Apr 2025 22:24:47 -0500 Subject: [PATCH 0793/2977] Add readymade nightly (#4354) --- anda/system/readymade/nightly/anda.hcl | 8 +++ .../readymade/nightly/readymade-nightly.spec | 62 +++++++++++++++++++ anda/system/readymade/nightly/update.rhai | 5 ++ anda/system/readymade/{ => stable}/anda.hcl | 0 .../readymade/{ => stable}/readymade.spec | 0 .../system/readymade/{ => stable}/update.rhai | 0 6 files changed, 75 insertions(+) create mode 100644 anda/system/readymade/nightly/anda.hcl create mode 100644 anda/system/readymade/nightly/readymade-nightly.spec create mode 100644 anda/system/readymade/nightly/update.rhai rename anda/system/readymade/{ => stable}/anda.hcl (100%) rename anda/system/readymade/{ => stable}/readymade.spec (100%) rename anda/system/readymade/{ => stable}/update.rhai (100%) diff --git a/anda/system/readymade/nightly/anda.hcl b/anda/system/readymade/nightly/anda.hcl new file mode 100644 index 0000000000..094f9bb371 --- /dev/null +++ b/anda/system/readymade/nightly/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "readymade-nightly.spec" + } + labels { + nightly = 1 + } +} diff --git a/anda/system/readymade/nightly/readymade-nightly.spec b/anda/system/readymade/nightly/readymade-nightly.spec new file mode 100644 index 0000000000..8e96cce5be --- /dev/null +++ b/anda/system/readymade/nightly/readymade-nightly.spec @@ -0,0 +1,62 @@ +%global commit c0eeb68ca45c7aca207c874b9ecd53e6300c900a +%global commit_date 20250418 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + +Name: readymade-nightly +Version: %commit_date.%shortcommit +Release: 1%?dist +Summary: Install ready-made distribution images! +License: GPL-3.0-or-later +URL: https://github.com/FyraLabs/readymade +Source0: %url/archive/%commit.tar.gz +BuildRequires: anda-srpm-macros rust-packaging mold +BuildRequires: pkgconfig(libhelium-1) +BuildRequires: pkgconfig(gnome-desktop-4) +BuildRequires: clang-devel +BuildRequires: cmake +Conflicts: readymade + +Requires: efibootmgr + +%description +Readymade is a simple Linux Distribution installer. + +It is created as a replacement to Red Hat's Anaconda installer. + + +%package config-ultramarine +Summary: Readymade Configuration for Ultramarine Linux +Requires: readymade-nightly +Provides: readymade-nightly-config +Conflicts: readymade-config-ultramarine + +%description config-ultramarine +This package contains the configuration files for Readymade to install Ultramarine Linux. + + +%prep +%autosetup -n readymade-%commit +ls -l +%cargo_prep_online + +%build + +%install +%cargo_install +./install.sh %buildroot +ln -sf %{_datadir}/applications/com.fyralabs.Readymade.desktop %{buildroot}%{_datadir}/applications/liveinst.desktop + + +%files config-ultramarine +%_sysconfdir/readymade.toml + + +%files +%license LICENSE +%_bindir/readymade +%_datadir/polkit-1/actions/com.fyralabs.pkexec.readymade.policy +%_datadir/applications/com.fyralabs.Readymade.desktop +%_datadir/applications/liveinst.desktop +%_datadir/readymade +%_datadir/icons/hicolor/scalable/apps/com.fyralabs.Readymade.svg + diff --git a/anda/system/readymade/nightly/update.rhai b/anda/system/readymade/nightly/update.rhai new file mode 100644 index 0000000000..70173214d0 --- /dev/null +++ b/anda/system/readymade/nightly/update.rhai @@ -0,0 +1,5 @@ +rpm.global("commit", gh_commit("FyraLabs/readymade")); +if rpm.changed() { + rpm.release(); + rpm.global("commit_date", date()); +} diff --git a/anda/system/readymade/anda.hcl b/anda/system/readymade/stable/anda.hcl similarity index 100% rename from anda/system/readymade/anda.hcl rename to anda/system/readymade/stable/anda.hcl diff --git a/anda/system/readymade/readymade.spec b/anda/system/readymade/stable/readymade.spec similarity index 100% rename from anda/system/readymade/readymade.spec rename to anda/system/readymade/stable/readymade.spec diff --git a/anda/system/readymade/update.rhai b/anda/system/readymade/stable/update.rhai similarity index 100% rename from anda/system/readymade/update.rhai rename to anda/system/readymade/stable/update.rhai From 4716b3ca42f9f73264d2afb1550c39c92b7bf38d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 19 Apr 2025 03:29:44 +0000 Subject: [PATCH 0794/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index feb13ffc86..ebb530a29c 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.648 +Version: 0.0.649 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 5c5863e48a..6ca783bf08 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.648 +Version: 0.0.649 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From a14fe7c4aa58f0cca719119541757e0dd059faf5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 19 Apr 2025 06:31:08 +0000 Subject: [PATCH 0795/2977] bump: eza --- anda/langs/rust/eza/rust-eza.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/rust/eza/rust-eza.spec b/anda/langs/rust/eza/rust-eza.spec index e31f15c57f..871d4034a3 100644 --- a/anda/langs/rust/eza/rust-eza.spec +++ b/anda/langs/rust/eza/rust-eza.spec @@ -4,7 +4,7 @@ %global crate eza Name: rust-eza -Version: 0.21.0 +Version: 0.21.1 Release: 1%?dist Summary: Modern replacement for ls From 54b2bd25bd5ea6d2c4ba46030c15b0f793e3a418 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 19 Apr 2025 18:23:43 +0000 Subject: [PATCH 0796/2977] bump: osu-lazer --- anda/games/osu-lazer/osu-lazer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index 9bc567f241..18269a71ce 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -3,7 +3,7 @@ %define __strip /bin/true Name: osu-lazer -Version: 2025.418.1 +Version: 2025.420.0 Release: 1%?dist Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew. ExclusiveArch: x86_64 From dcdf1dc20204654bc6184de7fb7b1ab4a15fc90a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 19 Apr 2025 18:43:07 +0000 Subject: [PATCH 0797/2977] bump: libva-nvidia-driver --- .../nvidia/libva-nvidia-driver/libva-nvidia-driver.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/system/nvidia/libva-nvidia-driver/libva-nvidia-driver.spec b/anda/system/nvidia/libva-nvidia-driver/libva-nvidia-driver.spec index 86f00080fd..8884cc04d8 100644 --- a/anda/system/nvidia/libva-nvidia-driver/libva-nvidia-driver.spec +++ b/anda/system/nvidia/libva-nvidia-driver/libva-nvidia-driver.spec @@ -1,5 +1,5 @@ -%global commit0 0ef97c1849fac3e07cdf39ffe4cd9aa9f352896f -%global date 20250418 +%global commit0 cf27f85427b5562eb02805e4b41189a5461f740b +%global date 20250419 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global upstream_name nvidia-vaapi-driver From 390e81227e65701fdc5dc1b93977796dd0c2c05e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 19 Apr 2025 18:55:50 +0000 Subject: [PATCH 0798/2977] bump: libva-nvidia-driver --- anda/system/nvidia/libva-nvidia-driver/libva-nvidia-driver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/nvidia/libva-nvidia-driver/libva-nvidia-driver.spec b/anda/system/nvidia/libva-nvidia-driver/libva-nvidia-driver.spec index 8884cc04d8..f0ba9c769d 100644 --- a/anda/system/nvidia/libva-nvidia-driver/libva-nvidia-driver.spec +++ b/anda/system/nvidia/libva-nvidia-driver/libva-nvidia-driver.spec @@ -1,4 +1,4 @@ -%global commit0 cf27f85427b5562eb02805e4b41189a5461f740b +%global commit0 c2860cc621ae1ef515c003d43315c63a41529ff4 %global date 20250419 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) From 83ef3bea7787e5b6127e5554b6b0b61149eb95c1 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 19 Apr 2025 20:26:33 +0000 Subject: [PATCH 0799/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 6ee319e1b9..249ab7d4da 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.19.000224 +Version: 2025.04.19.200854 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 2a666ea006fd5afa897ee8dc86c24c043bfb9c40 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 19 Apr 2025 20:59:29 +0000 Subject: [PATCH 0800/2977] bump: surface-dtx-daemon --- anda/system/surface-dtx-daemon/surface-dtx-daemon.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/surface-dtx-daemon/surface-dtx-daemon.spec b/anda/system/surface-dtx-daemon/surface-dtx-daemon.spec index 73c0e01ebc..ef82a1a699 100644 --- a/anda/system/surface-dtx-daemon/surface-dtx-daemon.spec +++ b/anda/system/surface-dtx-daemon/surface-dtx-daemon.spec @@ -1,5 +1,5 @@ %global debug_package %{nil} -%global ver v0.3.8-1 +%global ver v0.3.9-1 %global ver2 %(echo %{ver} | sed 's/^v//') Name: terra-surface-dtx-daemon From 3ac727982504d01c0caf21a529a68e6d09260901 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 20 Apr 2025 01:41:18 +0000 Subject: [PATCH 0801/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 8a97dd2d2d..1e8951f8f1 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-18 +%global ver 2025-04-20 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From b10ef27e02425c1584db05c75e443aa0c513c019 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 20 Apr 2025 01:51:54 +0000 Subject: [PATCH 0802/2977] bump(nightly): nightly nightly prismlauncher-nightly astal openbangla-keyboard --- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/lib/astal/astal/astal.spec | 4 ++-- .../misc/openbangla-keyboard/openbangla-keyboard-nightly.spec | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 66f3da53b7..b61db9d395 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 6a876ef8ec3e2aeb3d15df0dfb0e07677e49ff03 +%global commit 4e10f972df556ecdf5b97090ef605f83188a23d7 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-04-18 +%global fulldate 2025-04-19 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 5a88ec3214..df05368a32 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 8102a16747d4e39aac62bc00f4597341f8c1f80a +%global commit 107d8ca483276263362c23482612d1cadea81c71 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250419 +%global commit_date 20250420 %global ver 0.184.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 9efdf36c1f..f7109b5ee2 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 3df98dd5e75047a6bad13da14fe6bfc84aef17c4 +%global commit 15a981b3f8a4f907ea65013e46164f3aab65b08d %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250419 +%global commit_date 20250420 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/lib/astal/astal/astal.spec b/anda/lib/astal/astal/astal.spec index bd520ed598..ccf3372eec 100644 --- a/anda/lib/astal/astal/astal.spec +++ b/anda/lib/astal/astal/astal.spec @@ -1,7 +1,7 @@ -%global commit d4dd7fcaa25b885d1327d66aac440ddc7e043090 +%global commit c96126c7e261737270ad7ae35b27674c318648e6 %global shortcommit %{sub %commit 1 7} -%global commit_date 20250418 +%global commit_date 20250420 Name: astal Version: 0^%commit_date.%shortcommit diff --git a/anda/misc/openbangla-keyboard/openbangla-keyboard-nightly.spec b/anda/misc/openbangla-keyboard/openbangla-keyboard-nightly.spec index b23666fc81..168daa34f5 100644 --- a/anda/misc/openbangla-keyboard/openbangla-keyboard-nightly.spec +++ b/anda/misc/openbangla-keyboard/openbangla-keyboard-nightly.spec @@ -1,6 +1,6 @@ %global ver 2.0.0 -%global commit 7072f4c27c29975de36e0480b72a122538d9c29d -%global commit_date 20250416 +%global commit be784f67f78776745787bd7196792eafdccf2e48 +%global commit_date 20250420 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: openbangla-keyboard-nightly From f3a6e548c1ed21fa144edc41df20047b57f8d543 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 20 Apr 2025 02:52:10 +0000 Subject: [PATCH 0803/2977] bump(branch): astal-gtk --- anda/lib/astal/astal-gtk/astal-gtk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/astal/astal-gtk/astal-gtk.spec b/anda/lib/astal/astal-gtk/astal-gtk.spec index 15db2c1eae..1df8f90573 100644 --- a/anda/lib/astal/astal-gtk/astal-gtk.spec +++ b/anda/lib/astal/astal-gtk/astal-gtk.spec @@ -1,5 +1,5 @@ -%global commit d4dd7fc -%global commit_date 20250418 +%global commit c96126c +%global commit_date 20250420 Name: astal Version: 0^%commit_date.%commit From 60d0c281df2ed62406d591efeb53cdfd590775cb Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 20 Apr 2025 13:45:49 +0000 Subject: [PATCH 0804/2977] bump: stable --- anda/system/readymade/stable/readymade.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/system/readymade/stable/readymade.spec b/anda/system/readymade/stable/readymade.spec index 0f7a5c6f07..06b5e205be 100644 --- a/anda/system/readymade/stable/readymade.spec +++ b/anda/system/readymade/stable/readymade.spec @@ -1,6 +1,6 @@ Name: readymade -Version: 0.12.0 -Release: 2%?dist +Version: 0.12.1 +Release: 1%?dist Summary: Install ready-made distribution images! License: GPL-3.0-or-later URL: https://github.com/FyraLabs/readymade From 7ff868612089375b9cca83548ff5b6f190af9388 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 20 Apr 2025 17:16:46 +0000 Subject: [PATCH 0805/2977] bump: ouch --- anda/langs/rust/ouch/rust-ouch.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/langs/rust/ouch/rust-ouch.spec b/anda/langs/rust/ouch/rust-ouch.spec index b745ec90d9..e59834a96b 100644 --- a/anda/langs/rust/ouch/rust-ouch.spec +++ b/anda/langs/rust/ouch/rust-ouch.spec @@ -4,8 +4,8 @@ %global crate ouch Name: rust-ouch -Version: 0.5.1 -Release: 1%{?dist} +Version: 0.6.0 +Release: 1%?dist Summary: Command-line utility for easily compressing and decompressing files and directories License: MIT From bda27cfb26815ebccc32592488aebd53e808be46 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 20 Apr 2025 17:46:12 +0000 Subject: [PATCH 0806/2977] bump: stable --- anda/system/readymade/stable/readymade.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/readymade/stable/readymade.spec b/anda/system/readymade/stable/readymade.spec index 06b5e205be..ac13df8f33 100644 --- a/anda/system/readymade/stable/readymade.spec +++ b/anda/system/readymade/stable/readymade.spec @@ -1,5 +1,5 @@ Name: readymade -Version: 0.12.1 +Version: 0.12.2 Release: 1%?dist Summary: Install ready-made distribution images! License: GPL-3.0-or-later From 0d5a860804c37b6010c66a414a0e9a2ec7faefd2 Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 21 Apr 2025 07:57:24 +0800 Subject: [PATCH 0807/2977] fix(subtitleedit): wrong path to exe (#4362) --- anda/apps/subtitleedit/subtitleedit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/subtitleedit/subtitleedit.spec b/anda/apps/subtitleedit/subtitleedit.spec index fbb4c7a780..61d3a6fdac 100644 --- a/anda/apps/subtitleedit/subtitleedit.spec +++ b/anda/apps/subtitleedit/subtitleedit.spec @@ -13,7 +13,7 @@ Packager: madonuko Provides: %realname = %evr Conflicts: %realname BuildRequires: unzip anda-srpm-macros -Requires: dejavu-sans-mono-fonts +Requires: dejavu-sans-mono-fonts mono-core %description %summary. @@ -33,7 +33,7 @@ EOF cat< subtitleedit #!/usr/bin/sh -exec mono /opt/subtitleedit/SubtitleEdit.exe "$@" +exec mono /usr/share/subtitleedit/SubtitleEdit.exe "$@" EOF From ffd787492518c473ca096470280b29d76a125bba Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 21 Apr 2025 07:57:44 +0800 Subject: [PATCH 0808/2977] fix: ouch (#4361) --- .../rust/ouch/ouch-fix-metadata-auto.diff | 19 ++++++++++++++----- anda/langs/rust/ouch/rust-ouch.spec | 10 +++++++--- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/anda/langs/rust/ouch/ouch-fix-metadata-auto.diff b/anda/langs/rust/ouch/ouch-fix-metadata-auto.diff index 4b23e58e2d..69692d0fe1 100644 --- a/anda/langs/rust/ouch/ouch-fix-metadata-auto.diff +++ b/anda/langs/rust/ouch/ouch-fix-metadata-auto.diff @@ -1,8 +1,17 @@ ---- ouch-0.5.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ ouch-0.5.1/Cargo.toml 2023-12-10T09:36:31.446957+00:00 -@@ -176,5 +176,3 @@ - ] - use_zstd_thin = ["zstd/thin"] +--- ouch-0.6.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ ouch-0.6.0/Cargo.toml 2025-04-20T17:51:00.814645+00:00 +@@ -223,9 +223,6 @@ + [build-dependencies.clap_mangen] + version = "0.2.24" -[target."cfg(not(unix))".dependencies.is_executable] -version = "1.0.1" +- + [profile.fast] + opt-level = 2 + lto = false +@@ -238,3 +235,4 @@ + lto = true + codegen-units = 1 + strip = true ++ diff --git a/anda/langs/rust/ouch/rust-ouch.spec b/anda/langs/rust/ouch/rust-ouch.spec index e59834a96b..34a41c36cd 100644 --- a/anda/langs/rust/ouch/rust-ouch.spec +++ b/anda/langs/rust/ouch/rust-ouch.spec @@ -1,5 +1,5 @@ -# Generated by rust2rpm 25 -%bcond_without check +# Generated by rust2rpm 27 +%bcond check 1 %global crate ouch @@ -25,11 +25,14 @@ and directories.} %package -n %{crate} Summary: %{summary} +License: (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-3-Clause AND (BSD-3-Clause AND MIT) AND (BSD-3-Clause OR MIT) AND CC0-1.0 AND LGPL-3.0-only AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND (Unlicense OR MIT) AND Zlib +# LICENSE.dependencies contains a full license breakdown %description -n %{crate} %{_description} %files -n %{crate} %license LICENSE +%license LICENSE.dependencies %doc CHANGELOG.md %doc CONTRIBUTING.md %doc README.md @@ -40,7 +43,8 @@ Summary: %{summary} %cargo_prep_online %build -%cargo_build +%{cargo_license_summary_online} +%{cargo_license_online} > LICENSE.dependencies %install %cargo_install From 2be2cbc691b9694f99cefc8e7840eae7d17d05a9 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 21 Apr 2025 01:51:04 +0000 Subject: [PATCH 0809/2977] bump(nightly): nightly prismlauncher-nightly nim-nightly nvidia-patch nightly --- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/system/nvidia-patch/nvidia-patch.spec | 4 ++-- anda/system/readymade/nightly/readymade-nightly.spec | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index df05368a32..f8f4667cf8 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 107d8ca483276263362c23482612d1cadea81c71 +%global commit 4473b45c3d00221dd82bcf27bca22b6bae63963f %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250420 +%global commit_date 20250421 %global ver 0.184.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index f7109b5ee2..b54215c802 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 15a981b3f8a4f907ea65013e46164f3aab65b08d +%global commit 60e279bf395b2a353c79b53780f5965371a80506 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250420 +%global commit_date 20250421 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 2a4593e3d1..e24f6028b6 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 032da90ed1eda03b837145d711b756cb897c099e +%global commit 8bc8d40778ce0a2adbc6ba97068b729179a3ffc3 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250419 +%global commit_date 20250421 %global debug_package %nil Name: nim-nightly diff --git a/anda/system/nvidia-patch/nvidia-patch.spec b/anda/system/nvidia-patch/nvidia-patch.spec index b2f20eb1d4..775764e2ab 100644 --- a/anda/system/nvidia-patch/nvidia-patch.spec +++ b/anda/system/nvidia-patch/nvidia-patch.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} -%global commit 40bcef23ea2fa20466ef696bf00c47ad3c78bc3d +%global commit 9d7804b5e3c5fe05cd49a3e550e02f1c659ccfbd %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250404 +%global commit_date 20250421 %global patches %{_datadir}/src/nvidia-patch diff --git a/anda/system/readymade/nightly/readymade-nightly.spec b/anda/system/readymade/nightly/readymade-nightly.spec index 8e96cce5be..a9da16e02b 100644 --- a/anda/system/readymade/nightly/readymade-nightly.spec +++ b/anda/system/readymade/nightly/readymade-nightly.spec @@ -1,5 +1,5 @@ -%global commit c0eeb68ca45c7aca207c874b9ecd53e6300c900a -%global commit_date 20250418 +%global commit d5599cd8cf5303d11c19e511239dc4a02066bf76 +%global commit_date 20250421 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: readymade-nightly From 8d89cb522486c26f448c3cd44efbc6b0c7e6e173 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 21 Apr 2025 06:28:28 +0000 Subject: [PATCH 0810/2977] bump: ouch --- anda/langs/rust/ouch/rust-ouch.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/rust/ouch/rust-ouch.spec b/anda/langs/rust/ouch/rust-ouch.spec index 34a41c36cd..73300e87ef 100644 --- a/anda/langs/rust/ouch/rust-ouch.spec +++ b/anda/langs/rust/ouch/rust-ouch.spec @@ -4,7 +4,7 @@ %global crate ouch Name: rust-ouch -Version: 0.6.0 +Version: 0.6.1 Release: 1%?dist Summary: Command-line utility for easily compressing and decompressing files and directories From bbf3c086aaef8cb85172b16b1b5c7ca77b515bcc Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 21 Apr 2025 07:39:30 +0000 Subject: [PATCH 0811/2977] bump: opengamepadui --- anda/games/opengamepadui/opengamepadui.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/opengamepadui/opengamepadui.spec b/anda/games/opengamepadui/opengamepadui.spec index f33b76406f..0b35ced87f 100644 --- a/anda/games/opengamepadui/opengamepadui.spec +++ b/anda/games/opengamepadui/opengamepadui.spec @@ -1,5 +1,5 @@ Name: opengamepadui -Version: 0.39.0 +Version: 0.39.1 Release: 1%?dist Summary: Open source gamepad-native game launcher and overlay From 35a917f6d6cc169622dd8a0b683cceebe0c18e92 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 21 Apr 2025 10:24:24 +0000 Subject: [PATCH 0812/2977] bump: vala-panel-appmenu --- anda/langs/vala/vala-panel-appmenu/vala-panel-appmenu.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/vala/vala-panel-appmenu/vala-panel-appmenu.spec b/anda/langs/vala/vala-panel-appmenu/vala-panel-appmenu.spec index 1a7fed9d90..fe4751fae3 100644 --- a/anda/langs/vala/vala-panel-appmenu/vala-panel-appmenu.spec +++ b/anda/langs/vala/vala-panel-appmenu/vala-panel-appmenu.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/vala-panel-project/vala-panel-appmenu -%global commit beacc0fd6fc279726d8a87c2704f283d58fec830 +%global commit f05d28d805a22a7564895aa178772361c44b6b7a %forgemeta Name: vala-panel-appmenu From d5385652ff19b42de61e39c4e0e565b381ed5a1e Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 21 Apr 2025 05:37:49 -0500 Subject: [PATCH 0813/2977] fix(xone): The weird version scheme funny (#4355) * fix(xone): The weird version scheme funny Signed-off-by: Gilver * Forgot the ifcond 0 Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/system/xone/kmod-common/xone.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/anda/system/xone/kmod-common/xone.spec b/anda/system/xone/kmod-common/xone.spec index cba440d47a..a42d60d041 100644 --- a/anda/system/xone/kmod-common/xone.spec +++ b/anda/system/xone/kmod-common/xone.spec @@ -8,13 +8,13 @@ Name: xone Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 1%?dist +Release: 2%?dist Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories common files License: GPL-2.0-or-later URL: https://github.com/dlundqvist/xone Source0: %{url}/archive/%{commit}.tar.gz#/xone-%{shortcommit}.tar.gz Source1: modules.conf -### Windows driver and firmware file: +### Windows drivers and firmware files: Source2: http://download.windowsupdate.com/c/msdownload/update/driver/drvs/2017/07/1cd6a87c-623f-4407-a52d-c31be49e925c_e19f60808bdcbfbd3c3df6be3e71ffc52e43261e.cab Source3: https://catalog.s.download.windowsupdate.com/d/msdownload/update/driver/drvs/2015/12/20810869_8ce2975a7fbaa06bcfb0d8762a6275a1cf7c1dd3.cab ### Microsoft TOU copy: @@ -48,6 +48,9 @@ Akmods modules for the akmod-%{name} package. Summary: Firmware for the XBox One controller dongle License: Proprietary Requires: wireless-regdb +%if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 +Provides: %{name}-firmware = %{commitdate}.%{shortcommit}-%{release} +%endif BuildArch: noarch %description firmware From b9a2822921a2e2826cbf911c13a1527cddc32467 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 21 Apr 2025 13:46:51 +0000 Subject: [PATCH 0814/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index ebb530a29c..a8cebd3e8c 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.649 +Version: 0.0.650 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 6ca783bf08..785c0081a9 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.649 +Version: 0.0.650 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From c8720e0b5b8f28375c290b0f147e725654dcd351 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 21 Apr 2025 15:36:48 +0000 Subject: [PATCH 0815/2977] bump: tdlib --- anda/lib/tdlib/tdlib-nightly.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 656961130f..09a63dfda7 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,6 +1,6 @@ -%global commit f1b7500310baa496c0b779e4273a3aff0f14f42f +%global commit 42b1b825130c60f4688dea1af45ce8a26012d433 %global ver 1.8.47 -%global commit_date 20250415 +%global commit_date 20250421 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: tdlib-nightly From 05dab03f22612d4c7fd0d0ff16b08dba567924df Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 21 Apr 2025 16:47:54 +0000 Subject: [PATCH 0816/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index a8cebd3e8c..ded0519db7 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.650 +Version: 0.0.651 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 785c0081a9..7ce4dd42f9 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.650 +Version: 0.0.651 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 45c42aab2f5c5b7820eef8f05b6fd3b3197fc69c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 21 Apr 2025 17:22:20 +0000 Subject: [PATCH 0817/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index ded0519db7..bdb61d72f2 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.651 +Version: 0.0.652 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 7ce4dd42f9..284047c2bf 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.651 +Version: 0.0.652 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From b5806979915f6feee2d3bb95216b514e68e9c660 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 21 Apr 2025 17:50:18 +0000 Subject: [PATCH 0818/2977] bump: inputplumber --- anda/games/inputplumber/inputplumber.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index 9574a5f745..f547a01804 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.53.0 +Version: 0.53.1 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later From 2ed6580648fc5f569e439ed806d9d87eb2ce7408 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 21 Apr 2025 18:00:37 +0000 Subject: [PATCH 0819/2977] bump: osu-lazer --- anda/games/osu-lazer/osu-lazer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index 18269a71ce..bdb44446d3 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -1,4 +1,4 @@ -%define osuresver 2025.321.0 +%define osuresver 2025.422.0 %global debug_package %{nil} %define __strip /bin/true From b27d6f7cced807a0990a3d3d4354c4035fd3a62f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 21 Apr 2025 18:36:36 +0000 Subject: [PATCH 0820/2977] bump: inputplumber --- anda/games/inputplumber/inputplumber.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index f547a01804..1f812ad7ad 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.53.1 +Version: 0.53.2 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later From fd034762e98a2a09437d5b18d24c9a3883b252c1 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 21 Apr 2025 19:15:35 +0000 Subject: [PATCH 0821/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 66014d3364..d4b6926f33 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.183.6-pre +%global ver 0.183.7-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From 7113d26c966969234f6641543fa4628b1d1e4f4f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 21 Apr 2025 19:28:28 +0000 Subject: [PATCH 0822/2977] bump: discord-canary-openasar discord-canary dwarfs --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- anda/lib/dwarfs/dwarfs.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index bdb61d72f2..39ccf81cae 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.652 +Version: 0.0.653 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 284047c2bf..2b900ac9ad 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.652 +Version: 0.0.653 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com diff --git a/anda/lib/dwarfs/dwarfs.spec b/anda/lib/dwarfs/dwarfs.spec index a8136995da..63b1a59db1 100644 --- a/anda/lib/dwarfs/dwarfs.spec +++ b/anda/lib/dwarfs/dwarfs.spec @@ -4,7 +4,7 @@ The Deduplicating Warp-speed Advanced Read-only File System. A fast high compression read-only file system for Linux and Windows.} Name: dwarfs -Version: 0.12.2 +Version: 0.12.3 Release: 1%?dist Summary: A fast high compression read-only file system for Linux, Windows and macOS License: GPL-3.0-or-later From 56ce1b4c21951e9737f9875b684e44ba41cbabf7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 21 Apr 2025 20:55:35 +0000 Subject: [PATCH 0823/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 39ccf81cae..dc344b8ec8 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.653 +Version: 0.0.654 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 2b900ac9ad..55ad339620 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.653 +Version: 0.0.654 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 295fe46df24da901d93f8ea743a73f8e31f48f1b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 21 Apr 2025 21:55:41 +0000 Subject: [PATCH 0824/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index dc344b8ec8..12f2f31b3f 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.654 +Version: 0.0.655 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 55ad339620..7256ec6f9d 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.654 +Version: 0.0.655 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 1968659d6c55b23179c1920f56651c337b344a0e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 21 Apr 2025 22:18:39 +0000 Subject: [PATCH 0825/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 12f2f31b3f..62ae73dd5d 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.655 +Version: 0.0.656 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 7256ec6f9d..206c937930 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.655 +Version: 0.0.656 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From f27539fefa3fef62c97cb1d7137b726155a54e70 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 21 Apr 2025 23:21:59 +0000 Subject: [PATCH 0826/2977] bump: sass --- anda/misc/sass/sass.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/misc/sass/sass.spec b/anda/misc/sass/sass.spec index 59954f441e..2ecc2dd151 100644 --- a/anda/misc/sass/sass.spec +++ b/anda/misc/sass/sass.spec @@ -4,7 +4,7 @@ %define _build_id_links none Name: sass -Version: 1.86.3 +Version: 1.87.0 Release: 1%?dist Summary: The reference implementation of Sass, written in Dart License: MIT From e5103b754fa9541cce5b25aa6b58dbbf125044be Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 22 Apr 2025 01:46:28 +0000 Subject: [PATCH 0827/2977] bump(nightly): nightly mpv nightly nightly nim-nightly nvidia-patch nightly --- anda/apps/legcord/nightly/legcord-nightly.spec | 4 ++-- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/system/nvidia-patch/nvidia-patch.spec | 4 ++-- anda/system/readymade/nightly/readymade-nightly.spec | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/anda/apps/legcord/nightly/legcord-nightly.spec b/anda/apps/legcord/nightly/legcord-nightly.spec index 55679ed223..6877b47c7a 100644 --- a/anda/apps/legcord/nightly/legcord-nightly.spec +++ b/anda/apps/legcord/nightly/legcord-nightly.spec @@ -1,5 +1,5 @@ -%global commit 4280257fc61a6113a397536700374026330241af -%global commit_date 20250411 +%global commit a5e0c2e5ae7d2be97bf8407eb5d2bfc89671b5dd +%global commit_date 20250422 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define debug_package %nil diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index be9926a1ac..025daa901e 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 3600c716ea240a78cd75bbff6765b78a88171ded +%global commit b8ab1074eb3362063f11c734468286541e265cdb %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250419 +%global commit_date 20250422 %global ver 0.40.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index b61db9d395..dff5a483c7 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 4e10f972df556ecdf5b97090ef605f83188a23d7 +%global commit 7ef9c24e3f200342b13be777718f1cf278dca1eb %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-04-19 +%global fulldate 2025-04-21 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index f8f4667cf8..d128ef4fd4 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 4473b45c3d00221dd82bcf27bca22b6bae63963f +%global commit 2e8ee9b64f3aae9e0d4041b7e28c143ffaa21da2 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250421 +%global commit_date 20250422 %global ver 0.184.0 %bcond_with check diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index e24f6028b6..f5d39929e1 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 8bc8d40778ce0a2adbc6ba97068b729179a3ffc3 +%global commit dc100c5caa673b039155e9e5d4c7fc0c239f4eb5 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250421 +%global commit_date 20250422 %global debug_package %nil Name: nim-nightly diff --git a/anda/system/nvidia-patch/nvidia-patch.spec b/anda/system/nvidia-patch/nvidia-patch.spec index 775764e2ab..4f7e246e7d 100644 --- a/anda/system/nvidia-patch/nvidia-patch.spec +++ b/anda/system/nvidia-patch/nvidia-patch.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} -%global commit 9d7804b5e3c5fe05cd49a3e550e02f1c659ccfbd +%global commit 93e97e3c458f7270a937993deb778c15f9f16406 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250421 +%global commit_date 20250422 %global patches %{_datadir}/src/nvidia-patch diff --git a/anda/system/readymade/nightly/readymade-nightly.spec b/anda/system/readymade/nightly/readymade-nightly.spec index a9da16e02b..5fff16d291 100644 --- a/anda/system/readymade/nightly/readymade-nightly.spec +++ b/anda/system/readymade/nightly/readymade-nightly.spec @@ -1,5 +1,5 @@ -%global commit d5599cd8cf5303d11c19e511239dc4a02066bf76 -%global commit_date 20250421 +%global commit 9d6e1dd9fd549bd5c90bf908f428a602a97d3dcf +%global commit_date 20250422 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: readymade-nightly From 3ad91d659927ba3d1ea52cc92f9f6c7b18def040 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 22 Apr 2025 01:57:36 +0000 Subject: [PATCH 0828/2977] bump: ruffle preview --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- anda/devs/zed/preview/zed-preview.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 1e8951f8f1..56cf70dcaa 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-20 +%global ver 2025-04-22 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index d4b6926f33..308b39d6b4 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.183.7-pre +%global ver 0.183.8-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From 0ceccc6f8ee18ad9df516653294f56621724503e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 22 Apr 2025 05:18:25 +0000 Subject: [PATCH 0829/2977] bump: kvrocks opengamepadui --- anda/devs/kvrocks/kvrocks.spec | 2 +- anda/games/opengamepadui/opengamepadui.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/kvrocks/kvrocks.spec b/anda/devs/kvrocks/kvrocks.spec index 76936334c5..287de5aa3b 100644 --- a/anda/devs/kvrocks/kvrocks.spec +++ b/anda/devs/kvrocks/kvrocks.spec @@ -1,5 +1,5 @@ Name: kvrocks -Version: 2.11.1 +Version: 2.12.0 Release: 1%?dist Summary: Distributed key value NoSQL database that uses RocksDB License: Apache-2.0 diff --git a/anda/games/opengamepadui/opengamepadui.spec b/anda/games/opengamepadui/opengamepadui.spec index 0b35ced87f..9587c1883f 100644 --- a/anda/games/opengamepadui/opengamepadui.spec +++ b/anda/games/opengamepadui/opengamepadui.spec @@ -1,5 +1,5 @@ Name: opengamepadui -Version: 0.39.1 +Version: 0.39.2 Release: 1%?dist Summary: Open source gamepad-native game launcher and overlay From 84a9f6e5cc179d17ecf52d5d897aa03cf138d5fa Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 22 Apr 2025 09:24:10 +0000 Subject: [PATCH 0830/2977] bump: nim --- anda/langs/nim/nim/nim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/nim/nim/nim.spec b/anda/langs/nim/nim/nim.spec index 5fc62c7a0e..2b4be8494f 100644 --- a/anda/langs/nim/nim/nim.spec +++ b/anda/langs/nim/nim/nim.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Name: nim -Version: 2.2.2 +Version: 2.2.4 Release: 1%?dist Summary: Imperative, multi-paradigm, compiled programming language License: MIT and BSD From 98fe51429106015090e1ad82a5dd59998ab0d22e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 22 Apr 2025 14:18:55 +0000 Subject: [PATCH 0831/2977] bump: preview arduino-cli --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/tools/arduino-cli/arduino-cli.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 308b39d6b4..7c9d9e99f7 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.183.8-pre +%global ver 0.183.9-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/tools/arduino-cli/arduino-cli.spec b/anda/tools/arduino-cli/arduino-cli.spec index be72c5e1cb..75562a3f3f 100644 --- a/anda/tools/arduino-cli/arduino-cli.spec +++ b/anda/tools/arduino-cli/arduino-cli.spec @@ -1,6 +1,6 @@ # https://github.com/arduino/arduino-cli %global goipath github.com/arduino/arduino-cli -Version: 1.2.0 +Version: 1.2.2 %gometa -f @@ -12,7 +12,7 @@ Arduino CLI is an all-in-one solution that provides Boards/Library Managers, ske %global godocs README.md Name: arduino-cli -Release: 2%?dist +Release: 1%?dist Summary: Arduino command line tool License: GPL-3.0 Packager: Owen Zimmerman From ffe62828adf1fb789ed995604cdb9eb6d53605cd Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 22 Apr 2025 17:16:50 +0000 Subject: [PATCH 0832/2977] bump: codium --- anda/devs/codium/codium.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/codium/codium.spec b/anda/devs/codium/codium.spec index b83b45d802..7e528fd1e4 100644 --- a/anda/devs/codium/codium.spec +++ b/anda/devs/codium/codium.spec @@ -12,7 +12,7 @@ %endif Name: codium -Version: 1.99.32562 +Version: 1.99.32704 Release: 1%?dist Summary: Code editing. Redefined. License: MIT From 13bbeac4e6ac2a3cf0f15dfe57f7bc625cb796c8 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 22 Apr 2025 18:27:16 +0000 Subject: [PATCH 0833/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index 6bb31948b0..f30d2e7780 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.4.5 +Version: 2025.4.6 Release: 1%?dist Summary: Front-end to your dev env From 7d5c9f924d4ff5adc8b23a1b808cac945613a810 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 22 Apr 2025 21:17:26 +0000 Subject: [PATCH 0834/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 7c9d9e99f7..5cdb881cc7 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.183.9-pre +%global ver 0.183.10-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From 019cd08932dc61c15261ae51e44b2f7fc6d1538c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 22 Apr 2025 22:37:44 +0000 Subject: [PATCH 0835/2977] bump: inputplumber --- anda/games/inputplumber/inputplumber.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index 1f812ad7ad..c1a86a53e4 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.53.2 +Version: 0.54.0 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later From 8b8bd5be4a17d2024d07315dbaff7527e890f4bc Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 22 Apr 2025 23:22:25 +0000 Subject: [PATCH 0836/2977] bump: discord-openasar discord --- anda/apps/discord-openasar/discord-openasar.spec | 2 +- anda/apps/discord/discord.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-openasar/discord-openasar.spec b/anda/apps/discord-openasar/discord-openasar.spec index 3c4390e0c9..e6bc6006a1 100644 --- a/anda/apps/discord-openasar/discord-openasar.spec +++ b/anda/apps/discord-openasar/discord-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-openasar -Version: 0.0.91 +Version: 0.0.92 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord/discord.spec b/anda/apps/discord/discord.spec index 4141ee16b1..2dc9815dbe 100644 --- a/anda/apps/discord/discord.spec +++ b/anda/apps/discord/discord.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord -Version: 0.0.91 +Version: 0.0.92 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: https://discord.com From d65767c080db821862645ae0ab3c636660699a83 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 22 Apr 2025 23:58:48 +0000 Subject: [PATCH 0837/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 249ab7d4da..68e91c4cd0 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.19.200854 +Version: 2025.04.22.234753 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 461e43aca95d2ae13d73e04c79b39a3d8f1d04aa Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 23 Apr 2025 01:46:54 +0000 Subject: [PATCH 0838/2977] bump(nightly): envision mpv nightly nightly nim-nightly nightly spotx-bash --- anda/apps/envision/envision.spec | 4 ++-- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/system/readymade/nightly/readymade-nightly.spec | 4 ++-- anda/tools/spotx-bash/spotx-bash.spec | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/anda/apps/envision/envision.spec b/anda/apps/envision/envision.spec index 9b4edd9483..1370365fa8 100644 --- a/anda/apps/envision/envision.spec +++ b/anda/apps/envision/envision.spec @@ -1,5 +1,5 @@ -%global commit 139f72e2941c4e91091acef6c86712fec566425b -%global commit_date 20250409 +%global commit 9d85f1c24f5c6234e1672c96ea19b2dc990001e8 +%global commit_date 20250423 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: envision-nightly diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 025daa901e..1a92b5e777 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit b8ab1074eb3362063f11c734468286541e265cdb +%global commit f147df1393ddd2d4ec702b9768662e2cc6f7778a %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250422 +%global commit_date 20250423 %global ver 0.40.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index dff5a483c7..ad769469c9 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 7ef9c24e3f200342b13be777718f1cf278dca1eb +%global commit f5b5a36835583a89a48713c419235e1c693b794c %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-04-21 +%global fulldate 2025-04-22 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index d128ef4fd4..f3ec935d55 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 2e8ee9b64f3aae9e0d4041b7e28c143ffaa21da2 +%global commit 6a009b447af415f80cdb55d8c6064e984b899fd5 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250422 +%global commit_date 20250423 %global ver 0.184.0 %bcond_with check diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index f5d39929e1..79c859201f 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit dc100c5caa673b039155e9e5d4c7fc0c239f4eb5 +%global commit d966ee3fc3874f63b4e32a7edc7566982bb570ce %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250422 +%global commit_date 20250423 %global debug_package %nil Name: nim-nightly diff --git a/anda/system/readymade/nightly/readymade-nightly.spec b/anda/system/readymade/nightly/readymade-nightly.spec index 5fff16d291..0ee7126cc2 100644 --- a/anda/system/readymade/nightly/readymade-nightly.spec +++ b/anda/system/readymade/nightly/readymade-nightly.spec @@ -1,5 +1,5 @@ -%global commit 9d6e1dd9fd549bd5c90bf908f428a602a97d3dcf -%global commit_date 20250422 +%global commit 76d357aa1cac37c9c79b3219e82a58a9fd05c2da +%global commit_date 20250423 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: readymade-nightly diff --git a/anda/tools/spotx-bash/spotx-bash.spec b/anda/tools/spotx-bash/spotx-bash.spec index a279606b98..98985393b7 100644 --- a/anda/tools/spotx-bash/spotx-bash.spec +++ b/anda/tools/spotx-bash/spotx-bash.spec @@ -1,5 +1,5 @@ -%global commit 9093d0e29f0c871ce7a005a8e4cd5ca474438b24 -%global commit_date 20250412 +%global commit 2b146e65a8a5ff875217e1c9f5d2948b17451663 +%global commit_date 20250423 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: spotx-bash From 17f03adbd7750e45419579869d9a7e223c3d79bb Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 23 Apr 2025 02:01:36 +0000 Subject: [PATCH 0839/2977] bump: ruffle yt-dlp --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 56cf70dcaa..c53f624943 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-22 +%global ver 2025-04-23 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 68e91c4cd0..4c52dfc78b 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.22.234753 +Version: 2025.04.23.001458 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 650fbea522824f3bffa14bd6289e16a45291ec85 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 23 Apr 2025 04:26:46 +0000 Subject: [PATCH 0840/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index f30d2e7780..c2fc9e07bc 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.4.6 +Version: 2025.4.7 Release: 1%?dist Summary: Front-end to your dev env From 099779ea5cd13dde4d858862191f897ec363ba0c Mon Sep 17 00:00:00 2001 From: Adam Fidel Date: Wed, 23 Apr 2025 00:06:38 -0500 Subject: [PATCH 0841/2977] add: flatpost (#4376) * Add flatpost Co-authored-by: GloriousEggroll * bump to 1.0.5 * partially address review comments * add mime types * Fix typo in License Co-authored-by: madomado Signed-off-by: Adam Fidel * add patch to add mime types --------- Signed-off-by: Adam Fidel Co-authored-by: GloriousEggroll Co-authored-by: madomado --- anda/apps/flatpost/anda.hcl | 6 ++ .../flatpost/flatpost-desktop-mimetype.patch | 16 ++++ anda/apps/flatpost/flatpost-mime.xml | 11 +++ anda/apps/flatpost/flatpost.spec | 79 +++++++++++++++++++ anda/apps/flatpost/update.rhai | 1 + 5 files changed, 113 insertions(+) create mode 100644 anda/apps/flatpost/anda.hcl create mode 100644 anda/apps/flatpost/flatpost-desktop-mimetype.patch create mode 100644 anda/apps/flatpost/flatpost-mime.xml create mode 100644 anda/apps/flatpost/flatpost.spec create mode 100644 anda/apps/flatpost/update.rhai diff --git a/anda/apps/flatpost/anda.hcl b/anda/apps/flatpost/anda.hcl new file mode 100644 index 0000000000..8c63cdb5fd --- /dev/null +++ b/anda/apps/flatpost/anda.hcl @@ -0,0 +1,6 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "flatpost.spec" + } +} diff --git a/anda/apps/flatpost/flatpost-desktop-mimetype.patch b/anda/apps/flatpost/flatpost-desktop-mimetype.patch new file mode 100644 index 0000000000..9a38226d84 --- /dev/null +++ b/anda/apps/flatpost/flatpost-desktop-mimetype.patch @@ -0,0 +1,16 @@ +commit 86a77b2e3d69a09f75992e6795903ab56df1a900 (HEAD -> main, fork/main) +Author: Adam Fidel +Date: Tue Apr 22 14:52:16 2025 -0500 + + feat: add MimeType to .desktop file + +diff --git a/data/usr/share/applications/com.flatpost.flatpostapp.desktop b/data/usr/share/applications/com.flatpost.flatpostapp.desktop +index 73013fc..d1f321d 100644 +--- a/data/usr/share/applications/com.flatpost.flatpostapp.desktop ++++ b/data/usr/share/applications/com.flatpost.flatpostapp.desktop +@@ -4,3 +4,4 @@ Exec=python3 /usr/bin/flatpost + Icon=com.flatpost.flatpostapp + Type=Application + Categories=Utility; ++MimeType=application/vnd.flatpak.ref;application/vnd.flatpak.repo; + diff --git a/anda/apps/flatpost/flatpost-mime.xml b/anda/apps/flatpost/flatpost-mime.xml new file mode 100644 index 0000000000..c473050ee5 --- /dev/null +++ b/anda/apps/flatpost/flatpost-mime.xml @@ -0,0 +1,11 @@ + + + + + Flatpak Reference File + + + + Flatpak Repository File + + diff --git a/anda/apps/flatpost/flatpost.spec b/anda/apps/flatpost/flatpost.spec new file mode 100644 index 0000000000..0c89931c62 --- /dev/null +++ b/anda/apps/flatpost/flatpost.spec @@ -0,0 +1,79 @@ +%global tag 1.0.5 + +Name: flatpost +Version: %{tag} +Release: 1%?dist +License: BSD-2-Clause +Summary: Desktop environment agnostic Flathub software center. + +URL: https://github.com/gloriouseggroll/flatpost +Source0: %{url}/archive/refs/tags/%{tag}.tar.gz#/%{name}-%{tag}.tar.gz +Source1: flatpost-mime.xml +Patch0: flatpost-desktop-mimetype.patch + +BuildArch: noarch +BuildRequires: python3-devel +BuildRequires: make +BuildRequires: desktop-file-utils + +Provides: nobara-updater + +# App Deps +Requires: python +Requires: python3 +Requires: python3-gobject +Requires: python3-requests +Requires: python3-pillow +Requires: python3-svgwrite +Requires: python3-fonttools +Requires: python3-numpy + +Requires: flatpak +Requires: glib2 +Requires: gtk3 +Requires: gtk4 +Requires: xdg-utils + +Requires(post): shared-mime-info +Requires(postun): shared-mime-info +Requires(posttrans): shared-mime-info + +%description +Desktop environment agnostic Flathub software center. Allows for browsing, +installation, removal, updating, and permission management of flatpak packages and repositories. + +%prep +%autosetup -p1 + +%build +make all DESTDIR=%{buildroot} +install -D -m644 %{SOURCE1} %{buildroot}/usr/share/mime/packages/flatpost.xml + +%check +desktop-file-validate %{buildroot}%{_datadir}/applications/com.flatpost.flatpostapp.desktop + +%post +xdg-icon-resource forceupdate --theme hicolor &>/dev/null +update-mime-database usr/share/mime &>/dev/null +update-desktop-database -q + +%postun +xdg-icon-resource forceupdate --theme hicolor &>/dev/null +update-mime-database usr/share/mime &>/dev/null +update-desktop-database -q + +%posttrans +xdg-icon-resource forceupdate --theme hicolor &>/dev/null +update-mime-database usr/share/mime &>/dev/null +update-desktop-database -q + +%files +%{python3_sitelib}/flatpost/ +%{_bindir}/flatpost +%{_datadir}/applications/com.flatpost.flatpostapp.desktop +%{_datadir}/flatpost/collections_data.json +%{_datadir}/icons/hicolor/1024x1024/apps/com.flatpost.flatpostapp.png +%{_datadir}/icons/hicolor/64x64/apps/com.flatpost.flatpostapp.png +%{_datadir}/mime/packages/flatpost.xml +%license %{_datadir}/licenses/flatpost/LICENSE + diff --git a/anda/apps/flatpost/update.rhai b/anda/apps/flatpost/update.rhai new file mode 100644 index 0000000000..99eead2d72 --- /dev/null +++ b/anda/apps/flatpost/update.rhai @@ -0,0 +1 @@ +rpm.version(gh_rawfile("GloriousEggroll/flatpost", "main", "VERSION.txt")); From 43cfddae6db5e6c1c62798398dacfda748a15804 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 23 Apr 2025 05:22:48 +0000 Subject: [PATCH 0842/2977] bump: flatpost --- anda/apps/flatpost/flatpost.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anda/apps/flatpost/flatpost.spec b/anda/apps/flatpost/flatpost.spec index 0c89931c62..5ae0db655e 100644 --- a/anda/apps/flatpost/flatpost.spec +++ b/anda/apps/flatpost/flatpost.spec @@ -1,7 +1,8 @@ %global tag 1.0.5 Name: flatpost -Version: %{tag} +Version: 1.0.5 + Release: 1%?dist License: BSD-2-Clause Summary: Desktop environment agnostic Flathub software center. From f5d2e3aceaa21d07335bcf336e88b4bd81932ccc Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 23 Apr 2025 05:41:25 +0000 Subject: [PATCH 0843/2977] bump: flatpost --- anda/apps/flatpost/flatpost.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/apps/flatpost/flatpost.spec b/anda/apps/flatpost/flatpost.spec index 5ae0db655e..83c526f436 100644 --- a/anda/apps/flatpost/flatpost.spec +++ b/anda/apps/flatpost/flatpost.spec @@ -3,6 +3,7 @@ Name: flatpost Version: 1.0.5 + Release: 1%?dist License: BSD-2-Clause Summary: Desktop environment agnostic Flathub software center. From d05d4bd1278d7d2df76e8639ab07582c175050cd Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 23 Apr 2025 05:55:38 +0000 Subject: [PATCH 0844/2977] bump: flatpost --- anda/apps/flatpost/flatpost.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/apps/flatpost/flatpost.spec b/anda/apps/flatpost/flatpost.spec index 83c526f436..85ace32a99 100644 --- a/anda/apps/flatpost/flatpost.spec +++ b/anda/apps/flatpost/flatpost.spec @@ -4,6 +4,7 @@ Name: flatpost Version: 1.0.5 + Release: 1%?dist License: BSD-2-Clause Summary: Desktop environment agnostic Flathub software center. From e37dc27434f4401f61d971a478487648164f53f2 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 23 Apr 2025 06:27:43 +0000 Subject: [PATCH 0845/2977] bump: flatpost --- anda/apps/flatpost/flatpost.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/apps/flatpost/flatpost.spec b/anda/apps/flatpost/flatpost.spec index 85ace32a99..18474f2b8d 100644 --- a/anda/apps/flatpost/flatpost.spec +++ b/anda/apps/flatpost/flatpost.spec @@ -5,6 +5,7 @@ Version: 1.0.5 + Release: 1%?dist License: BSD-2-Clause Summary: Desktop environment agnostic Flathub software center. From ed2f45849e3ca2aee89ecd4ba4166afae37e04bb Mon Sep 17 00:00:00 2001 From: madomado Date: Wed, 23 Apr 2025 14:33:02 +0800 Subject: [PATCH 0846/2977] fix(flatpost): update.rhai (#4381) * fix(flatpost): update.rhai Signed-off-by: madomado * actually just this Signed-off-by: madomado * trim? Signed-off-by: madomado --------- Signed-off-by: madomado --- anda/apps/flatpost/flatpost.spec | 8 +------- anda/apps/flatpost/update.rhai | 4 +++- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/anda/apps/flatpost/flatpost.spec b/anda/apps/flatpost/flatpost.spec index 18474f2b8d..720712cf36 100644 --- a/anda/apps/flatpost/flatpost.spec +++ b/anda/apps/flatpost/flatpost.spec @@ -1,17 +1,11 @@ -%global tag 1.0.5 - Name: flatpost Version: 1.0.5 - - - - Release: 1%?dist License: BSD-2-Clause Summary: Desktop environment agnostic Flathub software center. URL: https://github.com/gloriouseggroll/flatpost -Source0: %{url}/archive/refs/tags/%{tag}.tar.gz#/%{name}-%{tag}.tar.gz +Source0: %{url}/archive/refs/tags/%{version}.tar.gz Source1: flatpost-mime.xml Patch0: flatpost-desktop-mimetype.patch diff --git a/anda/apps/flatpost/update.rhai b/anda/apps/flatpost/update.rhai index 99eead2d72..388673813c 100644 --- a/anda/apps/flatpost/update.rhai +++ b/anda/apps/flatpost/update.rhai @@ -1 +1,3 @@ -rpm.version(gh_rawfile("GloriousEggroll/flatpost", "main", "VERSION.txt")); +let v = gh_rawfile("GloriousEggroll/flatpost", "main", "VERSION.txt"); +v.trim(); +rpm.version(v); From a0bc65158fed9a7b3491e9cfe8022530e725c3e2 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 23 Apr 2025 09:27:58 +0000 Subject: [PATCH 0847/2977] bump: tdlib --- anda/lib/tdlib/tdlib-nightly.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 09a63dfda7..58d8aaa230 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,6 +1,6 @@ -%global commit 42b1b825130c60f4688dea1af45ce8a26012d433 +%global commit 6e32e56b56699cf91513ef349bab85d5f1450a05 %global ver 1.8.47 -%global commit_date 20250421 +%global commit_date 20250423 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: tdlib-nightly From d4fb9ff03416060963b82b77046d8e533e674bb6 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 23 Apr 2025 10:15:11 +0000 Subject: [PATCH 0848/2977] bump(branch): ffmpeg --- anda/multimedia/ffmpeg/VERSION_tesseract.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/multimedia/ffmpeg/VERSION_tesseract.txt b/anda/multimedia/ffmpeg/VERSION_tesseract.txt index acf69b48b8..c7ba1e87f7 100644 --- a/anda/multimedia/ffmpeg/VERSION_tesseract.txt +++ b/anda/multimedia/ffmpeg/VERSION_tesseract.txt @@ -1 +1 @@ -5.1.0 \ No newline at end of file +5.5.0 \ No newline at end of file From 978c9280b511d0a76f5bc9288d679b04b8d0ff0d Mon Sep 17 00:00:00 2001 From: bunzuhbu Date: Wed, 23 Apr 2025 16:54:09 +0300 Subject: [PATCH 0849/2977] add: nekoray (#4374) * update * Update version * update singbox version * fix: add build-ids --------- Co-authored-by: u Co-authored-by: madonuko --- .../apps/nekoray/Sagernet.SingBox.Version.txt | 1 + anda/apps/nekoray/anda.hcl | 5 + anda/apps/nekoray/nekoray.desktop | 11 +++ anda/apps/nekoray/nekoray.sh | 2 + anda/apps/nekoray/nekoray.spec | 93 +++++++++++++++++++ anda/apps/nekoray/pre.rhai | 5 + anda/apps/nekoray/pre.sh | 9 ++ anda/apps/nekoray/update.rhai | 3 + 8 files changed, 129 insertions(+) create mode 100644 anda/apps/nekoray/Sagernet.SingBox.Version.txt create mode 100644 anda/apps/nekoray/anda.hcl create mode 100644 anda/apps/nekoray/nekoray.desktop create mode 100644 anda/apps/nekoray/nekoray.sh create mode 100644 anda/apps/nekoray/nekoray.spec create mode 100644 anda/apps/nekoray/pre.rhai create mode 100644 anda/apps/nekoray/pre.sh create mode 100644 anda/apps/nekoray/update.rhai diff --git a/anda/apps/nekoray/Sagernet.SingBox.Version.txt b/anda/apps/nekoray/Sagernet.SingBox.Version.txt new file mode 100644 index 0000000000..40faed9aa4 --- /dev/null +++ b/anda/apps/nekoray/Sagernet.SingBox.Version.txt @@ -0,0 +1 @@ +1.11.8 diff --git a/anda/apps/nekoray/anda.hcl b/anda/apps/nekoray/anda.hcl new file mode 100644 index 0000000000..b122b1135d --- /dev/null +++ b/anda/apps/nekoray/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "nekoray.spec" + } +} diff --git a/anda/apps/nekoray/nekoray.desktop b/anda/apps/nekoray/nekoray.desktop new file mode 100644 index 0000000000..5be2046d62 --- /dev/null +++ b/anda/apps/nekoray/nekoray.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Terminal=false +Type=Application +Name=nekoray +Categories=Network; +Comment=Qt based cross-platform GUI proxy configuration manager (backend: sing-box) +Comment[zh_CN]=基于 Qt 的跨平台代理配置管理器 (后端 sing-box) +Keywords=Internet;VPN;Proxy;sing-box; +Exec=/bin/nekoray +Icon=/usr/share/icons/nekoray.ico diff --git a/anda/apps/nekoray/nekoray.sh b/anda/apps/nekoray/nekoray.sh new file mode 100644 index 0000000000..6a41b65f7a --- /dev/null +++ b/anda/apps/nekoray/nekoray.sh @@ -0,0 +1,2 @@ +#!/bin/sh +/lib64/nekoray/nekoray -appdata "${@}" diff --git a/anda/apps/nekoray/nekoray.spec b/anda/apps/nekoray/nekoray.spec new file mode 100644 index 0000000000..cd92bb2e8a --- /dev/null +++ b/anda/apps/nekoray/nekoray.spec @@ -0,0 +1,93 @@ +%global gomodulesmode GO111MODULE=on +Name: nekoray +Version: 4.3.3 +Release: 0%{?autorelease} +Summary: Qt based cross-platform GUI proxy configuration manager (backend: sing-box) +URL: https://github.com/Mahdi-zarei/nekoray +License: GPLv3 + +Source0: https://github.com/Mahdi-zarei/nekoray/archive/refs/tags/%{version}.tar.gz#/nekoray-%{version}.tar.gz +Packager: bunzuhbu +Source1: vendor-%{version}.tar.gz +%define fetch_vendor %{_rpmconfigdir}/rpmuncompress -xv %{SOURCE1} + +Source2: Sagernet.SingBox.Version.txt +%define singbox_version $(cat %{SOURCE2}) + +Source3: %{name}.desktop +Source4: %{name}.sh + +BuildRequires: rpm_macro(cmake) +BuildRequires: rpm_macro(cmake_build) +BuildRequires: rpm_macro(cmake_install) +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: pkgconfig(protobuf) +BuildRequires: pkgconfig(libcurl) +BuildRequires: cmake(yaml-cpp) +BuildRequires: cmake(ZXing) +BuildRequires: cmake(absl) +BuildRequires: cmake(cpr) +BuildRequires: cmake(Qt6) +BuildRequires: cmake(Qt6Svg) +BuildRequires: cmake(Qt6Linguist) +BuildRequires: cmake(Qt6Charts) +BuildRequires: patchelf +BuildRequires: sed +BuildRequires: golang +BuildRequires: rpm_macro(gobuildflags) +Requires: %{name}-core +%define core nekobox_core + +%package core +Summary: %{summary} + +%description +%{summary} + +%description core +%{summary} + +%prep +%autosetup -p1 -n %{name}-%{version} +sed -i 's~find_package(Protobuf CONFIG REQUIRED)~find_package(Protobuf REQUIRED)~' cmake/myproto.cmake +sed -i 's~add_library(qhotkey 3rdparty/QHotkey/qhotkey.cpp)~add_library(qhotkey STATIC 3rdparty/QHotkey/qhotkey.cpp)~' cmake/QHotkey.cmake +sed -i 's~ImageFormat::BGRA~ImageFormat::BGR~' 3rdparty/ZxingQtReader.hpp +pushd core/server +%{fetch_vendor} +popd + +%build +%cmake +%cmake_build +DEST=$PWD/%{__cmake_builddir}/%{core} +pushd core/server +go build %{gobuildflags} -o $DEST -trimpath -ldflags "-B 0x$(echo "%{name}-%{version}-%{release}-${SOURCE_DATE_EPOCH:-}" | sha1sum | cut -d ' ' -f1) -w -s -X 'github.com/sagernet/sing-box/constant.Version=%{singbox_version}'" -tags "with_clash_api,with_gvisor,with_quic,with_wireguard,with_utls,with_ech,with_dhcp" +popd + +%install +mkdir -p %{buildroot}%{_libdir}/%{name} +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_datadir}/applications +mkdir -p %{buildroot}%{_datadir}/icons + +cp %{SOURCE4} %{buildroot}%{_bindir}/%{name} +cp %{SOURCE3} %{buildroot}%{_datadir}/applications/%{name}.desktop +sed -i 's~/bin~%{_bindir}~g;s~/usr/share~%{_datadir}~g;s~nekoray~%{name}~g' %{buildroot}%{_datadir}/applications/%{name}.desktop +sed -i 's~/bin~%{_bindir}~g;s~/lib64~%{_libdir}~g;s~nekoray~%{name}~g' %{buildroot}%{_bindir}/%{name} +cp %{__cmake_builddir}/%{name} %{buildroot}%{_libdir}/%{name}/%{name} +cp %{__cmake_builddir}/%{core} %{buildroot}%{_libdir}/%{name}/%{core} +cp res/nekoray.ico %{buildroot}%{_datadir}/icons/%{name}.ico +patchelf --remove-rpath %{buildroot}%{_libdir}/%{name}/%{name} +patchelf --remove-rpath %{buildroot}%{_libdir}/%{name}/%{core} + +%files +%attr(0755, -, -) %{_bindir}/%{name} +%attr(0755, -, -) %{_libdir}/%{name}/%{name} +%attr(0644, -, -) %{_datadir}/icons/%{name}.ico +%attr(0644, -, -) %{_datadir}/applications/%{name}.desktop + +%files core +%dir %{_libdir}/%{name} +%attr(0755, -, -) %{_libdir}/%{name}/%{core} + diff --git a/anda/apps/nekoray/pre.rhai b/anda/apps/nekoray/pre.rhai new file mode 100644 index 0000000000..8ad379de32 --- /dev/null +++ b/anda/apps/nekoray/pre.rhai @@ -0,0 +1,5 @@ +let sourcedir = "anda/apps/nekoray"; + +sh(`dnf in -y golang rpmdevtools tar rpm-build coreutils`, #{}); +sh(`pushd ${sourcedir}; bash -x pre.sh; popd`, #{}); + diff --git a/anda/apps/nekoray/pre.sh b/anda/apps/nekoray/pre.sh new file mode 100644 index 0000000000..4c07e522b2 --- /dev/null +++ b/anda/apps/nekoray/pre.sh @@ -0,0 +1,9 @@ +export sourcedir="$PWD" +rpmdev-spectool --all --get-files nekoray.spec +version=$(rpmspec --query --queryformat "%{VERSION}\n" nekoray.spec | uniq) + +tar -xzf "nekoray-${version}.tar.gz" +pushd "nekoray-${version}/core/server" + go mod vendor + tar -czf "${sourcedir}/vendor-${version}.tar.gz" vendor +popd diff --git a/anda/apps/nekoray/update.rhai b/anda/apps/nekoray/update.rhai new file mode 100644 index 0000000000..a34cc96916 --- /dev/null +++ b/anda/apps/nekoray/update.rhai @@ -0,0 +1,3 @@ +rpm.version(find(`([\d.]+)-\d+-\d+-\d+`, gh_rawfile("Mahdi-zarei/nekoray", "dev", "nekoray_version.txt"), 1)); + +open_file("anda/apps/nekoray/Sagernet.SingBox.Version.txt", "w").write(gh('sagernet/sing-box')); From ff617fd04db2e4b41a7ac2188113d687cc4df3df Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 23 Apr 2025 14:41:12 +0000 Subject: [PATCH 0850/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 4c52dfc78b..530c1cb1f5 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.23.001458 +Version: 2025.04.23.143136 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From d7fe7d689ed5a16735f5e7d99321304a9f4bc62c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 23 Apr 2025 16:49:32 +0000 Subject: [PATCH 0851/2977] bump: tdlib --- anda/lib/tdlib/tdlib-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 58d8aaa230..aea5c75403 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,4 +1,4 @@ -%global commit 6e32e56b56699cf91513ef349bab85d5f1450a05 +%global commit 971684a3dcc7bdf99eec024e1c4f57ae729d6d53 %global ver 1.8.47 %global commit_date 20250423 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From e8a9158436c249589f9e0b39318853641afece6f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 23 Apr 2025 17:25:20 +0000 Subject: [PATCH 0852/2977] bump: preview stable --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 5cdb881cc7..3db85bdce6 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.183.10-pre +%global ver 0.183.10 # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 5f566db735..e5dfe94ec2 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.182.11 +Version: 0.183.10 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor From 9df96c707aeaef7419015189d4d8c272e936eeca Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 23 Apr 2025 17:40:50 +0000 Subject: [PATCH 0853/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 3db85bdce6..58de646e04 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.183.10 +%global ver 0.184.0-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From a82a94d95f76d145ed849135c203957d47792a10 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 23 Apr 2025 18:27:58 +0000 Subject: [PATCH 0854/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 62ae73dd5d..aa787ade67 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.656 +Version: 0.0.657 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 206c937930..9e02a89433 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.656 +Version: 0.0.657 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 0d2de4855c111c4c9308d1294c9d6cb510eaa166 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 23 Apr 2025 19:28:23 +0000 Subject: [PATCH 0855/2977] bump: anki-bin preview --- anda/apps/anki-bin/anki-bin.spec | 8 ++++---- anda/devs/zed/preview/zed-preview.spec | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/anda/apps/anki-bin/anki-bin.spec b/anda/apps/anki-bin/anki-bin.spec index d301686613..34a128f7b7 100644 --- a/anda/apps/anki-bin/anki-bin.spec +++ b/anda/apps/anki-bin/anki-bin.spec @@ -1,9 +1,9 @@ -%global xurl https://files.pythonhosted.org/packages/c7/cb/fa787ddcea10823b8a77713f6dd4d6cea6b17fe632bede3bf2d988dff7dc/anki-25.02.1-cp39-abi3-manylinux_2_35_x86_64.whl -%global aurl https://files.pythonhosted.org/packages/6b/b2/514364b7a8de44a9f22ddc9ec50439e0fe404f0e7e63b64dbb3ca8ebac21/anki-25.02.1-cp39-abi3-manylinux_2_35_aarch64.whl -%global qurl https://files.pythonhosted.org/packages/66/3f/ffa764b5262c8166c84e701cc333a62f8108d8200647be4a8230c1397e3e/aqt-25.02.1-py3-none-any.whl +%global xurl https://files.pythonhosted.org/packages/0e/ff/a67920e3bb66fe3563372efd3e0f0f36915506c5034e55669af4b72f0d07/anki-25.02.3-cp39-abi3-manylinux_2_35_x86_64.whl +%global aurl https://files.pythonhosted.org/packages/c3/db/0ddf1bd374c9c578df4a050fcffeef4796073315a02accb442d86253d0d3/anki-25.02.3-cp39-abi3-manylinux_2_35_aarch64.whl +%global qurl https://files.pythonhosted.org/packages/5f/60/1cd30c4577967d3bb1ac047ddfeeb22f43bf02f00da611ca8681a8dd0512/aqt-25.02.3-py3-none-any.whl Name: anki-bin -Version: 25.02.1 +Version: 25.02.3 Release: 1%?dist Summary: Flashcard program for using space repetition learning (Installed with wheel) License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5 diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 58de646e04..688ab0de9e 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.184.0-pre +%global ver 0.184.1-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From d27322bcb88de2701d80244152f82e0d2ed14b15 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 23 Apr 2025 20:28:41 +0000 Subject: [PATCH 0856/2977] bump: discord-canary-openasar discord-canary electron --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- anda/tools/electron/electron.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index aa787ade67..de77c1aed0 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.657 +Version: 0.0.658 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 9e02a89433..ec5b6dbe5a 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.657 +Version: 0.0.658 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com diff --git a/anda/tools/electron/electron.spec b/anda/tools/electron/electron.spec index 507fe29e8e..3d405135ff 100644 --- a/anda/tools/electron/electron.spec +++ b/anda/tools/electron/electron.spec @@ -12,7 +12,7 @@ %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so Name: electron -Version: 35.2.0 +Version: 35.2.1 Release: 1%?dist Summary: Build cross platform desktop apps with web technologies License: MIT From efa6d6f9ea673a4e57d75c8c66795f664207247f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 23 Apr 2025 22:38:41 +0000 Subject: [PATCH 0857/2977] bump: discord-canary-openasar discord-canary inputplumber --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- anda/games/inputplumber/inputplumber.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index de77c1aed0..a6dfe17d78 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.658 +Version: 0.0.659 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index ec5b6dbe5a..a98172bd8a 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.658 +Version: 0.0.659 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index c1a86a53e4..e07948c24b 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.54.0 +Version: 0.54.1 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later From 4958c49fc981302ec30b5f88f387637626b31d8a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 23 Apr 2025 22:40:37 +0000 Subject: [PATCH 0858/2977] bump(branch): gnome-shell --- anda/desktops/gnome/gnome-shell/gnome-shell.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/gnome/gnome-shell/gnome-shell.spec b/anda/desktops/gnome/gnome-shell/gnome-shell.spec index 57d94ca68a..1195f5e2a1 100644 --- a/anda/desktops/gnome/gnome-shell/gnome-shell.spec +++ b/anda/desktops/gnome/gnome-shell/gnome-shell.spec @@ -10,7 +10,7 @@ Name: gnome-shell Version: %{major_version}.%{minor_version} -Release: 1%{?dist}.switcheroo +Release: 2%{?dist}.switcheroo Summary: Window management and application launching for GNOME Provides: gnome-shell.switcheroo = %version-%release From 8a9bf81d9ab3dca61cfe63e8f5c233f54570763e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 23 Apr 2025 22:48:55 +0000 Subject: [PATCH 0859/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index c2fc9e07bc..52915d3c23 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.4.7 +Version: 2025.4.8 Release: 1%?dist Summary: Front-end to your dev env From 8864bb3d23b6bd2cc0cf46de651ebeb625759ad0 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 24 Apr 2025 01:47:20 +0000 Subject: [PATCH 0860/2977] bump(nightly): nightly nightly nightly spotx-bash --- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 6 +++--- anda/system/readymade/nightly/readymade-nightly.spec | 4 ++-- anda/tools/spotx-bash/spotx-bash.spec | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index ad769469c9..0fe3a02212 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit f5b5a36835583a89a48713c419235e1c693b794c +%global commit 4e91d11a60bf3f52a15936cef65eae7135906b28 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-04-22 +%global fulldate 2025-04-23 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index f3ec935d55..36df5c0de3 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,7 +1,7 @@ -%global commit 6a009b447af415f80cdb55d8c6064e984b899fd5 +%global commit f125353b6f689ccae2b70e540c8d0356b9ade285 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250423 -%global ver 0.184.0 +%global commit_date 20250424 +%global ver 0.185.0 %bcond_with check diff --git a/anda/system/readymade/nightly/readymade-nightly.spec b/anda/system/readymade/nightly/readymade-nightly.spec index 0ee7126cc2..82600f89d1 100644 --- a/anda/system/readymade/nightly/readymade-nightly.spec +++ b/anda/system/readymade/nightly/readymade-nightly.spec @@ -1,5 +1,5 @@ -%global commit 76d357aa1cac37c9c79b3219e82a58a9fd05c2da -%global commit_date 20250423 +%global commit dd3cd312d848d04e6d93bb1ae8863fe05ce01092 +%global commit_date 20250424 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: readymade-nightly diff --git a/anda/tools/spotx-bash/spotx-bash.spec b/anda/tools/spotx-bash/spotx-bash.spec index 98985393b7..cbc1a98b3a 100644 --- a/anda/tools/spotx-bash/spotx-bash.spec +++ b/anda/tools/spotx-bash/spotx-bash.spec @@ -1,5 +1,5 @@ -%global commit 2b146e65a8a5ff875217e1c9f5d2948b17451663 -%global commit_date 20250423 +%global commit d5a23bfc64d75979373c5fddc81641dabff051aa +%global commit_date 20250424 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: spotx-bash From ab57adf0567e729a6a647338bc640a89973e7c5a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 24 Apr 2025 02:00:24 +0000 Subject: [PATCH 0861/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index c53f624943..d8e78e155f 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-23 +%global ver 2025-04-24 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From af14134d678e73e22d05d0c26117ee8979c83fe6 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 24 Apr 2025 07:18:44 +0000 Subject: [PATCH 0862/2977] bump: anki-qt5 anki osu-lazer --- anda/apps/anki-qt5/anki-qt5.spec | 2 +- anda/apps/anki/anki.spec | 2 +- anda/games/osu-lazer/osu-lazer.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/apps/anki-qt5/anki-qt5.spec b/anda/apps/anki-qt5/anki-qt5.spec index 766df4cd1d..7ef5c9c974 100644 --- a/anda/apps/anki-qt5/anki-qt5.spec +++ b/anda/apps/anki-qt5/anki-qt5.spec @@ -1,5 +1,5 @@ Name: anki-qt5 -Version: 25.02.1 +Version: 25.02.4 Release: 1%?dist Summary: Flashcard program for using space repetition learning License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5 diff --git a/anda/apps/anki/anki.spec b/anda/apps/anki/anki.spec index 2e6cf9ce21..03fa0837fa 100644 --- a/anda/apps/anki/anki.spec +++ b/anda/apps/anki/anki.spec @@ -1,5 +1,5 @@ Name: anki -Version: 25.02.1 +Version: 25.02.4 Release: 1%?dist Summary: Flashcard program for using space repetition learning License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5 diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index bdb44446d3..e6aa4f9e42 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -3,7 +3,7 @@ %define __strip /bin/true Name: osu-lazer -Version: 2025.420.0 +Version: 2025.424.0 Release: 1%?dist Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew. ExclusiveArch: x86_64 From 00a37a74d4ef32a9eec5b1b054b7b8f4f875cb87 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 24 Apr 2025 07:45:48 +0000 Subject: [PATCH 0863/2977] bump: libnvidia-container nvidia-container-toolkit --- anda/lib/nvidia/libnvidia-container/libnvidia-container.spec | 2 +- .../nvidia-container-toolkit/nvidia-container-toolkit.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/nvidia/libnvidia-container/libnvidia-container.spec b/anda/lib/nvidia/libnvidia-container/libnvidia-container.spec index c846546099..fe79c91533 100644 --- a/anda/lib/nvidia/libnvidia-container/libnvidia-container.spec +++ b/anda/lib/nvidia/libnvidia-container/libnvidia-container.spec @@ -1,7 +1,7 @@ %global _major 1 Name: libnvidia-container -Version: 1.17.5 +Version: 1.17.6 Release: 1%?dist Summary: NVIDIA container runtime library License: BSD-3-Clause AND Apache-2.0 AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND GPL-2.0-only diff --git a/anda/system/nvidia/nvidia-container-toolkit/nvidia-container-toolkit.spec b/anda/system/nvidia/nvidia-container-toolkit/nvidia-container-toolkit.spec index 5371192865..bb74a5ff19 100644 --- a/anda/system/nvidia/nvidia-container-toolkit/nvidia-container-toolkit.spec +++ b/anda/system/nvidia/nvidia-container-toolkit/nvidia-container-toolkit.spec @@ -1,5 +1,5 @@ Name: nvidia-container-toolkit -Version: 1.17.5 +Version: 1.17.6 Release: 1%?dist Summary: NVIDIA Container Toolkit License: Apache-2.0 From ce03ce1f380bcb7efb541f55ce117e744888c5f2 Mon Sep 17 00:00:00 2001 From: Gilver Date: Thu, 24 Apr 2025 05:57:07 -0500 Subject: [PATCH 0864/2977] add: Zig master builds (#4394) --- ...-bounds-of-main-zig-executable-to-9G.patch | 11 + anda/langs/zig/anda.hcl | 5 + anda/langs/zig/update.rhai | 7 + anda/langs/zig/zig-master.spec | 200 ++++++++++++++++++ 4 files changed, 223 insertions(+) create mode 100644 anda/langs/zig/0000-increase-upper-bounds-of-main-zig-executable-to-9G.patch create mode 100644 anda/langs/zig/anda.hcl create mode 100644 anda/langs/zig/update.rhai create mode 100644 anda/langs/zig/zig-master.spec diff --git a/anda/langs/zig/0000-increase-upper-bounds-of-main-zig-executable-to-9G.patch b/anda/langs/zig/0000-increase-upper-bounds-of-main-zig-executable-to-9G.patch new file mode 100644 index 0000000000..2101ac8a2d --- /dev/null +++ b/anda/langs/zig/0000-increase-upper-bounds-of-main-zig-executable-to-9G.patch @@ -0,0 +1,11 @@ +--- a/build.zig 2025-04-23 22:33:17.801652844 -0500 ++++ b/build.zig 2025-04-23 22:34:14.127282140 -0500 +@@ -679,7 +679,7 @@ + + const exe = b.addExecutable(.{ + .name = "zig", +- .max_rss = 7_800_000_000, ++ .max_rss = 9_000_000_000, + .root_module = compiler_mod, + }); + exe.stack_size = stack_size; diff --git a/anda/langs/zig/anda.hcl b/anda/langs/zig/anda.hcl new file mode 100644 index 0000000000..2ed6c200f0 --- /dev/null +++ b/anda/langs/zig/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "zig-master.spec" + } +} diff --git a/anda/langs/zig/update.rhai b/anda/langs/zig/update.rhai new file mode 100644 index 0000000000..4e64359f58 --- /dev/null +++ b/anda/langs/zig/update.rhai @@ -0,0 +1,7 @@ +let url = `https://ziglang.org/download/index.json`; +let json = get(url).json(); +let v = json.master.version; +rpm.global("ver", v); +if rpm.changed() { + rpm.release(); +} diff --git a/anda/langs/zig/zig-master.spec b/anda/langs/zig/zig-master.spec new file mode 100644 index 0000000000..93da27ba14 --- /dev/null +++ b/anda/langs/zig/zig-master.spec @@ -0,0 +1,200 @@ +# https://ziglang.org/download/VERSION/release-notes.html#Support-Table +%global zig_arches x86_64 aarch64 riscv64 %{mips64} +# Signing key from https://ziglang.org/download/ +%global public_key RWSGOq2NVecA2UPNdBUZykf1CCb147pkmdtYxgb3Ti+JO/wCYvhbAb/U +# Not needed yet +%if 0%{?fedora} >= 42 || 0%{?rhel} >= 9 +%define llvm_compat 20 +%endif +%global llvm_version 20.0.0 +%global ver 0.15.0-dev.383+927f233ff +%bcond bootstrap 1 +%bcond docs %{without bootstrap} +%bcond test 1 +%if 0%{?fedora} <= 40 +%global zig_cache_dir %{_builddir}/zig-cache +%else +%global zig_cache_dir %{builddir}/zig-cache +%endif +%global zig_build_options %{shrink: \ + --verbose \ + --release=fast \ + --summary all \ + \ + -Dtarget=native \ + -Dcpu=baseline \ + --zig-lib-dir lib \ + --build-id=sha1 \ + \ + --cache-dir "%{zig_cache_dir}" \ + --global-cache-dir "%{zig_cache_dir}" \ + \ + -Dversion-string="%{version}" \ + -Dstatic-llvm=false \ + -Denable-llvm=true \ + -Dno-langref=true \ + -Dstd-docs=false \ + -Dpie \ + -Dconfig_h="%{__cmake_builddir}/config.h" \ +} +%global zig_install_options %zig_build_options %{shrink: \ + --prefix "%{_prefix}" \ +} + +Name: zig-master +Version: %(echo %{ver} | sed 's/-/~/g') +Release: 1%{?dist} +Summary: Programming language for maintaining robust, optimal, and reusable software +License: MIT AND NCSA AND LGPL-2.1-or-later AND LGPL-2.1-or-later WITH GCC-exception-2.0 AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND BSD-3-Clause AND Inner-Net-2.0 AND ISC AND LicenseRef-Fedora-Public-Domain AND GFDL-1.1-or-later AND ZPL-2.1 +URL: https://ziglang.org +Source0: %{url}/builds/zig-%{ver}.tar.xz +Source1: %{url}/builds/zig-%{ver}.tar.xz.minisig +Patch0: 0000-increase-upper-bounds-of-main-zig-executable-to-9G.patch +BuildRequires: cmake +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: libxml2-devel +BuildRequires: llvm-devel +BuildRequires: clang-devel +BuildRequires: lld-devel +BuildRequires: zlib-devel +# for man page generation +BuildRequires: help2man +# for signature verification +BuildRequires: minisign +%if %{without bootstrap} +BuildRequires: %{name} = %{version} +%endif +%if %{with test} +BuildRequires: elfutils-libelf-devel +BuildRequires: libstdc++-static +%endif +Requires: %{name}-libs = %{version} +# Apache-2.0 WITH LLVM-exception OR NCSA OR MIT +Provides: bundled(compiler-rt) = %{llvm_version} +# LGPL-2.1-or-later AND SunPro AND LGPL-2.1-or-later WITH GCC-exception-2.0 AND BSD-3-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later WITH GNU-compiler-exception AND GPL-2.0-only AND ISC AND LicenseRef-Fedora-Public-Domain AND HPND AND CMU-Mach AND LGPL-2.0-or-later AND Unicode-3.0 AND GFDL-1.1-or-later AND GPL-1.0-or-later AND FSFUL AND MIT AND Inner-Net-2.0 AND X11 AND GPL-2.0-or-later WITH GCC-exception-2.0 AND GFDL-1.3-only AND GFDL-1.1-only +Provides: bundled(glibc) = 2.41 +# Apache-2.0 WITH LLVM-exception OR MIT OR NCSA +Provides: bundled(libcxx) = %{llvm_version} +# Apache-2.0 WITH LLVM-exception OR MIT OR NCSA +Provides: bundled(libcxxabi) = %{llvm_version} +# NCSA +Provides: bundled(libunwind) = %{llvm_version} +# BSD, LGPG, ZPL +Provides: bundled(mingw) = 3839e21b08807479a31d5a9764666f82ae2f0356 +# MIT +Provides: bundled(musl) = 1.2.5 +# Apache-2.0 WITH LLVM-exception AND Apache-2.0 AND MIT AND BSD-2-Clause +Provides: bundled(wasi-libc) = d03829489904d38c624f6de9983190f1e5e7c9c5 +Conflicts: zig +ExclusiveArch: %{zig_arches} +Packager: Gilver E. + +%description +Zig is an open-source programming language designed for robustness, optimality, +and clarity. This package provides the zig compiler and the associated runtime. + +# The Zig stdlib only contains uncompiled code +%package libs +Summary: Zig Standard Library +Conflicts: zig-libs +BuildArch: noarch + +%description libs +Zig Standard Library + +%if %{with docs} +%package doc +Summary: Documentation for Zig +Conflicts: zig-doc +BuildArch: noarch +Requires: %{name} = %{version} + +%description doc +Documentation for Zig. For more information, visit %{url} +%endif + +%prep +/usr/bin/minisign -V -m %{SOURCE0} -x %{SOURCE1} -P %{public_key} +%autosetup -p1 -n zig-%{ver} + +%build +# zig doesn't know how to dynamically link llvm on its own so we need cmake to generate a header ahead of time +# if we provide the header we need to also build zigcpp + +# C_FLAGS: wasm2c output generates a lot of noise with -Wunused. +# EXTRA_BUILD_ARGS: explicitly specify a build-id +%cmake \ + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ + -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="-DNDEBUG -Wno-unused" \ + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="-DNDEBUG -Wno-unused" \ + \ + -DZIG_EXTRA_BUILD_ARGS:STRING="--verbose;--build-id=sha1" \ + -DZIG_SHARED_LLVM:BOOL=true \ + -DZIG_PIE:BOOL=true \ + \ + -DZIG_TARGET_MCPU:STRING=baseline \ + -DZIG_TARGET_TRIPLE:STRING=native \ + \ + -DZIG_VERSION:STRING="%{ver}" + +%if %{with bootstrap} +%cmake_build --target stage3 +%else +%cmake_build --target zigcpp +zig build %{zig_build_options} + +# Zig has no official manpage +# https://github.com/ziglang/zig/issues/715 +help2man --no-discard-stderr --no-info "./zig-out/bin/zig" --version-option=version --output=zig.1 +%endif + + +%if %{with docs} +# Use the newly made stage 3 compiler to generate docs +./zig-out/bin/zig build docs \ + --verbose \ + --global-cache-dir "%{zig_cache_dir}" \ + -Dversion-string="%{version}" +%endif + +%install +%if %{with bootstrap} +%cmake_install +%else +DESTDIR="%{buildroot}" zig build install %{zig_install_options} + +install -D -pv -m 0644 -t %{buildroot}%{_mandir}/man1/zig.1 +%endif + + +%if %{with macro} +install -D -pv -m 0644 %{SOURCE2} %{buildroot}%{_rpmmacrodir}/macros.%{name} +%endif + +%if %{with test} +%check +# Run reduced set of tests, based on the Zig CI +"%{buildroot}%{_bindir}/zig" test test/behavior.zig -Itest +%endif + +%files +%license LICENSE +%{_bindir}/zig +%if %{without bootstrap} +%{_mandir}/man1/zig.1.* +%endif + +%files libs +%{_prefix}/lib/zig + +%if %{with docs} +%files doc +%doc README.md +%doc zig-out/doc/langref.html +%doc zig-out/doc/std +%endif + +%changelog +* Wed Apr 23 2025 Gilver E. +- Initial package From 1283e2280c9444f00431d8cda486fbc82a65814f Mon Sep 17 00:00:00 2001 From: Gilver Date: Thu, 24 Apr 2025 06:00:18 -0500 Subject: [PATCH 0865/2977] feat/fix(ipu6-drivers): Refactor and add DKMS package (#4395) * feat/fix(ipu6-drivers): Refactor and add DKMS package * fix: Forgot the 0 Signed-off-by: Gilver * Update intel-ipu6-kmod.spec Signed-off-by: Gilver * Update intel-ipu6-kmod.spec Signed-off-by: Gilver --------- Signed-off-by: Gilver --- .../ipu6-camera-bins/ipu6-camera-bins.spec | 2 - .../0000-probe-improvements.patch | 183 ----- .../0002-fix-compilation-6.10.patch | 85 -- .../intel-ipu6-kmod/0003-prefix-modules.patch | 84 -- .../0004-fix-compilation-6.11.patch | 32 - .../0005-fix-compilation-6.12.patch | 269 ------ ...06-fix-compilation-6.12-no-no_llseek.patch | 53 -- .../0007-modules-per-kernel.patch | 773 ------------------ .../intel-ipu6-kmod/intel-ipu6-kmod.spec | 93 --- ...sensor-driver-symbols-from-CONFIG_VI.patch | 88 ++ ...e-gc5035-compilation-with-kernels-6.patch} | 40 +- ...build-hi556-driver-with-kernels-6.10.patch | 54 ++ ...build-ov01a10-driver-with-kernels-6..patch | 51 ++ ...05-media-ipu6-Fix-out-of-tree-builds.patch | 28 + ...a-ipu6-Fix-building-with-kernel-6.13.patch | 53 ++ ...0-IPU6-headers-used-by-PSYS.patch-fo.patch | 49 ++ ...-DMA-code-for-ipu6-bus-DMA-changes-i.patch | 306 +++++++ ...o-0001-v6.10-IPU6-headers-used-by-PS.patch | 84 ++ ...ping-registering-ipu_psys_bus-for-ke.patch | 202 +++++ ...o-Fix-GPIO-and-I2C-driver-modaliases.patch | 38 + ...se-cdev_device_add-for-dev-ipu-psys0.patch | 130 +++ ...0011-usbio-Fix-I2C-max-transfer-size.patch | 115 +++ ...AX_PAYLOAD_BSIZE-in-usbio_bulk_write.patch | 30 + ...-integrate-usbio-drivers-within-ipu6.patch | 38 + .../akmod}/anda.hcl | 1 + .../ipu6-drivers/akmod/intel-ipu6-kmod.spec | 113 +++ anda/system/ipu6-drivers/akmod/update.rhai | 13 + ...sensor-driver-symbols-from-CONFIG_VI.patch | 88 ++ ...le-gc5035-compilation-with-kernels-6.patch | 97 +++ ...build-hi556-driver-with-kernels-6.10.patch | 54 ++ ...build-ov01a10-driver-with-kernels-6..patch | 51 ++ ...05-media-ipu6-Fix-out-of-tree-builds.patch | 28 + ...a-ipu6-Fix-building-with-kernel-6.13.patch | 53 ++ ...0-IPU6-headers-used-by-PSYS.patch-fo.patch | 49 ++ ...-DMA-code-for-ipu6-bus-DMA-changes-i.patch | 306 +++++++ ...o-0001-v6.10-IPU6-headers-used-by-PS.patch | 84 ++ ...ping-registering-ipu_psys_bus-for-ke.patch | 202 +++++ ...o-Fix-GPIO-and-I2C-driver-modaliases.patch | 38 + ...se-cdev_device_add-for-dev-ipu-psys0.patch | 130 +++ ...0011-usbio-Fix-I2C-max-transfer-size.patch | 115 +++ ...AX_PAYLOAD_BSIZE-in-usbio_bulk_write.patch | 30 + ...-integrate-usbio-drivers-within-ipu6.patch | 38 + anda/system/ipu6-drivers/dkms/anda.hcl | 10 + .../ipu6-drivers/dkms/dkms-intel-ipu6.spec | 112 +++ .../ipu6-drivers/dkms/no-weak-modules.conf | 1 + anda/system/ipu6-drivers/dkms/update.rhai | 13 + anda/system/ipu6-drivers/kmod-common/anda.hcl | 6 + .../kmod-common/intel-ipu6-drivers.spec | 47 ++ .../ipu6-drivers/kmod-common/update.rhai | 6 + 49 files changed, 2983 insertions(+), 1582 deletions(-) delete mode 100644 anda/system/intel-ipu6-kmod/0000-probe-improvements.patch delete mode 100644 anda/system/intel-ipu6-kmod/0002-fix-compilation-6.10.patch delete mode 100644 anda/system/intel-ipu6-kmod/0003-prefix-modules.patch delete mode 100644 anda/system/intel-ipu6-kmod/0004-fix-compilation-6.11.patch delete mode 100644 anda/system/intel-ipu6-kmod/0005-fix-compilation-6.12.patch delete mode 100644 anda/system/intel-ipu6-kmod/0006-fix-compilation-6.12-no-no_llseek.patch delete mode 100644 anda/system/intel-ipu6-kmod/0007-modules-per-kernel.patch delete mode 100644 anda/system/intel-ipu6-kmod/intel-ipu6-kmod.spec create mode 100644 anda/system/ipu6-drivers/akmod/0001-Makefile-Switch-sensor-driver-symbols-from-CONFIG_VI.patch rename anda/system/{intel-ipu6-kmod/0001-fix-compilation-6.8.patch => ipu6-drivers/akmod/0002-Makefile-Re-enable-gc5035-compilation-with-kernels-6.patch} (66%) create mode 100644 anda/system/ipu6-drivers/akmod/0003-Makefile-Do-not-build-hi556-driver-with-kernels-6.10.patch create mode 100644 anda/system/ipu6-drivers/akmod/0004-Makefile-Do-not-build-ov01a10-driver-with-kernels-6..patch create mode 100644 anda/system/ipu6-drivers/akmod/0005-media-ipu6-Fix-out-of-tree-builds.patch create mode 100644 anda/system/ipu6-drivers/akmod/0006-media-ipu6-Fix-building-with-kernel-6.13.patch create mode 100644 anda/system/ipu6-drivers/akmod/0007-Modify-0001-v6.10-IPU6-headers-used-by-PSYS.patch-fo.patch create mode 100644 anda/system/ipu6-drivers/akmod/0008-ipu6-psys-Adjust-DMA-code-for-ipu6-bus-DMA-changes-i.patch create mode 100644 anda/system/ipu6-drivers/akmod/0009-Add-ipu6-dma.h-to-0001-v6.10-IPU6-headers-used-by-PS.patch create mode 100644 anda/system/ipu6-drivers/akmod/0010-psys-Do-not-skipping-registering-ipu_psys_bus-for-ke.patch create mode 100644 anda/system/ipu6-drivers/akmod/0010-usbio-Fix-GPIO-and-I2C-driver-modaliases.patch create mode 100644 anda/system/ipu6-drivers/akmod/0011-psys-Use-cdev_device_add-for-dev-ipu-psys0.patch create mode 100644 anda/system/ipu6-drivers/akmod/0011-usbio-Fix-I2C-max-transfer-size.patch create mode 100644 anda/system/ipu6-drivers/akmod/0012-usbio-Use-MAX_PAYLOAD_BSIZE-in-usbio_bulk_write.patch create mode 100644 anda/system/ipu6-drivers/akmod/0101-Fedora-local-mod-integrate-usbio-drivers-within-ipu6.patch rename anda/system/{intel-ipu6-kmod => ipu6-drivers/akmod}/anda.hcl (85%) create mode 100644 anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec create mode 100644 anda/system/ipu6-drivers/akmod/update.rhai create mode 100644 anda/system/ipu6-drivers/dkms/0001-Makefile-Switch-sensor-driver-symbols-from-CONFIG_VI.patch create mode 100644 anda/system/ipu6-drivers/dkms/0002-Makefile-Re-enable-gc5035-compilation-with-kernels-6.patch create mode 100644 anda/system/ipu6-drivers/dkms/0003-Makefile-Do-not-build-hi556-driver-with-kernels-6.10.patch create mode 100644 anda/system/ipu6-drivers/dkms/0004-Makefile-Do-not-build-ov01a10-driver-with-kernels-6..patch create mode 100644 anda/system/ipu6-drivers/dkms/0005-media-ipu6-Fix-out-of-tree-builds.patch create mode 100644 anda/system/ipu6-drivers/dkms/0006-media-ipu6-Fix-building-with-kernel-6.13.patch create mode 100644 anda/system/ipu6-drivers/dkms/0007-Modify-0001-v6.10-IPU6-headers-used-by-PSYS.patch-fo.patch create mode 100644 anda/system/ipu6-drivers/dkms/0008-ipu6-psys-Adjust-DMA-code-for-ipu6-bus-DMA-changes-i.patch create mode 100644 anda/system/ipu6-drivers/dkms/0009-Add-ipu6-dma.h-to-0001-v6.10-IPU6-headers-used-by-PS.patch create mode 100644 anda/system/ipu6-drivers/dkms/0010-psys-Do-not-skipping-registering-ipu_psys_bus-for-ke.patch create mode 100644 anda/system/ipu6-drivers/dkms/0010-usbio-Fix-GPIO-and-I2C-driver-modaliases.patch create mode 100644 anda/system/ipu6-drivers/dkms/0011-psys-Use-cdev_device_add-for-dev-ipu-psys0.patch create mode 100644 anda/system/ipu6-drivers/dkms/0011-usbio-Fix-I2C-max-transfer-size.patch create mode 100644 anda/system/ipu6-drivers/dkms/0012-usbio-Use-MAX_PAYLOAD_BSIZE-in-usbio_bulk_write.patch create mode 100644 anda/system/ipu6-drivers/dkms/0101-Fedora-local-mod-integrate-usbio-drivers-within-ipu6.patch create mode 100644 anda/system/ipu6-drivers/dkms/anda.hcl create mode 100644 anda/system/ipu6-drivers/dkms/dkms-intel-ipu6.spec create mode 100644 anda/system/ipu6-drivers/dkms/no-weak-modules.conf create mode 100644 anda/system/ipu6-drivers/dkms/update.rhai create mode 100644 anda/system/ipu6-drivers/kmod-common/anda.hcl create mode 100644 anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec create mode 100644 anda/system/ipu6-drivers/kmod-common/update.rhai diff --git a/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec b/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec index c6b7bfe49b..7c4597310b 100644 --- a/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec +++ b/anda/lib/ipu6-camera-bins/ipu6-camera-bins.spec @@ -30,8 +30,6 @@ Obsoletes: ivsc-firmware < 20250326.3377801-3 %endif Obsoletes: ivsc-firmware < 0^20250326git.3377801-3 %endif -### For Akmods package -Provides: intel-ipu6-kmod-common = %{version} # Fix the stupid issue when changing versioning schemes %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 Provides: %{name} = %{?epoch:%{epoch}:}%{commit_date}.%{shortcommit}-%{release} diff --git a/anda/system/intel-ipu6-kmod/0000-probe-improvements.patch b/anda/system/intel-ipu6-kmod/0000-probe-improvements.patch deleted file mode 100644 index 83be7f74df..0000000000 --- a/anda/system/intel-ipu6-kmod/0000-probe-improvements.patch +++ /dev/null @@ -1,183 +0,0 @@ ---- a/drivers/media/pci/intel/ipu-isys-csi2.c -+++ b/drivers/media/pci/intel/ipu-isys-csi2.c -@@ -532,8 +532,10 @@ int ipu_isys_csi2_init(struct ipu_isys_csi2 *csi2, - NR_OF_CSI2_SINK_PADS, 0, - CSI2_PAD_SOURCE, - CSI2_PAD_SINK); -- if (rval) -+ if (rval) { -+ dev_err(&isys->adev->dev, "ipu_isys_subdev_init() err %d\n", rval); - goto fail; -+ } - - csi2->asd.pad[CSI2_PAD_SINK].flags |= MEDIA_PAD_FL_MUST_CONNECT; - ---- a/drivers/media/pci/intel/ipu-isys-subdev.c -+++ b/drivers/media/pci/intel/ipu-isys-subdev.c -@@ -849,17 +849,22 @@ int ipu_isys_subdev_init(struct ipu_isys_subdev *asd, - return -ENOMEM; - - rval = media_entity_pads_init(&asd->sd.entity, num_pads, asd->pad); -- if (rval) -+ if (rval) { -+ dev_err(&asd->isys->adev->dev, "%s: media_entity_pads_init(%d) err %d\n", __func__, num_pads, rval); - goto out_mutex_destroy; -+ } - - if (asd->ctrl_init) { - rval = v4l2_ctrl_handler_init(&asd->ctrl_handler, nr_ctrls); -- if (rval) -+ if (rval) { -+ dev_err(&asd->isys->adev->dev, "%s: v4l2_ctrl_handler_init() err %d\n", __func__, rval); - goto out_media_entity_cleanup; -+ } - - asd->ctrl_init(&asd->sd); - if (asd->ctrl_handler.error) { - rval = asd->ctrl_handler.error; -+ dev_err(&asd->isys->adev->dev, "%s: ctrl_handler.error %d\n", __func__, rval); - goto out_v4l2_ctrl_handler_free; - } - ---- a/drivers/media/pci/intel/ipu-isys.c -+++ b/drivers/media/pci/intel/ipu-isys.c -@@ -396,8 +396,10 @@ static int isys_register_subdevices(struct ipu_isys *isys) - rval = ipu_isys_csi2_init(&isys->csi2[i], isys, - isys->pdata->base + - csi2->offsets[i], i); -- if (rval) -+ if (rval) { -+ dev_err(&isys->adev->dev, "ipu_isys_csi2_init() err %d\n", rval); - goto fail; -+ } - - isys->isr_csi2_bits |= IPU_ISYS_UNISPART_IRQ_CSI2(i); - } -@@ -1009,12 +1011,16 @@ static int isys_register_devices(struct ipu_isys *isys) - goto out_v4l2_device_unregister; - - rval = isys_notifier_init(isys); -- if (rval) -+ if (rval) { -+ dev_err(&isys->adev->dev, "isys_notifier_init() err %d\n", rval); - goto out_isys_unregister_subdevices; -+ } - - rval = v4l2_device_register_subdev_nodes(&isys->v4l2_dev); -- if (rval) -+ if (rval) { -+ dev_err(&isys->adev->dev, "error registering subdev nodes %d\n", rval); - goto out_isys_notifier_cleanup; -+ } - - return 0; - -@@ -1561,8 +1567,10 @@ static int isys_probe(struct ipu_bus_device *adev) - if (rval) - goto out_remove_pkg_dir_shared_buffer; - rval = isys_iwake_watermark_init(isys); -- if (rval) -+ if (rval) { -+ dev_err(&adev->dev, "isys_iwake_watermark_init() err %d\n", rval); - goto out_unregister_devices; -+ } - - ipu_mmu_hw_cleanup(adev->mmu); - ---- a/drivers/media/pci/intel/ipu-isys.c -+++ b/drivers/media/pci/intel/ipu-isys.c -@@ -382,15 +382,12 @@ static int isys_register_subdevices(struct ipu_isys *isys) - const struct ipu_isys_internal_csi2_pdata *csi2 = - &isys->pdata->ipdata->csi2; - struct ipu_isys_csi2_be_soc *csi2_be_soc; -- unsigned int i, k; -- int rval; -+ int i = 0, k = 0, rval; - - isys->csi2 = devm_kcalloc(&isys->adev->dev, csi2->nports, - sizeof(*isys->csi2), GFP_KERNEL); -- if (!isys->csi2) { -- rval = -ENOMEM; -- goto fail; -- } -+ if (!isys->csi2) -+ return -ENOMEM; - - for (i = 0; i < csi2->nports; i++) { - rval = ipu_isys_csi2_init(&isys->csi2[i], isys, -@@ -425,7 +422,8 @@ static int isys_register_subdevices(struct ipu_isys *isys) - if (rval) { - dev_info(&isys->adev->dev, - "can't create link csi2->be_soc\n"); -- goto fail; -+ isys_unregister_subdevices(isys); -+ return rval; - } - } - } -@@ -433,7 +431,16 @@ static int isys_register_subdevices(struct ipu_isys *isys) - return 0; - - fail: -- isys_unregister_subdevices(isys); -+ while (--k >= 0) { -+ dev_info(&isys->adev->dev, "foo %d\n", k); -+ ipu_isys_csi2_be_soc_cleanup(&isys->csi2_be_soc[k]); -+ } -+ -+ while (--i >= 0) { -+ dev_info(&isys->adev->dev, "bar %d\n", k); -+ ipu_isys_csi2_cleanup(&isys->csi2[i]); -+ } -+ - return rval; - } - ---- a/drivers/media/pci/intel/ipu-isys.c -+++ b/drivers/media/pci/intel/ipu-isys.c -@@ -1170,8 +1170,7 @@ static void isys_remove(struct ipu_bus_device *adev) - - dev_info(&adev->dev, "removed\n"); - #ifdef CONFIG_DEBUG_FS -- if (isp->ipu_dir) -- debugfs_remove_recursive(isys->debugfsdir); -+ debugfs_remove_recursive(isys->debugfsdir); - #endif - - list_for_each_entry_safe(fwmsg, safe, &isys->framebuflist, head) { -@@ -1217,6 +1216,7 @@ static void isys_remove(struct ipu_bus_device *adev) - - mutex_destroy(&isys->stream_mutex); - mutex_destroy(&isys->mutex); -+ mutex_destroy(&isys->lib_mutex); - - if (isys->short_packet_source == IPU_ISYS_SHORT_PACKET_FROM_TUNIT) { - u32 trace_size = IPU_ISYS_SHORT_PACKET_TRACE_BUFFER_SIZE; -@@ -1587,7 +1587,15 @@ static int isys_probe(struct ipu_bus_device *adev) - isys_iwake_watermark_cleanup(isys); - isys_unregister_devices(isys); - out_remove_pkg_dir_shared_buffer: -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0) - cpu_latency_qos_remove_request(&isys->pm_qos); -+#else -+ pm_qos_remove_request(&isys->pm_qos); -+#endif -+ ipu_trace_uninit(&adev->dev); -+#ifdef CONFIG_DEBUG_FS -+ debugfs_remove_recursive(isys->debugfsdir); -+#endif - if (!isp->secure_mode) - ipu_cpd_free_pkg_dir(adev, isys->pkg_dir, - isys->pkg_dir_dma_addr, -@@ -1598,10 +1606,10 @@ static int isys_probe(struct ipu_bus_device *adev) - release_firmware: - if (!isp->secure_mode) - release_firmware(isys->fw); -- ipu_trace_uninit(&adev->dev); - - mutex_destroy(&isys->mutex); - mutex_destroy(&isys->stream_mutex); -+ mutex_destroy(&isys->lib_mutex); - - if (isys->short_packet_source == IPU_ISYS_SHORT_PACKET_FROM_TUNIT) - mutex_destroy(&isys->short_packet_tracing_mutex); diff --git a/anda/system/intel-ipu6-kmod/0002-fix-compilation-6.10.patch b/anda/system/intel-ipu6-kmod/0002-fix-compilation-6.10.patch deleted file mode 100644 index 0ce55a5d2c..0000000000 --- a/anda/system/intel-ipu6-kmod/0002-fix-compilation-6.10.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 5917297efb44d52548a052c04e9f759926ca2ddd Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Tue, 11 Jun 2024 11:39:34 +0200 -Subject: [PATCH 2/6] media: ipu6: Fix compilation with kernels >= 6.10 - -Fix compilation with kernels >= 6.10. - -Signed-off-by: Hans de Goede -[vicamo: update for v6.12-rc1] -Signed-off-by: You-Sheng Yang ---- - drivers/media/pci/intel/ipu-mmu.c | 1 + - drivers/media/pci/intel/ipu-psys.c | 31 ++++++++++++++++++++++++++++++ - drivers/media/pci/intel/ipu.c | 1 + - 3 files changed, 33 insertions(+) - -diff --git a/drivers/media/pci/intel/ipu-mmu.c b/drivers/media/pci/intel/ipu-mmu.c -index a36a6ded8..b06c9f8c1 100644 ---- a/drivers/media/pci/intel/ipu-mmu.c -+++ b/drivers/media/pci/intel/ipu-mmu.c -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - - #include "ipu.h" - #include "ipu-platform.h" -diff --git a/drivers/media/pci/intel/ipu-psys.c b/drivers/media/pci/intel/ipu-psys.c -index b12ecf3fc..87fab7cf8 100644 ---- a/drivers/media/pci/intel/ipu-psys.c -+++ b/drivers/media/pci/intel/ipu-psys.c -@@ -128,6 +128,37 @@ ipu_psys_lookup_kbuffer_by_kaddr(struct ipu_psys_fh *fh, void *kaddr) - return NULL; - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 10, 0) -+/* Dropped from 6.10, use our own copy for now */ -+static int follow_pfn(struct vm_area_struct *vma, unsigned long address, unsigned long *pfn) -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) -+ spinlock_t *ptl; -+ pte_t *ptep; -+ -+ if (follow_pte(vma, address, &ptep, &ptl)) -+ return -EINVAL; -+ -+ *pfn = pte_pfn(ptep_get(ptep)); -+ pte_unmap_unlock(ptep, ptl); -+#else -+ struct follow_pfnmap_args args = { -+ .vma = vma, -+ .address = address, -+ }; -+ int ret; -+ -+ ret = follow_pfnmap_start(&args); -+ if (ret) -+ return ret; -+ -+ *pfn = args.pfn; -+ follow_pfnmap_end(&args); -+#endif -+ return 0; -+} -+#endif -+ - static int ipu_psys_get_userpages(struct ipu_dma_buf_attach *attach) - { - struct vm_area_struct *vma; -diff --git a/drivers/media/pci/intel/ipu.c b/drivers/media/pci/intel/ipu.c -index 33592a662..fc091a11a 100644 ---- a/drivers/media/pci/intel/ipu.c -+++ b/drivers/media/pci/intel/ipu.c -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - - #include "ipu.h" - #include "ipu-buttress.h" --- -2.47.0 - diff --git a/anda/system/intel-ipu6-kmod/0003-prefix-modules.patch b/anda/system/intel-ipu6-kmod/0003-prefix-modules.patch deleted file mode 100644 index 50cab6d22d..0000000000 --- a/anda/system/intel-ipu6-kmod/0003-prefix-modules.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 3ddee5543a8caa4bb716fd0ff815d52b0d09bbb1 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Mon, 10 Jun 2024 19:30:48 +0200 -Subject: [PATCH 3/6] Makefile: prefix ipu6 modules with icamera- instead of - intel- - -Now that IPU6 isys support has landed upstream, using an auxbus approach -rather then the custom ipu6-bus, there is a conflict between the mainline -intel-ipu6* kernel modules and the out of tree ipu6-drivers intel-ipu6* -kernel modules. - -Rename the out of tree ipu6 modules to icamera-ipu6* so that both can be -installed together and the user can easily switch by blacklisting one of -the 2 sets of modules. - -Signed-off-by: Hans de Goede ---- - drivers/media/pci/intel/ipu6/Makefile | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/drivers/media/pci/intel/ipu6/Makefile b/drivers/media/pci/intel/ipu6/Makefile -index 23f8cdba4..92cd9fe1b 100644 ---- a/drivers/media/pci/intel/ipu6/Makefile -+++ b/drivers/media/pci/intel/ipu6/Makefile -@@ -8,7 +8,7 @@ endif - ccflags-y += -DIPU_TPG_FRAME_SYNC -DIPU_PSYS_GPC \ - -DIPU_ISYS_GPC - --intel-ipu6-objs += ../ipu.o \ -+icamera-ipu6-objs += ../ipu.o \ - ../ipu-bus.o \ - ../ipu-dma.o \ - ../ipu-mmu.o \ -@@ -18,12 +18,12 @@ intel-ipu6-objs += ../ipu.o \ - ipu6.o \ - ../ipu-fw-com.o - ifdef CONFIG_IPU_ISYS_BRIDGE --intel-ipu6-objs += ../cio2-bridge.o -+icamera-ipu6-objs += ../cio2-bridge.o - endif - --obj-$(CONFIG_VIDEO_INTEL_IPU6) += intel-ipu6.o -+obj-$(CONFIG_VIDEO_INTEL_IPU6) += icamera-ipu6.o - --intel-ipu6-isys-objs += ../ipu-isys.o \ -+icamera-ipu6-isys-objs += ../ipu-isys.o \ - ../ipu-isys-csi2.o \ - ipu6-isys.o \ - ipu6-isys-phy.o \ -@@ -36,26 +36,26 @@ intel-ipu6-isys-objs += ../ipu-isys.o \ - ../ipu-isys-queue.o \ - ../ipu-isys-subdev.o - --obj-$(CONFIG_VIDEO_INTEL_IPU6) += intel-ipu6-isys.o -+obj-$(CONFIG_VIDEO_INTEL_IPU6) += icamera-ipu6-isys.o - --intel-ipu6-psys-objs += ../ipu-psys.o \ -+icamera-ipu6-psys-objs += ../ipu-psys.o \ - ipu6-psys.o \ - ipu-resources.o \ - ipu6-psys-gpc.o \ - ipu6-l-scheduler.o \ - ipu6-ppg.o - --intel-ipu6-psys-objs += ipu-fw-resources.o \ -+icamera-ipu6-psys-objs += ipu-fw-resources.o \ - ipu6-fw-resources.o \ - ipu6se-fw-resources.o \ - ipu6ep-fw-resources.o \ - ../ipu-fw-psys.o - - ifeq ($(CONFIG_COMPAT),y) --intel-ipu6-psys-objs += ../ipu-psys-compat32.o -+icamera-ipu6-psys-objs += ../ipu-psys-compat32.o - endif - --obj-$(CONFIG_VIDEO_INTEL_IPU6) += intel-ipu6-psys.o -+obj-$(CONFIG_VIDEO_INTEL_IPU6) += icamera-ipu6-psys.o - - ccflags-y += -I$(srcpath)/$(src)/../../../../../include/ - ccflags-y += -I$(srcpath)/$(src)/../ --- -2.47.0 - diff --git a/anda/system/intel-ipu6-kmod/0004-fix-compilation-6.11.patch b/anda/system/intel-ipu6-kmod/0004-fix-compilation-6.11.patch deleted file mode 100644 index b24c4aed65..0000000000 --- a/anda/system/intel-ipu6-kmod/0004-fix-compilation-6.11.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5c1e910f6c473f7f53377219e1f00b36e6ae7da1 Mon Sep 17 00:00:00 2001 -From: You-Sheng Yang -Date: Thu, 8 Aug 2024 14:30:51 +0800 -Subject: [PATCH 4/6] media: ipu6: Fix compilation with kernels >= 6.11 - -Signed-off-by: You-Sheng Yang ---- - drivers/media/pci/intel/ipu-bus.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/drivers/media/pci/intel/ipu-bus.c b/drivers/media/pci/intel/ipu-bus.c -index 0569ccb61..234fde8f1 100644 ---- a/drivers/media/pci/intel/ipu-bus.c -+++ b/drivers/media/pci/intel/ipu-bus.c -@@ -75,9 +75,13 @@ static const struct dev_pm_ops ipu_bus_pm_ops = { - #define IPU_BUS_PM_OPS NULL - #endif - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0) - static int ipu_bus_match(struct device *dev, struct device_driver *drv) -+#else -+static int ipu_bus_match(struct device *dev, const struct device_driver *drv) -+#endif - { -- struct ipu_bus_driver *adrv = to_ipu_bus_driver(drv); -+ const struct ipu_bus_driver *adrv = to_ipu_bus_driver(drv); - - dev_dbg(dev, "bus match: \"%s\" --- \"%s\"\n", dev_name(dev), - adrv->wanted); --- -2.47.0 - diff --git a/anda/system/intel-ipu6-kmod/0005-fix-compilation-6.12.patch b/anda/system/intel-ipu6-kmod/0005-fix-compilation-6.12.patch deleted file mode 100644 index 89aa9e931a..0000000000 --- a/anda/system/intel-ipu6-kmod/0005-fix-compilation-6.12.patch +++ /dev/null @@ -1,269 +0,0 @@ -From 3bbe043c6c92ef8fb2482077911ca6ea5fb2ef52 Mon Sep 17 00:00:00 2001 -From: You-Sheng Yang -Date: Fri, 11 Oct 2024 01:44:50 +0800 -Subject: [PATCH 5/6] media: ipu6: Fix compilation with kernels >= 6.12: move - asm/unaligned.h to linux/unaligned.h - -Accommodate to v6.12-rc2 commit 5f60d5f6bbc12 ("move asm/unaligned.h to -linux/unaligned.h"). - -Bug-Ubuntu: https://bugs.launchpad.net/bugs/2083996 -Signed-off-by: You-Sheng Yang -Signed-off-by: Hans de Goede ---- - drivers/media/i2c/hi556.c | 6 +++++- - drivers/media/i2c/hm11b1.c | 6 +++++- - drivers/media/i2c/hm2170.c | 6 +++++- - drivers/media/i2c/hm2172.c | 6 +++++- - drivers/media/i2c/ov01a10.c | 6 +++++- - drivers/media/i2c/ov01a1s.c | 6 +++++- - drivers/media/i2c/ov02c10.c | 6 +++++- - drivers/media/i2c/ov02e10.c | 6 +++++- - drivers/media/i2c/ov2740.c | 6 +++++- - drivers/media/i2c/ov8856.c | 6 +++++- - 10 files changed, 50 insertions(+), 10 deletions(-) - -diff --git a/drivers/media/i2c/hi556.c b/drivers/media/i2c/hi556.c -index 4fc020b65..90080438b 100644 ---- a/drivers/media/i2c/hi556.c -+++ b/drivers/media/i2c/hi556.c -@@ -1,14 +1,18 @@ - // SPDX-License-Identifier: GPL-2.0 - // Copyright (c) 2019 Intel Corporation. - -+#include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - #include -+#else -+#include -+#endif - #include - #include - #include - #include - #include - #include --#include - #include - #include - #include -diff --git a/drivers/media/i2c/hm11b1.c b/drivers/media/i2c/hm11b1.c -index f3900d29f..173bb32eb 100644 ---- a/drivers/media/i2c/hm11b1.c -+++ b/drivers/media/i2c/hm11b1.c -@@ -1,13 +1,17 @@ - // SPDX-License-Identifier: GPL-2.0 - // Copyright (c) 2020-2022 Intel Corporation. - -+#include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - #include -+#else -+#include -+#endif - #include - #include - #include - #include - #include --#include - #include - #include - #include -diff --git a/drivers/media/i2c/hm2170.c b/drivers/media/i2c/hm2170.c -index 102eec25a..060bb04d1 100644 ---- a/drivers/media/i2c/hm2170.c -+++ b/drivers/media/i2c/hm2170.c -@@ -1,7 +1,12 @@ - // SPDX-License-Identifier: GPL-2.0 - // Copyright (c) 2022 Intel Corporation. - -+#include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - #include -+#else -+#include -+#endif - #include - #include - #include -@@ -9,7 +14,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/drivers/media/i2c/hm2172.c b/drivers/media/i2c/hm2172.c -index 3362d3151..422166f04 100644 ---- a/drivers/media/i2c/hm2172.c -+++ b/drivers/media/i2c/hm2172.c -@@ -1,7 +1,12 @@ - // SPDX-License-Identifier: GPL-2.0 - // Copyright (c) 2022 Intel Corporation. - -+#include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - #include -+#else -+#include -+#endif - #include - #include - #include -@@ -9,7 +14,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/drivers/media/i2c/ov01a10.c b/drivers/media/i2c/ov01a10.c -index 78ae01811..aa47a50e5 100644 ---- a/drivers/media/i2c/ov01a10.c -+++ b/drivers/media/i2c/ov01a10.c -@@ -1,13 +1,17 @@ - // SPDX-License-Identifier: GPL-2.0 - // Copyright (c) 2020-2022 Intel Corporation. - -+#include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - #include -+#else -+#include -+#endif - #include - #include - #include - #include - #include --#include - #include - #include - #include -diff --git a/drivers/media/i2c/ov01a1s.c b/drivers/media/i2c/ov01a1s.c -index f7cf2218c..639b0921f 100644 ---- a/drivers/media/i2c/ov01a1s.c -+++ b/drivers/media/i2c/ov01a1s.c -@@ -1,13 +1,17 @@ - // SPDX-License-Identifier: GPL-2.0 - // Copyright (c) 2020-2022 Intel Corporation. - -+#include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - #include -+#else -+#include -+#endif - #include - #include - #include - #include - #include --#include - #include - #include - #include -diff --git a/drivers/media/i2c/ov02c10.c b/drivers/media/i2c/ov02c10.c -index 40865f8e3..0a1fed161 100644 ---- a/drivers/media/i2c/ov02c10.c -+++ b/drivers/media/i2c/ov02c10.c -@@ -1,7 +1,12 @@ - // SPDX-License-Identifier: GPL-2.0 - // Copyright (c) 2022 Intel Corporation. - -+#include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - #include -+#else -+#include -+#endif - #include - #include - #include -@@ -9,7 +14,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/drivers/media/i2c/ov02e10.c b/drivers/media/i2c/ov02e10.c -index 916def90f..ea82040f2 100644 ---- a/drivers/media/i2c/ov02e10.c -+++ b/drivers/media/i2c/ov02e10.c -@@ -1,7 +1,12 @@ - // SPDX-License-Identifier: GPL-2.0 - // Copyright (c) 2023 Intel Corporation. - -+#include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - #include -+#else -+#include -+#endif - #include - #include - #include -@@ -9,7 +14,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/drivers/media/i2c/ov2740.c b/drivers/media/i2c/ov2740.c -index bd9b68e34..4ed0094f7 100644 ---- a/drivers/media/i2c/ov2740.c -+++ b/drivers/media/i2c/ov2740.c -@@ -1,7 +1,12 @@ - // SPDX-License-Identifier: GPL-2.0 - // Copyright (c) 2022 Intel Corporation. - -+#include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - #include -+#else -+#include -+#endif - #include - #include - #include -@@ -9,7 +14,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/drivers/media/i2c/ov8856.c b/drivers/media/i2c/ov8856.c -index 1c4469ea0..a2c7c8c22 100644 ---- a/drivers/media/i2c/ov8856.c -+++ b/drivers/media/i2c/ov8856.c -@@ -1,13 +1,17 @@ - // SPDX-License-Identifier: GPL-2.0 - // Copyright (c) 2021-2022 Intel Corporation. - -+#include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - #include -+#else -+#include -+#endif - #include - #include - #include - #include - #include --#include - #include - #include - #include --- -2.47.0 - diff --git a/anda/system/intel-ipu6-kmod/0006-fix-compilation-6.12-no-no_llseek.patch b/anda/system/intel-ipu6-kmod/0006-fix-compilation-6.12-no-no_llseek.patch deleted file mode 100644 index e4501d4763..0000000000 --- a/anda/system/intel-ipu6-kmod/0006-fix-compilation-6.12-no-no_llseek.patch +++ /dev/null @@ -1,53 +0,0 @@ -From f89a4e3da45753d012b3c40bfe9c8b56671e5306 Mon Sep 17 00:00:00 2001 -From: You-Sheng Yang -Date: Fri, 11 Oct 2024 01:28:38 +0800 -Subject: [PATCH 6/6] media: ipu6: Fix compilation with kernels >= 6.12: - Finally take no_llseek out - -Accommodate to v6.12-rc1 commit cb787f4ac0c2 ("[tree-wide] finally take -no_llseek out"). - -Bug-Ubuntu: https://bugs.launchpad.net/bugs/2083996 -Signed-off-by: You-Sheng Yang -Signed-off-by: Hans de Goede ---- - drivers/media/pci/intel/ipu-trace.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/drivers/media/pci/intel/ipu-trace.c b/drivers/media/pci/intel/ipu-trace.c -index 282ac659a..2dc458a1d 100644 ---- a/drivers/media/pci/intel/ipu-trace.c -+++ b/drivers/media/pci/intel/ipu-trace.c -@@ -517,7 +517,9 @@ static const struct file_operations ipu_traceconf_fops = { - .release = traceconf_release, - .read = traceconf_read, - .write = traceconf_write, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - .llseek = no_llseek, -+#endif - }; - - static void wptraceconf_dump(struct ipu_device *isp) -@@ -673,7 +675,9 @@ static const struct file_operations ipu_wptraceconf_fops = { - .release = wptraceconf_release, - .read = wptraceconf_read, - .write = wptraceconf_write, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - .llseek = no_llseek, -+#endif - }; - - static int gettrace_open(struct inode *inode, struct file *file) -@@ -740,7 +744,9 @@ static const struct file_operations ipu_gettrace_fops = { - .release = gettrace_release, - .read = gettrace_read, - .write = gettrace_write, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - .llseek = no_llseek, -+#endif - }; - - int ipu_trace_init(struct ipu_device *isp, void __iomem *base, --- -2.47.0 - diff --git a/anda/system/intel-ipu6-kmod/0007-modules-per-kernel.patch b/anda/system/intel-ipu6-kmod/0007-modules-per-kernel.patch deleted file mode 100644 index 69bceb020d..0000000000 --- a/anda/system/intel-ipu6-kmod/0007-modules-per-kernel.patch +++ /dev/null @@ -1,773 +0,0 @@ -From 2c4ad1398dddfb307e8a40a714a6d5f70d6d14cb Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Mon, 10 Jun 2024 13:05:53 +0200 -Subject: [PATCH 4/4] Makefile: Adjust which modules to build for which - kernel-versions for Fedora - -Fedora's kernels have not enabled various IPU6 related drivers as soon -as they were mainlined. Instead they were enabled at later times. - -Fix the automatic disabling of certain modules to match when they were -enabled in the Fedora kernels: - -Do not build ljca for kernels >= 6.7 -Do not build ivsc for kernels >= 6.10 -Do not build ov2740 for kernels >= 6.10 (1) -Do not build ov01a10 for kernels >= 6.10 -Do not build hi556 for kernels >= 6.10 (2) -Do not build cio2-bridge for kernels >= 6.10 (3) - -1) Also switch the Kconfig symbols for mainlined sensor drivers from -CONFIG_VIDEO_FOO to CONFIG_ICAMERA_FOO to avoid these still being -set when they should not because of the CONFIG_VIDEO_FOO symbols -inherited from the base kernel. - -2) hi556 was enabled in earlier Fedora patches but the mainline version -missed reset GPIO / clk / regulator support - -3) The mainline ipu6-bridge is only used for kernels >= 6.10 because it -lacked ACPI HIDs for many of the still out of tree sensor drivers, see: -https://lore.kernel.org/linux-media/20240610173418.16119-1-hdegoede@redhat.com/ - -Signed-off-by: Hans de Goede ---- - Makefile | 20 ++++++++++++-------- - drivers/media/i2c/Makefile | 7 ++++--- - drivers/media/i2c/hi556.c | 20 ++++++++++---------- - drivers/media/i2c/hm2170.c | 20 ++++++++++---------- - drivers/media/i2c/hm2172.c | 20 ++++++++++---------- - drivers/media/i2c/ov01a10.c | 18 +++++++++--------- - drivers/media/i2c/ov01a1s.c | 20 ++++++++++---------- - drivers/media/i2c/ov02c10.c | 20 ++++++++++---------- - drivers/media/i2c/ov02e10.c | 20 ++++++++++---------- - 9 files changed, 85 insertions(+), 80 deletions(-) - -diff --git a/Makefile b/Makefile -index 4734c4497..5d716eb61 100644 ---- a/Makefile -+++ b/Makefile -@@ -20,15 +20,16 @@ version_lt = $(shell \ - echo "false"; \ - fi) - --KV_IVSC := 6.6.0 --KV_IPU_BRIDGE := 6.6.0 --KV_OV2740 := 6.8.0 -+KV_LJCA := 6.7.0 -+KV_IVSC := 6.10.0 -+KV_IPU_BRIDGE := 6.10.0 -+KV_OV2740 := 6.10.0 - - KERNEL_SRC ?= /lib/modules/$(KERNELRELEASE)/build - MODSRC := $(shell pwd) - --ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_IVSC)),true) --$(warning build ljca ivsc) -+ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_LJCA)),true) -+$(warning build ljca) - obj-m += ljca.o - ljca-y := drivers/mfd/ljca.o - -@@ -40,7 +41,10 @@ gpio-ljca-y := drivers/gpio/gpio-ljca.o - - obj-m += i2c-ljca.o - i2c-ljca-y := drivers/i2c/busses/i2c-ljca.o -+endif - -+ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_IVSC)),true) -+$(warning build ivsc) - obj-m += mei-vsc.o - mei-vsc-y := drivers/misc/mei/spi-vsc.o - mei-vsc-y += drivers/misc/mei/hw-vsc.o -@@ -77,16 +81,16 @@ obj-y += drivers/media/pci/intel/ - - export CONFIG_VIDEO_HM11B1 = m - export CONFIG_VIDEO_OV01A1S = m --export CONFIG_VIDEO_OV01A10 = m - export CONFIG_VIDEO_OV02C10 = m - export CONFIG_VIDEO_OV02E10 = m - export CONFIG_VIDEO_HM2170 = m - export CONFIG_VIDEO_HM2172 = m --export CONFIG_VIDEO_HI556 = m - export CONFIG_VIDEO_GC5035 = m - - ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV2740)),true) --export CONFIG_VIDEO_OV2740 = m -+export CONFIG_ICAMERA_OV2740 = m -+export CONFIG_ICAMERA_OV01A10 = m -+export CONFIG_ICAMERA_HI556 = m - endif - obj-y += drivers/media/i2c/ - -diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile -index 1f395448b..f49609620 100644 ---- a/drivers/media/i2c/Makefile -+++ b/drivers/media/i2c/Makefile -@@ -4,11 +4,12 @@ - obj-$(CONFIG_VIDEO_HM11B1) += hm11b1.o - obj-$(CONFIG_VIDEO_GC5035) += gc5035.o - obj-$(CONFIG_VIDEO_OV01A1S) += ov01a1s.o --obj-$(CONFIG_VIDEO_OV01A10) += ov01a10.o - obj-$(CONFIG_VIDEO_OV02C10) += ov02c10.o - obj-$(CONFIG_VIDEO_OV02E10) += ov02e10.o --obj-$(CONFIG_VIDEO_OV2740) += ov2740.o - obj-$(CONFIG_VIDEO_HM2170) += hm2170.o - obj-$(CONFIG_VIDEO_HM2170) += hm2172.o --obj-$(CONFIG_VIDEO_HI556) += hi556.o - obj-$(CONFIG_POWER_CTRL_LOGIC) += power_ctrl_logic.o -+ -+obj-$(CONFIG_ICAMERA_OV2740) += ov2740.o -+obj-$(CONFIG_ICAMERA_OV01A10) += ov01a10.o -+obj-$(CONFIG_ICAMERA_HI556) += hi556.o -diff --git a/drivers/media/i2c/hi556.c b/drivers/media/i2c/hi556.c -index 4fc020b65..2adb5a1fe 100644 ---- a/drivers/media/i2c/hi556.c -+++ b/drivers/media/i2c/hi556.c -@@ -12,7 +12,7 @@ - #include - #include - #include --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - #include - -@@ -510,7 +510,7 @@ struct hi556 { - /* Clock provider */ - struct clk *img_clk; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - struct vsc_mipi_config conf; - struct vsc_camera_status status; -@@ -527,7 +527,7 @@ struct hi556 { - - /* True if the device has been identified */ - bool identified; --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - bool use_intel_vsc; - #endif -@@ -704,7 +704,7 @@ static int hi556_set_ctrl(struct v4l2_ctrl *ctrl) - ret = hi556_test_pattern(hi556, ctrl->val); - break; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - case V4L2_CID_PRIVACY: - dev_dbg(&client->dev, "set privacy to %d", ctrl->val); -@@ -732,7 +732,7 @@ static int hi556_init_controls(struct hi556 *hi556) - int ret; - - ctrl_hdlr = &hi556->ctrl_handler; --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - ret = v4l2_ctrl_handler_init(ctrl_hdlr, 9); - #else -@@ -771,7 +771,7 @@ static int hi556_init_controls(struct hi556 *hi556) - h_blank); - if (hi556->hblank) - hi556->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY; --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - hi556->privacy_status = v4l2_ctrl_new_std(ctrl_hdlr, &hi556_ctrl_ops, - V4L2_CID_PRIVACY, 0, 1, 1, -@@ -836,7 +836,7 @@ static int hi556_identify_module(struct hi556 *hi556) - return 0; - } - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - static void hi556_vsc_privacy_callback(void *handle, - enum vsc_privacy_status status) -@@ -936,7 +936,7 @@ static int hi556_power_off(struct device *dev) - struct hi556 *hi556 = to_hi556(sd); - int ret = 0; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - if (hi556->use_intel_vsc) { - ret = vsc_release_camera_sensor(&hi556->status); -@@ -961,7 +961,7 @@ static int hi556_power_on(struct device *dev) - struct hi556 *hi556 = to_hi556(sd); - int ret; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - if (hi556->use_intel_vsc) { - hi556->conf.lane_num = HI556_DATA_LANES; -@@ -1217,7 +1217,7 @@ static int hi556_get_pm_resources(struct device *dev) - struct hi556 *hi556 = to_hi556(sd); - int ret; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - acpi_handle handle = ACPI_HANDLE(dev); - struct acpi_handle_list dep_devices; -diff --git a/drivers/media/i2c/hm2170.c b/drivers/media/i2c/hm2170.c -index 102eec25a..2987e0cbe 100644 ---- a/drivers/media/i2c/hm2170.c -+++ b/drivers/media/i2c/hm2170.c -@@ -13,7 +13,7 @@ - #include - #include - #include --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - #include - #endif -@@ -615,7 +615,7 @@ struct hm2170 { - struct v4l2_ctrl *vblank; - struct v4l2_ctrl *hblank; - struct v4l2_ctrl *exposure; --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - struct vsc_mipi_config conf; - struct vsc_camera_status status; -@@ -792,7 +792,7 @@ static int hm2170_set_ctrl(struct v4l2_ctrl *ctrl) - ret = hm2170_test_pattern(hm2170, ctrl->val); - break; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - case V4L2_CID_PRIVACY: - dev_dbg(&client->dev, "set privacy to %d", ctrl->val); -@@ -825,7 +825,7 @@ static int hm2170_init_controls(struct hm2170 *hm2170) - int ret = 0; - - ctrl_hdlr = &hm2170->ctrl_handler; --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - ret = v4l2_ctrl_handler_init(ctrl_hdlr, 9); - #else -@@ -864,7 +864,7 @@ static int hm2170_init_controls(struct hm2170 *hm2170) - h_blank); - if (hm2170->hblank) - hm2170->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY; --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - hm2170->privacy_status = v4l2_ctrl_new_std(ctrl_hdlr, &hm2170_ctrl_ops, - V4L2_CID_PRIVACY, 0, 1, 1, -@@ -904,7 +904,7 @@ static void hm2170_update_pad_format(const struct hm2170_mode *mode, - fmt->field = V4L2_FIELD_NONE; - } - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - static void hm2170_vsc_privacy_callback(void *handle, - enum vsc_privacy_status status) -@@ -984,7 +984,7 @@ static int hm2170_set_stream(struct v4l2_subdev *sd, int enable) - return ret; - } - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - static int hm2170_power_off(struct device *dev) - { -@@ -1323,7 +1323,7 @@ static int hm2170_probe(struct i2c_client *client) - } - - v4l2_i2c_subdev_init(&hm2170->sd, client, &hm2170_subdev_ops); --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - hm2170->conf.lane_num = HM2170_DATA_LANES; - /* frequency unit 100k */ -@@ -1389,7 +1389,7 @@ probe_error_v4l2_ctrl_handler_free: - mutex_destroy(&hm2170->mutex); - - probe_error_ret: --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - hm2170_power_off(&client->dev); - #endif -@@ -1399,7 +1399,7 @@ probe_error_ret: - - static const struct dev_pm_ops hm2170_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(hm2170_suspend, hm2170_resume) --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - SET_RUNTIME_PM_OPS(hm2170_power_off, hm2170_power_on, NULL) - #endif -diff --git a/drivers/media/i2c/hm2172.c b/drivers/media/i2c/hm2172.c -index 3362d3151..8e1d1f883 100644 ---- a/drivers/media/i2c/hm2172.c -+++ b/drivers/media/i2c/hm2172.c -@@ -15,7 +15,7 @@ - #include - #include - #include --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - #include - -@@ -927,7 +927,7 @@ struct hm2172 { - struct gpio_desc *reset; - struct gpio_desc *handshake; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - struct vsc_mipi_config conf; - struct vsc_camera_status status; -@@ -942,7 +942,7 @@ struct hm2172 { - - /* Streaming on/off */ - bool streaming; --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - bool use_intel_vsc; - #endif -@@ -1109,7 +1109,7 @@ static int hm2172_set_ctrl(struct v4l2_ctrl *ctrl) - ret = hm2172_test_pattern(hm2172, ctrl->val); - break; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - case V4L2_CID_PRIVACY: - dev_dbg(&client->dev, "set privacy to %d", ctrl->val); -@@ -1142,7 +1142,7 @@ static int hm2172_init_controls(struct hm2172 *hm2172) - int ret = 0; - - ctrl_hdlr = &hm2172->ctrl_handler; --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - ret = v4l2_ctrl_handler_init(ctrl_hdlr, 9); - #else -@@ -1183,7 +1183,7 @@ static int hm2172_init_controls(struct hm2172 *hm2172) - if (hm2172->hblank) - hm2172->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - hm2172->privacy_status = v4l2_ctrl_new_std(ctrl_hdlr, &hm2172_ctrl_ops, - V4L2_CID_PRIVACY, 0, 1, 1, -@@ -1223,7 +1223,7 @@ static void hm2172_update_pad_format(const struct hm2172_mode *mode, - fmt->field = V4L2_FIELD_NONE; - } - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - static void hm2172_vsc_privacy_callback(void *handle, - enum vsc_privacy_status status) -@@ -1309,7 +1309,7 @@ static int hm2172_power_off(struct device *dev) - struct hm2172 *hm2172 = to_hm2172(sd); - int ret = 0; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - if (hm2172->use_intel_vsc) { - ret = vsc_release_camera_sensor(&hm2172->status); -@@ -1336,7 +1336,7 @@ static int hm2172_power_on(struct device *dev) - struct hm2172 *hm2172 = to_hm2172(sd); - int ret; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - if (hm2172->use_intel_vsc) { - hm2172->conf.lane_num = HM2172_DATA_LANES; -@@ -1392,7 +1392,7 @@ static int hm2172_get_pm_resources(struct device *dev) - struct hm2172 *hm2172 = to_hm2172(sd); - int ret = 0; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - acpi_handle handle = ACPI_HANDLE(dev); - struct acpi_handle_list dep_devices; -diff --git a/drivers/media/i2c/ov01a10.c b/drivers/media/i2c/ov01a10.c -index 78ae01811..31f1e7a3d 100644 ---- a/drivers/media/i2c/ov01a10.c -+++ b/drivers/media/i2c/ov01a10.c -@@ -11,7 +11,7 @@ - #include - #include - #include --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - #include - #endif -@@ -296,7 +296,7 @@ struct ov01a10 { - /* To serialize asynchronus callbacks */ - struct mutex mutex; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - struct vsc_mipi_config conf; - struct vsc_camera_status status; -@@ -469,7 +469,7 @@ static int ov01a10_set_ctrl(struct v4l2_ctrl *ctrl) - ret = ov01a10_test_pattern(ov01a10, ctrl->val); - break; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - case V4L2_CID_PRIVACY: - dev_dbg(&client->dev, "set privacy to %d", ctrl->val); -@@ -500,7 +500,7 @@ static int ov01a10_init_controls(struct ov01a10 *ov01a10) - int ret = 0; - - ctrl_hdlr = &ov01a10->ctrl_handler; --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - ret = v4l2_ctrl_handler_init(ctrl_hdlr, 9); - #else -@@ -539,7 +539,7 @@ static int ov01a10_init_controls(struct ov01a10 *ov01a10) - if (ov01a10->hblank) - ov01a10->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - ov01a10->privacy_status = v4l2_ctrl_new_std(ctrl_hdlr, - &ov01a10_ctrl_ops, -@@ -661,7 +661,7 @@ static int ov01a10_set_stream(struct v4l2_subdev *sd, int enable) - return ret; - } - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - static void ov01a10_vsc_privacy_callback(void *handle, - enum vsc_privacy_status status) -@@ -1016,7 +1016,7 @@ static int ov01a10_probe(struct i2c_client *client) - return -ENOMEM; - - v4l2_i2c_subdev_init(&ov01a10->sd, client, &ov01a10_subdev_ops); --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - ov01a10->conf.lane_num = OV01A10_DATA_LANES; - /* frequency unit 100k */ -@@ -1082,7 +1082,7 @@ probe_error_v4l2_ctrl_handler_free: - mutex_destroy(&ov01a10->mutex); - - probe_error_ret: --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - ov01a10_power_off(&client->dev); - #endif -@@ -1092,7 +1092,7 @@ probe_error_ret: - - static const struct dev_pm_ops ov01a10_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(ov01a10_suspend, ov01a10_resume) --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - SET_RUNTIME_PM_OPS(ov01a10_power_off, ov01a10_power_on, NULL) - #endif -diff --git a/drivers/media/i2c/ov01a1s.c b/drivers/media/i2c/ov01a1s.c -index f7cf2218c..85f9c684c 100644 ---- a/drivers/media/i2c/ov01a1s.c -+++ b/drivers/media/i2c/ov01a1s.c -@@ -17,7 +17,7 @@ - #elif IS_ENABLED(CONFIG_POWER_CTRL_LOGIC) - #include "power_ctrl_logic.h" - #endif --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - #include - #endif -@@ -303,7 +303,7 @@ struct ov01a1s { - struct v4l2_ctrl *vblank; - struct v4l2_ctrl *hblank; - struct v4l2_ctrl *exposure; --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - struct v4l2_ctrl *privacy_status; - -@@ -337,7 +337,7 @@ struct ov01a1s { - #if IS_ENABLED(CONFIG_INTEL_SKL_INT3472) || IS_ENABLED(CONFIG_POWER_CTRL_LOGIC) - OV01A1S_USE_INT3472 = 1, - #endif --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - OV01A1S_USE_INTEL_VSC = 2, - #endif -@@ -508,7 +508,7 @@ static int ov01a1s_set_ctrl(struct v4l2_ctrl *ctrl) - ret = ov01a1s_test_pattern(ov01a1s, ctrl->val); - break; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - case V4L2_CID_PRIVACY: - dev_dbg(&client->dev, "set privacy to %d", ctrl->val); -@@ -539,7 +539,7 @@ static int ov01a1s_init_controls(struct ov01a1s *ov01a1s) - int ret = 0; - - ctrl_hdlr = &ov01a1s->ctrl_handler; --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - ret = v4l2_ctrl_handler_init(ctrl_hdlr, 9); - #else -@@ -577,7 +577,7 @@ static int ov01a1s_init_controls(struct ov01a1s *ov01a1s) - 1, h_blank); - if (ov01a1s->hblank) - ov01a1s->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY; --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - ov01a1s->privacy_status = v4l2_ctrl_new_std(ctrl_hdlr, - &ov01a1s_ctrl_ops, -@@ -619,7 +619,7 @@ static void ov01a1s_update_pad_format(const struct ov01a1s_mode *mode, - fmt->field = V4L2_FIELD_NONE; - } - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - static void ov01a1s_vsc_privacy_callback(void *handle, - enum vsc_privacy_status status) -@@ -729,7 +729,7 @@ static int ov01a1s_power_off(struct device *dev) - if (ov01a1s->power_type == OV01A1S_USE_INT3472) - ret = power_ctrl_logic_set_power(0); - #endif --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - if (ov01a1s->power_type == OV01A1S_USE_INTEL_VSC) { - ret = vsc_release_camera_sensor(&ov01a1s->status); -@@ -764,7 +764,7 @@ static int ov01a1s_power_on(struct device *dev) - if (ov01a1s->power_type == OV01A1S_USE_INT3472) - ret = power_ctrl_logic_set_power(1); - #endif --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - if (ov01a1s->power_type == OV01A1S_USE_INTEL_VSC) { - ret = vsc_acquire_camera_sensor(&ov01a1s->conf, -@@ -1125,7 +1125,7 @@ static int ov01a1s_parse_power(struct ov01a1s *ov01a1s) - { - int ret = 0; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - ov01a1s->conf.lane_num = OV01A1S_DATA_LANES; - /* frequency unit 100k */ -diff --git a/drivers/media/i2c/ov02c10.c b/drivers/media/i2c/ov02c10.c -index 40865f8e3..4f58d5ac9 100644 ---- a/drivers/media/i2c/ov02c10.c -+++ b/drivers/media/i2c/ov02c10.c -@@ -13,7 +13,7 @@ - #include - #include - #include --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - #include - -@@ -697,7 +697,7 @@ struct ov02c10 { - struct gpio_desc *reset; - struct gpio_desc *handshake; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - struct vsc_mipi_config conf; - struct vsc_camera_status status; -@@ -717,7 +717,7 @@ IS_ENABLED(CONFIG_INTEL_VSC) - - /* Module name index */ - u8 module_name_index; --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - - bool use_intel_vsc; -@@ -857,7 +857,7 @@ static int ov02c10_set_ctrl(struct v4l2_ctrl *ctrl) - ret = ov02c10_test_pattern(ov02c10, ctrl->val); - break; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - case V4L2_CID_PRIVACY: - dev_dbg(&client->dev, "set privacy to %d", ctrl->val); -@@ -888,7 +888,7 @@ static int ov02c10_init_controls(struct ov02c10 *ov02c10) - int ret = 0; - - ctrl_hdlr = &ov02c10->ctrl_handler; --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - ret = v4l2_ctrl_handler_init(ctrl_hdlr, 9); - #else -@@ -926,7 +926,7 @@ IS_ENABLED(CONFIG_INTEL_VSC) - 1, h_blank); - if (ov02c10->hblank) - ov02c10->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY; --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - ov02c10->privacy_status = v4l2_ctrl_new_std(ctrl_hdlr, - &ov02c10_ctrl_ops, -@@ -1102,7 +1102,7 @@ static int ov02c10_get_pm_resources(struct device *dev) - struct ov02c10 *ov02c10 = to_ov02c10(sd); - int ret; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - acpi_handle handle = ACPI_HANDLE(dev); - struct acpi_handle_list deps; -@@ -1162,7 +1162,7 @@ IS_ENABLED(CONFIG_INTEL_VSC) - return 0; - } - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - static void ov02c10_vsc_privacy_callback(void *handle, - enum vsc_privacy_status status) -@@ -1179,7 +1179,7 @@ static int ov02c10_power_off(struct device *dev) - struct ov02c10 *ov02c10 = to_ov02c10(sd); - int ret = 0; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - if (ov02c10->use_intel_vsc) { - ret = vsc_release_camera_sensor(&ov02c10->status); -@@ -1206,7 +1206,7 @@ static int ov02c10_power_on(struct device *dev) - struct ov02c10 *ov02c10 = to_ov02c10(sd); - int ret; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - if (ov02c10->use_intel_vsc) { - ov02c10->conf.lane_num = ov02c10->mipi_lanes; -diff --git a/drivers/media/i2c/ov02e10.c b/drivers/media/i2c/ov02e10.c -index 916def90f..c5c373aa6 100644 ---- a/drivers/media/i2c/ov02e10.c -+++ b/drivers/media/i2c/ov02e10.c -@@ -13,7 +13,7 @@ - #include - #include - #include --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - #include - -@@ -289,7 +289,7 @@ struct ov02e10 { - struct gpio_desc *reset; - struct gpio_desc *handshake; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - struct vsc_mipi_config conf; - struct vsc_camera_status status; -@@ -304,7 +304,7 @@ struct ov02e10 { - - /* Streaming on/off */ - bool streaming; --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - bool use_intel_vsc; - #endif -@@ -486,7 +486,7 @@ static int ov02e10_set_ctrl(struct v4l2_ctrl *ctrl) - ret = ov02e10_test_pattern(ov02e10, ctrl->val); - break; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - case V4L2_CID_PRIVACY: - dev_dbg(&client->dev, "set privacy to %d", ctrl->val); -@@ -520,7 +520,7 @@ static int ov02e10_init_controls(struct ov02e10 *ov02e10) - int ret; - - ctrl_hdlr = &ov02e10->ctrl_handler; --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - ret = v4l2_ctrl_handler_init(ctrl_hdlr, 9); - #else -@@ -561,7 +561,7 @@ static int ov02e10_init_controls(struct ov02e10 *ov02e10) - if (ov02e10->hblank) - ov02e10->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - ov02e10->privacy_status = v4l2_ctrl_new_std(ctrl_hdlr, &ov02e10_ctrl_ops, - V4L2_CID_PRIVACY, 0, 1, 1, -@@ -602,7 +602,7 @@ static void ov02e10_update_pad_format(const struct ov02e10_mode *mode, - fmt->field = V4L2_FIELD_NONE; - } - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - static void ov02e10_vsc_privacy_callback(void *handle, - enum vsc_privacy_status status) -@@ -696,7 +696,7 @@ static int ov02e10_get_pm_resources(struct device *dev) - struct ov02e10 *ov02e10 = to_ov02e10(sd); - int ret; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - acpi_handle handle = ACPI_HANDLE(dev); - struct acpi_handle_list dep_devices; -@@ -763,7 +763,7 @@ static int ov02e10_power_off(struct device *dev) - struct ov02e10 *ov02e10 = to_ov02e10(sd); - int ret = 0; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - if (ov02e10->use_intel_vsc) { - ret = vsc_release_camera_sensor(&ov02e10->status); -@@ -790,7 +790,7 @@ static int ov02e10_power_on(struct device *dev) - struct ov02e10 *ov02e10 = to_ov02e10(sd); - int ret; - --#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) && \ - IS_ENABLED(CONFIG_INTEL_VSC) - if (ov02e10->use_intel_vsc) { - ov02e10->conf.lane_num = OV02E10_DATA_LANES; --- -2.45.1 - diff --git a/anda/system/intel-ipu6-kmod/intel-ipu6-kmod.spec b/anda/system/intel-ipu6-kmod/intel-ipu6-kmod.spec deleted file mode 100644 index de891408c3..0000000000 --- a/anda/system/intel-ipu6-kmod/intel-ipu6-kmod.spec +++ /dev/null @@ -1,93 +0,0 @@ -%global commit0 aecec2aaef069fea56aa921cf5d7e449bb7a0b82 -%global date 20240624 -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global commit1 a6dccbbf5a955489d20d996234b6ebb481183ed7 -%global date 20240416 -%global shortcommit1 %(c=%{commit0}; echo ${c:0:7}) -%define buildforkernels akmod -%global debug_package %{nil} -%global realname intel-ipu6 - -Name: %{realname}-kmod -Version: %{date}.%{shortcommit0} -Release: 1%{?dist} -Summary: Kernel drivers for the IPU 6 and sensors -License: GPL-3.0-only -URL: https://github.com/intel/ipu6-drivers -Source0: https://github.com/intel/ipu6-drivers/archive/%{commit0}.tar.gz#/ipu6-drivers-%{shortcommit0}.tar.gz -Source1: https://github.com/intel/ivsc-driver/archive/%{commit1}.tar.gz#/ivsc-driver-%{shortcommit1}.tar.gz -### intel/ipu6-drivers | PR #214 | Ipu6-isys probe improvements -## https://github.com/intel/ipu6-drivers/pull/214 -Patch0: 0000-probe-improvements.patch -### intel/ipu6-drivers | PR #239 | gc5035: Fix compilation with kernels >= 6.8 -## https://github.com/intel/ipu6-drivers/pull/239 -Patch1: 0001-fix-compilation-6.8.patch -### intel/ipu6-drivers | PR #242 | media: ipu6: Fix compilation with kernels >= 6.10 -## https://github.com/intel/ipu6-drivers/pull/242 -Patch2: 0002-fix-compilation-6.10.patch -### intel-ipu6-drivers | PR #243 | Rename ipu6 .ko files to avoid conflict with upstream ipu6 isys support -## https://github.com/intel/ipu6-drivers/pull/243 -Patch3: 0003-prefix-modules.patch -### intel/ipu6-drivers | PR #261 | media: ipu6: Fix compilation with kernels >= 6.11 -## https://github.com/intel/ipu6-drivers/pull/261 -Patch4: 0004-fix-compilation-6.11.patch -### intel/ipu6-drivers | PR #283 | media: ipu6: Fix compilation with kernels >= 6.12 -## https://github.com/intel/ipu6-drivers/pull/283 -Patch5: 0005-fix-compilation-6.12.patch -Patch6: 0006-fix-compilation-6.12-no-no_llseek.patch -### jwrdegoede/ipu6-drivers | Commit 2c4ad13 | Makefile: Adjust which modules to build for which kernel-versions for Fedora -## https://github.com/jwrdegoede/ipu6-drivers/commit/2c4ad1398dddfb307e8a40a714a6d5f70d6d14cb -Patch7: 0007-modules-per-kernel.patch -BuildRequires: gcc -BuildRequires: elfutils-libelf-devel -BuildRequires: kmodtool - -%{expand:%(kmodtool --target %{_target_cpu} --repo terra --kmodname %{realname} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"}) } - -%description -Kernel drivers for Intel iVSC, IPU 6, and sensors. - -%prep -%{?kmodtool_check} -kmodtool --target %{_target_cpu} --repo terra --kmodname %{realname} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} - -%autosetup -p1 -n ipu6-drivers-%{commit0} -a 1 - -cp -av ivsc-driver-%{commit1}/{backport-include,drivers,include} . -rm -fr intel-vsc-%{commit1} - -for kernel_version in %{?kernel_versions}; do - mkdir _kmod_build_${kernel_version%%___*} - cp -fr backport-include drivers include Makefile _kmod_build_${kernel_version%%___*} -done - -%build -for kernel_version in %{?kernel_versions}; do - pushd _kmod_build_${kernel_version%%___*}/ - %make_build -C "${kernel_version##*___}" M=$(pwd) VERSION="v%{version}" modules - popd -done - -%install -for kernel_version in %{?kernel_versions}; do - mkdir -p %{buildroot}/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ - install -p -m 0755 \ - _kmod_build_${kernel_version%%___*}/*.ko \ - _kmod_build_${kernel_version%%___*}/drivers/media/i2c/*.ko \ - _kmod_build_${kernel_version%%___*}/drivers/media/pci/intel/ipu6/*.ko \ - %{buildroot}/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ -done -%{?akmod_install} - -### Reloading the modules is needed for %{PATCH0} to take effect properly on some kernels, as well for the changes to be properly reverted on uninstall. -## See: https://github.com/intel/ipu6-drivers/pull/214#issuecomment-1986110818 -%post -/usr/sbin/rmmod -f intel_ipu6_psys intel_ipu6_isys intel_ipu6 -/usr/sbin/modprobe -a intel_ipu6 intel_ipu6_isys intel_ipu6_psys - -%postun -/usr/sbin/rmmod -f intel_ipu6_psys intel_ipu6_isys intel_ipu6 -/usr/sbin/modprobe -a intel_ipu6 intel_ipu6_isys intel_ipu6_psys - -%changelog -%autochangelog diff --git a/anda/system/ipu6-drivers/akmod/0001-Makefile-Switch-sensor-driver-symbols-from-CONFIG_VI.patch b/anda/system/ipu6-drivers/akmod/0001-Makefile-Switch-sensor-driver-symbols-from-CONFIG_VI.patch new file mode 100644 index 0000000000..4e768ef1e7 --- /dev/null +++ b/anda/system/ipu6-drivers/akmod/0001-Makefile-Switch-sensor-driver-symbols-from-CONFIG_VI.patch @@ -0,0 +1,88 @@ +From c451aa3f50f8a5ef26d9a36f159c3f9fb8e6ef11 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Mon, 10 Jun 2024 13:05:53 +0200 +Subject: [PATCH 1/9] Makefile: Switch sensor driver symbols from + CONFIG_VIDEO_FOO to CONFIG_ICAMERA_FOO + +Switch the Kconfig symbols for sensor drivers from CONFIG_VIDEO_FOO to +CONFIG_ICAMERA_FOO to avoid these still being set when they should not +because of the CONFIG_VIDEO_FOO symbols inherited from the base kernel. + +Signed-off-by: Hans de Goede +--- + Makefile | 22 +++++++++++----------- + drivers/media/i2c/Makefile | 22 +++++++++++----------- + 2 files changed, 22 insertions(+), 22 deletions(-) + +diff --git a/Makefile b/Makefile +index 49b27300a..356f5e7f3 100644 +--- a/Makefile ++++ b/Makefile +@@ -81,22 +81,22 @@ else + obj-y += drivers/media/pci/intel/ipu6/psys/ + endif + +-export CONFIG_VIDEO_HM11B1 = m +-export CONFIG_VIDEO_OV01A1S = m +-export CONFIG_VIDEO_OV01A10 = m +-export CONFIG_VIDEO_OV02C10 = m +-export CONFIG_VIDEO_OV02E10 = m +-export CONFIG_VIDEO_HM2170 = m +-export CONFIG_VIDEO_HM2172 = m +-export CONFIG_VIDEO_HI556 = m ++export CONFIG_ICAMERA_HM11B1 = m ++export CONFIG_ICAMERA_OV01A1S = m ++export CONFIG_ICAMERA_OV01A10 = m ++export CONFIG_ICAMERA_OV02C10 = m ++export CONFIG_ICAMERA_OV02E10 = m ++export CONFIG_ICAMERA_HM2170 = m ++export CONFIG_ICAMERA_HM2172 = m ++export CONFIG_ICAMERA_HI556 = m + + ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV2740)),true) +-export CONFIG_VIDEO_OV2740 = m +-export CONFIG_VIDEO_GC5035 = m ++export CONFIG_ICAMERA_OV2740 = m ++export CONFIG_ICAMERA_GC5035 = m + endif + + ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV05C10)),false) +-export CONFIG_VIDEO_OV05C10 = m ++export CONFIG_ICAMERA_OV05C10 = m + endif + + obj-y += drivers/media/i2c/ +diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile +index b4fa25598..2bcc878e7 100644 +--- a/drivers/media/i2c/Makefile ++++ b/drivers/media/i2c/Makefile +@@ -1,15 +1,15 @@ + # SPDX-License-Identifier: GPL-2.0 + # Copyright (c) 2021 Intel Corporation. + +-obj-$(CONFIG_VIDEO_HM11B1) += hm11b1.o +-obj-$(CONFIG_VIDEO_GC5035) += gc5035.o +-obj-$(CONFIG_VIDEO_OV01A1S) += ov01a1s.o +-obj-$(CONFIG_VIDEO_OV01A10) += ov01a10.o +-obj-$(CONFIG_VIDEO_OV02C10) += ov02c10.o +-obj-$(CONFIG_VIDEO_OV02E10) += ov02e10.o +-obj-$(CONFIG_VIDEO_OV05C10) += ov05c10.o +-obj-$(CONFIG_VIDEO_OV2740) += ov2740.o +-obj-$(CONFIG_VIDEO_HM2170) += hm2170.o +-obj-$(CONFIG_VIDEO_HM2170) += hm2172.o +-obj-$(CONFIG_VIDEO_HI556) += hi556.o ++obj-$(CONFIG_ICAMERA_HM11B1) += hm11b1.o ++obj-$(CONFIG_ICAMERA_GC5035) += gc5035.o ++obj-$(CONFIG_ICAMERA_OV01A1S) += ov01a1s.o ++obj-$(CONFIG_ICAMERA_OV01A10) += ov01a10.o ++obj-$(CONFIG_ICAMERA_OV02C10) += ov02c10.o ++obj-$(CONFIG_ICAMERA_OV02E10) += ov02e10.o ++obj-$(CONFIG_ICAMERA_OV05C10) += ov05c10.o ++obj-$(CONFIG_ICAMERA_OV2740) += ov2740.o ++obj-$(CONFIG_ICAMERA_HM2170) += hm2170.o ++obj-$(CONFIG_ICAMERA_HM2170) += hm2172.o ++obj-$(CONFIG_ICAMERA_HI556) += hi556.o + obj-$(CONFIG_POWER_CTRL_LOGIC) += power_ctrl_logic.o +-- +2.48.1 + diff --git a/anda/system/intel-ipu6-kmod/0001-fix-compilation-6.8.patch b/anda/system/ipu6-drivers/akmod/0002-Makefile-Re-enable-gc5035-compilation-with-kernels-6.patch similarity index 66% rename from anda/system/intel-ipu6-kmod/0001-fix-compilation-6.8.patch rename to anda/system/ipu6-drivers/akmod/0002-Makefile-Re-enable-gc5035-compilation-with-kernels-6.patch index 45bb8de9ca..d8bb788804 100644 --- a/anda/system/intel-ipu6-kmod/0001-fix-compilation-6.8.patch +++ b/anda/system/ipu6-drivers/akmod/0002-Makefile-Re-enable-gc5035-compilation-with-kernels-6.patch @@ -1,17 +1,38 @@ +From b839b8153bd364c22811496c1753145fa475bcc8 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Mon, 10 Jun 2024 13:41:16 +0200 +Subject: [PATCH 2/9] Makefile: Re-enable gc5035 compilation with kernels >= + 6.8 + +For some reason the gc5035 driver has been disabled for kernels >= 6.8, +but it is not upstream yet. + +Fix compilation with kernel >= 6.8 and re-enable the driver. + +Signed-off-by: Hans de Goede +--- + Makefile | 2 +- + drivers/media/i2c/gc5035.c | 19 +++++++++++++++++++ + 2 files changed, 20 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 356f5e7f3..58bc10aed 100644 --- a/Makefile +++ b/Makefile -@@ -83,10 +83,10 @@ export CONFIG_VIDEO_OV02E10 = m - export CONFIG_VIDEO_HM2170 = m - export CONFIG_VIDEO_HM2172 = m - export CONFIG_VIDEO_HI556 = m -+export CONFIG_VIDEO_GC5035 = m +@@ -89,10 +89,10 @@ export CONFIG_ICAMERA_OV02E10 = m + export CONFIG_ICAMERA_HM2170 = m + export CONFIG_ICAMERA_HM2172 = m + export CONFIG_ICAMERA_HI556 = m ++export CONFIG_ICAMERA_GC5035 = m ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV2740)),true) - export CONFIG_VIDEO_OV2740 = m --export CONFIG_VIDEO_GC5035 = m + export CONFIG_ICAMERA_OV2740 = m +-export CONFIG_ICAMERA_GC5035 = m endif - obj-y += drivers/media/i2c/ + ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV05C10)),false) +diff --git a/drivers/media/i2c/gc5035.c b/drivers/media/i2c/gc5035.c +index 16bbd4845..e825dfa7d 100644 --- a/drivers/media/i2c/gc5035.c +++ b/drivers/media/i2c/gc5035.c @@ -1497,7 +1497,11 @@ static int gc5035_set_fmt(struct v4l2_subdev *sd, @@ -71,3 +92,6 @@ ret = gc5035_initialize_controls(gc5035); if (ret) { dev_err_probe(dev, ret, "Failed to initialize controls\n"); +-- +2.48.1 + diff --git a/anda/system/ipu6-drivers/akmod/0003-Makefile-Do-not-build-hi556-driver-with-kernels-6.10.patch b/anda/system/ipu6-drivers/akmod/0003-Makefile-Do-not-build-hi556-driver-with-kernels-6.10.patch new file mode 100644 index 0000000000..923f26602b --- /dev/null +++ b/anda/system/ipu6-drivers/akmod/0003-Makefile-Do-not-build-hi556-driver-with-kernels-6.10.patch @@ -0,0 +1,54 @@ +From 580d73c387405534bdef7911e0616ad66953f7ce Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Mon, 13 Jan 2025 13:11:00 +0100 +Subject: [PATCH 3/9] Makefile: Do not build hi556 driver with kernels >= 6.10 + +The mainline kernel hi556 driver has ACPI enumeration, GPIO and clk support +since kernel 6.10, so it can be used instead of the out of tree driver. + +Add a new KV_HI556 variable and stop building the hi556 driver on +kernels >= 6.10. + +Signed-off-by: Hans de Goede +--- + Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 58bc10aed..472fdec22 100644 +--- a/Makefile ++++ b/Makefile +@@ -24,6 +24,7 @@ KV_IVSC := 6.6.0 + KV_IPU_BRIDGE := 6.6.0 + KV_OV2740 := 6.8.0 + KV_OV05C10 := 6.8.0 ++KV_HI556 := 6.10 + KV_IPU6_ISYS := 6.10.0 + + KERNEL_SRC ?= /lib/modules/$(KERNELRELEASE)/build +@@ -88,17 +89,21 @@ export CONFIG_ICAMERA_OV02C10 = m + export CONFIG_ICAMERA_OV02E10 = m + export CONFIG_ICAMERA_HM2170 = m + export CONFIG_ICAMERA_HM2172 = m +-export CONFIG_ICAMERA_HI556 = m + export CONFIG_ICAMERA_GC5035 = m + + ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV2740)),true) + export CONFIG_ICAMERA_OV2740 = m + endif + ++# Note OV05C10 check is reversed, it is not build on too old kernels + ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV05C10)),false) + export CONFIG_ICAMERA_OV05C10 = m + endif + ++ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_HI556)),true) ++export CONFIG_ICAMERA_HI556 = m ++endif ++ + obj-y += drivers/media/i2c/ + + ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_IVSC)),true) +-- +2.48.1 + diff --git a/anda/system/ipu6-drivers/akmod/0004-Makefile-Do-not-build-ov01a10-driver-with-kernels-6..patch b/anda/system/ipu6-drivers/akmod/0004-Makefile-Do-not-build-ov01a10-driver-with-kernels-6..patch new file mode 100644 index 0000000000..73f37ea469 --- /dev/null +++ b/anda/system/ipu6-drivers/akmod/0004-Makefile-Do-not-build-ov01a10-driver-with-kernels-6..patch @@ -0,0 +1,51 @@ +From 14d41bf82770fcab65dcf3b2eec3f95b7a963aff Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Mon, 13 Jan 2025 13:15:15 +0100 +Subject: [PATCH 4/9] Makefile: Do not build ov01a10 driver with kernels >= 6.8 + +Since commit 47a78052db51 ("media: ov01a10: Enable runtime PM before +registering async sub-device") the mainline ov01a10 driver is fully +usable and it can be used instead of the out of tree driver. + +Add a new KV_OV01A10 variable and stop building the ov01a10 driver on +kernels >= 6.8. + +Signed-off-by: Hans de Goede +--- + Makefile | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 472fdec22..7ae3be835 100644 +--- a/Makefile ++++ b/Makefile +@@ -23,6 +23,7 @@ version_lt = $(shell \ + KV_IVSC := 6.6.0 + KV_IPU_BRIDGE := 6.6.0 + KV_OV2740 := 6.8.0 ++KV_OV01A10 := 6.8.0 + KV_OV05C10 := 6.8.0 + KV_HI556 := 6.10 + KV_IPU6_ISYS := 6.10.0 +@@ -84,7 +85,6 @@ endif + + export CONFIG_ICAMERA_HM11B1 = m + export CONFIG_ICAMERA_OV01A1S = m +-export CONFIG_ICAMERA_OV01A10 = m + export CONFIG_ICAMERA_OV02C10 = m + export CONFIG_ICAMERA_OV02E10 = m + export CONFIG_ICAMERA_HM2170 = m +@@ -95,6 +95,10 @@ ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV2740)),true) + export CONFIG_ICAMERA_OV2740 = m + endif + ++ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV01A10)),true) ++export CONFIG_ICAMERA_OV01A10 = m ++endif ++ + # Note OV05C10 check is reversed, it is not build on too old kernels + ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV05C10)),false) + export CONFIG_ICAMERA_OV05C10 = m +-- +2.48.1 + diff --git a/anda/system/ipu6-drivers/akmod/0005-media-ipu6-Fix-out-of-tree-builds.patch b/anda/system/ipu6-drivers/akmod/0005-media-ipu6-Fix-out-of-tree-builds.patch new file mode 100644 index 0000000000..52b0d88a03 --- /dev/null +++ b/anda/system/ipu6-drivers/akmod/0005-media-ipu6-Fix-out-of-tree-builds.patch @@ -0,0 +1,28 @@ +From 7ce00bf77d1b92981f471a26fa2d92c96d14e51c Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Tue, 14 Jan 2025 23:07:35 +0100 +Subject: [PATCH 5/9] media: ipu6: Fix out of tree builds + +Fix out of tree builds not finding the ipu6*.h files. + +Signed-off-by: Hans de Goede +--- + drivers/media/pci/intel/ipu6/psys/Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/media/pci/intel/ipu6/psys/Makefile b/drivers/media/pci/intel/ipu6/psys/Makefile +index fa638fcdf..9a3aa6e78 100644 +--- a/drivers/media/pci/intel/ipu6/psys/Makefile ++++ b/drivers/media/pci/intel/ipu6/psys/Makefile +@@ -23,6 +23,8 @@ obj-$(CONFIG_VIDEO_INTEL_IPU6) += intel-ipu6-psys.o + + ifeq ($(is_kernel_lt_6_10), 1) + ccflags-y += -I$(src)/../ipu6/ ++else ++ccflags-y += -I/lib/modules/$(KERNELRELEASE)/build/drivers/media/pci/intel/ipu6/ + endif + ccflags-y += -I$(src)/../ + ccflags-y += -I$(src)/../../ +-- +2.48.1 + diff --git a/anda/system/ipu6-drivers/akmod/0006-media-ipu6-Fix-building-with-kernel-6.13.patch b/anda/system/ipu6-drivers/akmod/0006-media-ipu6-Fix-building-with-kernel-6.13.patch new file mode 100644 index 0000000000..a4b0ddbdea --- /dev/null +++ b/anda/system/ipu6-drivers/akmod/0006-media-ipu6-Fix-building-with-kernel-6.13.patch @@ -0,0 +1,53 @@ +From a42273020f4a2e1c633dda6f30c512db56738b67 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Tue, 14 Jan 2025 23:08:04 +0100 +Subject: [PATCH 6/9] media: ipu6: Fix building with kernel 6.13 + +Fix building with kernel 6.13. + +Signed-off-by: Hans de Goede +--- + drivers/media/pci/intel/ipu6/psys/ipu-psys.c | 8 ++++++++ + drivers/media/pci/intel/ipu6/psys/ipu6-psys.c | 4 ++++ + 2 files changed, 12 insertions(+) + +diff --git a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c +index 00e394f20..36f99a3b8 100644 +--- a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c ++++ b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c +@@ -2681,8 +2681,16 @@ MODULE_AUTHOR("Yunliang Ding "); + MODULE_LICENSE("GPL"); + MODULE_DESCRIPTION("Intel ipu processing system driver"); + #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0) || IS_ENABLED(CONFIG_DRM_I915_HAS_SRIOV) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0) + MODULE_IMPORT_NS(DMA_BUF); ++#else ++MODULE_IMPORT_NS("DMA_BUF"); ++#endif + #endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 10, 0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0) + MODULE_IMPORT_NS(INTEL_IPU6); ++#else ++MODULE_IMPORT_NS("INTEL_IPU6"); ++#endif + #endif +diff --git a/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c +index 53c845ba3..0c3a5ca62 100644 +--- a/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c ++++ b/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c +@@ -32,7 +32,11 @@ + #include "ipu6-platform-buttress-regs.h" + #endif + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0) + MODULE_IMPORT_NS(DMA_BUF); ++#else ++MODULE_IMPORT_NS("DMA_BUF"); ++#endif + + static bool early_pg_transfer; + module_param(early_pg_transfer, bool, 0664); +-- +2.48.1 + diff --git a/anda/system/ipu6-drivers/akmod/0007-Modify-0001-v6.10-IPU6-headers-used-by-PSYS.patch-fo.patch b/anda/system/ipu6-drivers/akmod/0007-Modify-0001-v6.10-IPU6-headers-used-by-PSYS.patch-fo.patch new file mode 100644 index 0000000000..d1bccf20a1 --- /dev/null +++ b/anda/system/ipu6-drivers/akmod/0007-Modify-0001-v6.10-IPU6-headers-used-by-PSYS.patch-fo.patch @@ -0,0 +1,49 @@ +From 32ce53b82bef51479d49d7d68794e2b801367dd6 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Thu, 30 Jan 2025 22:20:16 +0100 +Subject: [PATCH 7/9] Modify 0001-v6.10-IPU6-headers-used-by-PSYS.patch for + v6.13 + +Modify 0001-v6.10-IPU6-headers-used-by-PSYS.patch so that it also works +with 6.13 kernels. + +Signed-off-by: Hans de Goede +--- + patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch b/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch +index 00fb961d2..6a465a924 100644 +--- a/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch ++++ b/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch +@@ -52,7 +52,7 @@ index 000000000..b26c6aee1 + + + +struct ipu6_bus_device { + + struct auxiliary_device auxdev; +-+ struct auxiliary_driver *auxdrv; +++ const struct auxiliary_driver *auxdrv; + + const struct ipu6_auxdrv_data *auxdrv_data; + + struct list_head list; + + void *pdata; +@@ -92,7 +92,7 @@ new file mode 100644 + index 000000000..9b6f56958 + --- /dev/null + +++ b/drivers/media/pci/intel/ipu6/ipu6-buttress.h +-@@ -0,0 +1,92 @@ ++@@ -0,0 +1,94 @@ + +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* Copyright (C) 2013--2024 Intel Corporation */ + + +@@ -141,7 +141,9 @@ index 000000000..9b6f56958 + +struct ipu6_buttress { + + struct mutex power_mutex, auth_mutex, cons_mutex, ipc_mutex; + + struct ipu6_buttress_ipc cse; +++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0) + + struct ipu6_buttress_ipc ish; +++#endif + + struct list_head constraints; + + u32 wdt_cached_value; + + bool force_suspend; +-- +2.48.1 + diff --git a/anda/system/ipu6-drivers/akmod/0008-ipu6-psys-Adjust-DMA-code-for-ipu6-bus-DMA-changes-i.patch b/anda/system/ipu6-drivers/akmod/0008-ipu6-psys-Adjust-DMA-code-for-ipu6-bus-DMA-changes-i.patch new file mode 100644 index 0000000000..141202d154 --- /dev/null +++ b/anda/system/ipu6-drivers/akmod/0008-ipu6-psys-Adjust-DMA-code-for-ipu6-bus-DMA-changes-i.patch @@ -0,0 +1,306 @@ +From a9236f549f28811a5af0c71ce6708d1f259d0e78 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Sat, 1 Feb 2025 08:04:35 +0100 +Subject: [PATCH 8/9] ipu6-psys: Adjust DMA code for ipu6-bus DMA changes in + kernels >= 6.12 + +Upstream commit daabc5c64703 ("media: ipu6: not override the dma_ops of +device in driver") has changed the ipu6-bus code to no longer modify +the aux device's dma_ops, instead new ipu6_dma_*() helpers were introduced +modify the psys driver to use these new helpers. + +This fixes the below DMA warning, which was followed by ipu6_psys_probe() +failing due to dma_alloc_attrs() failing: + +Jan 31 11:59:59 x1 kernel: ------------[ cut here ]------------ +Jan 31 11:59:59 x1 kernel: WARNING: CPU: 3 PID: 8595 at kernel/dma/mapping.c:597 dma_alloc_attrs+0x12b/0x140 +Jan 31 11:59:59 x1 kernel: Modules linked in: intel_ipu6_psys(OE+) rfcomm snd_seq_dummy snd_hrtimer qrtr bnep binfmt_misc vfat fat snd_soc_skl_hda_dsp snd_soc_intel_sof_board_helpers snd_sof_probes snd_soc_intel_hda_dsp_common snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic snd_hda_scodec_component snd_soc_dmic snd_sof_pci_intel_mtl snd_sof_intel_hda_generic soundwire_intel soundwire_cadence snd_sof_intel_hda_common snd_soc_hdac_hda iwlmvm snd_sof_intel_hda_mlink snd_sof_intel_hda snd_sof_pci snd_sof_xtensa_dsp snd_sof snd_sof_utils snd_hda_ext_core mac80211 snd_soc_acpi_intel_match soundwire_generic_allocation snd_soc_acpi intel_uncore_frequency soundwire_bus intel_uncore_frequency_common x86_pkg_temp_thermal snd_soc_core intel_ipu6_isys intel_powerclamp videobuf2_dma_sg coretemp snd_compress videobuf2_memops ac97_bus videobuf2_v4l2 snd_pcm_dmaengine videobuf2_common snd_hda_intel libarc4 snd_intel_dspcfg snd_intel_sdw_acpi kvm_intel snd_hda_codec spi_nor btusb iTCO_wdt btrtl mhi_wwan_mbim intel_pmc_bxt mhi_wwan_ctrl +Jan 31 11:59:59 x1 kernel: snd_hda_core mei_gsc_proxy gpio_usbio(OE) mei_wdt i2c_usbio(OE) mtd iTCO_vendor_support intel_rapl_msr btintel snd_hwdep kvm btbcm btmtk snd_seq snd_ctl_led hid_sensor_accel_3d hid_sensor_gyro_3d iwlwifi bluetooth snd_seq_device rapl processor_thermal_device_pci intel_cstate hid_sensor_trigger think_lmi processor_thermal_device hid_sensor_iio_common processor_thermal_wt_hint industrialio_triggered_buffer intel_uncore usbio(OE) firmware_attributes_class snd_pcm wmi_bmof mhi_pci_generic kfifo_buf processor_thermal_rfim i2c_i801 mei_me cfg80211 processor_thermal_rapl thinkpad_acpi spi_intel_pci mhi industrialio thunderbolt snd_timer spi_intel mei intel_ipu6 i2c_smbus intel_rapl_common idma64 platform_profile processor_thermal_wt_req ipu_bridge rfkill processor_thermal_power_floor snd igen6_edac processor_thermal_mbox int3403_thermal soundcore soc_button_array int340x_thermal_zone intel_pmc_core intel_skl_int3472_tps68470 ov08x40(OE) tps68470_regulator v4l2_fwnode clk_tps68470 intel_vsec v4l2_async +Jan 31 11:59:59 x1 kernel: pmt_telemetry intel_skl_int3472_discrete int3400_thermal intel_hid acpi_tad pmt_class intel_skl_int3472_common acpi_pad sparse_keymap joydev acpi_thermal_rel loop nfnetlink zram lz4hc_compress lz4_compress dm_crypt xe drm_ttm_helper gpu_sched drm_suballoc_helper drm_gpuvm drm_exec hid_sensor_hub intel_ishtp_hid i915 i2c_algo_bit drm_buddy nvme ttm nvme_core drm_display_helper intel_ish_ipc video ucsi_acpi crct10dif_pclmul hid_multitouch crc32_pclmul crc32c_intel polyval_clmulni polyval_generic ghash_clmulni_intel intel_vpu sha512_ssse3 sha256_ssse3 typec_ucsi sha1_ssse3 intel_ishtp cec typec nvme_auth i2c_hid_acpi i2c_hid wmi pinctrl_meteorlake serio_raw v4l2loopback(OE) videodev mc i2c_dev fuse +Jan 31 11:59:59 x1 kernel: CPU: 3 UID: 0 PID: 8595 Comm: modprobe Tainted: G OE 6.12.10-200.fc41.x86_64 #1 +Jan 31 11:59:59 x1 kernel: Tainted: [O]=OOT_MODULE, [E]=UNSIGNED_MODULE +Jan 31 11:59:59 x1 kernel: Hardware name: LENOVO 21KCSIT080/21KCSIT080, BIOS N3YET72W (1.37 ) 10/03/2024 +Jan 31 11:59:59 x1 kernel: RIP: 0010:dma_alloc_attrs+0x12b/0x140 +Jan 31 11:59:59 x1 kernel: Code: 4c 89 e6 48 89 df e8 94 5d 9a 00 49 89 c7 e9 62 ff ff ff 0f 0b 45 31 ff 5b 5d 4c 89 f8 41 5c 41 5d 41 5e 41 5f c3 cc cc cc cc <0f> 0b e9 0d ff ff ff 45 31 ff e9 3e ff ff ff 66 0f 1f 44 00 00 90 +Jan 31 11:59:59 x1 kernel: RSP: 0018:ffffaeefe452fbc8 EFLAGS: 00010246 +Jan 31 11:59:59 x1 kernel: RAX: 0000000000000000 RBX: ffff936a8de60800 RCX: 0000000000000cc0 +Jan 31 11:59:59 x1 kernel: RDX: ffff936af6c65018 RSI: 0000000000002000 RDI: ffff936a8de60800 +Jan 31 11:59:59 x1 kernel: RBP: ffff936a8de60800 R08: 0000000000000000 R09: ffff936af6c65000 +Jan 31 11:59:59 x1 kernel: R10: ffffaeefe452fc00 R11: ffff9371bf9a17c0 R12: 0000000000002000 +Jan 31 11:59:59 x1 kernel: R13: ffff936af6c65018 R14: 0000000000000000 R15: ffff936a9d9be440 +Jan 31 11:59:59 x1 kernel: FS: 00007f8ff258f740(0000) GS:ffff9371bf980000(0000) knlGS:0000000000000000 +Jan 31 11:59:59 x1 kernel: CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +Jan 31 11:59:59 x1 kernel: CR2: 00007f2e39eee67c CR3: 000000013b884003 CR4: 0000000000f72ef0 +Jan 31 11:59:59 x1 kernel: DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 +Jan 31 11:59:59 x1 kernel: DR3: 0000000000000000 DR6: 00000000ffff07f0 DR7: 0000000000000400 +Jan 31 11:59:59 x1 kernel: PKRU: 55555554 +Jan 31 11:59:59 x1 kernel: Call Trace: +Jan 31 11:59:59 x1 kernel: +Jan 31 11:59:59 x1 kernel: ? dma_alloc_attrs+0x12b/0x140 +Jan 31 11:59:59 x1 kernel: ? __warn.cold+0x93/0xfa +Jan 31 11:59:59 x1 kernel: ? dma_alloc_attrs+0x12b/0x140 +Jan 31 11:59:59 x1 kernel: ? report_bug+0xff/0x140 +Jan 31 11:59:59 x1 kernel: ? handle_bug+0x58/0x90 +Jan 31 11:59:59 x1 kernel: ? exc_invalid_op+0x17/0x70 +Jan 31 11:59:59 x1 kernel: ? asm_exc_invalid_op+0x1a/0x20 +Jan 31 11:59:59 x1 kernel: ? dma_alloc_attrs+0x12b/0x140 +Jan 31 11:59:59 x1 kernel: ipu6_psys_probe+0x37d/0x4b0 [intel_ipu6_psys] +Jan 31 11:59:59 x1 kernel: ? __pfx_ipu6_psys_probe+0x10/0x10 [intel_ipu6_psys] +Jan 31 11:59:59 x1 kernel: auxiliary_bus_probe+0x46/0x80 +Jan 31 11:59:59 x1 kernel: ? driver_sysfs_add+0x57/0xc0 +Jan 31 11:59:59 x1 kernel: really_probe+0xdb/0x340 +Jan 31 11:59:59 x1 kernel: ? pm_runtime_barrier+0x54/0x90 +Jan 31 11:59:59 x1 kernel: ? __pfx___driver_attach+0x10/0x10 +Jan 31 11:59:59 x1 kernel: __driver_probe_device+0x78/0x110 +Jan 31 11:59:59 x1 kernel: driver_probe_device+0x1f/0xa0 +Jan 31 11:59:59 x1 kernel: __driver_attach+0xba/0x1c0 +Jan 31 11:59:59 x1 kernel: bus_for_each_dev+0x8c/0xe0 +Jan 31 11:59:59 x1 kernel: bus_add_driver+0x142/0x220 +Jan 31 11:59:59 x1 kernel: driver_register+0x72/0xd0 +Jan 31 11:59:59 x1 kernel: __auxiliary_driver_register+0x6e/0xd0 +Jan 31 11:59:59 x1 kernel: ? __pfx_ipu6_psys_aux_driver_init+0x10/0x10 [intel_ipu6_psys] +Jan 31 11:59:59 x1 kernel: do_one_initcall+0x58/0x310 +Jan 31 11:59:59 x1 kernel: do_init_module+0x90/0x260 +Jan 31 11:59:59 x1 kernel: __do_sys_init_module+0x17a/0x1b0 +Jan 31 11:59:59 x1 kernel: do_syscall_64+0x82/0x160 +Jan 31 11:59:59 x1 kernel: ? exc_page_fault+0x7e/0x180 +Jan 31 11:59:59 x1 kernel: entry_SYSCALL_64_after_hwframe+0x76/0x7e +Jan 31 11:59:59 x1 kernel: RIP: 0033:0x7f8ff1f0228e +Jan 31 11:59:59 x1 kernel: Code: 48 8b 0d 85 3b 0f 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 49 89 ca b8 af 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 52 3b 0f 00 f7 d8 64 89 01 48 +Jan 31 11:59:59 x1 kernel: RSP: 002b:00007ffdfbde11e8 EFLAGS: 00000246 ORIG_RAX: 00000000000000af +Jan 31 11:59:59 x1 kernel: RAX: ffffffffffffffda RBX: 000055a0687e9240 RCX: 00007f8ff1f0228e +Jan 31 11:59:59 x1 kernel: RDX: 000055a05859a715 RSI: 0000000000041a65 RDI: 00007f8ff13a7010 +Jan 31 11:59:59 x1 kernel: RBP: 00007ffdfbde12a0 R08: 000055a0687e8010 R09: 0000000000000007 +Jan 31 11:59:59 x1 kernel: R10: 0000000000000001 R11: 0000000000000246 R12: 000055a05859a715 +Jan 31 11:59:59 x1 kernel: R13: 0000000000040000 R14: 000055a0687e92e0 R15: 0000000000000000 +Jan 31 11:59:59 x1 kernel: +Jan 31 11:59:59 x1 kernel: ---[ end trace 0000000000000000 ]--- + +Signed-off-by: Hans de Goede +--- + drivers/media/pci/intel/ipu6/psys/ipu-psys.c | 64 ++++++++++++++++++- + drivers/media/pci/intel/ipu6/psys/ipu6-ppg.c | 6 +- + drivers/media/pci/intel/ipu6/psys/ipu6-psys.c | 22 +++++-- + 3 files changed, 85 insertions(+), 7 deletions(-) + +diff --git a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c +index 36f99a3b8..7c512e5ae 100644 +--- a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c ++++ b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c +@@ -52,6 +52,7 @@ + #include "ipu-psys.h" + #include "ipu6-platform-regs.h" + #include "ipu6-fw-com.h" ++#include "ipu6-dma.h" + #endif + + static bool async_fw_init; +@@ -228,9 +229,12 @@ struct ipu_psys_pg *__get_pg_buf(struct ipu_psys *psys, size_t pg_size) + #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) + kpg->pg = dma_alloc_attrs(&psys->adev->dev, pg_size, + &kpg->pg_dma_addr, GFP_KERNEL, 0); +-#else ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + kpg->pg = dma_alloc_attrs(dev, pg_size, &kpg->pg_dma_addr, + GFP_KERNEL, 0); ++#else ++ kpg->pg = ipu6_dma_alloc(to_ipu6_bus_device(dev), pg_size, ++ &kpg->pg_dma_addr, GFP_KERNEL, 0); + #endif + if (!kpg->pg) { + kfree(kpg); +@@ -597,6 +601,7 @@ static void ipu_dma_buf_detach(struct dma_buf *dbuf, + attach->priv = NULL; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + static struct sg_table *ipu_dma_buf_map(struct dma_buf_attachment *attach, + enum dma_data_direction dir) + { +@@ -658,6 +663,50 @@ static void ipu_dma_buf_unmap(struct dma_buf_attachment *attach, + #endif + } + ++#else ++ ++static struct sg_table *ipu_dma_buf_map(struct dma_buf_attachment *attach, ++ enum dma_data_direction dir) ++{ ++ struct ipu_dma_buf_attach *ipu_attach = attach->priv; ++ struct ipu6_bus_device *adev = to_ipu6_bus_device(attach->dev); ++ struct pci_dev *pdev = adev->isp->pdev; ++ unsigned long attrs; ++ int ret; ++ ++ attrs = DMA_ATTR_SKIP_CPU_SYNC; ++ ret = dma_map_sgtable(&pdev->dev, ipu_attach->sgt, dir, attrs); ++ if (ret) { ++ dev_dbg(attach->dev, "buf map failed\n"); ++ return ERR_PTR(-EIO); ++ } ++ ++ ret = ipu6_dma_map_sgtable(adev, ipu_attach->sgt, dir, attrs); ++ if (ret) { ++ dma_unmap_sgtable(&pdev->dev, ipu_attach->sgt, dir, attrs); ++ return ERR_PTR(-EIO); ++ } ++ ++ /* ++ * Initial cache flush to avoid writing dirty pages for buffers which ++ * are later marked as IPU_BUFFER_FLAG_NO_FLUSH. ++ */ ++ ipu6_dma_sync_sgtable(adev, ipu_attach->sgt); ++ ++ return ipu_attach->sgt; ++} ++ ++static void ipu_dma_buf_unmap(struct dma_buf_attachment *attach, ++ struct sg_table *sgt, enum dma_data_direction dir) ++{ ++ struct ipu6_bus_device *adev = to_ipu6_bus_device(attach->dev); ++ struct pci_dev *pdev = adev->isp->pdev; ++ ++ ipu6_dma_unmap_sgtable(adev, sgt, dir, DMA_ATTR_SKIP_CPU_SYNC); ++ dma_unmap_sgtable(&pdev->dev, sgt, dir, DMA_ATTR_SKIP_CPU_SYNC); ++} ++#endif ++ + static int ipu_dma_buf_mmap(struct dma_buf *dbuf, struct vm_area_struct *vma) + { + return -ENOTTY; +@@ -2371,7 +2420,12 @@ static int ipu6_psys_probe(struct auxiliary_device *auxdev, + kpg = kzalloc(sizeof(*kpg), GFP_KERNEL); + if (!kpg) + goto out_free_pgs; ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + kpg->pg = dma_alloc_attrs(dev, IPU_PSYS_PG_MAX_SIZE, ++#else ++ kpg->pg = ipu6_dma_alloc(adev, IPU_PSYS_PG_MAX_SIZE, ++#endif + &kpg->pg_dma_addr, + GFP_KERNEL, 0); + if (!kpg->pg) { +@@ -2426,7 +2480,11 @@ out_release_fw_com: + ipu6_fw_com_release(psys->fwcom, 1); + out_free_pgs: + list_for_each_entry_safe(kpg, kpg0, &psys->pgs, list) { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + dma_free_attrs(dev, kpg->size, kpg->pg, kpg->pg_dma_addr, 0); ++#else ++ ipu6_dma_free(adev, kpg->size, kpg->pg, kpg->pg_dma_addr, 0); ++#endif + kfree(kpg); + } + +@@ -2484,8 +2542,10 @@ static void ipu6_psys_remove(struct auxiliary_device *auxdev) + #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) + dma_free_attrs(&adev->dev, kpg->size, kpg->pg, + kpg->pg_dma_addr, 0); +-#else ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + dma_free_attrs(dev, kpg->size, kpg->pg, kpg->pg_dma_addr, 0); ++#else ++ ipu6_dma_free(psys->adev, kpg->size, kpg->pg, kpg->pg_dma_addr, 0); + #endif + kfree(kpg); + } +diff --git a/drivers/media/pci/intel/ipu6/psys/ipu6-ppg.c b/drivers/media/pci/intel/ipu6/psys/ipu6-ppg.c +index 9038f69cd..5e6fb9a1b 100644 +--- a/drivers/media/pci/intel/ipu6/psys/ipu6-ppg.c ++++ b/drivers/media/pci/intel/ipu6/psys/ipu6-ppg.c +@@ -8,6 +8,7 @@ + #include + + #include "ipu6-ppg.h" ++#include "ipu6-dma.h" + + static bool enable_suspend_resume; + module_param(enable_suspend_resume, bool, 0664); +@@ -75,9 +76,12 @@ __get_buf_set(struct ipu_psys_fh *fh, size_t buf_set_size) + kbuf_set->kaddr = dma_alloc_attrs(&fh->psys->adev->dev, + buf_set_size, &kbuf_set->dma_addr, + GFP_KERNEL, 0); +-#else ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + kbuf_set->kaddr = dma_alloc_attrs(dev, buf_set_size, + &kbuf_set->dma_addr, GFP_KERNEL, 0); ++#else ++ kbuf_set->kaddr = ipu6_dma_alloc(to_ipu6_bus_device(dev), buf_set_size, ++ &kbuf_set->dma_addr, GFP_KERNEL, 0); + #endif + if (!kbuf_set->kaddr) { + kfree(kbuf_set); +diff --git a/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c +index 0c3a5ca62..58662ea16 100644 +--- a/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c ++++ b/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c +@@ -30,6 +30,7 @@ + #include "ipu6-ppg.h" + #include "ipu6-platform-regs.h" + #include "ipu6-platform-buttress-regs.h" ++#include "ipu6-dma.h" + #endif + + #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0) +@@ -450,10 +451,12 @@ static struct ipu_psys_kcmd *ipu_psys_copy_cmd(struct ipu_psys_command *cmd, + kcmd->kbufs[i]->sgt->sgl, + kcmd->kbufs[i]->sgt->orig_nents, + DMA_BIDIRECTIONAL); +-#else ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + dma_sync_sg_for_device(dev, kcmd->kbufs[i]->sgt->sgl, + kcmd->kbufs[i]->sgt->orig_nents, + DMA_BIDIRECTIONAL); ++#else ++ ipu6_dma_sync_sgtable(psys->adev, kcmd->kbufs[i]->sgt); + #endif + } + +@@ -1102,11 +1105,16 @@ int ipu_psys_fh_init(struct ipu_psys_fh *fh) + &kbuf_set->dma_addr, + GFP_KERNEL, + 0); +-#else ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + kbuf_set->kaddr = dma_alloc_attrs(dev, + IPU_PSYS_BUF_SET_MAX_SIZE, + &kbuf_set->dma_addr, + GFP_KERNEL, 0); ++#else ++ kbuf_set->kaddr = ipu6_dma_alloc(to_ipu6_bus_device(dev), ++ IPU_PSYS_BUF_SET_MAX_SIZE, ++ &kbuf_set->dma_addr, ++ GFP_KERNEL, 0); + #endif + if (!kbuf_set->kaddr) { + kfree(kbuf_set); +@@ -1124,8 +1132,11 @@ out_free_buf_sets: + #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) + dma_free_attrs(&psys->adev->dev, + kbuf_set->size, kbuf_set->kaddr, +-#else ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + dma_free_attrs(dev, kbuf_set->size, kbuf_set->kaddr, ++#else ++ ipu6_dma_free(to_ipu6_bus_device(dev), ++ kbuf_set->size, kbuf_set->kaddr, + #endif + kbuf_set->dma_addr, 0); + list_del(&kbuf_set->list); +@@ -1229,8 +1240,11 @@ int ipu_psys_fh_deinit(struct ipu_psys_fh *fh) + #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) + dma_free_attrs(&psys->adev->dev, + kbuf_set->size, kbuf_set->kaddr, +-#else ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + dma_free_attrs(dev, kbuf_set->size, kbuf_set->kaddr, ++#else ++ ipu6_dma_free(to_ipu6_bus_device(dev), ++ kbuf_set->size, kbuf_set->kaddr, + #endif + kbuf_set->dma_addr, 0); + list_del(&kbuf_set->list); +-- +2.48.1 + diff --git a/anda/system/ipu6-drivers/akmod/0009-Add-ipu6-dma.h-to-0001-v6.10-IPU6-headers-used-by-PS.patch b/anda/system/ipu6-drivers/akmod/0009-Add-ipu6-dma.h-to-0001-v6.10-IPU6-headers-used-by-PS.patch new file mode 100644 index 0000000000..63b626a834 --- /dev/null +++ b/anda/system/ipu6-drivers/akmod/0009-Add-ipu6-dma.h-to-0001-v6.10-IPU6-headers-used-by-PS.patch @@ -0,0 +1,84 @@ +From 47a2e1cf89b789bbc10d3cb3b26b357404633114 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Sat, 1 Feb 2025 08:19:22 +0100 +Subject: [PATCH 9/9] Add ipu6-dma.h to + 0001-v6.10-IPU6-headers-used-by-PSYS.patch + +Add ipu6-dma.h to 0001-v6.10-IPU6-headers-used-by-PSYS.patch, +this is necessary for the DMA code adjustments in the psys code +which were done for the ipu6-bus DMA changes in kernels >= 6.12. + +Signed-off-by: Hans de Goede +--- + ...0001-v6.10-IPU6-headers-used-by-PSYS.patch | 55 +++++++++++++++++++ + 1 file changed, 55 insertions(+) + +diff --git a/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch b/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch +index 6a465a924..b8eeaae66 100644 +--- a/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch ++++ b/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch +@@ -1195,6 +1195,61 @@ index 000000000..92e3c3414 + + int pkg_dir_idx, void __iomem *base, u64 *pkg_dir, + + dma_addr_t pkg_dir_dma_addr); + +#endif /* IPU6_H */ ++diff --git a/drivers/media/pci/intel/ipu6/ipu6-dma.h b/drivers/media/pci/intel/ipu6/ipu6-dma.h ++new file mode 100644 ++index 000000000..b51244add ++--- /dev/null +++++ b/drivers/media/pci/intel/ipu6/ipu6-dma.h ++@@ -0,0 +1,49 @@ +++/* SPDX-License-Identifier: GPL-2.0-only */ +++/* Copyright (C) 2013--2024 Intel Corporation */ +++ +++#ifndef IPU6_DMA_H +++#define IPU6_DMA_H +++ +++#include +++#include +++#include +++#include +++#include +++#include +++ +++#include "ipu6-bus.h" +++ +++struct ipu6_mmu_info; +++ +++struct ipu6_dma_mapping { +++ struct ipu6_mmu_info *mmu_info; +++ struct iova_domain iovad; +++}; +++ +++void ipu6_dma_sync_single(struct ipu6_bus_device *sys, dma_addr_t dma_handle, +++ size_t size); +++void ipu6_dma_sync_sg(struct ipu6_bus_device *sys, struct scatterlist *sglist, +++ int nents); +++void ipu6_dma_sync_sgtable(struct ipu6_bus_device *sys, struct sg_table *sgt); +++void *ipu6_dma_alloc(struct ipu6_bus_device *sys, size_t size, +++ dma_addr_t *dma_handle, gfp_t gfp, +++ unsigned long attrs); +++void ipu6_dma_free(struct ipu6_bus_device *sys, size_t size, void *vaddr, +++ dma_addr_t dma_handle, unsigned long attrs); +++int ipu6_dma_mmap(struct ipu6_bus_device *sys, struct vm_area_struct *vma, +++ void *addr, dma_addr_t iova, size_t size, +++ unsigned long attrs); +++int ipu6_dma_map_sg(struct ipu6_bus_device *sys, struct scatterlist *sglist, +++ int nents, enum dma_data_direction dir, +++ unsigned long attrs); +++void ipu6_dma_unmap_sg(struct ipu6_bus_device *sys, struct scatterlist *sglist, +++ int nents, enum dma_data_direction dir, +++ unsigned long attrs); +++int ipu6_dma_map_sgtable(struct ipu6_bus_device *sys, struct sg_table *sgt, +++ enum dma_data_direction dir, unsigned long attrs); +++void ipu6_dma_unmap_sgtable(struct ipu6_bus_device *sys, struct sg_table *sgt, +++ enum dma_data_direction dir, unsigned long attrs); +++int ipu6_dma_get_sgtable(struct ipu6_bus_device *sys, struct sg_table *sgt, +++ void *cpu_addr, dma_addr_t handle, size_t size, +++ unsigned long attrs); +++#endif /* IPU6_DMA_H */ + -- + 2.43.0 + +-- +2.48.1 + diff --git a/anda/system/ipu6-drivers/akmod/0010-psys-Do-not-skipping-registering-ipu_psys_bus-for-ke.patch b/anda/system/ipu6-drivers/akmod/0010-psys-Do-not-skipping-registering-ipu_psys_bus-for-ke.patch new file mode 100644 index 0000000000..6ba5e4a65f --- /dev/null +++ b/anda/system/ipu6-drivers/akmod/0010-psys-Do-not-skipping-registering-ipu_psys_bus-for-ke.patch @@ -0,0 +1,202 @@ +From c1cb2a62cd9d949fda60f5993a72ec0c44f52719 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Wed, 5 Feb 2025 13:20:21 +0100 +Subject: [PATCH 10/11] psys: Do not skipping registering ipu_psys_bus for + kernels >= 6.10 + +The new auxbus code-paths were not registering the ipu_psys_bus used for +psys->dev.bus = &ipu_psys_bus, this was causing udev to not be able to +properly enumerate the device. For example running: + +udevadm test -a add /dev/ipu-psys0 + +would fail with the following error: + +"Failed to clone sd_device object: No such file or directory" + +This udev issue in turn was causing issues with udev rules to set +permissions on /dev/ipu-psys0 not working + +Fix this by: + +1. Rename ipu6_psys_bus to ipu_psys_bus, there is no need for separate +names for this struct with different kernels and having the same name +allows code sharing. + +2. Switching back from using module_auxiliary_driver() to using +module_init() / module_exit() codes for registering the drivers. + +3. Move the now always used ipu_psys_init() and ipu_psys_exit() +out of any ifdefs blocks, so that these functions now always +(un)register the chrdev region and the ipu_psys_bus. + +4. Remove the now duplicate chrdev region handling from the auxbus +ipu6_psys_probe() and ipu6_psys_remove() functions (now handled +by ipu_psys_init() and ipu_psys_exit()). + +Signed-off-by: Hans de Goede +--- + drivers/media/pci/intel/ipu6/psys/ipu-psys.c | 94 +++++++++----------- + 1 file changed, 40 insertions(+), 54 deletions(-) + +diff --git a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c +index 7c512e5ae..c06cd515a 100644 +--- a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c ++++ b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c +@@ -92,7 +92,7 @@ static struct bus_type ipu_psys_bus = { + .name = IPU_PSYS_NAME, + }; + #else +-static const struct bus_type ipu6_psys_bus = { ++static const struct bus_type ipu_psys_bus = { + .name = "intel-ipu6-psys", + }; + #endif +@@ -2331,17 +2331,9 @@ static int ipu6_psys_probe(struct auxiliary_device *auxdev, + + ipu_ver = adev->isp->hw_ver; + +- rval = alloc_chrdev_region(&ipu_psys_dev_t, 0, +- IPU_PSYS_NUM_DEVICES, IPU6_PSYS_NAME); +- if (rval) { +- dev_err(dev, "can't alloc psys chrdev region (%d)\n", +- rval); +- return rval; +- } +- + rval = ipu6_mmu_hw_init(adev->mmu); + if (rval) +- goto out_unregister_chr_region; ++ return rval; + + mutex_lock(&ipu_psys_mutex); + +@@ -2453,7 +2445,7 @@ static int ipu6_psys_probe(struct auxiliary_device *auxdev, + goto out_free_pgs; + } + +- psys->dev.bus = &ipu6_psys_bus; ++ psys->dev.bus = &ipu_psys_bus; + psys->dev.parent = dev; + psys->dev.devt = MKDEV(MAJOR(ipu_psys_dev_t), minor); + psys->dev.release = ipu_psys_dev_release; +@@ -2500,10 +2492,6 @@ out_unlock: + /* Safe to call even if the init is not called */ + mutex_unlock(&ipu_psys_mutex); + ipu6_mmu_hw_cleanup(adev->mmu); +- +-out_unregister_chr_region: +- unregister_chrdev_region(ipu_psys_dev_t, IPU_PSYS_NUM_DEVICES); +- + return rval; + } + #endif +@@ -2521,9 +2509,6 @@ static void ipu6_psys_remove(struct auxiliary_device *auxdev) + #endif + struct ipu_psys_pg *kpg, *kpg0; + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 10, 0) +- unregister_chrdev_region(ipu_psys_dev_t, IPU_PSYS_NUM_DEVICES); +-#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) + #ifdef CONFIG_DEBUG_FS + if (isp->ipu_dir) +@@ -2658,38 +2643,6 @@ static struct ipu_bus_driver ipu_psys_driver = { + }, + }; + +-static int __init ipu_psys_init(void) +-{ +- int rval = alloc_chrdev_region(&ipu_psys_dev_t, 0, +- IPU_PSYS_NUM_DEVICES, IPU_PSYS_NAME); +- if (rval) { +- pr_err("can't alloc psys chrdev region (%d)\n", rval); +- return rval; +- } +- +- rval = bus_register(&ipu_psys_bus); +- if (rval) { +- pr_warn("can't register psys bus (%d)\n", rval); +- goto out_bus_register; +- } +- +- ipu_bus_register_driver(&ipu_psys_driver); +- +- return rval; +- +-out_bus_register: +- unregister_chrdev_region(ipu_psys_dev_t, IPU_PSYS_NUM_DEVICES); +- +- return rval; +-} +- +-static void __exit ipu_psys_exit(void) +-{ +- ipu_bus_unregister_driver(&ipu_psys_driver); +- bus_unregister(&ipu_psys_bus); +- unregister_chrdev_region(ipu_psys_dev_t, IPU_PSYS_NUM_DEVICES); +-} +- + static const struct pci_device_id ipu_pci_tbl[] = { + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, IPU6_PCI_ID)}, + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, IPU6SE_PCI_ID)}, +@@ -2700,9 +2653,6 @@ static const struct pci_device_id ipu_pci_tbl[] = { + {0,} + }; + MODULE_DEVICE_TABLE(pci, ipu_pci_tbl); +- +-module_init(ipu_psys_init); +-module_exit(ipu_psys_exit); + #else + static const struct ipu6_auxdrv_data ipu6_psys_auxdrv_data = { + .isr_threaded = psys_isr_threaded, +@@ -2727,9 +2677,45 @@ static struct auxiliary_driver ipu6_psys_aux_driver = { + .pm = &psys_pm_ops, + }, + }; +-module_auxiliary_driver(ipu6_psys_aux_driver); + #endif + ++static int __init ipu_psys_init(void) ++{ ++ int rval = alloc_chrdev_region(&ipu_psys_dev_t, 0, ++ IPU_PSYS_NUM_DEVICES, ipu_psys_bus.name); ++ if (rval) { ++ pr_err("can't alloc psys chrdev region (%d)\n", rval); ++ return rval; ++ } ++ ++ rval = bus_register(&ipu_psys_bus); ++ if (rval) { ++ pr_err("can't register psys bus (%d)\n", rval); ++ unregister_chrdev_region(ipu_psys_dev_t, IPU_PSYS_NUM_DEVICES); ++ return rval; ++ } ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) ++ ipu_bus_register_driver(&ipu_psys_driver); ++#else ++ auxiliary_driver_register(&ipu6_psys_aux_driver); ++#endif ++ return 0; ++} ++module_init(ipu_psys_init); ++ ++static void __exit ipu_psys_exit(void) ++{ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) ++ ipu_bus_unregister_driver(&ipu_psys_driver); ++#else ++ auxiliary_driver_unregister(&ipu6_psys_aux_driver); ++#endif ++ bus_unregister(&ipu_psys_bus); ++ unregister_chrdev_region(ipu_psys_dev_t, IPU_PSYS_NUM_DEVICES); ++} ++module_exit(ipu_psys_exit); ++ + MODULE_AUTHOR("Antti Laakso "); + MODULE_AUTHOR("Bin Han "); + MODULE_AUTHOR("Renwei Wu "); +-- +2.48.1 + diff --git a/anda/system/ipu6-drivers/akmod/0010-usbio-Fix-GPIO-and-I2C-driver-modaliases.patch b/anda/system/ipu6-drivers/akmod/0010-usbio-Fix-GPIO-and-I2C-driver-modaliases.patch new file mode 100644 index 0000000000..f4b784f3bd --- /dev/null +++ b/anda/system/ipu6-drivers/akmod/0010-usbio-Fix-GPIO-and-I2C-driver-modaliases.patch @@ -0,0 +1,38 @@ +From d5f08986936a7fda0cce543c73fb8d9bab76eae2 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Wed, 15 Jan 2025 11:28:54 +0100 +Subject: [PATCH 10/12] usbio: Fix GPIO and I2C driver modaliases + +The created GPIO and I2C devices have modaliases of +"platform:usbio-gpio" and "platform:usbio-i2c" note "usbio" not "usb" +fix the aliases of the drivers so that these will properly auto load. + +Signed-off-by: Hans de Goede +--- + drivers/gpio/gpio-usbio.c | 2 +- + drivers/i2c/busses/i2c-usbio.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpio/gpio-usbio.c b/drivers/gpio/gpio-usbio.c +index 625558b..de9d5cb 100644 +--- a/drivers/gpio/gpio-usbio.c ++++ b/drivers/gpio/gpio-usbio.c +@@ -499,4 +499,4 @@ MODULE_AUTHOR("Israel Cepeda "); + MODULE_AUTHOR("Lifu Wang "); + MODULE_DESCRIPTION("Intel USBIO-GPIO driver"); + MODULE_LICENSE("GPL v2"); +-MODULE_ALIAS("platform:usb-gpio"); ++MODULE_ALIAS("platform:usbio-gpio"); +diff --git a/drivers/i2c/busses/i2c-usbio.c b/drivers/i2c/busses/i2c-usbio.c +index ef1f380..3b2c856 100644 +--- a/drivers/i2c/busses/i2c-usbio.c ++++ b/drivers/i2c/busses/i2c-usbio.c +@@ -437,4 +437,4 @@ MODULE_AUTHOR("Israel Cepeda "); + MODULE_AUTHOR("Lifu Wang "); + MODULE_DESCRIPTION("Intel USBIO-I2C driver"); + MODULE_LICENSE("GPL v2"); +-MODULE_ALIAS("platform:usb-i2c"); ++MODULE_ALIAS("platform:usbio-i2c"); +-- +2.47.1 + diff --git a/anda/system/ipu6-drivers/akmod/0011-psys-Use-cdev_device_add-for-dev-ipu-psys0.patch b/anda/system/ipu6-drivers/akmod/0011-psys-Use-cdev_device_add-for-dev-ipu-psys0.patch new file mode 100644 index 0000000000..e1c7d44bdc --- /dev/null +++ b/anda/system/ipu6-drivers/akmod/0011-psys-Use-cdev_device_add-for-dev-ipu-psys0.patch @@ -0,0 +1,130 @@ +From ce28836eb5ce74ae26a66a97949778bdb2cebc3c Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Tue, 4 Feb 2025 17:34:54 +0100 +Subject: [PATCH 11/11] psys: Use cdev_device_add() for /dev/ipu-psys0 + +Use cdev_device_add() for /dev/ipu-psys0 so that its kobj parents gets +set properly by calling cdev_set_parent(). + +"cdev_set_parent() sets a parent kobject which will be referenced + appropriately so the parent is not freed before the cdev. This + should be called before cdev_add." + +Signed-off-by: Hans de Goede +--- + drivers/media/pci/intel/ipu6/psys/ipu-psys.c | 45 ++++++++------------ + 1 file changed, 17 insertions(+), 28 deletions(-) + +diff --git a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c +index c06cd515a..62fcf0215 100644 +--- a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c ++++ b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c +@@ -2170,17 +2170,6 @@ static int ipu_psys_probe(struct ipu_bus_device *adev) + ipu_trace_init(adev->isp, psys->pdata->base, &adev->dev, + psys_trace_blocks); + +- cdev_init(&psys->cdev, &ipu_psys_fops); +- psys->cdev.owner = ipu_psys_fops.owner; +- +- rval = cdev_add(&psys->cdev, MKDEV(MAJOR(ipu_psys_dev_t), minor), 1); +- if (rval) { +- dev_err(&adev->dev, "cdev_add failed (%d)\n", rval); +- goto out_unlock; +- } +- +- set_bit(minor, ipu_psys_devices); +- + spin_lock_init(&psys->ready_lock); + spin_lock_init(&psys->pgs_lock); + psys->ready = 0; +@@ -2261,12 +2250,19 @@ static int ipu_psys_probe(struct ipu_bus_device *adev) + psys->dev.devt = MKDEV(MAJOR(ipu_psys_dev_t), minor); + psys->dev.release = ipu_psys_dev_release; + dev_set_name(&psys->dev, "ipu-psys%d", minor); +- rval = device_register(&psys->dev); ++ device_initialize(&psys->dev); ++ ++ cdev_init(&psys->cdev, &ipu_psys_fops); ++ psys->cdev.owner = ipu_psys_fops.owner; ++ ++ rval = cdev_device_add(&psys->cdev, &psys->dev); + if (rval < 0) { + dev_err(&psys->dev, "psys device_register failed\n"); + goto out_release_fw_com; + } + ++ set_bit(minor, ipu_psys_devices); ++ + /* Add the hw stepping information to caps */ + strscpy(psys->caps.dev_model, IPU_MEDIA_DEV_MODEL_NAME, + sizeof(psys->caps.dev_model)); +@@ -2298,7 +2294,6 @@ out_free_pgs: + ipu_psys_resource_pool_cleanup(&psys->resource_pool_running); + out_mutex_destroy: + mutex_destroy(&psys->mutex); +- cdev_del(&psys->cdev); + if (psys->sched_cmd_thread) { + kthread_stop(psys->sched_cmd_thread); + psys->sched_cmd_thread = NULL; +@@ -2359,17 +2354,6 @@ static int ipu6_psys_probe(struct auxiliary_device *auxdev, + + psys->power_gating = 0; + +- cdev_init(&psys->cdev, &ipu_psys_fops); +- psys->cdev.owner = ipu_psys_fops.owner; +- +- rval = cdev_add(&psys->cdev, MKDEV(MAJOR(ipu_psys_dev_t), minor), 1); +- if (rval) { +- dev_err(dev, "cdev_add failed (%d)\n", rval); +- goto out_unlock; +- } +- +- set_bit(minor, ipu_psys_devices); +- + spin_lock_init(&psys->ready_lock); + spin_lock_init(&psys->pgs_lock); + psys->ready = 0; +@@ -2450,12 +2434,19 @@ static int ipu6_psys_probe(struct auxiliary_device *auxdev, + psys->dev.devt = MKDEV(MAJOR(ipu_psys_dev_t), minor); + psys->dev.release = ipu_psys_dev_release; + dev_set_name(&psys->dev, "ipu-psys%d", minor); +- rval = device_register(&psys->dev); ++ device_initialize(&psys->dev); ++ ++ cdev_init(&psys->cdev, &ipu_psys_fops); ++ psys->cdev.owner = ipu_psys_fops.owner; ++ ++ rval = cdev_device_add(&psys->cdev, &psys->dev); + if (rval < 0) { + dev_err(dev, "psys device_register failed\n"); + goto out_release_fw_com; + } + ++ set_bit(minor, ipu_psys_devices); ++ + /* Add the hw stepping information to caps */ + strscpy(psys->caps.dev_model, IPU6_MEDIA_DEV_MODEL_NAME, + sizeof(psys->caps.dev_model)); +@@ -2483,7 +2474,6 @@ out_free_pgs: + ipu_psys_resource_pool_cleanup(&psys->resource_pool_running); + out_mutex_destroy: + mutex_destroy(&psys->mutex); +- cdev_del(&psys->cdev); + if (psys->sched_cmd_thread) { + kthread_stop(psys->sched_cmd_thread); + psys->sched_cmd_thread = NULL; +@@ -2552,10 +2542,9 @@ static void ipu6_psys_remove(struct auxiliary_device *auxdev) + + ipu_psys_resource_pool_cleanup(&psys->resource_pool_running); + +- device_unregister(&psys->dev); ++ cdev_device_del(&psys->cdev, &psys->dev); + + clear_bit(MINOR(psys->cdev.dev), ipu_psys_devices); +- cdev_del(&psys->cdev); + + mutex_unlock(&ipu_psys_mutex); + +-- +2.48.1 + diff --git a/anda/system/ipu6-drivers/akmod/0011-usbio-Fix-I2C-max-transfer-size.patch b/anda/system/ipu6-drivers/akmod/0011-usbio-Fix-I2C-max-transfer-size.patch new file mode 100644 index 0000000000..c922df2529 --- /dev/null +++ b/anda/system/ipu6-drivers/akmod/0011-usbio-Fix-I2C-max-transfer-size.patch @@ -0,0 +1,115 @@ +From 47b34a6f467eebb4e9fc59f5e25618fe760fbf33 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Wed, 29 Jan 2025 19:13:29 +0100 +Subject: [PATCH 11/12] usbio: Fix I2C max transfer size + +There are 2 issues with the I2C max transfer size in the i2c-usbio module: + +1. The code defines a usbio_i2c_quirks struct but does not set +i2c_adapter.quirks. This causes ov08x40_burst_fill_regs() to not split +i2c-transfers larger then USBIO_I2C_MAX_XFER_SIZE which causes them +to be rejected with -EINVAL. Fix this by setting i2c_adapter.quirks. + +2. Once 1. is fixed the following error messages show up in dmesg: + +Jan 28 18:31:04 x1 kernel: usbio-bridge 3-9:1.0: data not correct header->len:5 payload_len:3 +Jan 28 18:31:04 x1 kernel: usbio-bridge 3-9:1.0: data not correct header->len:5 payload_len:3 +... + +Every time ov08x40_burst_fill_regs() gets called. This is caused by +the usbio_transfer_internal() splitting-up the i2c-transfer into +multiple USB bulk packets to honor MAX_PACKET_SIZE. + +This splitting up seems to not work and the USBIO expander responds with +a 3 byte answer with flags set 0x0e which includes ERR_FLAG, it seems that +when ERR_FLAG is set only a 3 byte header is returned (no length field). + +Modify USBIO_I2C_MAX_XFER_SIZE to avoid the splitting of the i2c-transfer +over multiple USB bulk packets, since the USBIO chip seems to not like +the splitting. + +After this change to USBIO_I2C_MAX_XFER_SIZE the code to split transfers +in usbio_transfer_internal() is no longer necessary, remove it. + +Signed-off-by: Hans de Goede +--- + drivers/i2c/busses/i2c-usbio.c | 11 ++++++++++- + drivers/mfd/usbio.c | 33 ++------------------------------- + 2 files changed, 12 insertions(+), 32 deletions(-) + +diff --git a/drivers/i2c/busses/i2c-usbio.c b/drivers/i2c/busses/i2c-usbio.c +index 3b2c856..a6c5edc 100644 +--- a/drivers/i2c/busses/i2c-usbio.c ++++ b/drivers/i2c/busses/i2c-usbio.c +@@ -65,7 +65,15 @@ struct i2c_xfer { + u8 data[]; + } __packed; + +-#define USBIO_I2C_MAX_XFER_SIZE 256 ++//[WA]: Max USB packet size needs to be 63 ++//in order for fw download to work ++#define USBIO_MAX_PACKET_SIZE 63 ++#define USBIO_BULK_MSG_HDR_SIZE 5 ++ ++#define USBIO_I2C_MAX_XFER_SIZE \ ++ (USBIO_MAX_PACKET_SIZE - USBIO_BULK_MSG_HDR_SIZE - \ ++ sizeof(struct i2c_rw_packet)) ++ + #define USBIO_I2C_BUF_SIZE \ + (USBIO_I2C_MAX_XFER_SIZE + sizeof(struct i2c_rw_packet)) + +@@ -384,6 +392,7 @@ static int usbio_i2c_probe(struct platform_device *pdev) + usbio_i2c->adap.owner = THIS_MODULE; + usbio_i2c->adap.class = I2C_CLASS_HWMON; + usbio_i2c->adap.algo = &usbio_i2c_algo; ++ usbio_i2c->adap.quirks = &usbio_i2c_quirks; + usbio_i2c->adap.dev.parent = &pdev->dev; + + try_bind_acpi(pdev, usbio_i2c); +diff --git a/drivers/mfd/usbio.c b/drivers/mfd/usbio.c +index 8bc7600..51757df 100644 +--- a/drivers/mfd/usbio.c ++++ b/drivers/mfd/usbio.c +@@ -390,37 +390,8 @@ static int usbio_transfer_internal(struct platform_device *pdev, u8 cmd, + ret = usbio_control_xfer(stub, cmd, obuf, obuf_len, + ibuf, ibuf_len, wait_ack, USB_WRITE_ACK_TIMEOUT); + else if (stub->type == I2C_STUB) { +- if (cmd == I2C_WRITE) { +- u8 *i2cpkt = obuf; +- int wsize = 0; +- bool done = false; +- while (wsize < obuf_len) { +- int chunk; +- +- if ((obuf_len - wsize) <= MAX_PAYLOAD_BSIZE) { +- chunk = obuf_len - wsize; +- done = true; +- } else +- chunk = MAX_PAYLOAD_BSIZE; +- +- //[WA]: The I2C header in each chunk has to be updated +- //to the payload bytes being sent in that chunk for fw +- //download to work. +- struct i2c_rw_packet *i2cpkt_hdr = (struct i2c_rw_packet *)i2cpkt; +- i2cpkt_hdr->len = chunk - sizeof(struct i2c_rw_packet); +- +- ret = usbio_bulk_write(stub, cmd, i2cpkt, chunk, ibuf, ibuf_len, +- done, done? wait_ack : false, USB_WRITE_ACK_TIMEOUT); +- if (ret || done) +- break; +- +- wsize += chunk - sizeof(struct i2c_rw_packet); +- i2cpkt += chunk - sizeof(struct i2c_rw_packet); +- memcpy(i2cpkt, obuf, sizeof(struct i2c_rw_packet)); +- } +- } else +- ret = usbio_bulk_write(stub, cmd, obuf, obuf_len, +- ibuf, ibuf_len, true, wait_ack, USB_WRITE_ACK_TIMEOUT); ++ ret = usbio_bulk_write(stub, cmd, obuf, obuf_len, ++ ibuf, ibuf_len, true, wait_ack, USB_WRITE_ACK_TIMEOUT); + } + + return ret; +-- +2.47.1 + diff --git a/anda/system/ipu6-drivers/akmod/0012-usbio-Use-MAX_PAYLOAD_BSIZE-in-usbio_bulk_write.patch b/anda/system/ipu6-drivers/akmod/0012-usbio-Use-MAX_PAYLOAD_BSIZE-in-usbio_bulk_write.patch new file mode 100644 index 0000000000..07b8329497 --- /dev/null +++ b/anda/system/ipu6-drivers/akmod/0012-usbio-Use-MAX_PAYLOAD_BSIZE-in-usbio_bulk_write.patch @@ -0,0 +1,30 @@ +From 0eae85556558b410635ad03ed5eccb9648e11fce Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Wed, 29 Jan 2025 19:26:16 +0100 +Subject: [PATCH 12/12] usbio: Use MAX_PAYLOAD_BSIZE in usbio_bulk_write() + +usbio_bulk_write() uses a struct usbio_bmsg header rather than +a struct usbio_msg header. So its max payload length check must use +MAX_PAYLOAD_BSIZE instead of MAX_PAYLOAD_SIZE. + +Signed-off-by: Hans de Goede +--- + drivers/mfd/usbio.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/mfd/usbio.c b/drivers/mfd/usbio.c +index 51757df..ab5dae9 100644 +--- a/drivers/mfd/usbio.c ++++ b/drivers/mfd/usbio.c +@@ -303,7 +303,7 @@ static int usbio_bulk_write(struct usbio_stub *stub, u8 cmd, const void *obuf, + if (bridge->state == BRIDGE_STOPPED) + return -ENODEV; + +- if (obuf_len > MAX_PAYLOAD_SIZE) ++ if (obuf_len > MAX_PAYLOAD_BSIZE) + return -EINVAL; + + if (last_pkt) +-- +2.47.1 + diff --git a/anda/system/ipu6-drivers/akmod/0101-Fedora-local-mod-integrate-usbio-drivers-within-ipu6.patch b/anda/system/ipu6-drivers/akmod/0101-Fedora-local-mod-integrate-usbio-drivers-within-ipu6.patch new file mode 100644 index 0000000000..4b0cb49893 --- /dev/null +++ b/anda/system/ipu6-drivers/akmod/0101-Fedora-local-mod-integrate-usbio-drivers-within-ipu6.patch @@ -0,0 +1,38 @@ +From a6c5a0c329fd1582fc94b51ba9c6f1c21abc0084 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Thu, 30 Jan 2025 22:04:41 +0100 +Subject: [PATCH 8/8] Fedora local mod: integrate usbio-drivers within + ipu6-drivers Makefile + +Integrate usbio-drivers within ipu6-drivers Makefile. + +Signed-off-by: Hans de Goede +--- + Makefile | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/Makefile b/Makefile +index 7ae3be835..637382d6d 100644 +--- a/Makefile ++++ b/Makefile +@@ -114,6 +114,17 @@ ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_IVSC)),true) + ccflags-y += -I$(src)/backport-include/drivers/misc/mei/ + endif + ++# begin integrate usbio-drivers within ipu6-drivers Makefile ++obj-m += usbio.o ++usbio-y := drivers/mfd/usbio.o ++ ++obj-m += gpio-usbio.o ++gpio-usbio-y := drivers/gpio/gpio-usbio.o ++ ++obj-m += i2c-usbio.o ++i2c-usbio-y := drivers/i2c/busses/i2c-usbio.o ++# end integrate usbio-drivers within ipu6-drivers Makefile ++ + subdir-ccflags-y += -I$(src)/include/ \ + -DCONFIG_VIDEO_V4L2_SUBDEV_API + +-- +2.47.1 + diff --git a/anda/system/intel-ipu6-kmod/anda.hcl b/anda/system/ipu6-drivers/akmod/anda.hcl similarity index 85% rename from anda/system/intel-ipu6-kmod/anda.hcl rename to anda/system/ipu6-drivers/akmod/anda.hcl index 385a9583bb..0305b7a9f9 100644 --- a/anda/system/intel-ipu6-kmod/anda.hcl +++ b/anda/system/ipu6-drivers/akmod/anda.hcl @@ -5,5 +5,6 @@ project pkg { } labels { mock = 1 + updbranch = 1 } } diff --git a/anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec b/anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec new file mode 100644 index 0000000000..200d8b5d0e --- /dev/null +++ b/anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec @@ -0,0 +1,113 @@ +%if 0%{?fedora} +%global buildforkernels akmod +%global debug_package %{nil} +%endif +%global ipu6_commit 13c466ebdaaa0578e82bf3039b63eb0b3f472b72 +%global ipu6_commitdate 20250115 +%global ipu6_shortcommit %(c=%{ipu6_commit}; echo ${c:0:7}) +%global usbio_commit 450939ff5f8af733bc89c564603222a4d420acf3 +%global usbio_commitdate 20241210 +%global usbio_shortcommit %(c=%{usbio_commit}; echo ${c:0:7}) +%global modulename intel-ipu6 +# Actual "release" version, currently unused as the release versions are back and forth on if on if they use 1.0.0 or 1.0.1 +%global ver 1.0.1 + +Name: %{modulename}-kmod +Summary: Akmods module for %{modulename} +Version: 0^%{ipu6_commitdate}git.%{ipu6_shortcommit} +Release: 2%{?dist} +License: GPL-2.0-or-later +URL: https://github.com/intel/ipu6-drivers +Source0: https://github.com/intel/ipu6-drivers/archive/%{ipu6_commit}/ipu6-drivers-%{ipu6_shortcommit}.tar.gz +Source1: https://github.com/intel/usbio-drivers/archive/%{usbio_commit}/usbio-drivers-%{usbio_shortcommit}.tar.gz +# Patches +# https://github.com/intel/ipu6-drivers/pull/322 +Patch1: 0001-Makefile-Switch-sensor-driver-symbols-from-CONFIG_VI.patch +Patch2: 0002-Makefile-Re-enable-gc5035-compilation-with-kernels-6.patch +Patch3: 0003-Makefile-Do-not-build-hi556-driver-with-kernels-6.10.patch +Patch4: 0004-Makefile-Do-not-build-ov01a10-driver-with-kernels-6..patch +# https://github.com/intel/ipu6-drivers/pull/321 +Patch5: 0005-media-ipu6-Fix-out-of-tree-builds.patch +Patch6: 0006-media-ipu6-Fix-building-with-kernel-6.13.patch +Patch7: 0007-Modify-0001-v6.10-IPU6-headers-used-by-PSYS.patch-fo.patch +# https://github.com/intel/ipu6-drivers/pull/324 +Patch8: 0008-ipu6-psys-Adjust-DMA-code-for-ipu6-bus-DMA-changes-i.patch +Patch9: 0009-Add-ipu6-dma.h-to-0001-v6.10-IPU6-headers-used-by-PS.patch +# https://github.com/intel/ipu6-drivers/pull/327 +Patch10: 0010-psys-Do-not-skipping-registering-ipu_psys_bus-for-ke.patch +Patch11: 0011-psys-Use-cdev_device_add-for-dev-ipu-psys0.patch +# https://github.com/intel/usbio-drivers/pull/33 +Patch20: 0010-usbio-Fix-GPIO-and-I2C-driver-modaliases.patch +# https://github.com/intel/usbio-drivers/pull/34 +Patch21: 0011-usbio-Fix-I2C-max-transfer-size.patch +Patch22: 0012-usbio-Use-MAX_PAYLOAD_BSIZE-in-usbio_bulk_write.patch +# Downstream/Fedora specific patches +Patch101: 0101-Fedora-local-mod-integrate-usbio-drivers-within-ipu6.patch +BuildRequires: elfutils-libelf-devel +BuildRequires: gcc +BuildRequires: kmodtool +Requires: %{modulename}-kmod-common = %{?epoch:%{epoch}:}%{version} +Requires: akmods +%if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 +Provides: %{name} = %{ipu6_commitdate}.%{ipu6_shortcommit}-%{release} +Provides: akmod-%{modulename} = %{ipu6_commitdate}.%{ipu6_shortcommit}-%{release} +%endif + +%{expand:%(kmodtool --target %{_target_cpu} --repo terra --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } + +%description +This package enables the Intel IPU6 image processor. + +%prep +# error out if there was something wrong with kmodtool +%{?kmodtool_check} + +# print kmodtool output for debugging purposes: +kmodtool --target %{_target_cpu} --repo terra --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null + +%setup -q -c -a 1 +(cd ipu6-drivers-%{ipu6_commit} +%patch 1 -p1 +%patch 2 -p1 +%patch 3 -p1 +%patch 4 -p1 +%patch 5 -p1 +%patch 6 -p1 +%patch 7 -p1 +%patch 8 -p1 +%patch 9 -p1 +%patch 10 -p1 +%patch 11 -p1 +%patch 101 -p1 +patch -p1 < patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch +) +(cd usbio-drivers-%{usbio_commit} +%patch 20 -p1 +%patch 21 -p1 +%patch 22 -p1 +) + +cp -Rp usbio-drivers-%{usbio_commit}/drivers ipu6-drivers-%{ipu6_commit}/ +cp -Rp usbio-drivers-%{usbio_commit}/include ipu6-drivers-%{ipu6_commit}/ + +for kernel_version in %{?kernel_versions} ; do + cp -a ipu6-drivers-%{ipu6_commit}/ _kmod_build_${kernel_version%%___*} +done + +%build +for kernel_version in %{?kernel_versions} ; do + make -C ${kernel_version##*___} M=${PWD}/_kmod_build_${kernel_version%%___*} modules +done + +%install +for kernel_version in %{?kernel_versions}; do + mkdir -p %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/drivers/media/i2c/ + mkdir -p %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/drivers/media/pci/intel/ipu6/psys/ + install -m 755 _kmod_build_${kernel_version%%___*}/drivers/media/i2c/*.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/drivers/media/i2c/ + install -m 755 _kmod_build_${kernel_version%%___*}/drivers/media/pci/intel/ipu6/psys/*.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/drivers/media/pci/intel/ipu6/psys/ + install -m 755 _kmod_build_${kernel_version%%___*}/*.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix} +done +%{?akmod_install} + +%changelog +%autochangelog diff --git a/anda/system/ipu6-drivers/akmod/update.rhai b/anda/system/ipu6-drivers/akmod/update.rhai new file mode 100644 index 0000000000..b5fda8dfcb --- /dev/null +++ b/anda/system/ipu6-drivers/akmod/update.rhai @@ -0,0 +1,13 @@ +let c = sh("cat anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec | grep '%global ipu6_commit ' | sed -E 's/.+ipu6_commit //'", #{"stdout": "piped"}).ctx.stdout; +c.pop(); +rpm.global("ipu6_commit", c); +if rpm.changed() { + rpm.release(); + let d = sh("cat anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec | grep '%global ipu6_commitdate' | sed -E 's/.+ipu6_commitdate //'", #{"stdout": "piped"}).ctx.stdout; + d.pop(); + rpm.global("ipu6_commitdate", d); + let v = sh("cat anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; + v.pop(); + rpm.global("ver", v); +} + diff --git a/anda/system/ipu6-drivers/dkms/0001-Makefile-Switch-sensor-driver-symbols-from-CONFIG_VI.patch b/anda/system/ipu6-drivers/dkms/0001-Makefile-Switch-sensor-driver-symbols-from-CONFIG_VI.patch new file mode 100644 index 0000000000..4e768ef1e7 --- /dev/null +++ b/anda/system/ipu6-drivers/dkms/0001-Makefile-Switch-sensor-driver-symbols-from-CONFIG_VI.patch @@ -0,0 +1,88 @@ +From c451aa3f50f8a5ef26d9a36f159c3f9fb8e6ef11 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Mon, 10 Jun 2024 13:05:53 +0200 +Subject: [PATCH 1/9] Makefile: Switch sensor driver symbols from + CONFIG_VIDEO_FOO to CONFIG_ICAMERA_FOO + +Switch the Kconfig symbols for sensor drivers from CONFIG_VIDEO_FOO to +CONFIG_ICAMERA_FOO to avoid these still being set when they should not +because of the CONFIG_VIDEO_FOO symbols inherited from the base kernel. + +Signed-off-by: Hans de Goede +--- + Makefile | 22 +++++++++++----------- + drivers/media/i2c/Makefile | 22 +++++++++++----------- + 2 files changed, 22 insertions(+), 22 deletions(-) + +diff --git a/Makefile b/Makefile +index 49b27300a..356f5e7f3 100644 +--- a/Makefile ++++ b/Makefile +@@ -81,22 +81,22 @@ else + obj-y += drivers/media/pci/intel/ipu6/psys/ + endif + +-export CONFIG_VIDEO_HM11B1 = m +-export CONFIG_VIDEO_OV01A1S = m +-export CONFIG_VIDEO_OV01A10 = m +-export CONFIG_VIDEO_OV02C10 = m +-export CONFIG_VIDEO_OV02E10 = m +-export CONFIG_VIDEO_HM2170 = m +-export CONFIG_VIDEO_HM2172 = m +-export CONFIG_VIDEO_HI556 = m ++export CONFIG_ICAMERA_HM11B1 = m ++export CONFIG_ICAMERA_OV01A1S = m ++export CONFIG_ICAMERA_OV01A10 = m ++export CONFIG_ICAMERA_OV02C10 = m ++export CONFIG_ICAMERA_OV02E10 = m ++export CONFIG_ICAMERA_HM2170 = m ++export CONFIG_ICAMERA_HM2172 = m ++export CONFIG_ICAMERA_HI556 = m + + ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV2740)),true) +-export CONFIG_VIDEO_OV2740 = m +-export CONFIG_VIDEO_GC5035 = m ++export CONFIG_ICAMERA_OV2740 = m ++export CONFIG_ICAMERA_GC5035 = m + endif + + ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV05C10)),false) +-export CONFIG_VIDEO_OV05C10 = m ++export CONFIG_ICAMERA_OV05C10 = m + endif + + obj-y += drivers/media/i2c/ +diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile +index b4fa25598..2bcc878e7 100644 +--- a/drivers/media/i2c/Makefile ++++ b/drivers/media/i2c/Makefile +@@ -1,15 +1,15 @@ + # SPDX-License-Identifier: GPL-2.0 + # Copyright (c) 2021 Intel Corporation. + +-obj-$(CONFIG_VIDEO_HM11B1) += hm11b1.o +-obj-$(CONFIG_VIDEO_GC5035) += gc5035.o +-obj-$(CONFIG_VIDEO_OV01A1S) += ov01a1s.o +-obj-$(CONFIG_VIDEO_OV01A10) += ov01a10.o +-obj-$(CONFIG_VIDEO_OV02C10) += ov02c10.o +-obj-$(CONFIG_VIDEO_OV02E10) += ov02e10.o +-obj-$(CONFIG_VIDEO_OV05C10) += ov05c10.o +-obj-$(CONFIG_VIDEO_OV2740) += ov2740.o +-obj-$(CONFIG_VIDEO_HM2170) += hm2170.o +-obj-$(CONFIG_VIDEO_HM2170) += hm2172.o +-obj-$(CONFIG_VIDEO_HI556) += hi556.o ++obj-$(CONFIG_ICAMERA_HM11B1) += hm11b1.o ++obj-$(CONFIG_ICAMERA_GC5035) += gc5035.o ++obj-$(CONFIG_ICAMERA_OV01A1S) += ov01a1s.o ++obj-$(CONFIG_ICAMERA_OV01A10) += ov01a10.o ++obj-$(CONFIG_ICAMERA_OV02C10) += ov02c10.o ++obj-$(CONFIG_ICAMERA_OV02E10) += ov02e10.o ++obj-$(CONFIG_ICAMERA_OV05C10) += ov05c10.o ++obj-$(CONFIG_ICAMERA_OV2740) += ov2740.o ++obj-$(CONFIG_ICAMERA_HM2170) += hm2170.o ++obj-$(CONFIG_ICAMERA_HM2170) += hm2172.o ++obj-$(CONFIG_ICAMERA_HI556) += hi556.o + obj-$(CONFIG_POWER_CTRL_LOGIC) += power_ctrl_logic.o +-- +2.48.1 + diff --git a/anda/system/ipu6-drivers/dkms/0002-Makefile-Re-enable-gc5035-compilation-with-kernels-6.patch b/anda/system/ipu6-drivers/dkms/0002-Makefile-Re-enable-gc5035-compilation-with-kernels-6.patch new file mode 100644 index 0000000000..d8bb788804 --- /dev/null +++ b/anda/system/ipu6-drivers/dkms/0002-Makefile-Re-enable-gc5035-compilation-with-kernels-6.patch @@ -0,0 +1,97 @@ +From b839b8153bd364c22811496c1753145fa475bcc8 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Mon, 10 Jun 2024 13:41:16 +0200 +Subject: [PATCH 2/9] Makefile: Re-enable gc5035 compilation with kernels >= + 6.8 + +For some reason the gc5035 driver has been disabled for kernels >= 6.8, +but it is not upstream yet. + +Fix compilation with kernel >= 6.8 and re-enable the driver. + +Signed-off-by: Hans de Goede +--- + Makefile | 2 +- + drivers/media/i2c/gc5035.c | 19 +++++++++++++++++++ + 2 files changed, 20 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 356f5e7f3..58bc10aed 100644 +--- a/Makefile ++++ b/Makefile +@@ -89,10 +89,10 @@ export CONFIG_ICAMERA_OV02E10 = m + export CONFIG_ICAMERA_HM2170 = m + export CONFIG_ICAMERA_HM2172 = m + export CONFIG_ICAMERA_HI556 = m ++export CONFIG_ICAMERA_GC5035 = m + + ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV2740)),true) + export CONFIG_ICAMERA_OV2740 = m +-export CONFIG_ICAMERA_GC5035 = m + endif + + ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV05C10)),false) +diff --git a/drivers/media/i2c/gc5035.c b/drivers/media/i2c/gc5035.c +index 16bbd4845..e825dfa7d 100644 +--- a/drivers/media/i2c/gc5035.c ++++ b/drivers/media/i2c/gc5035.c +@@ -1497,7 +1497,11 @@ static int gc5035_set_fmt(struct v4l2_subdev *sd, + + mutex_lock(&gc5035->mutex); + if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 8, 0) + *v4l2_subdev_get_try_format(sd, sd_state, fmt->pad) = fmt->format; ++#else ++ *v4l2_subdev_state_get_format(sd_state, fmt->pad) = fmt->format; ++#endif + } else { + gc5035->cur_mode = mode; + h_blank = mode->hts_def - mode->width; +@@ -1522,7 +1526,11 @@ static int gc5035_get_fmt(struct v4l2_subdev *sd, + + mutex_lock(&gc5035->mutex); + if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 8, 0) + fmt->format = *v4l2_subdev_get_try_format(sd, sd_state, fmt->pad); ++#else ++ fmt->format = *v4l2_subdev_state_get_format(sd_state, fmt->pad); ++#endif + } else { + fmt->format.width = mode->width; + fmt->format.height = mode->height; +@@ -1714,7 +1722,9 @@ static const struct v4l2_subdev_video_ops gc5035_video_ops = { + }; + + static const struct v4l2_subdev_pad_ops gc5035_pad_ops = { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 8, 0) + .init_cfg = gc5035_entity_init_cfg, ++#endif + .enum_mbus_code = gc5035_enum_mbus_code, + .enum_frame_size = gc5035_enum_frame_sizes, + .get_fmt = gc5035_get_fmt, +@@ -1730,6 +1740,12 @@ static const struct media_entity_operations gc5035_subdev_entity_ops = { + .link_validate = v4l2_subdev_link_validate, + }; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 8, 0) ++static const struct v4l2_subdev_internal_ops gc5035_internal_ops = { ++ .init_state = gc5035_entity_init_cfg, ++}; ++#endif ++ + static int gc5035_set_exposure(struct gc5035 *gc5035, u32 val) + { + u32 caltime = 0; +@@ -2091,6 +2107,9 @@ static int gc5035_probe(struct i2c_client *client) + mutex_init(&gc5035->mutex); + sd = &gc5035->subdev; + v4l2_i2c_subdev_init(sd, client, &gc5035_subdev_ops); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 8, 0) ++ sd->internal_ops = &gc5035_internal_ops; ++#endif + ret = gc5035_initialize_controls(gc5035); + if (ret) { + dev_err_probe(dev, ret, "Failed to initialize controls\n"); +-- +2.48.1 + diff --git a/anda/system/ipu6-drivers/dkms/0003-Makefile-Do-not-build-hi556-driver-with-kernels-6.10.patch b/anda/system/ipu6-drivers/dkms/0003-Makefile-Do-not-build-hi556-driver-with-kernels-6.10.patch new file mode 100644 index 0000000000..923f26602b --- /dev/null +++ b/anda/system/ipu6-drivers/dkms/0003-Makefile-Do-not-build-hi556-driver-with-kernels-6.10.patch @@ -0,0 +1,54 @@ +From 580d73c387405534bdef7911e0616ad66953f7ce Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Mon, 13 Jan 2025 13:11:00 +0100 +Subject: [PATCH 3/9] Makefile: Do not build hi556 driver with kernels >= 6.10 + +The mainline kernel hi556 driver has ACPI enumeration, GPIO and clk support +since kernel 6.10, so it can be used instead of the out of tree driver. + +Add a new KV_HI556 variable and stop building the hi556 driver on +kernels >= 6.10. + +Signed-off-by: Hans de Goede +--- + Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 58bc10aed..472fdec22 100644 +--- a/Makefile ++++ b/Makefile +@@ -24,6 +24,7 @@ KV_IVSC := 6.6.0 + KV_IPU_BRIDGE := 6.6.0 + KV_OV2740 := 6.8.0 + KV_OV05C10 := 6.8.0 ++KV_HI556 := 6.10 + KV_IPU6_ISYS := 6.10.0 + + KERNEL_SRC ?= /lib/modules/$(KERNELRELEASE)/build +@@ -88,17 +89,21 @@ export CONFIG_ICAMERA_OV02C10 = m + export CONFIG_ICAMERA_OV02E10 = m + export CONFIG_ICAMERA_HM2170 = m + export CONFIG_ICAMERA_HM2172 = m +-export CONFIG_ICAMERA_HI556 = m + export CONFIG_ICAMERA_GC5035 = m + + ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV2740)),true) + export CONFIG_ICAMERA_OV2740 = m + endif + ++# Note OV05C10 check is reversed, it is not build on too old kernels + ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV05C10)),false) + export CONFIG_ICAMERA_OV05C10 = m + endif + ++ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_HI556)),true) ++export CONFIG_ICAMERA_HI556 = m ++endif ++ + obj-y += drivers/media/i2c/ + + ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_IVSC)),true) +-- +2.48.1 + diff --git a/anda/system/ipu6-drivers/dkms/0004-Makefile-Do-not-build-ov01a10-driver-with-kernels-6..patch b/anda/system/ipu6-drivers/dkms/0004-Makefile-Do-not-build-ov01a10-driver-with-kernels-6..patch new file mode 100644 index 0000000000..73f37ea469 --- /dev/null +++ b/anda/system/ipu6-drivers/dkms/0004-Makefile-Do-not-build-ov01a10-driver-with-kernels-6..patch @@ -0,0 +1,51 @@ +From 14d41bf82770fcab65dcf3b2eec3f95b7a963aff Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Mon, 13 Jan 2025 13:15:15 +0100 +Subject: [PATCH 4/9] Makefile: Do not build ov01a10 driver with kernels >= 6.8 + +Since commit 47a78052db51 ("media: ov01a10: Enable runtime PM before +registering async sub-device") the mainline ov01a10 driver is fully +usable and it can be used instead of the out of tree driver. + +Add a new KV_OV01A10 variable and stop building the ov01a10 driver on +kernels >= 6.8. + +Signed-off-by: Hans de Goede +--- + Makefile | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 472fdec22..7ae3be835 100644 +--- a/Makefile ++++ b/Makefile +@@ -23,6 +23,7 @@ version_lt = $(shell \ + KV_IVSC := 6.6.0 + KV_IPU_BRIDGE := 6.6.0 + KV_OV2740 := 6.8.0 ++KV_OV01A10 := 6.8.0 + KV_OV05C10 := 6.8.0 + KV_HI556 := 6.10 + KV_IPU6_ISYS := 6.10.0 +@@ -84,7 +85,6 @@ endif + + export CONFIG_ICAMERA_HM11B1 = m + export CONFIG_ICAMERA_OV01A1S = m +-export CONFIG_ICAMERA_OV01A10 = m + export CONFIG_ICAMERA_OV02C10 = m + export CONFIG_ICAMERA_OV02E10 = m + export CONFIG_ICAMERA_HM2170 = m +@@ -95,6 +95,10 @@ ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV2740)),true) + export CONFIG_ICAMERA_OV2740 = m + endif + ++ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV01A10)),true) ++export CONFIG_ICAMERA_OV01A10 = m ++endif ++ + # Note OV05C10 check is reversed, it is not build on too old kernels + ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV05C10)),false) + export CONFIG_ICAMERA_OV05C10 = m +-- +2.48.1 + diff --git a/anda/system/ipu6-drivers/dkms/0005-media-ipu6-Fix-out-of-tree-builds.patch b/anda/system/ipu6-drivers/dkms/0005-media-ipu6-Fix-out-of-tree-builds.patch new file mode 100644 index 0000000000..52b0d88a03 --- /dev/null +++ b/anda/system/ipu6-drivers/dkms/0005-media-ipu6-Fix-out-of-tree-builds.patch @@ -0,0 +1,28 @@ +From 7ce00bf77d1b92981f471a26fa2d92c96d14e51c Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Tue, 14 Jan 2025 23:07:35 +0100 +Subject: [PATCH 5/9] media: ipu6: Fix out of tree builds + +Fix out of tree builds not finding the ipu6*.h files. + +Signed-off-by: Hans de Goede +--- + drivers/media/pci/intel/ipu6/psys/Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/media/pci/intel/ipu6/psys/Makefile b/drivers/media/pci/intel/ipu6/psys/Makefile +index fa638fcdf..9a3aa6e78 100644 +--- a/drivers/media/pci/intel/ipu6/psys/Makefile ++++ b/drivers/media/pci/intel/ipu6/psys/Makefile +@@ -23,6 +23,8 @@ obj-$(CONFIG_VIDEO_INTEL_IPU6) += intel-ipu6-psys.o + + ifeq ($(is_kernel_lt_6_10), 1) + ccflags-y += -I$(src)/../ipu6/ ++else ++ccflags-y += -I/lib/modules/$(KERNELRELEASE)/build/drivers/media/pci/intel/ipu6/ + endif + ccflags-y += -I$(src)/../ + ccflags-y += -I$(src)/../../ +-- +2.48.1 + diff --git a/anda/system/ipu6-drivers/dkms/0006-media-ipu6-Fix-building-with-kernel-6.13.patch b/anda/system/ipu6-drivers/dkms/0006-media-ipu6-Fix-building-with-kernel-6.13.patch new file mode 100644 index 0000000000..a4b0ddbdea --- /dev/null +++ b/anda/system/ipu6-drivers/dkms/0006-media-ipu6-Fix-building-with-kernel-6.13.patch @@ -0,0 +1,53 @@ +From a42273020f4a2e1c633dda6f30c512db56738b67 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Tue, 14 Jan 2025 23:08:04 +0100 +Subject: [PATCH 6/9] media: ipu6: Fix building with kernel 6.13 + +Fix building with kernel 6.13. + +Signed-off-by: Hans de Goede +--- + drivers/media/pci/intel/ipu6/psys/ipu-psys.c | 8 ++++++++ + drivers/media/pci/intel/ipu6/psys/ipu6-psys.c | 4 ++++ + 2 files changed, 12 insertions(+) + +diff --git a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c +index 00e394f20..36f99a3b8 100644 +--- a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c ++++ b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c +@@ -2681,8 +2681,16 @@ MODULE_AUTHOR("Yunliang Ding "); + MODULE_LICENSE("GPL"); + MODULE_DESCRIPTION("Intel ipu processing system driver"); + #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0) || IS_ENABLED(CONFIG_DRM_I915_HAS_SRIOV) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0) + MODULE_IMPORT_NS(DMA_BUF); ++#else ++MODULE_IMPORT_NS("DMA_BUF"); ++#endif + #endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 10, 0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0) + MODULE_IMPORT_NS(INTEL_IPU6); ++#else ++MODULE_IMPORT_NS("INTEL_IPU6"); ++#endif + #endif +diff --git a/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c +index 53c845ba3..0c3a5ca62 100644 +--- a/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c ++++ b/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c +@@ -32,7 +32,11 @@ + #include "ipu6-platform-buttress-regs.h" + #endif + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0) + MODULE_IMPORT_NS(DMA_BUF); ++#else ++MODULE_IMPORT_NS("DMA_BUF"); ++#endif + + static bool early_pg_transfer; + module_param(early_pg_transfer, bool, 0664); +-- +2.48.1 + diff --git a/anda/system/ipu6-drivers/dkms/0007-Modify-0001-v6.10-IPU6-headers-used-by-PSYS.patch-fo.patch b/anda/system/ipu6-drivers/dkms/0007-Modify-0001-v6.10-IPU6-headers-used-by-PSYS.patch-fo.patch new file mode 100644 index 0000000000..d1bccf20a1 --- /dev/null +++ b/anda/system/ipu6-drivers/dkms/0007-Modify-0001-v6.10-IPU6-headers-used-by-PSYS.patch-fo.patch @@ -0,0 +1,49 @@ +From 32ce53b82bef51479d49d7d68794e2b801367dd6 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Thu, 30 Jan 2025 22:20:16 +0100 +Subject: [PATCH 7/9] Modify 0001-v6.10-IPU6-headers-used-by-PSYS.patch for + v6.13 + +Modify 0001-v6.10-IPU6-headers-used-by-PSYS.patch so that it also works +with 6.13 kernels. + +Signed-off-by: Hans de Goede +--- + patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch b/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch +index 00fb961d2..6a465a924 100644 +--- a/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch ++++ b/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch +@@ -52,7 +52,7 @@ index 000000000..b26c6aee1 + + + +struct ipu6_bus_device { + + struct auxiliary_device auxdev; +-+ struct auxiliary_driver *auxdrv; +++ const struct auxiliary_driver *auxdrv; + + const struct ipu6_auxdrv_data *auxdrv_data; + + struct list_head list; + + void *pdata; +@@ -92,7 +92,7 @@ new file mode 100644 + index 000000000..9b6f56958 + --- /dev/null + +++ b/drivers/media/pci/intel/ipu6/ipu6-buttress.h +-@@ -0,0 +1,92 @@ ++@@ -0,0 +1,94 @@ + +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* Copyright (C) 2013--2024 Intel Corporation */ + + +@@ -141,7 +141,9 @@ index 000000000..9b6f56958 + +struct ipu6_buttress { + + struct mutex power_mutex, auth_mutex, cons_mutex, ipc_mutex; + + struct ipu6_buttress_ipc cse; +++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0) + + struct ipu6_buttress_ipc ish; +++#endif + + struct list_head constraints; + + u32 wdt_cached_value; + + bool force_suspend; +-- +2.48.1 + diff --git a/anda/system/ipu6-drivers/dkms/0008-ipu6-psys-Adjust-DMA-code-for-ipu6-bus-DMA-changes-i.patch b/anda/system/ipu6-drivers/dkms/0008-ipu6-psys-Adjust-DMA-code-for-ipu6-bus-DMA-changes-i.patch new file mode 100644 index 0000000000..141202d154 --- /dev/null +++ b/anda/system/ipu6-drivers/dkms/0008-ipu6-psys-Adjust-DMA-code-for-ipu6-bus-DMA-changes-i.patch @@ -0,0 +1,306 @@ +From a9236f549f28811a5af0c71ce6708d1f259d0e78 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Sat, 1 Feb 2025 08:04:35 +0100 +Subject: [PATCH 8/9] ipu6-psys: Adjust DMA code for ipu6-bus DMA changes in + kernels >= 6.12 + +Upstream commit daabc5c64703 ("media: ipu6: not override the dma_ops of +device in driver") has changed the ipu6-bus code to no longer modify +the aux device's dma_ops, instead new ipu6_dma_*() helpers were introduced +modify the psys driver to use these new helpers. + +This fixes the below DMA warning, which was followed by ipu6_psys_probe() +failing due to dma_alloc_attrs() failing: + +Jan 31 11:59:59 x1 kernel: ------------[ cut here ]------------ +Jan 31 11:59:59 x1 kernel: WARNING: CPU: 3 PID: 8595 at kernel/dma/mapping.c:597 dma_alloc_attrs+0x12b/0x140 +Jan 31 11:59:59 x1 kernel: Modules linked in: intel_ipu6_psys(OE+) rfcomm snd_seq_dummy snd_hrtimer qrtr bnep binfmt_misc vfat fat snd_soc_skl_hda_dsp snd_soc_intel_sof_board_helpers snd_sof_probes snd_soc_intel_hda_dsp_common snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic snd_hda_scodec_component snd_soc_dmic snd_sof_pci_intel_mtl snd_sof_intel_hda_generic soundwire_intel soundwire_cadence snd_sof_intel_hda_common snd_soc_hdac_hda iwlmvm snd_sof_intel_hda_mlink snd_sof_intel_hda snd_sof_pci snd_sof_xtensa_dsp snd_sof snd_sof_utils snd_hda_ext_core mac80211 snd_soc_acpi_intel_match soundwire_generic_allocation snd_soc_acpi intel_uncore_frequency soundwire_bus intel_uncore_frequency_common x86_pkg_temp_thermal snd_soc_core intel_ipu6_isys intel_powerclamp videobuf2_dma_sg coretemp snd_compress videobuf2_memops ac97_bus videobuf2_v4l2 snd_pcm_dmaengine videobuf2_common snd_hda_intel libarc4 snd_intel_dspcfg snd_intel_sdw_acpi kvm_intel snd_hda_codec spi_nor btusb iTCO_wdt btrtl mhi_wwan_mbim intel_pmc_bxt mhi_wwan_ctrl +Jan 31 11:59:59 x1 kernel: snd_hda_core mei_gsc_proxy gpio_usbio(OE) mei_wdt i2c_usbio(OE) mtd iTCO_vendor_support intel_rapl_msr btintel snd_hwdep kvm btbcm btmtk snd_seq snd_ctl_led hid_sensor_accel_3d hid_sensor_gyro_3d iwlwifi bluetooth snd_seq_device rapl processor_thermal_device_pci intel_cstate hid_sensor_trigger think_lmi processor_thermal_device hid_sensor_iio_common processor_thermal_wt_hint industrialio_triggered_buffer intel_uncore usbio(OE) firmware_attributes_class snd_pcm wmi_bmof mhi_pci_generic kfifo_buf processor_thermal_rfim i2c_i801 mei_me cfg80211 processor_thermal_rapl thinkpad_acpi spi_intel_pci mhi industrialio thunderbolt snd_timer spi_intel mei intel_ipu6 i2c_smbus intel_rapl_common idma64 platform_profile processor_thermal_wt_req ipu_bridge rfkill processor_thermal_power_floor snd igen6_edac processor_thermal_mbox int3403_thermal soundcore soc_button_array int340x_thermal_zone intel_pmc_core intel_skl_int3472_tps68470 ov08x40(OE) tps68470_regulator v4l2_fwnode clk_tps68470 intel_vsec v4l2_async +Jan 31 11:59:59 x1 kernel: pmt_telemetry intel_skl_int3472_discrete int3400_thermal intel_hid acpi_tad pmt_class intel_skl_int3472_common acpi_pad sparse_keymap joydev acpi_thermal_rel loop nfnetlink zram lz4hc_compress lz4_compress dm_crypt xe drm_ttm_helper gpu_sched drm_suballoc_helper drm_gpuvm drm_exec hid_sensor_hub intel_ishtp_hid i915 i2c_algo_bit drm_buddy nvme ttm nvme_core drm_display_helper intel_ish_ipc video ucsi_acpi crct10dif_pclmul hid_multitouch crc32_pclmul crc32c_intel polyval_clmulni polyval_generic ghash_clmulni_intel intel_vpu sha512_ssse3 sha256_ssse3 typec_ucsi sha1_ssse3 intel_ishtp cec typec nvme_auth i2c_hid_acpi i2c_hid wmi pinctrl_meteorlake serio_raw v4l2loopback(OE) videodev mc i2c_dev fuse +Jan 31 11:59:59 x1 kernel: CPU: 3 UID: 0 PID: 8595 Comm: modprobe Tainted: G OE 6.12.10-200.fc41.x86_64 #1 +Jan 31 11:59:59 x1 kernel: Tainted: [O]=OOT_MODULE, [E]=UNSIGNED_MODULE +Jan 31 11:59:59 x1 kernel: Hardware name: LENOVO 21KCSIT080/21KCSIT080, BIOS N3YET72W (1.37 ) 10/03/2024 +Jan 31 11:59:59 x1 kernel: RIP: 0010:dma_alloc_attrs+0x12b/0x140 +Jan 31 11:59:59 x1 kernel: Code: 4c 89 e6 48 89 df e8 94 5d 9a 00 49 89 c7 e9 62 ff ff ff 0f 0b 45 31 ff 5b 5d 4c 89 f8 41 5c 41 5d 41 5e 41 5f c3 cc cc cc cc <0f> 0b e9 0d ff ff ff 45 31 ff e9 3e ff ff ff 66 0f 1f 44 00 00 90 +Jan 31 11:59:59 x1 kernel: RSP: 0018:ffffaeefe452fbc8 EFLAGS: 00010246 +Jan 31 11:59:59 x1 kernel: RAX: 0000000000000000 RBX: ffff936a8de60800 RCX: 0000000000000cc0 +Jan 31 11:59:59 x1 kernel: RDX: ffff936af6c65018 RSI: 0000000000002000 RDI: ffff936a8de60800 +Jan 31 11:59:59 x1 kernel: RBP: ffff936a8de60800 R08: 0000000000000000 R09: ffff936af6c65000 +Jan 31 11:59:59 x1 kernel: R10: ffffaeefe452fc00 R11: ffff9371bf9a17c0 R12: 0000000000002000 +Jan 31 11:59:59 x1 kernel: R13: ffff936af6c65018 R14: 0000000000000000 R15: ffff936a9d9be440 +Jan 31 11:59:59 x1 kernel: FS: 00007f8ff258f740(0000) GS:ffff9371bf980000(0000) knlGS:0000000000000000 +Jan 31 11:59:59 x1 kernel: CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +Jan 31 11:59:59 x1 kernel: CR2: 00007f2e39eee67c CR3: 000000013b884003 CR4: 0000000000f72ef0 +Jan 31 11:59:59 x1 kernel: DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 +Jan 31 11:59:59 x1 kernel: DR3: 0000000000000000 DR6: 00000000ffff07f0 DR7: 0000000000000400 +Jan 31 11:59:59 x1 kernel: PKRU: 55555554 +Jan 31 11:59:59 x1 kernel: Call Trace: +Jan 31 11:59:59 x1 kernel: +Jan 31 11:59:59 x1 kernel: ? dma_alloc_attrs+0x12b/0x140 +Jan 31 11:59:59 x1 kernel: ? __warn.cold+0x93/0xfa +Jan 31 11:59:59 x1 kernel: ? dma_alloc_attrs+0x12b/0x140 +Jan 31 11:59:59 x1 kernel: ? report_bug+0xff/0x140 +Jan 31 11:59:59 x1 kernel: ? handle_bug+0x58/0x90 +Jan 31 11:59:59 x1 kernel: ? exc_invalid_op+0x17/0x70 +Jan 31 11:59:59 x1 kernel: ? asm_exc_invalid_op+0x1a/0x20 +Jan 31 11:59:59 x1 kernel: ? dma_alloc_attrs+0x12b/0x140 +Jan 31 11:59:59 x1 kernel: ipu6_psys_probe+0x37d/0x4b0 [intel_ipu6_psys] +Jan 31 11:59:59 x1 kernel: ? __pfx_ipu6_psys_probe+0x10/0x10 [intel_ipu6_psys] +Jan 31 11:59:59 x1 kernel: auxiliary_bus_probe+0x46/0x80 +Jan 31 11:59:59 x1 kernel: ? driver_sysfs_add+0x57/0xc0 +Jan 31 11:59:59 x1 kernel: really_probe+0xdb/0x340 +Jan 31 11:59:59 x1 kernel: ? pm_runtime_barrier+0x54/0x90 +Jan 31 11:59:59 x1 kernel: ? __pfx___driver_attach+0x10/0x10 +Jan 31 11:59:59 x1 kernel: __driver_probe_device+0x78/0x110 +Jan 31 11:59:59 x1 kernel: driver_probe_device+0x1f/0xa0 +Jan 31 11:59:59 x1 kernel: __driver_attach+0xba/0x1c0 +Jan 31 11:59:59 x1 kernel: bus_for_each_dev+0x8c/0xe0 +Jan 31 11:59:59 x1 kernel: bus_add_driver+0x142/0x220 +Jan 31 11:59:59 x1 kernel: driver_register+0x72/0xd0 +Jan 31 11:59:59 x1 kernel: __auxiliary_driver_register+0x6e/0xd0 +Jan 31 11:59:59 x1 kernel: ? __pfx_ipu6_psys_aux_driver_init+0x10/0x10 [intel_ipu6_psys] +Jan 31 11:59:59 x1 kernel: do_one_initcall+0x58/0x310 +Jan 31 11:59:59 x1 kernel: do_init_module+0x90/0x260 +Jan 31 11:59:59 x1 kernel: __do_sys_init_module+0x17a/0x1b0 +Jan 31 11:59:59 x1 kernel: do_syscall_64+0x82/0x160 +Jan 31 11:59:59 x1 kernel: ? exc_page_fault+0x7e/0x180 +Jan 31 11:59:59 x1 kernel: entry_SYSCALL_64_after_hwframe+0x76/0x7e +Jan 31 11:59:59 x1 kernel: RIP: 0033:0x7f8ff1f0228e +Jan 31 11:59:59 x1 kernel: Code: 48 8b 0d 85 3b 0f 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 49 89 ca b8 af 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 52 3b 0f 00 f7 d8 64 89 01 48 +Jan 31 11:59:59 x1 kernel: RSP: 002b:00007ffdfbde11e8 EFLAGS: 00000246 ORIG_RAX: 00000000000000af +Jan 31 11:59:59 x1 kernel: RAX: ffffffffffffffda RBX: 000055a0687e9240 RCX: 00007f8ff1f0228e +Jan 31 11:59:59 x1 kernel: RDX: 000055a05859a715 RSI: 0000000000041a65 RDI: 00007f8ff13a7010 +Jan 31 11:59:59 x1 kernel: RBP: 00007ffdfbde12a0 R08: 000055a0687e8010 R09: 0000000000000007 +Jan 31 11:59:59 x1 kernel: R10: 0000000000000001 R11: 0000000000000246 R12: 000055a05859a715 +Jan 31 11:59:59 x1 kernel: R13: 0000000000040000 R14: 000055a0687e92e0 R15: 0000000000000000 +Jan 31 11:59:59 x1 kernel: +Jan 31 11:59:59 x1 kernel: ---[ end trace 0000000000000000 ]--- + +Signed-off-by: Hans de Goede +--- + drivers/media/pci/intel/ipu6/psys/ipu-psys.c | 64 ++++++++++++++++++- + drivers/media/pci/intel/ipu6/psys/ipu6-ppg.c | 6 +- + drivers/media/pci/intel/ipu6/psys/ipu6-psys.c | 22 +++++-- + 3 files changed, 85 insertions(+), 7 deletions(-) + +diff --git a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c +index 36f99a3b8..7c512e5ae 100644 +--- a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c ++++ b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c +@@ -52,6 +52,7 @@ + #include "ipu-psys.h" + #include "ipu6-platform-regs.h" + #include "ipu6-fw-com.h" ++#include "ipu6-dma.h" + #endif + + static bool async_fw_init; +@@ -228,9 +229,12 @@ struct ipu_psys_pg *__get_pg_buf(struct ipu_psys *psys, size_t pg_size) + #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) + kpg->pg = dma_alloc_attrs(&psys->adev->dev, pg_size, + &kpg->pg_dma_addr, GFP_KERNEL, 0); +-#else ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + kpg->pg = dma_alloc_attrs(dev, pg_size, &kpg->pg_dma_addr, + GFP_KERNEL, 0); ++#else ++ kpg->pg = ipu6_dma_alloc(to_ipu6_bus_device(dev), pg_size, ++ &kpg->pg_dma_addr, GFP_KERNEL, 0); + #endif + if (!kpg->pg) { + kfree(kpg); +@@ -597,6 +601,7 @@ static void ipu_dma_buf_detach(struct dma_buf *dbuf, + attach->priv = NULL; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + static struct sg_table *ipu_dma_buf_map(struct dma_buf_attachment *attach, + enum dma_data_direction dir) + { +@@ -658,6 +663,50 @@ static void ipu_dma_buf_unmap(struct dma_buf_attachment *attach, + #endif + } + ++#else ++ ++static struct sg_table *ipu_dma_buf_map(struct dma_buf_attachment *attach, ++ enum dma_data_direction dir) ++{ ++ struct ipu_dma_buf_attach *ipu_attach = attach->priv; ++ struct ipu6_bus_device *adev = to_ipu6_bus_device(attach->dev); ++ struct pci_dev *pdev = adev->isp->pdev; ++ unsigned long attrs; ++ int ret; ++ ++ attrs = DMA_ATTR_SKIP_CPU_SYNC; ++ ret = dma_map_sgtable(&pdev->dev, ipu_attach->sgt, dir, attrs); ++ if (ret) { ++ dev_dbg(attach->dev, "buf map failed\n"); ++ return ERR_PTR(-EIO); ++ } ++ ++ ret = ipu6_dma_map_sgtable(adev, ipu_attach->sgt, dir, attrs); ++ if (ret) { ++ dma_unmap_sgtable(&pdev->dev, ipu_attach->sgt, dir, attrs); ++ return ERR_PTR(-EIO); ++ } ++ ++ /* ++ * Initial cache flush to avoid writing dirty pages for buffers which ++ * are later marked as IPU_BUFFER_FLAG_NO_FLUSH. ++ */ ++ ipu6_dma_sync_sgtable(adev, ipu_attach->sgt); ++ ++ return ipu_attach->sgt; ++} ++ ++static void ipu_dma_buf_unmap(struct dma_buf_attachment *attach, ++ struct sg_table *sgt, enum dma_data_direction dir) ++{ ++ struct ipu6_bus_device *adev = to_ipu6_bus_device(attach->dev); ++ struct pci_dev *pdev = adev->isp->pdev; ++ ++ ipu6_dma_unmap_sgtable(adev, sgt, dir, DMA_ATTR_SKIP_CPU_SYNC); ++ dma_unmap_sgtable(&pdev->dev, sgt, dir, DMA_ATTR_SKIP_CPU_SYNC); ++} ++#endif ++ + static int ipu_dma_buf_mmap(struct dma_buf *dbuf, struct vm_area_struct *vma) + { + return -ENOTTY; +@@ -2371,7 +2420,12 @@ static int ipu6_psys_probe(struct auxiliary_device *auxdev, + kpg = kzalloc(sizeof(*kpg), GFP_KERNEL); + if (!kpg) + goto out_free_pgs; ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + kpg->pg = dma_alloc_attrs(dev, IPU_PSYS_PG_MAX_SIZE, ++#else ++ kpg->pg = ipu6_dma_alloc(adev, IPU_PSYS_PG_MAX_SIZE, ++#endif + &kpg->pg_dma_addr, + GFP_KERNEL, 0); + if (!kpg->pg) { +@@ -2426,7 +2480,11 @@ out_release_fw_com: + ipu6_fw_com_release(psys->fwcom, 1); + out_free_pgs: + list_for_each_entry_safe(kpg, kpg0, &psys->pgs, list) { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + dma_free_attrs(dev, kpg->size, kpg->pg, kpg->pg_dma_addr, 0); ++#else ++ ipu6_dma_free(adev, kpg->size, kpg->pg, kpg->pg_dma_addr, 0); ++#endif + kfree(kpg); + } + +@@ -2484,8 +2542,10 @@ static void ipu6_psys_remove(struct auxiliary_device *auxdev) + #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) + dma_free_attrs(&adev->dev, kpg->size, kpg->pg, + kpg->pg_dma_addr, 0); +-#else ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + dma_free_attrs(dev, kpg->size, kpg->pg, kpg->pg_dma_addr, 0); ++#else ++ ipu6_dma_free(psys->adev, kpg->size, kpg->pg, kpg->pg_dma_addr, 0); + #endif + kfree(kpg); + } +diff --git a/drivers/media/pci/intel/ipu6/psys/ipu6-ppg.c b/drivers/media/pci/intel/ipu6/psys/ipu6-ppg.c +index 9038f69cd..5e6fb9a1b 100644 +--- a/drivers/media/pci/intel/ipu6/psys/ipu6-ppg.c ++++ b/drivers/media/pci/intel/ipu6/psys/ipu6-ppg.c +@@ -8,6 +8,7 @@ + #include + + #include "ipu6-ppg.h" ++#include "ipu6-dma.h" + + static bool enable_suspend_resume; + module_param(enable_suspend_resume, bool, 0664); +@@ -75,9 +76,12 @@ __get_buf_set(struct ipu_psys_fh *fh, size_t buf_set_size) + kbuf_set->kaddr = dma_alloc_attrs(&fh->psys->adev->dev, + buf_set_size, &kbuf_set->dma_addr, + GFP_KERNEL, 0); +-#else ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + kbuf_set->kaddr = dma_alloc_attrs(dev, buf_set_size, + &kbuf_set->dma_addr, GFP_KERNEL, 0); ++#else ++ kbuf_set->kaddr = ipu6_dma_alloc(to_ipu6_bus_device(dev), buf_set_size, ++ &kbuf_set->dma_addr, GFP_KERNEL, 0); + #endif + if (!kbuf_set->kaddr) { + kfree(kbuf_set); +diff --git a/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c +index 0c3a5ca62..58662ea16 100644 +--- a/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c ++++ b/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c +@@ -30,6 +30,7 @@ + #include "ipu6-ppg.h" + #include "ipu6-platform-regs.h" + #include "ipu6-platform-buttress-regs.h" ++#include "ipu6-dma.h" + #endif + + #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0) +@@ -450,10 +451,12 @@ static struct ipu_psys_kcmd *ipu_psys_copy_cmd(struct ipu_psys_command *cmd, + kcmd->kbufs[i]->sgt->sgl, + kcmd->kbufs[i]->sgt->orig_nents, + DMA_BIDIRECTIONAL); +-#else ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + dma_sync_sg_for_device(dev, kcmd->kbufs[i]->sgt->sgl, + kcmd->kbufs[i]->sgt->orig_nents, + DMA_BIDIRECTIONAL); ++#else ++ ipu6_dma_sync_sgtable(psys->adev, kcmd->kbufs[i]->sgt); + #endif + } + +@@ -1102,11 +1105,16 @@ int ipu_psys_fh_init(struct ipu_psys_fh *fh) + &kbuf_set->dma_addr, + GFP_KERNEL, + 0); +-#else ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + kbuf_set->kaddr = dma_alloc_attrs(dev, + IPU_PSYS_BUF_SET_MAX_SIZE, + &kbuf_set->dma_addr, + GFP_KERNEL, 0); ++#else ++ kbuf_set->kaddr = ipu6_dma_alloc(to_ipu6_bus_device(dev), ++ IPU_PSYS_BUF_SET_MAX_SIZE, ++ &kbuf_set->dma_addr, ++ GFP_KERNEL, 0); + #endif + if (!kbuf_set->kaddr) { + kfree(kbuf_set); +@@ -1124,8 +1132,11 @@ out_free_buf_sets: + #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) + dma_free_attrs(&psys->adev->dev, + kbuf_set->size, kbuf_set->kaddr, +-#else ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + dma_free_attrs(dev, kbuf_set->size, kbuf_set->kaddr, ++#else ++ ipu6_dma_free(to_ipu6_bus_device(dev), ++ kbuf_set->size, kbuf_set->kaddr, + #endif + kbuf_set->dma_addr, 0); + list_del(&kbuf_set->list); +@@ -1229,8 +1240,11 @@ int ipu_psys_fh_deinit(struct ipu_psys_fh *fh) + #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) + dma_free_attrs(&psys->adev->dev, + kbuf_set->size, kbuf_set->kaddr, +-#else ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + dma_free_attrs(dev, kbuf_set->size, kbuf_set->kaddr, ++#else ++ ipu6_dma_free(to_ipu6_bus_device(dev), ++ kbuf_set->size, kbuf_set->kaddr, + #endif + kbuf_set->dma_addr, 0); + list_del(&kbuf_set->list); +-- +2.48.1 + diff --git a/anda/system/ipu6-drivers/dkms/0009-Add-ipu6-dma.h-to-0001-v6.10-IPU6-headers-used-by-PS.patch b/anda/system/ipu6-drivers/dkms/0009-Add-ipu6-dma.h-to-0001-v6.10-IPU6-headers-used-by-PS.patch new file mode 100644 index 0000000000..63b626a834 --- /dev/null +++ b/anda/system/ipu6-drivers/dkms/0009-Add-ipu6-dma.h-to-0001-v6.10-IPU6-headers-used-by-PS.patch @@ -0,0 +1,84 @@ +From 47a2e1cf89b789bbc10d3cb3b26b357404633114 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Sat, 1 Feb 2025 08:19:22 +0100 +Subject: [PATCH 9/9] Add ipu6-dma.h to + 0001-v6.10-IPU6-headers-used-by-PSYS.patch + +Add ipu6-dma.h to 0001-v6.10-IPU6-headers-used-by-PSYS.patch, +this is necessary for the DMA code adjustments in the psys code +which were done for the ipu6-bus DMA changes in kernels >= 6.12. + +Signed-off-by: Hans de Goede +--- + ...0001-v6.10-IPU6-headers-used-by-PSYS.patch | 55 +++++++++++++++++++ + 1 file changed, 55 insertions(+) + +diff --git a/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch b/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch +index 6a465a924..b8eeaae66 100644 +--- a/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch ++++ b/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch +@@ -1195,6 +1195,61 @@ index 000000000..92e3c3414 + + int pkg_dir_idx, void __iomem *base, u64 *pkg_dir, + + dma_addr_t pkg_dir_dma_addr); + +#endif /* IPU6_H */ ++diff --git a/drivers/media/pci/intel/ipu6/ipu6-dma.h b/drivers/media/pci/intel/ipu6/ipu6-dma.h ++new file mode 100644 ++index 000000000..b51244add ++--- /dev/null +++++ b/drivers/media/pci/intel/ipu6/ipu6-dma.h ++@@ -0,0 +1,49 @@ +++/* SPDX-License-Identifier: GPL-2.0-only */ +++/* Copyright (C) 2013--2024 Intel Corporation */ +++ +++#ifndef IPU6_DMA_H +++#define IPU6_DMA_H +++ +++#include +++#include +++#include +++#include +++#include +++#include +++ +++#include "ipu6-bus.h" +++ +++struct ipu6_mmu_info; +++ +++struct ipu6_dma_mapping { +++ struct ipu6_mmu_info *mmu_info; +++ struct iova_domain iovad; +++}; +++ +++void ipu6_dma_sync_single(struct ipu6_bus_device *sys, dma_addr_t dma_handle, +++ size_t size); +++void ipu6_dma_sync_sg(struct ipu6_bus_device *sys, struct scatterlist *sglist, +++ int nents); +++void ipu6_dma_sync_sgtable(struct ipu6_bus_device *sys, struct sg_table *sgt); +++void *ipu6_dma_alloc(struct ipu6_bus_device *sys, size_t size, +++ dma_addr_t *dma_handle, gfp_t gfp, +++ unsigned long attrs); +++void ipu6_dma_free(struct ipu6_bus_device *sys, size_t size, void *vaddr, +++ dma_addr_t dma_handle, unsigned long attrs); +++int ipu6_dma_mmap(struct ipu6_bus_device *sys, struct vm_area_struct *vma, +++ void *addr, dma_addr_t iova, size_t size, +++ unsigned long attrs); +++int ipu6_dma_map_sg(struct ipu6_bus_device *sys, struct scatterlist *sglist, +++ int nents, enum dma_data_direction dir, +++ unsigned long attrs); +++void ipu6_dma_unmap_sg(struct ipu6_bus_device *sys, struct scatterlist *sglist, +++ int nents, enum dma_data_direction dir, +++ unsigned long attrs); +++int ipu6_dma_map_sgtable(struct ipu6_bus_device *sys, struct sg_table *sgt, +++ enum dma_data_direction dir, unsigned long attrs); +++void ipu6_dma_unmap_sgtable(struct ipu6_bus_device *sys, struct sg_table *sgt, +++ enum dma_data_direction dir, unsigned long attrs); +++int ipu6_dma_get_sgtable(struct ipu6_bus_device *sys, struct sg_table *sgt, +++ void *cpu_addr, dma_addr_t handle, size_t size, +++ unsigned long attrs); +++#endif /* IPU6_DMA_H */ + -- + 2.43.0 + +-- +2.48.1 + diff --git a/anda/system/ipu6-drivers/dkms/0010-psys-Do-not-skipping-registering-ipu_psys_bus-for-ke.patch b/anda/system/ipu6-drivers/dkms/0010-psys-Do-not-skipping-registering-ipu_psys_bus-for-ke.patch new file mode 100644 index 0000000000..6ba5e4a65f --- /dev/null +++ b/anda/system/ipu6-drivers/dkms/0010-psys-Do-not-skipping-registering-ipu_psys_bus-for-ke.patch @@ -0,0 +1,202 @@ +From c1cb2a62cd9d949fda60f5993a72ec0c44f52719 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Wed, 5 Feb 2025 13:20:21 +0100 +Subject: [PATCH 10/11] psys: Do not skipping registering ipu_psys_bus for + kernels >= 6.10 + +The new auxbus code-paths were not registering the ipu_psys_bus used for +psys->dev.bus = &ipu_psys_bus, this was causing udev to not be able to +properly enumerate the device. For example running: + +udevadm test -a add /dev/ipu-psys0 + +would fail with the following error: + +"Failed to clone sd_device object: No such file or directory" + +This udev issue in turn was causing issues with udev rules to set +permissions on /dev/ipu-psys0 not working + +Fix this by: + +1. Rename ipu6_psys_bus to ipu_psys_bus, there is no need for separate +names for this struct with different kernels and having the same name +allows code sharing. + +2. Switching back from using module_auxiliary_driver() to using +module_init() / module_exit() codes for registering the drivers. + +3. Move the now always used ipu_psys_init() and ipu_psys_exit() +out of any ifdefs blocks, so that these functions now always +(un)register the chrdev region and the ipu_psys_bus. + +4. Remove the now duplicate chrdev region handling from the auxbus +ipu6_psys_probe() and ipu6_psys_remove() functions (now handled +by ipu_psys_init() and ipu_psys_exit()). + +Signed-off-by: Hans de Goede +--- + drivers/media/pci/intel/ipu6/psys/ipu-psys.c | 94 +++++++++----------- + 1 file changed, 40 insertions(+), 54 deletions(-) + +diff --git a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c +index 7c512e5ae..c06cd515a 100644 +--- a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c ++++ b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c +@@ -92,7 +92,7 @@ static struct bus_type ipu_psys_bus = { + .name = IPU_PSYS_NAME, + }; + #else +-static const struct bus_type ipu6_psys_bus = { ++static const struct bus_type ipu_psys_bus = { + .name = "intel-ipu6-psys", + }; + #endif +@@ -2331,17 +2331,9 @@ static int ipu6_psys_probe(struct auxiliary_device *auxdev, + + ipu_ver = adev->isp->hw_ver; + +- rval = alloc_chrdev_region(&ipu_psys_dev_t, 0, +- IPU_PSYS_NUM_DEVICES, IPU6_PSYS_NAME); +- if (rval) { +- dev_err(dev, "can't alloc psys chrdev region (%d)\n", +- rval); +- return rval; +- } +- + rval = ipu6_mmu_hw_init(adev->mmu); + if (rval) +- goto out_unregister_chr_region; ++ return rval; + + mutex_lock(&ipu_psys_mutex); + +@@ -2453,7 +2445,7 @@ static int ipu6_psys_probe(struct auxiliary_device *auxdev, + goto out_free_pgs; + } + +- psys->dev.bus = &ipu6_psys_bus; ++ psys->dev.bus = &ipu_psys_bus; + psys->dev.parent = dev; + psys->dev.devt = MKDEV(MAJOR(ipu_psys_dev_t), minor); + psys->dev.release = ipu_psys_dev_release; +@@ -2500,10 +2492,6 @@ out_unlock: + /* Safe to call even if the init is not called */ + mutex_unlock(&ipu_psys_mutex); + ipu6_mmu_hw_cleanup(adev->mmu); +- +-out_unregister_chr_region: +- unregister_chrdev_region(ipu_psys_dev_t, IPU_PSYS_NUM_DEVICES); +- + return rval; + } + #endif +@@ -2521,9 +2509,6 @@ static void ipu6_psys_remove(struct auxiliary_device *auxdev) + #endif + struct ipu_psys_pg *kpg, *kpg0; + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 10, 0) +- unregister_chrdev_region(ipu_psys_dev_t, IPU_PSYS_NUM_DEVICES); +-#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) + #ifdef CONFIG_DEBUG_FS + if (isp->ipu_dir) +@@ -2658,38 +2643,6 @@ static struct ipu_bus_driver ipu_psys_driver = { + }, + }; + +-static int __init ipu_psys_init(void) +-{ +- int rval = alloc_chrdev_region(&ipu_psys_dev_t, 0, +- IPU_PSYS_NUM_DEVICES, IPU_PSYS_NAME); +- if (rval) { +- pr_err("can't alloc psys chrdev region (%d)\n", rval); +- return rval; +- } +- +- rval = bus_register(&ipu_psys_bus); +- if (rval) { +- pr_warn("can't register psys bus (%d)\n", rval); +- goto out_bus_register; +- } +- +- ipu_bus_register_driver(&ipu_psys_driver); +- +- return rval; +- +-out_bus_register: +- unregister_chrdev_region(ipu_psys_dev_t, IPU_PSYS_NUM_DEVICES); +- +- return rval; +-} +- +-static void __exit ipu_psys_exit(void) +-{ +- ipu_bus_unregister_driver(&ipu_psys_driver); +- bus_unregister(&ipu_psys_bus); +- unregister_chrdev_region(ipu_psys_dev_t, IPU_PSYS_NUM_DEVICES); +-} +- + static const struct pci_device_id ipu_pci_tbl[] = { + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, IPU6_PCI_ID)}, + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, IPU6SE_PCI_ID)}, +@@ -2700,9 +2653,6 @@ static const struct pci_device_id ipu_pci_tbl[] = { + {0,} + }; + MODULE_DEVICE_TABLE(pci, ipu_pci_tbl); +- +-module_init(ipu_psys_init); +-module_exit(ipu_psys_exit); + #else + static const struct ipu6_auxdrv_data ipu6_psys_auxdrv_data = { + .isr_threaded = psys_isr_threaded, +@@ -2727,9 +2677,45 @@ static struct auxiliary_driver ipu6_psys_aux_driver = { + .pm = &psys_pm_ops, + }, + }; +-module_auxiliary_driver(ipu6_psys_aux_driver); + #endif + ++static int __init ipu_psys_init(void) ++{ ++ int rval = alloc_chrdev_region(&ipu_psys_dev_t, 0, ++ IPU_PSYS_NUM_DEVICES, ipu_psys_bus.name); ++ if (rval) { ++ pr_err("can't alloc psys chrdev region (%d)\n", rval); ++ return rval; ++ } ++ ++ rval = bus_register(&ipu_psys_bus); ++ if (rval) { ++ pr_err("can't register psys bus (%d)\n", rval); ++ unregister_chrdev_region(ipu_psys_dev_t, IPU_PSYS_NUM_DEVICES); ++ return rval; ++ } ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) ++ ipu_bus_register_driver(&ipu_psys_driver); ++#else ++ auxiliary_driver_register(&ipu6_psys_aux_driver); ++#endif ++ return 0; ++} ++module_init(ipu_psys_init); ++ ++static void __exit ipu_psys_exit(void) ++{ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) ++ ipu_bus_unregister_driver(&ipu_psys_driver); ++#else ++ auxiliary_driver_unregister(&ipu6_psys_aux_driver); ++#endif ++ bus_unregister(&ipu_psys_bus); ++ unregister_chrdev_region(ipu_psys_dev_t, IPU_PSYS_NUM_DEVICES); ++} ++module_exit(ipu_psys_exit); ++ + MODULE_AUTHOR("Antti Laakso "); + MODULE_AUTHOR("Bin Han "); + MODULE_AUTHOR("Renwei Wu "); +-- +2.48.1 + diff --git a/anda/system/ipu6-drivers/dkms/0010-usbio-Fix-GPIO-and-I2C-driver-modaliases.patch b/anda/system/ipu6-drivers/dkms/0010-usbio-Fix-GPIO-and-I2C-driver-modaliases.patch new file mode 100644 index 0000000000..f4b784f3bd --- /dev/null +++ b/anda/system/ipu6-drivers/dkms/0010-usbio-Fix-GPIO-and-I2C-driver-modaliases.patch @@ -0,0 +1,38 @@ +From d5f08986936a7fda0cce543c73fb8d9bab76eae2 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Wed, 15 Jan 2025 11:28:54 +0100 +Subject: [PATCH 10/12] usbio: Fix GPIO and I2C driver modaliases + +The created GPIO and I2C devices have modaliases of +"platform:usbio-gpio" and "platform:usbio-i2c" note "usbio" not "usb" +fix the aliases of the drivers so that these will properly auto load. + +Signed-off-by: Hans de Goede +--- + drivers/gpio/gpio-usbio.c | 2 +- + drivers/i2c/busses/i2c-usbio.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpio/gpio-usbio.c b/drivers/gpio/gpio-usbio.c +index 625558b..de9d5cb 100644 +--- a/drivers/gpio/gpio-usbio.c ++++ b/drivers/gpio/gpio-usbio.c +@@ -499,4 +499,4 @@ MODULE_AUTHOR("Israel Cepeda "); + MODULE_AUTHOR("Lifu Wang "); + MODULE_DESCRIPTION("Intel USBIO-GPIO driver"); + MODULE_LICENSE("GPL v2"); +-MODULE_ALIAS("platform:usb-gpio"); ++MODULE_ALIAS("platform:usbio-gpio"); +diff --git a/drivers/i2c/busses/i2c-usbio.c b/drivers/i2c/busses/i2c-usbio.c +index ef1f380..3b2c856 100644 +--- a/drivers/i2c/busses/i2c-usbio.c ++++ b/drivers/i2c/busses/i2c-usbio.c +@@ -437,4 +437,4 @@ MODULE_AUTHOR("Israel Cepeda "); + MODULE_AUTHOR("Lifu Wang "); + MODULE_DESCRIPTION("Intel USBIO-I2C driver"); + MODULE_LICENSE("GPL v2"); +-MODULE_ALIAS("platform:usb-i2c"); ++MODULE_ALIAS("platform:usbio-i2c"); +-- +2.47.1 + diff --git a/anda/system/ipu6-drivers/dkms/0011-psys-Use-cdev_device_add-for-dev-ipu-psys0.patch b/anda/system/ipu6-drivers/dkms/0011-psys-Use-cdev_device_add-for-dev-ipu-psys0.patch new file mode 100644 index 0000000000..e1c7d44bdc --- /dev/null +++ b/anda/system/ipu6-drivers/dkms/0011-psys-Use-cdev_device_add-for-dev-ipu-psys0.patch @@ -0,0 +1,130 @@ +From ce28836eb5ce74ae26a66a97949778bdb2cebc3c Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Tue, 4 Feb 2025 17:34:54 +0100 +Subject: [PATCH 11/11] psys: Use cdev_device_add() for /dev/ipu-psys0 + +Use cdev_device_add() for /dev/ipu-psys0 so that its kobj parents gets +set properly by calling cdev_set_parent(). + +"cdev_set_parent() sets a parent kobject which will be referenced + appropriately so the parent is not freed before the cdev. This + should be called before cdev_add." + +Signed-off-by: Hans de Goede +--- + drivers/media/pci/intel/ipu6/psys/ipu-psys.c | 45 ++++++++------------ + 1 file changed, 17 insertions(+), 28 deletions(-) + +diff --git a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c +index c06cd515a..62fcf0215 100644 +--- a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c ++++ b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c +@@ -2170,17 +2170,6 @@ static int ipu_psys_probe(struct ipu_bus_device *adev) + ipu_trace_init(adev->isp, psys->pdata->base, &adev->dev, + psys_trace_blocks); + +- cdev_init(&psys->cdev, &ipu_psys_fops); +- psys->cdev.owner = ipu_psys_fops.owner; +- +- rval = cdev_add(&psys->cdev, MKDEV(MAJOR(ipu_psys_dev_t), minor), 1); +- if (rval) { +- dev_err(&adev->dev, "cdev_add failed (%d)\n", rval); +- goto out_unlock; +- } +- +- set_bit(minor, ipu_psys_devices); +- + spin_lock_init(&psys->ready_lock); + spin_lock_init(&psys->pgs_lock); + psys->ready = 0; +@@ -2261,12 +2250,19 @@ static int ipu_psys_probe(struct ipu_bus_device *adev) + psys->dev.devt = MKDEV(MAJOR(ipu_psys_dev_t), minor); + psys->dev.release = ipu_psys_dev_release; + dev_set_name(&psys->dev, "ipu-psys%d", minor); +- rval = device_register(&psys->dev); ++ device_initialize(&psys->dev); ++ ++ cdev_init(&psys->cdev, &ipu_psys_fops); ++ psys->cdev.owner = ipu_psys_fops.owner; ++ ++ rval = cdev_device_add(&psys->cdev, &psys->dev); + if (rval < 0) { + dev_err(&psys->dev, "psys device_register failed\n"); + goto out_release_fw_com; + } + ++ set_bit(minor, ipu_psys_devices); ++ + /* Add the hw stepping information to caps */ + strscpy(psys->caps.dev_model, IPU_MEDIA_DEV_MODEL_NAME, + sizeof(psys->caps.dev_model)); +@@ -2298,7 +2294,6 @@ out_free_pgs: + ipu_psys_resource_pool_cleanup(&psys->resource_pool_running); + out_mutex_destroy: + mutex_destroy(&psys->mutex); +- cdev_del(&psys->cdev); + if (psys->sched_cmd_thread) { + kthread_stop(psys->sched_cmd_thread); + psys->sched_cmd_thread = NULL; +@@ -2359,17 +2354,6 @@ static int ipu6_psys_probe(struct auxiliary_device *auxdev, + + psys->power_gating = 0; + +- cdev_init(&psys->cdev, &ipu_psys_fops); +- psys->cdev.owner = ipu_psys_fops.owner; +- +- rval = cdev_add(&psys->cdev, MKDEV(MAJOR(ipu_psys_dev_t), minor), 1); +- if (rval) { +- dev_err(dev, "cdev_add failed (%d)\n", rval); +- goto out_unlock; +- } +- +- set_bit(minor, ipu_psys_devices); +- + spin_lock_init(&psys->ready_lock); + spin_lock_init(&psys->pgs_lock); + psys->ready = 0; +@@ -2450,12 +2434,19 @@ static int ipu6_psys_probe(struct auxiliary_device *auxdev, + psys->dev.devt = MKDEV(MAJOR(ipu_psys_dev_t), minor); + psys->dev.release = ipu_psys_dev_release; + dev_set_name(&psys->dev, "ipu-psys%d", minor); +- rval = device_register(&psys->dev); ++ device_initialize(&psys->dev); ++ ++ cdev_init(&psys->cdev, &ipu_psys_fops); ++ psys->cdev.owner = ipu_psys_fops.owner; ++ ++ rval = cdev_device_add(&psys->cdev, &psys->dev); + if (rval < 0) { + dev_err(dev, "psys device_register failed\n"); + goto out_release_fw_com; + } + ++ set_bit(minor, ipu_psys_devices); ++ + /* Add the hw stepping information to caps */ + strscpy(psys->caps.dev_model, IPU6_MEDIA_DEV_MODEL_NAME, + sizeof(psys->caps.dev_model)); +@@ -2483,7 +2474,6 @@ out_free_pgs: + ipu_psys_resource_pool_cleanup(&psys->resource_pool_running); + out_mutex_destroy: + mutex_destroy(&psys->mutex); +- cdev_del(&psys->cdev); + if (psys->sched_cmd_thread) { + kthread_stop(psys->sched_cmd_thread); + psys->sched_cmd_thread = NULL; +@@ -2552,10 +2542,9 @@ static void ipu6_psys_remove(struct auxiliary_device *auxdev) + + ipu_psys_resource_pool_cleanup(&psys->resource_pool_running); + +- device_unregister(&psys->dev); ++ cdev_device_del(&psys->cdev, &psys->dev); + + clear_bit(MINOR(psys->cdev.dev), ipu_psys_devices); +- cdev_del(&psys->cdev); + + mutex_unlock(&ipu_psys_mutex); + +-- +2.48.1 + diff --git a/anda/system/ipu6-drivers/dkms/0011-usbio-Fix-I2C-max-transfer-size.patch b/anda/system/ipu6-drivers/dkms/0011-usbio-Fix-I2C-max-transfer-size.patch new file mode 100644 index 0000000000..c922df2529 --- /dev/null +++ b/anda/system/ipu6-drivers/dkms/0011-usbio-Fix-I2C-max-transfer-size.patch @@ -0,0 +1,115 @@ +From 47b34a6f467eebb4e9fc59f5e25618fe760fbf33 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Wed, 29 Jan 2025 19:13:29 +0100 +Subject: [PATCH 11/12] usbio: Fix I2C max transfer size + +There are 2 issues with the I2C max transfer size in the i2c-usbio module: + +1. The code defines a usbio_i2c_quirks struct but does not set +i2c_adapter.quirks. This causes ov08x40_burst_fill_regs() to not split +i2c-transfers larger then USBIO_I2C_MAX_XFER_SIZE which causes them +to be rejected with -EINVAL. Fix this by setting i2c_adapter.quirks. + +2. Once 1. is fixed the following error messages show up in dmesg: + +Jan 28 18:31:04 x1 kernel: usbio-bridge 3-9:1.0: data not correct header->len:5 payload_len:3 +Jan 28 18:31:04 x1 kernel: usbio-bridge 3-9:1.0: data not correct header->len:5 payload_len:3 +... + +Every time ov08x40_burst_fill_regs() gets called. This is caused by +the usbio_transfer_internal() splitting-up the i2c-transfer into +multiple USB bulk packets to honor MAX_PACKET_SIZE. + +This splitting up seems to not work and the USBIO expander responds with +a 3 byte answer with flags set 0x0e which includes ERR_FLAG, it seems that +when ERR_FLAG is set only a 3 byte header is returned (no length field). + +Modify USBIO_I2C_MAX_XFER_SIZE to avoid the splitting of the i2c-transfer +over multiple USB bulk packets, since the USBIO chip seems to not like +the splitting. + +After this change to USBIO_I2C_MAX_XFER_SIZE the code to split transfers +in usbio_transfer_internal() is no longer necessary, remove it. + +Signed-off-by: Hans de Goede +--- + drivers/i2c/busses/i2c-usbio.c | 11 ++++++++++- + drivers/mfd/usbio.c | 33 ++------------------------------- + 2 files changed, 12 insertions(+), 32 deletions(-) + +diff --git a/drivers/i2c/busses/i2c-usbio.c b/drivers/i2c/busses/i2c-usbio.c +index 3b2c856..a6c5edc 100644 +--- a/drivers/i2c/busses/i2c-usbio.c ++++ b/drivers/i2c/busses/i2c-usbio.c +@@ -65,7 +65,15 @@ struct i2c_xfer { + u8 data[]; + } __packed; + +-#define USBIO_I2C_MAX_XFER_SIZE 256 ++//[WA]: Max USB packet size needs to be 63 ++//in order for fw download to work ++#define USBIO_MAX_PACKET_SIZE 63 ++#define USBIO_BULK_MSG_HDR_SIZE 5 ++ ++#define USBIO_I2C_MAX_XFER_SIZE \ ++ (USBIO_MAX_PACKET_SIZE - USBIO_BULK_MSG_HDR_SIZE - \ ++ sizeof(struct i2c_rw_packet)) ++ + #define USBIO_I2C_BUF_SIZE \ + (USBIO_I2C_MAX_XFER_SIZE + sizeof(struct i2c_rw_packet)) + +@@ -384,6 +392,7 @@ static int usbio_i2c_probe(struct platform_device *pdev) + usbio_i2c->adap.owner = THIS_MODULE; + usbio_i2c->adap.class = I2C_CLASS_HWMON; + usbio_i2c->adap.algo = &usbio_i2c_algo; ++ usbio_i2c->adap.quirks = &usbio_i2c_quirks; + usbio_i2c->adap.dev.parent = &pdev->dev; + + try_bind_acpi(pdev, usbio_i2c); +diff --git a/drivers/mfd/usbio.c b/drivers/mfd/usbio.c +index 8bc7600..51757df 100644 +--- a/drivers/mfd/usbio.c ++++ b/drivers/mfd/usbio.c +@@ -390,37 +390,8 @@ static int usbio_transfer_internal(struct platform_device *pdev, u8 cmd, + ret = usbio_control_xfer(stub, cmd, obuf, obuf_len, + ibuf, ibuf_len, wait_ack, USB_WRITE_ACK_TIMEOUT); + else if (stub->type == I2C_STUB) { +- if (cmd == I2C_WRITE) { +- u8 *i2cpkt = obuf; +- int wsize = 0; +- bool done = false; +- while (wsize < obuf_len) { +- int chunk; +- +- if ((obuf_len - wsize) <= MAX_PAYLOAD_BSIZE) { +- chunk = obuf_len - wsize; +- done = true; +- } else +- chunk = MAX_PAYLOAD_BSIZE; +- +- //[WA]: The I2C header in each chunk has to be updated +- //to the payload bytes being sent in that chunk for fw +- //download to work. +- struct i2c_rw_packet *i2cpkt_hdr = (struct i2c_rw_packet *)i2cpkt; +- i2cpkt_hdr->len = chunk - sizeof(struct i2c_rw_packet); +- +- ret = usbio_bulk_write(stub, cmd, i2cpkt, chunk, ibuf, ibuf_len, +- done, done? wait_ack : false, USB_WRITE_ACK_TIMEOUT); +- if (ret || done) +- break; +- +- wsize += chunk - sizeof(struct i2c_rw_packet); +- i2cpkt += chunk - sizeof(struct i2c_rw_packet); +- memcpy(i2cpkt, obuf, sizeof(struct i2c_rw_packet)); +- } +- } else +- ret = usbio_bulk_write(stub, cmd, obuf, obuf_len, +- ibuf, ibuf_len, true, wait_ack, USB_WRITE_ACK_TIMEOUT); ++ ret = usbio_bulk_write(stub, cmd, obuf, obuf_len, ++ ibuf, ibuf_len, true, wait_ack, USB_WRITE_ACK_TIMEOUT); + } + + return ret; +-- +2.47.1 + diff --git a/anda/system/ipu6-drivers/dkms/0012-usbio-Use-MAX_PAYLOAD_BSIZE-in-usbio_bulk_write.patch b/anda/system/ipu6-drivers/dkms/0012-usbio-Use-MAX_PAYLOAD_BSIZE-in-usbio_bulk_write.patch new file mode 100644 index 0000000000..07b8329497 --- /dev/null +++ b/anda/system/ipu6-drivers/dkms/0012-usbio-Use-MAX_PAYLOAD_BSIZE-in-usbio_bulk_write.patch @@ -0,0 +1,30 @@ +From 0eae85556558b410635ad03ed5eccb9648e11fce Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Wed, 29 Jan 2025 19:26:16 +0100 +Subject: [PATCH 12/12] usbio: Use MAX_PAYLOAD_BSIZE in usbio_bulk_write() + +usbio_bulk_write() uses a struct usbio_bmsg header rather than +a struct usbio_msg header. So its max payload length check must use +MAX_PAYLOAD_BSIZE instead of MAX_PAYLOAD_SIZE. + +Signed-off-by: Hans de Goede +--- + drivers/mfd/usbio.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/mfd/usbio.c b/drivers/mfd/usbio.c +index 51757df..ab5dae9 100644 +--- a/drivers/mfd/usbio.c ++++ b/drivers/mfd/usbio.c +@@ -303,7 +303,7 @@ static int usbio_bulk_write(struct usbio_stub *stub, u8 cmd, const void *obuf, + if (bridge->state == BRIDGE_STOPPED) + return -ENODEV; + +- if (obuf_len > MAX_PAYLOAD_SIZE) ++ if (obuf_len > MAX_PAYLOAD_BSIZE) + return -EINVAL; + + if (last_pkt) +-- +2.47.1 + diff --git a/anda/system/ipu6-drivers/dkms/0101-Fedora-local-mod-integrate-usbio-drivers-within-ipu6.patch b/anda/system/ipu6-drivers/dkms/0101-Fedora-local-mod-integrate-usbio-drivers-within-ipu6.patch new file mode 100644 index 0000000000..4b0cb49893 --- /dev/null +++ b/anda/system/ipu6-drivers/dkms/0101-Fedora-local-mod-integrate-usbio-drivers-within-ipu6.patch @@ -0,0 +1,38 @@ +From a6c5a0c329fd1582fc94b51ba9c6f1c21abc0084 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Thu, 30 Jan 2025 22:04:41 +0100 +Subject: [PATCH 8/8] Fedora local mod: integrate usbio-drivers within + ipu6-drivers Makefile + +Integrate usbio-drivers within ipu6-drivers Makefile. + +Signed-off-by: Hans de Goede +--- + Makefile | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/Makefile b/Makefile +index 7ae3be835..637382d6d 100644 +--- a/Makefile ++++ b/Makefile +@@ -114,6 +114,17 @@ ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_IVSC)),true) + ccflags-y += -I$(src)/backport-include/drivers/misc/mei/ + endif + ++# begin integrate usbio-drivers within ipu6-drivers Makefile ++obj-m += usbio.o ++usbio-y := drivers/mfd/usbio.o ++ ++obj-m += gpio-usbio.o ++gpio-usbio-y := drivers/gpio/gpio-usbio.o ++ ++obj-m += i2c-usbio.o ++i2c-usbio-y := drivers/i2c/busses/i2c-usbio.o ++# end integrate usbio-drivers within ipu6-drivers Makefile ++ + subdir-ccflags-y += -I$(src)/include/ \ + -DCONFIG_VIDEO_V4L2_SUBDEV_API + +-- +2.47.1 + diff --git a/anda/system/ipu6-drivers/dkms/anda.hcl b/anda/system/ipu6-drivers/dkms/anda.hcl new file mode 100644 index 0000000000..f189196e65 --- /dev/null +++ b/anda/system/ipu6-drivers/dkms/anda.hcl @@ -0,0 +1,10 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "dkms-intel-ipu6.spec" + } + labels { + mock = 1 + updbranch = 1 + } +} diff --git a/anda/system/ipu6-drivers/dkms/dkms-intel-ipu6.spec b/anda/system/ipu6-drivers/dkms/dkms-intel-ipu6.spec new file mode 100644 index 0000000000..f06840a9b3 --- /dev/null +++ b/anda/system/ipu6-drivers/dkms/dkms-intel-ipu6.spec @@ -0,0 +1,112 @@ +%global debug_package %{nil} +%global ipu6_commit 13c466ebdaaa0578e82bf3039b63eb0b3f472b72 +%global ipu6_commitdate 20250115 +%global ipu6_shortcommit %(c=%{ipu6_commit}; echo ${c:0:7}) +%global usbio_commit 450939ff5f8af733bc89c564603222a4d420acf3 +%global usbio_commitdate 20241210 +%global usbio_shortcommit %(c=%{usbio_commit}; echo ${c:0:7}) +%global commit_date 20250224 +%global modulename intel-ipu6 +# Actual "release" version, currently unused as the release versions are back and forth on if on if they use 1.0.0 or 1.0.1 +%global ver 1.0.1 + +Name: dkms-%{modulename} +Summary: DKMS module for %{modulename} +Version: 0^%{ipu6_commitdate}git.%{ipu6_shortcommit} +Release: 1%{?dist} +License: GPL-2.0-or-later +URL: https://github.com/intel/ipu6-drivers +Source0: https://github.com/intel/ipu6-drivers/archive/%{ipu6_commit}/ipu6-drivers-%{ipu6_shortcommit}.tar.gz +Source1: https://github.com/intel/usbio-drivers/archive/%{usbio_commit}/usbio-drivers-%{usbio_shortcommit}.tar.gz +Source2: no-weak-modules.conf +# Patches +# https://github.com/intel/ipu6-drivers/pull/322 +Patch1: 0001-Makefile-Switch-sensor-driver-symbols-from-CONFIG_VI.patch +Patch2: 0002-Makefile-Re-enable-gc5035-compilation-with-kernels-6.patch +Patch3: 0003-Makefile-Do-not-build-hi556-driver-with-kernels-6.10.patch +Patch4: 0004-Makefile-Do-not-build-ov01a10-driver-with-kernels-6..patch +# https://github.com/intel/ipu6-drivers/pull/321 +Patch5: 0005-media-ipu6-Fix-out-of-tree-builds.patch +Patch6: 0006-media-ipu6-Fix-building-with-kernel-6.13.patch +Patch7: 0007-Modify-0001-v6.10-IPU6-headers-used-by-PSYS.patch-fo.patch +# https://github.com/intel/ipu6-drivers/pull/324 +Patch8: 0008-ipu6-psys-Adjust-DMA-code-for-ipu6-bus-DMA-changes-i.patch +Patch9: 0009-Add-ipu6-dma.h-to-0001-v6.10-IPU6-headers-used-by-PS.patch +# https://github.com/intel/ipu6-drivers/pull/327 +Patch10: 0010-psys-Do-not-skipping-registering-ipu_psys_bus-for-ke.patch +Patch11: 0011-psys-Use-cdev_device_add-for-dev-ipu-psys0.patch +# https://github.com/intel/usbio-drivers/pull/33 +Patch20: 0010-usbio-Fix-GPIO-and-I2C-driver-modaliases.patch +# https://github.com/intel/usbio-drivers/pull/34 +Patch21: 0011-usbio-Fix-I2C-max-transfer-size.patch +Patch22: 0012-usbio-Use-MAX_PAYLOAD_BSIZE-in-usbio_bulk_write.patch +# Downstream/Fedora specific patches +Patch101: 0101-Fedora-local-mod-integrate-usbio-drivers-within-ipu6.patch +BuildRequires: elfutils-libelf-devel +BuildRequires: gcc +BuildRequires: systemd-rpm-macros +Requires: %{modulename}-kmod-common = %{?epoch:%{epoch}:}%{version} +Requires: dkms +BuildArch: noarch +Packager: Gilver E. + +%description +This package enables the Intel IPU6 image processor. + +%prep +%setup -q -c -a 1 +(cd ipu6-drivers-%{ipu6_commit} +%patch 1 -p1 +%patch 2 -p1 +%patch 3 -p1 +%patch 4 -p1 +%patch 5 -p1 +%patch 6 -p1 +%patch 7 -p1 +%patch 8 -p1 +%patch 9 -p1 +%patch 10 -p1 +%patch 11 -p1 +%patch 101 -p1 +patch -p1 < patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch +sed -i "s/^PACKAGE_VERSION=\".*\"$/PACKAGE_VERSION=\"%{version}\"/g" ./dkms.conf +) +(cd usbio-drivers-%{usbio_commit} +%patch 20 -p1 +%patch 21 -p1 +%patch 22 -p1 +) + +cp -Rp usbio-drivers-%{usbio_commit}/drivers ipu6-drivers-%{ipu6_commit}/ +cp -Rp usbio-drivers-%{usbio_commit}/include ipu6-drivers-%{ipu6_commit}/ + +%build + +%install +mkdir -p %{buildroot}%{_usrsrc}/%{modulename}-%{version} +cp -fr ipu6-drivers-%{ipu6_commit}/{drivers,include,patch,patches,Makefile,dkms.conf} %{buildroot}%{_usrsrc}/%{modulename}-%{version}/ + +%if 0%{?fedora} +# Do not enable weak modules support in Fedora (no kABI): +install -Dpm644 %{SOURCE2} %{buildroot}%{_sysconfdir}/dkms/%{modulename}.conf +%endif + +%post +dkms add -m %{modulename} -v %{version} -q --rpm_safe_upgrade || : +# Rebuild and make available for the currently running kernel: +dkms build -m %{modulename} -v %{version} -q || : +dkms install -m %{modulename} -v %{version} -q --force || : + +%preun +# Remove all versions from DKMS registry: +dkms remove -m %{modulename} -v %{version} -q --all --rpm_safe_upgrade || : + +%files +%{_usrsrc}/%{modulename}-%{version} +%if 0%{?fedora} +%{_sysconfdir}/dkms/%{modulename}.conf +%endif + +%changelog +* Thu Apr 24 2025 Gilver E. +- Initial package diff --git a/anda/system/ipu6-drivers/dkms/no-weak-modules.conf b/anda/system/ipu6-drivers/dkms/no-weak-modules.conf new file mode 100644 index 0000000000..24f6f95c96 --- /dev/null +++ b/anda/system/ipu6-drivers/dkms/no-weak-modules.conf @@ -0,0 +1 @@ +NO_WEAK_MODULES="yes" diff --git a/anda/system/ipu6-drivers/dkms/update.rhai b/anda/system/ipu6-drivers/dkms/update.rhai new file mode 100644 index 0000000000..b5fda8dfcb --- /dev/null +++ b/anda/system/ipu6-drivers/dkms/update.rhai @@ -0,0 +1,13 @@ +let c = sh("cat anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec | grep '%global ipu6_commit ' | sed -E 's/.+ipu6_commit //'", #{"stdout": "piped"}).ctx.stdout; +c.pop(); +rpm.global("ipu6_commit", c); +if rpm.changed() { + rpm.release(); + let d = sh("cat anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec | grep '%global ipu6_commitdate' | sed -E 's/.+ipu6_commitdate //'", #{"stdout": "piped"}).ctx.stdout; + d.pop(); + rpm.global("ipu6_commitdate", d); + let v = sh("cat anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; + v.pop(); + rpm.global("ver", v); +} + diff --git a/anda/system/ipu6-drivers/kmod-common/anda.hcl b/anda/system/ipu6-drivers/kmod-common/anda.hcl new file mode 100644 index 0000000000..fbb075574c --- /dev/null +++ b/anda/system/ipu6-drivers/kmod-common/anda.hcl @@ -0,0 +1,6 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "intel-ipu6-drivers.spec" + } +} diff --git a/anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec b/anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec new file mode 100644 index 0000000000..746978d122 --- /dev/null +++ b/anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec @@ -0,0 +1,47 @@ +%global debug_package %{nil} +%global ipu6_commit 13c466ebdaaa0578e82bf3039b63eb0b3f472b72 +%global ipu6_commitdate 20250115 +%global ipu6_shortcommit %(c=%{ipu6_commit}; echo ${c:0:7}) +%global usbio_commit 450939ff5f8af733bc89c564603222a4d420acf3 +%global usbio_commitdate 20241210 +%global usbio_shortcommit %(c=%{usbio_commit}; echo ${c:0:7}) +# Actual "release" version, currently unused as the release versions are back and forth on if on if they use 1.0.0 or 1.0.1 +# Use this if they ever stop doing that I guess +%global ver 1.0.1 + +Name: intel-ipu6-drivers +Summary: Common files for Intel IPU6 drivers +Version: 0^%{ipu6_commitdate}git.%{ipu6_shortcommit} +Release: 1%{?dist} +License: GPL-2.0-or-later +URL: https://github.com/intel/ipu6-drivers +Source0: https://github.com/intel/ipu6-drivers/archive/%{ipu6_commit}/ipu6-drivers-%{ipu6_shortcommit}.tar.gz +Source1: https://github.com/intel/usbio-drivers/archive/%{usbio_commit}/usbio-drivers-%{usbio_shortcommit}.tar.gz +Requires: ipu6-camera-bins +Requires: (intel-ipu6-kmod = %{?epoch:%{epoch}:}%{version} or dkms-intel-ipu6 = %{?epoch:%{epoch}:}%{version}) +Provides: intel-ipu6-kmod-common = %{?epoch:%{epoch}:}%{version}-%{release} +BuildArch: noarch +Packager: Gilver E. + +%description +Common files for the Intel IPU6 camera drivers. + +%prep +%setup -q -c -a 1 + +%build + +%install +install -Dpm644 usbio-drivers-%{usbio_commit}/LICENSE.txt -t %{buildroot}%{_defaultlicensedir}/%{name}/usbio-drivers/ +install -Dpm644 usbio-drivers-%{usbio_commit}/{CODE_OF_CONDUCT.md,README.md,SECURITY.md,security.md} -t %{buildroot}%{_defaultdocdir}/%{name}/usbio-drivers/ + +%files +%license ipu6-drivers-%{ipu6_commit}/LICENSE +%doc ipu6-drivers-%{ipu6_commit}/README.md +%doc ipu6-drivers-%{ipu6_commit}/SECURITY.md +%{_defaultdocdir}/%{name}/usbio-drivers +%{_defaultlicensedir}/%{name}/usbio-drivers + +%changelog +* Thu Apr 24 2025 Gilver E. +- Initial package diff --git a/anda/system/ipu6-drivers/kmod-common/update.rhai b/anda/system/ipu6-drivers/kmod-common/update.rhai new file mode 100644 index 0000000000..ec836da3f2 --- /dev/null +++ b/anda/system/ipu6-drivers/kmod-common/update.rhai @@ -0,0 +1,6 @@ +rpm.global("ipu6_commit", gh_commit("intel/ipu6-drivers")); +if rpm.changed() { + rpm.release(); + rpm.global("usbio_commit", gh_commit("intel/usbio-drivers")); + rpm.global("ipu6_commitdate", date()); +} From fe3b6c4c89caa2ccfeead57e9e3f9ee710414356 Mon Sep 17 00:00:00 2001 From: Gilver Date: Thu, 24 Apr 2025 06:01:13 -0500 Subject: [PATCH 0866/2977] fix(xone): Dropoff epoch and Conflicts/Obsoletes old versions (#4393) --- anda/system/xone/akmod/xone-kmod.spec | 9 ++++++++- anda/system/xone/dkms/dkms-xone.spec | 9 ++++++++- anda/system/xone/kmod-common/xone.spec | 14 ++++++++++---- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index b102d1b539..179a5e85ee 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -8,7 +8,10 @@ Name: %{modulename}-kmod Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 1%?dist +Release: 2%?dist +%if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 +Epoch: 1 +%endif Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories License: GPL-2.0-or-later URL: https://github.com/dlundqvist/xone @@ -19,6 +22,10 @@ Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} Requires: %{modulename}-akmod-modules = %{?epoch:%{epoch}:}%{version} Requires: akmods Conflicts: dkms-%{modulename} +%if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 +Conflicts: %{name} < %{?epoch:%{epoch}:}3.0^20250419git.c682b0c +Obsoletes: %{name} < %{?epoch:%{epoch}:}3.0^20250419git.c682b0c +%endif Packager: Gilver E. %{expand:%(kmodtool --target %{_target_cpu} --repo terra --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index ef3be6c570..bb087b2651 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -7,7 +7,10 @@ Name: dkms-%{modulename} Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 1%?dist +Release: 2%?dist +%if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 +Epoch: 1 +%endif Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories License: GPL-2.0-or-later URL: https://github.com/dlundqvist/xone @@ -18,6 +21,10 @@ BuildRequires: systemd-rpm-macros Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} Requires: dkms Conflicts: akmod-%{modulename} +%if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 +Conflicts: %{name} < %{?epoch:%{epoch}:}3.0^20250419git.c682b0c +Obsoletes: %{name} < %{?epoch:%{epoch}:}3.0^20250419git.c682b0c +%endif BuildArch: noarch Packager: Gilver E. diff --git a/anda/system/xone/kmod-common/xone.spec b/anda/system/xone/kmod-common/xone.spec index a42d60d041..fa154992f6 100644 --- a/anda/system/xone/kmod-common/xone.spec +++ b/anda/system/xone/kmod-common/xone.spec @@ -8,7 +8,10 @@ Name: xone Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 2%?dist +Release: 3%?dist +%if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 +Epoch: 1 +%endif Summary: Linux kernel driver for Xbox One and Xbox Series X|S accessories common files License: GPL-2.0-or-later URL: https://github.com/dlundqvist/xone @@ -23,13 +26,16 @@ BuildRequires: cabextract BuildRequires: sed BuildRequires: systemd-rpm-macros Requires: wireless-regdb -Requires: %{name}-firmware = %{version}-%{release} +Requires: %{name}-firmware = %{?epoch:%{epoch}:}%{version}-%{release} Requires: (akmod-%{name} = %{?epoch:%{epoch}:}%{version} or dkms-%{name} = %{?epoch:%{epoch}:}%{version}) Requires(post): dracut Provides: %{name}-kmod-common = %{?epoch:%{epoch}:}%{version} -Obsoletes: %{name}-kmod-common < %{?epoch:%{epoch}:}%{version}-2%{?dist} Conflicts: xow <= 0.5 Obsoletes: xow <= 0.5 +%if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 +Conflicts: %{name} < %{?epoch:%{epoch}:}0.3^20250419git.c682b0c +Obsoletes: %{name} < %{?epoch:%{epoch}:}0.3^20250419git.c682b0c +%endif BuildArch: noarch Packager: Gilver E. @@ -49,7 +55,7 @@ Summary: Firmware for the XBox One controller dongle License: Proprietary Requires: wireless-regdb %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 -Provides: %{name}-firmware = %{commitdate}.%{shortcommit}-%{release} +Obsoletes: %{name}-firmware < %{?epoch:%{epoch}:}0.3^20250419git.c682b0c %endif BuildArch: noarch From 052d0db0875855380068bcae585552578f11abcd Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 24 Apr 2025 11:16:08 +0000 Subject: [PATCH 0867/2977] bump: kmod-common --- .../ipu6-drivers/kmod-common/intel-ipu6-drivers.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec b/anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec index 746978d122..738a4a119c 100644 --- a/anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec +++ b/anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec @@ -1,8 +1,8 @@ %global debug_package %{nil} -%global ipu6_commit 13c466ebdaaa0578e82bf3039b63eb0b3f472b72 -%global ipu6_commitdate 20250115 +%global ipu6_commit c09e2198d801e1eb701984d2948373123ba92a56 +%global ipu6_commitdate 20250424 %global ipu6_shortcommit %(c=%{ipu6_commit}; echo ${c:0:7}) -%global usbio_commit 450939ff5f8af733bc89c564603222a4d420acf3 +%global usbio_commit 4fb690c6d15a81c492954636c2db396cb700a119 %global usbio_commitdate 20241210 %global usbio_shortcommit %(c=%{usbio_commit}; echo ${c:0:7}) # Actual "release" version, currently unused as the release versions are back and forth on if on if they use 1.0.0 or 1.0.1 @@ -12,7 +12,7 @@ Name: intel-ipu6-drivers Summary: Common files for Intel IPU6 drivers Version: 0^%{ipu6_commitdate}git.%{ipu6_shortcommit} -Release: 1%{?dist} +Release: 1%?dist License: GPL-2.0-or-later URL: https://github.com/intel/ipu6-drivers Source0: https://github.com/intel/ipu6-drivers/archive/%{ipu6_commit}/ipu6-drivers-%{ipu6_shortcommit}.tar.gz From 9cb04cc0d141fa9462c73bf40b69fda8e6fa4a3d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 24 Apr 2025 11:35:55 +0000 Subject: [PATCH 0868/2977] bump(branch): akmod dkms --- anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec | 6 +++--- anda/system/ipu6-drivers/dkms/dkms-intel-ipu6.spec | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec b/anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec index 200d8b5d0e..181485e2b5 100644 --- a/anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec +++ b/anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec @@ -2,8 +2,8 @@ %global buildforkernels akmod %global debug_package %{nil} %endif -%global ipu6_commit 13c466ebdaaa0578e82bf3039b63eb0b3f472b72 -%global ipu6_commitdate 20250115 +%global ipu6_commit c09e2198d801e1eb701984d2948373123ba92a56 +%global ipu6_commitdate 20250424 %global ipu6_shortcommit %(c=%{ipu6_commit}; echo ${c:0:7}) %global usbio_commit 450939ff5f8af733bc89c564603222a4d420acf3 %global usbio_commitdate 20241210 @@ -15,7 +15,7 @@ Name: %{modulename}-kmod Summary: Akmods module for %{modulename} Version: 0^%{ipu6_commitdate}git.%{ipu6_shortcommit} -Release: 2%{?dist} +Release: 1%?dist License: GPL-2.0-or-later URL: https://github.com/intel/ipu6-drivers Source0: https://github.com/intel/ipu6-drivers/archive/%{ipu6_commit}/ipu6-drivers-%{ipu6_shortcommit}.tar.gz diff --git a/anda/system/ipu6-drivers/dkms/dkms-intel-ipu6.spec b/anda/system/ipu6-drivers/dkms/dkms-intel-ipu6.spec index f06840a9b3..82bcc5d401 100644 --- a/anda/system/ipu6-drivers/dkms/dkms-intel-ipu6.spec +++ b/anda/system/ipu6-drivers/dkms/dkms-intel-ipu6.spec @@ -1,6 +1,6 @@ %global debug_package %{nil} -%global ipu6_commit 13c466ebdaaa0578e82bf3039b63eb0b3f472b72 -%global ipu6_commitdate 20250115 +%global ipu6_commit c09e2198d801e1eb701984d2948373123ba92a56 +%global ipu6_commitdate 20250424 %global ipu6_shortcommit %(c=%{ipu6_commit}; echo ${c:0:7}) %global usbio_commit 450939ff5f8af733bc89c564603222a4d420acf3 %global usbio_commitdate 20241210 @@ -13,7 +13,7 @@ Name: dkms-%{modulename} Summary: DKMS module for %{modulename} Version: 0^%{ipu6_commitdate}git.%{ipu6_shortcommit} -Release: 1%{?dist} +Release: 1%?dist License: GPL-2.0-or-later URL: https://github.com/intel/ipu6-drivers Source0: https://github.com/intel/ipu6-drivers/archive/%{ipu6_commit}/ipu6-drivers-%{ipu6_shortcommit}.tar.gz From c9a8e7b0628b78ab4ffa6b9bf529173323effb55 Mon Sep 17 00:00:00 2001 From: Gilver Date: Thu, 24 Apr 2025 06:37:31 -0500 Subject: [PATCH 0869/2977] refactor: Nightly (#4404) Signed-off-by: Gilver --- anda/system/ipu6-drivers/kmod-common/anda.hcl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/anda/system/ipu6-drivers/kmod-common/anda.hcl b/anda/system/ipu6-drivers/kmod-common/anda.hcl index fbb075574c..27781c612f 100644 --- a/anda/system/ipu6-drivers/kmod-common/anda.hcl +++ b/anda/system/ipu6-drivers/kmod-common/anda.hcl @@ -3,4 +3,7 @@ project pkg { rpm { spec = "intel-ipu6-drivers.spec" } + labels { + nightly = 1 + } } From 6bc392e2eeb8f92db7fa5457a223fe9cec53791c Mon Sep 17 00:00:00 2001 From: Gilver Date: Thu, 24 Apr 2025 06:39:20 -0500 Subject: [PATCH 0870/2977] fix(nvidia*): Update and fix various spec parts (#4396) * fix(nvidia*): Update and fix various spec parts * Negativo what the heck was that Signed-off-by: Gilver * ? * Blegh * WTF * ???? --------- Signed-off-by: Gilver --- .../nvidia/dkms-nvidia/dkms-nvidia.spec | 8 +- .../dkms-nvidia/nvidia-kernel-ccflags-y.patch | 234 ++++++++++++++++++ anda/system/nvidia/kmod-nvidia/anda.hcl | 9 + .../kmod-nvidia/kmod-nvidia-ldflags.patch | 37 +++ .../kmod-nvidia-no-hostname-whoami.patch | 27 ++ .../nvidia/kmod-nvidia/kmod-nvidia.spec | 98 ++++++++ .../kmod-nvidia/nvidia-kernel-ccflags-y.patch | 117 +++++++++ anda/system/nvidia/kmod-nvidia/update.rhai | 1 + .../nvidia/nvidia-driver/nvidia-driver.spec | 71 +++--- .../nvidia/nvidia-kmod-common/99-nvidia.conf | 3 - .../nvidia-kmod-common/nvidia-boot-update | 186 -------------- .../nvidia-kmod-common.spec | 32 +-- .../nvidia-kmod/nvidia-kernel-ccflags-y.patch | 234 ++++++++++++++++++ .../nvidia/nvidia-kmod/nvidia-kmod.spec | 8 +- 14 files changed, 810 insertions(+), 255 deletions(-) create mode 100644 anda/system/nvidia/dkms-nvidia/nvidia-kernel-ccflags-y.patch create mode 100644 anda/system/nvidia/kmod-nvidia/anda.hcl create mode 100644 anda/system/nvidia/kmod-nvidia/kmod-nvidia-ldflags.patch create mode 100644 anda/system/nvidia/kmod-nvidia/kmod-nvidia-no-hostname-whoami.patch create mode 100644 anda/system/nvidia/kmod-nvidia/kmod-nvidia.spec create mode 100644 anda/system/nvidia/kmod-nvidia/nvidia-kernel-ccflags-y.patch create mode 100644 anda/system/nvidia/kmod-nvidia/update.rhai delete mode 100644 anda/system/nvidia/nvidia-kmod-common/99-nvidia.conf delete mode 100755 anda/system/nvidia/nvidia-kmod-common/nvidia-boot-update create mode 100644 anda/system/nvidia/nvidia-kmod/nvidia-kernel-ccflags-y.patch diff --git a/anda/system/nvidia/dkms-nvidia/dkms-nvidia.spec b/anda/system/nvidia/dkms-nvidia/dkms-nvidia.spec index 17a866c2a7..2921ca287f 100644 --- a/anda/system/nvidia/dkms-nvidia/dkms-nvidia.spec +++ b/anda/system/nvidia/dkms-nvidia/dkms-nvidia.spec @@ -5,13 +5,14 @@ Name: dkms-%{modulename} Version: 575.51.02 -Release: 1%?dist +Release: 2%?dist Summary: NVIDIA display driver kernel module Epoch: 3 License: NVIDIA License URL: https://www.nvidia.com/object/unix.html Source0: https://download.nvidia.com/XFree86/Linux-%{_arch}/%{version}/NVIDIA-Linux-%{_arch}-%{version}.run Source1: %{name}.conf +Patch0: nvidia-kernel-ccflags-y.patch BuildRequires: sed Provides: %{modulename}-kmod = %{?epoch:%{epoch}:}%{version} Requires: %{modulename}-kmod-common = %{?epoch:%{epoch}:}%{version} @@ -26,6 +27,7 @@ This package provides the proprietary NVIDIA kernel driver modules. %prep sh %{SOURCE0} -x --target dkms-nvidia-%{version}-%{_arch} %setup -T -D -n dkms-nvidia-%{version}-%{_arch} +%autopatch -p1 cp -f %{SOURCE1} dkms.conf @@ -43,10 +45,14 @@ dkms add -m %{modulename} -v %{version} -q --rpm_safe_upgrade || : # Rebuild and make available for the currently running kernel: dkms build -m %{modulename} -v %{version} -q || : dkms install -m %{modulename} -v %{version} -q --force || : +dracut --regenerate-all --force --quiet %preun # Remove all versions from DKMS registry: dkms remove -m %{modulename} -v %{version} -q --all --rpm_safe_upgrade || : +if [ "$1" == 0 ]; then + dracut --regenerate-all --force --quiet +fi %files %{_usrsrc}/%{modulename}-%{version} diff --git a/anda/system/nvidia/dkms-nvidia/nvidia-kernel-ccflags-y.patch b/anda/system/nvidia/dkms-nvidia/nvidia-kernel-ccflags-y.patch new file mode 100644 index 0000000000..1792b26793 --- /dev/null +++ b/anda/system/nvidia/dkms-nvidia/nvidia-kernel-ccflags-y.patch @@ -0,0 +1,234 @@ +diff -Naur nvidia-kmod-575.51.02-x86_64.old/kernel/Kbuild nvidia-kmod-575.51.02-x86_64/kernel/Kbuild +--- nvidia-kmod-575.51.02-x86_64.old/kernel/Kbuild 2025-04-22 18:54:37.758155663 +0200 ++++ nvidia-kmod-575.51.02-x86_64/kernel/Kbuild 2025-04-22 18:54:45.069483044 +0200 +@@ -75,21 +75,15 @@ + $(eval include $(src)/$(_module)/$(_module).Kbuild)) + + +-# +-# Define CFLAGS that apply to all the NVIDIA kernel modules. EXTRA_CFLAGS +-# is deprecated since 2.6.24 in favor of ccflags-y, but we need to support +-# older kernels which do not have ccflags-y. Newer kernels append +-# $(EXTRA_CFLAGS) to ccflags-y for compatibility. +-# +- +-EXTRA_CFLAGS += -I$(src)/common/inc +-EXTRA_CFLAGS += -I$(src) +-EXTRA_CFLAGS += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-format-extra-args +-EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DNVRM +-EXTRA_CFLAGS += -DNV_VERSION_STRING=\"575.51.02\" ++ccflags-y += -std=gnu17 ++ccflags-y += -I$(src)/common/inc ++ccflags-y += -I$(src) ++ccflags-y += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-format-extra-args ++ccflags-y += -D__KERNEL__ -DMODULE -DNVRM ++ccflags-y += -DNV_VERSION_STRING=\"575.51.02\" + + ifneq ($(SYSSRCHOST1X),) +- EXTRA_CFLAGS += -I$(SYSSRCHOST1X) ++ ccflags-y += -I$(SYSSRCHOST1X) + endif + + # Some Android kernels prohibit driver use of filesystem functions like +@@ -99,57 +93,57 @@ + PLATFORM_IS_ANDROID ?= 0 + + ifeq ($(PLATFORM_IS_ANDROID),1) +- EXTRA_CFLAGS += -DNV_FILESYSTEM_ACCESS_AVAILABLE=0 ++ ccflags-y += -DNV_FILESYSTEM_ACCESS_AVAILABLE=0 + else +- EXTRA_CFLAGS += -DNV_FILESYSTEM_ACCESS_AVAILABLE=1 ++ ccflags-y += -DNV_FILESYSTEM_ACCESS_AVAILABLE=1 + endif + +-EXTRA_CFLAGS += -Wno-unused-function ++ccflags-y += -Wno-unused-function + + ifneq ($(NV_BUILD_TYPE),debug) +- EXTRA_CFLAGS += -Wuninitialized ++ ccflags-y += -Wuninitialized + endif + +-EXTRA_CFLAGS += -fno-strict-aliasing ++ccflags-y += -fno-strict-aliasing + + ifeq ($(ARCH),arm64) +- EXTRA_CFLAGS += -mstrict-align ++ ccflags-y += -mstrict-align + endif + + ifeq ($(NV_BUILD_TYPE),debug) +- EXTRA_CFLAGS += -g ++ ccflags-y += -g + endif + +-EXTRA_CFLAGS += -ffreestanding ++ccflags-y += -ffreestanding + + ifeq ($(ARCH),arm64) +- EXTRA_CFLAGS += -mgeneral-regs-only -march=armv8-a +- EXTRA_CFLAGS += $(call cc-option,-mno-outline-atomics,) ++ ccflags-y += -mgeneral-regs-only -march=armv8-a ++ ccflags-y += $(call cc-option,-mno-outline-atomics,) + endif + + ifeq ($(ARCH),x86_64) +- EXTRA_CFLAGS += -mno-red-zone -mcmodel=kernel ++ ccflags-y += -mno-red-zone -mcmodel=kernel + endif + + ifeq ($(ARCH),powerpc) +- EXTRA_CFLAGS += -mlittle-endian -mno-strict-align ++ ccflags-y += -mlittle-endian -mno-strict-align + endif + +-EXTRA_CFLAGS += -DNV_UVM_ENABLE +-EXTRA_CFLAGS += $(call cc-option,-Werror=undef,) +-EXTRA_CFLAGS += -DNV_SPECTRE_V2=$(NV_SPECTRE_V2) +-EXTRA_CFLAGS += -DNV_KERNEL_INTERFACE_LAYER ++ccflags-y += -DNV_UVM_ENABLE ++ccflags-y += $(call cc-option,-Werror=undef,) ++ccflags-y += -DNV_SPECTRE_V2=$(NV_SPECTRE_V2) ++ccflags-y += -DNV_KERNEL_INTERFACE_LAYER + + # + # Detect SGI UV systems and apply system-specific optimizations. + # + + ifneq ($(wildcard /proc/sgi_uv),) +- EXTRA_CFLAGS += -DNV_CONFIG_X86_UV ++ ccflags-y += -DNV_CONFIG_X86_UV + endif + + ifdef VGX_FORCE_VFIO_PCI_CORE +- EXTRA_CFLAGS += -DNV_VGPU_FORCE_VFIO_PCI_CORE ++ ccflags-y += -DNV_VGPU_FORCE_VFIO_PCI_CORE + endif + + WARNINGS_AS_ERRORS ?= +@@ -183,7 +177,7 @@ + + NV_CFLAGS_FROM_CONFTEST := $(shell $(NV_CONFTEST_CMD) build_cflags) + +-NV_CONFTEST_CFLAGS = $(NV_CFLAGS_FROM_CONFTEST) $(EXTRA_CFLAGS) -fno-pie ++NV_CONFTEST_CFLAGS = $(NV_CFLAGS_FROM_CONFTEST) $(ccflags-y) -fno-pie + NV_CONFTEST_CFLAGS += $(call cc-disable-warning,pointer-sign) + NV_CONFTEST_CFLAGS += $(call cc-option,-fshort-wchar,) + NV_CONFTEST_CFLAGS += $(call cc-option,-Werror=incompatible-pointer-types,) +diff -Naur nvidia-kmod-575.51.02-x86_64.old/kernel-open/Kbuild nvidia-kmod-575.51.02-x86_64/kernel-open/Kbuild +--- nvidia-kmod-575.51.02-x86_64.old/kernel-open/Kbuild 2025-04-22 18:54:37.828156191 +0200 ++++ nvidia-kmod-575.51.02-x86_64/kernel-open/Kbuild 2025-04-22 18:54:45.069786396 +0200 +@@ -75,21 +75,15 @@ + $(eval include $(src)/$(_module)/$(_module).Kbuild)) + + +-# +-# Define CFLAGS that apply to all the NVIDIA kernel modules. EXTRA_CFLAGS +-# is deprecated since 2.6.24 in favor of ccflags-y, but we need to support +-# older kernels which do not have ccflags-y. Newer kernels append +-# $(EXTRA_CFLAGS) to ccflags-y for compatibility. +-# +- +-EXTRA_CFLAGS += -I$(src)/common/inc +-EXTRA_CFLAGS += -I$(src) +-EXTRA_CFLAGS += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-format-extra-args +-EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DNVRM +-EXTRA_CFLAGS += -DNV_VERSION_STRING=\"575.51.02\" ++ccflags-y += -std=gnu17 ++ccflags-y += -I$(src)/common/inc ++ccflags-y += -I$(src) ++ccflags-y += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-format-extra-args ++ccflags-y += -D__KERNEL__ -DMODULE -DNVRM ++ccflags-y += -DNV_VERSION_STRING=\"575.51.02\" + + ifneq ($(SYSSRCHOST1X),) +- EXTRA_CFLAGS += -I$(SYSSRCHOST1X) ++ ccflags-y += -I$(SYSSRCHOST1X) + endif + + # Some Android kernels prohibit driver use of filesystem functions like +@@ -99,57 +93,57 @@ + PLATFORM_IS_ANDROID ?= 0 + + ifeq ($(PLATFORM_IS_ANDROID),1) +- EXTRA_CFLAGS += -DNV_FILESYSTEM_ACCESS_AVAILABLE=0 ++ ccflags-y += -DNV_FILESYSTEM_ACCESS_AVAILABLE=0 + else +- EXTRA_CFLAGS += -DNV_FILESYSTEM_ACCESS_AVAILABLE=1 ++ ccflags-y += -DNV_FILESYSTEM_ACCESS_AVAILABLE=1 + endif + +-EXTRA_CFLAGS += -Wno-unused-function ++ccflags-y += -Wno-unused-function + + ifneq ($(NV_BUILD_TYPE),debug) +- EXTRA_CFLAGS += -Wuninitialized ++ ccflags-y += -Wuninitialized + endif + +-EXTRA_CFLAGS += -fno-strict-aliasing ++ccflags-y += -fno-strict-aliasing + + ifeq ($(ARCH),arm64) +- EXTRA_CFLAGS += -mstrict-align ++ ccflags-y += -mstrict-align + endif + + ifeq ($(NV_BUILD_TYPE),debug) +- EXTRA_CFLAGS += -g ++ ccflags-y += -g + endif + +-EXTRA_CFLAGS += -ffreestanding ++ccflags-y += -ffreestanding + + ifeq ($(ARCH),arm64) +- EXTRA_CFLAGS += -mgeneral-regs-only -march=armv8-a +- EXTRA_CFLAGS += $(call cc-option,-mno-outline-atomics,) ++ ccflags-y += -mgeneral-regs-only -march=armv8-a ++ ccflags-y += $(call cc-option,-mno-outline-atomics,) + endif + + ifeq ($(ARCH),x86_64) +- EXTRA_CFLAGS += -mno-red-zone -mcmodel=kernel ++ ccflags-y += -mno-red-zone -mcmodel=kernel + endif + + ifeq ($(ARCH),powerpc) +- EXTRA_CFLAGS += -mlittle-endian -mno-strict-align ++ ccflags-y += -mlittle-endian -mno-strict-align + endif + +-EXTRA_CFLAGS += -DNV_UVM_ENABLE +-EXTRA_CFLAGS += $(call cc-option,-Werror=undef,) +-EXTRA_CFLAGS += -DNV_SPECTRE_V2=$(NV_SPECTRE_V2) +-EXTRA_CFLAGS += -DNV_KERNEL_INTERFACE_LAYER ++ccflags-y += -DNV_UVM_ENABLE ++ccflags-y += $(call cc-option,-Werror=undef,) ++ccflags-y += -DNV_SPECTRE_V2=$(NV_SPECTRE_V2) ++ccflags-y += -DNV_KERNEL_INTERFACE_LAYER + + # + # Detect SGI UV systems and apply system-specific optimizations. + # + + ifneq ($(wildcard /proc/sgi_uv),) +- EXTRA_CFLAGS += -DNV_CONFIG_X86_UV ++ ccflags-y += -DNV_CONFIG_X86_UV + endif + + ifdef VGX_FORCE_VFIO_PCI_CORE +- EXTRA_CFLAGS += -DNV_VGPU_FORCE_VFIO_PCI_CORE ++ ccflags-y += -DNV_VGPU_FORCE_VFIO_PCI_CORE + endif + + WARNINGS_AS_ERRORS ?= +@@ -183,7 +177,7 @@ + + NV_CFLAGS_FROM_CONFTEST := $(shell $(NV_CONFTEST_CMD) build_cflags) + +-NV_CONFTEST_CFLAGS = $(NV_CFLAGS_FROM_CONFTEST) $(EXTRA_CFLAGS) -fno-pie ++NV_CONFTEST_CFLAGS = $(NV_CFLAGS_FROM_CONFTEST) $(ccflags-y) -fno-pie + NV_CONFTEST_CFLAGS += $(call cc-disable-warning,pointer-sign) + NV_CONFTEST_CFLAGS += $(call cc-option,-fshort-wchar,) + NV_CONFTEST_CFLAGS += $(call cc-option,-Werror=incompatible-pointer-types,) diff --git a/anda/system/nvidia/kmod-nvidia/anda.hcl b/anda/system/nvidia/kmod-nvidia/anda.hcl new file mode 100644 index 0000000000..3aa67f1119 --- /dev/null +++ b/anda/system/nvidia/kmod-nvidia/anda.hcl @@ -0,0 +1,9 @@ +project pkg { + rpm { + spec = "kmod-nvidia.spec" + } + labels { + subrepo = "nvidia" + mock = 1 + } +} diff --git a/anda/system/nvidia/kmod-nvidia/kmod-nvidia-ldflags.patch b/anda/system/nvidia/kmod-nvidia/kmod-nvidia-ldflags.patch new file mode 100644 index 0000000000..7c6358c2a9 --- /dev/null +++ b/anda/system/nvidia/kmod-nvidia/kmod-nvidia-ldflags.patch @@ -0,0 +1,37 @@ +From 38b7e1478b58b983724ec817562301edd5c244a2 Mon Sep 17 00:00:00 2001 +From: Neal Gompa +Date: Mon, 7 Apr 2025 19:34:49 -0400 +Subject: [PATCH] src/nvidia/Makefile: Drop broken addition of userspace linker + flags + +The Makefile currently causes the package build of the kernel modules +to fail with the following error: + +ld: unrecognized option '-Wl,-z,relro' +ld: use the --help option for usage information +make[1]: *** [Makefile:214: _out/Linux_x86_64/nv-kernel.o] Error 1 +make: *** [Makefile:34: src/nvidia/_out/Linux_x86_64/nv-kernel.o] Error 2 + +Dropping this line fixes this issue. + +Signed-off-by: Neal Gompa +--- + src/nvidia/Makefile | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/nvidia/Makefile b/src/nvidia/Makefile +index 931a74c0..423414af 100644 +--- a/src/nvidia/Makefile ++++ b/src/nvidia/Makefile +@@ -208,8 +208,6 @@ all: $(NV_KERNEL_O) + + LINKER_SCRIPT = nv-kernel.ld + +-NV_KERNEL_O_LDFLAGS += $(LDFLAGS) +- + $(NV_KERNEL_O): $(OBJS) $(EXPORTS_LINK_COMMAND) $(LINKER_SCRIPT) + $(call quiet_cmd,LD) \ + $(NV_KERNEL_O_LDFLAGS) \ +-- +2.48.1 + diff --git a/anda/system/nvidia/kmod-nvidia/kmod-nvidia-no-hostname-whoami.patch b/anda/system/nvidia/kmod-nvidia/kmod-nvidia-no-hostname-whoami.patch new file mode 100644 index 0000000000..59038ca030 --- /dev/null +++ b/anda/system/nvidia/kmod-nvidia/kmod-nvidia-no-hostname-whoami.patch @@ -0,0 +1,27 @@ +diff -Naur open-gpu-kernel-modules-570.133.07.old/utils.mk open-gpu-kernel-modules-570.133.07/utils.mk +--- open-gpu-kernel-modules-570.133.07.old/utils.mk 2025-04-12 15:13:09.368747667 +0200 ++++ open-gpu-kernel-modules-570.133.07/utils.mk 2025-04-12 15:14:11.297683469 +0200 +@@ -114,14 +114,8 @@ + CHMOD ?= chmod + OBJCOPY ?= objcopy + XZ ?= xz +-WHOAMI ?= whoami + PKG_CONFIG ?= pkg-config + +-ifndef HOSTNAME +- HOSTNAME = $(shell hostname) +-endif +- +- + NV_AUTO_DEPEND ?= 1 + NV_VERBOSE ?= 0 + +@@ -551,7 +545,7 @@ + # g_nvid_string.c depends on all objects except g_nvid_string.o, and version.mk + $(NVIDSTRING): $$(filter-out $$(call BUILD_OBJECT_LIST,$$(NVIDSTRING)), $(3)) $$(VERSION_MK) + $(at_if_quiet)$$(MKDIR) $$(dir $$@) +- $(at_if_quiet)$$(ECHO) "const char $(1)[] = \"nvidia id: NVIDIA $$(strip $(2)) for $$(TARGET_ARCH) $$(NVIDIA_VERSION) $$(NVIDSTRING_BUILD_TYPE_STRING) (`$$(WHOAMI)`@$$(HOSTNAME)) `$$(DATE)`\";" > $$@ ++ $(at_if_quiet)$$(ECHO) "const char $(1)[] = \"nvidia id: NVIDIA $$(strip $(2)) for $$(TARGET_ARCH) $$(NVIDIA_VERSION) $$(NVIDSTRING_BUILD_TYPE_STRING) `$$(DATE)`\";" > $$@ + $(at_if_quiet)$$(ECHO) "const char *const p$$(strip $(1)) = $(1) + 11;" >> $$@; + endef + diff --git a/anda/system/nvidia/kmod-nvidia/kmod-nvidia.spec b/anda/system/nvidia/kmod-nvidia/kmod-nvidia.spec new file mode 100644 index 0000000000..f6815a441f --- /dev/null +++ b/anda/system/nvidia/kmod-nvidia/kmod-nvidia.spec @@ -0,0 +1,98 @@ +%global kmod_name nvidia + +%global debug_package %{nil} + +# Generate kernel symbols requirements: +%global _use_internal_dependency_generator 0 + +%{!?kversion: %global kversion %(uname -r)} + +Name: kmod-%{kmod_name} +Version: 575.51.02 +Release: 1%{?dist} +Summary: NVIDIA display driver kernel module +Epoch: 3 +License: NVIDIA License +URL: http://www.nvidia.com/ +ExclusiveArch: x86_64 aarch64 + +Source0: https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/%{version}.tar.gz +# Kbuild: Convert EXTRA_CFLAGS to ccflags-y (6.15+) + std=gnu17 +Patch0: nvidia-kernel-ccflags-y.patch +# https://git.almalinux.org/ngompa/nvidia-kmod-el-rpm/ +Patch1: %{name}-ldflags.patch +Patch2: %{name}-no-hostname-whoami.patch + +BuildRequires: elfutils-libelf-devel +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: kernel-abi-stablelists +BuildRequires: kernel-devel +BuildRequires: kernel-rpm-macros +BuildRequires: kmod +BuildRequires: redhat-rpm-config + +Provides: kabi-modules = %{kversion} +Provides: %{kmod_name}-kmod = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: module-init-tools + +%description +This package provides the proprietary NVIDIA kernel modules. It is built to +depend upon the specific ABI provided by a range of releases of the same variant +of the Linux kernel and not on any one specific build. + +%prep +%autosetup -p1 -n open-gpu-kernel-modules-%{version} + +echo "override %{kmod_name} * weak-updates/%{kmod_name}" > kmod-%{kmod_name}.conf + +%build +export SYSSRC=%{_usrsrc}/kernels/%{kversion} +export IGNORE_XEN_PRESENCE=1 +export IGNORE_PREEMPT_RT_PRESENCE=1 +export IGNORE_CC_MISMATCH=1 + +%make_build modules + +%install +export INSTALL_MOD_PATH=%{buildroot}%{_prefix} +export INSTALL_MOD_DIR=extra/%{kmod_name} + +make -C %{_usrsrc}/kernels/%{kversion} -j$(nproc) modules_install M=$PWD/kernel-open + +install -d %{buildroot}%{_sysconfdir}/depmod.d/ +install kmod-%{kmod_name}.conf %{buildroot}%{_sysconfdir}/depmod.d/ +# Remove the unrequired files. +rm -f %{buildroot}%{_prefix}/lib/modules/%{kversion}/modules.* + +find %{buildroot} -type f -name '*.ko' | xargs %{__strip} --strip-debug +find %{buildroot} -type f -name '*.ko' | xargs xz + +%post +if [ -e "/boot/System.map-%{kversion}" ]; then + %{_sbindir}/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || : +fi +modules=( $(find %{_prefix}/lib/modules/%{kversion}/extra/%{kmod_name} | grep '\.ko.xz$') ) +if [ -x "%{_sbindir}/weak-modules" ]; then + printf '%s\n' "${modules[@]}" | %{_sbindir}/weak-modules --add-modules +fi + +%preun +rpm -ql kmod-%{kmod_name}-%{version}-%{release}.%{_target_cpu} | grep '\.ko.xz$' > %{_var}/run/rpm-kmod-%{kmod_name}-modules + +%postun +if [ -e "/boot/System.map-%{kversion}" ]; then + %{_sbindir}/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || : +fi +modules=( $(cat /var/run/rpm-kmod-%{kmod_name}-modules) ) +rm %{_var}/run/rpm-kmod-%{kmod_name}-modules +if [ -x "%{_sbindir}/weak-modules" ]; then + printf '%s\n' "${modules[@]}" | %{_sbindir}/weak-modules --remove-modules +fi + +%files +%{_prefix}/lib/modules/%{kversion}/extra/* +%config %{_sysconfdir}/depmod.d/kmod-%{kmod_name}.conf + +%changelog +%autochangelog diff --git a/anda/system/nvidia/kmod-nvidia/nvidia-kernel-ccflags-y.patch b/anda/system/nvidia/kmod-nvidia/nvidia-kernel-ccflags-y.patch new file mode 100644 index 0000000000..4f724a820a --- /dev/null +++ b/anda/system/nvidia/kmod-nvidia/nvidia-kernel-ccflags-y.patch @@ -0,0 +1,117 @@ +diff -Naur open-gpu-kernel-modules-575.51.02.old/kernel-open/Kbuild open-gpu-kernel-modules-575.51.02/kernel-open/Kbuild +--- open-gpu-kernel-modules-575.51.02.old/kernel-open/Kbuild 2025-04-22 19:14:10.712973734 +0200 ++++ open-gpu-kernel-modules-575.51.02/kernel-open/Kbuild 2025-04-22 19:16:40.057981220 +0200 +@@ -75,21 +75,15 @@ + $(eval include $(src)/$(_module)/$(_module).Kbuild)) + + +-# +-# Define CFLAGS that apply to all the NVIDIA kernel modules. EXTRA_CFLAGS +-# is deprecated since 2.6.24 in favor of ccflags-y, but we need to support +-# older kernels which do not have ccflags-y. Newer kernels append +-# $(EXTRA_CFLAGS) to ccflags-y for compatibility. +-# +- +-EXTRA_CFLAGS += -I$(src)/common/inc +-EXTRA_CFLAGS += -I$(src) +-EXTRA_CFLAGS += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-format-extra-args +-EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DNVRM +-EXTRA_CFLAGS += -DNV_VERSION_STRING=\"575.51.02\" ++ccflags-y += -std=gnu17 ++ccflags-y += -I$(src)/common/inc ++ccflags-y += -I$(src) ++ccflags-y += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-format-extra-args ++ccflags-y += -D__KERNEL__ -DMODULE -DNVRM ++ccflags-y += -DNV_VERSION_STRING=\"575.51.02\" + + ifneq ($(SYSSRCHOST1X),) +- EXTRA_CFLAGS += -I$(SYSSRCHOST1X) ++ ccflags-y += -I$(SYSSRCHOST1X) + endif + + # Some Android kernels prohibit driver use of filesystem functions like +@@ -99,57 +93,57 @@ + PLATFORM_IS_ANDROID ?= 0 + + ifeq ($(PLATFORM_IS_ANDROID),1) +- EXTRA_CFLAGS += -DNV_FILESYSTEM_ACCESS_AVAILABLE=0 ++ ccflags-y += -DNV_FILESYSTEM_ACCESS_AVAILABLE=0 + else +- EXTRA_CFLAGS += -DNV_FILESYSTEM_ACCESS_AVAILABLE=1 ++ ccflags-y += -DNV_FILESYSTEM_ACCESS_AVAILABLE=1 + endif + +-EXTRA_CFLAGS += -Wno-unused-function ++ccflags-y += -Wno-unused-function + + ifneq ($(NV_BUILD_TYPE),debug) +- EXTRA_CFLAGS += -Wuninitialized ++ ccflags-y += -Wuninitialized + endif + +-EXTRA_CFLAGS += -fno-strict-aliasing ++ccflags-y += -fno-strict-aliasing + + ifeq ($(ARCH),arm64) +- EXTRA_CFLAGS += -mstrict-align ++ ccflags-y += -mstrict-align + endif + + ifeq ($(NV_BUILD_TYPE),debug) +- EXTRA_CFLAGS += -g ++ ccflags-y += -g + endif + +-EXTRA_CFLAGS += -ffreestanding ++ccflags-y += -ffreestanding + + ifeq ($(ARCH),arm64) +- EXTRA_CFLAGS += -mgeneral-regs-only -march=armv8-a +- EXTRA_CFLAGS += $(call cc-option,-mno-outline-atomics,) ++ ccflags-y += -mgeneral-regs-only -march=armv8-a ++ ccflags-y += $(call cc-option,-mno-outline-atomics,) + endif + + ifeq ($(ARCH),x86_64) +- EXTRA_CFLAGS += -mno-red-zone -mcmodel=kernel ++ ccflags-y += -mno-red-zone -mcmodel=kernel + endif + + ifeq ($(ARCH),powerpc) +- EXTRA_CFLAGS += -mlittle-endian -mno-strict-align ++ ccflags-y += -mlittle-endian -mno-strict-align + endif + +-EXTRA_CFLAGS += -DNV_UVM_ENABLE +-EXTRA_CFLAGS += $(call cc-option,-Werror=undef,) +-EXTRA_CFLAGS += -DNV_SPECTRE_V2=$(NV_SPECTRE_V2) +-EXTRA_CFLAGS += -DNV_KERNEL_INTERFACE_LAYER ++ccflags-y += -DNV_UVM_ENABLE ++ccflags-y += $(call cc-option,-Werror=undef,) ++ccflags-y += -DNV_SPECTRE_V2=$(NV_SPECTRE_V2) ++ccflags-y += -DNV_KERNEL_INTERFACE_LAYER + + # + # Detect SGI UV systems and apply system-specific optimizations. + # + + ifneq ($(wildcard /proc/sgi_uv),) +- EXTRA_CFLAGS += -DNV_CONFIG_X86_UV ++ ccflags-y += -DNV_CONFIG_X86_UV + endif + + ifdef VGX_FORCE_VFIO_PCI_CORE +- EXTRA_CFLAGS += -DNV_VGPU_FORCE_VFIO_PCI_CORE ++ ccflags-y += -DNV_VGPU_FORCE_VFIO_PCI_CORE + endif + + WARNINGS_AS_ERRORS ?= +@@ -183,7 +177,7 @@ + + NV_CFLAGS_FROM_CONFTEST := $(shell $(NV_CONFTEST_CMD) build_cflags) + +-NV_CONFTEST_CFLAGS = $(NV_CFLAGS_FROM_CONFTEST) $(EXTRA_CFLAGS) -fno-pie ++NV_CONFTEST_CFLAGS = $(NV_CFLAGS_FROM_CONFTEST) $(ccflags-y) -fno-pie + NV_CONFTEST_CFLAGS += $(call cc-disable-warning,pointer-sign) + NV_CONFTEST_CFLAGS += $(call cc-option,-fshort-wchar,) + NV_CONFTEST_CFLAGS += $(call cc-option,-Werror=incompatible-pointer-types,) diff --git a/anda/system/nvidia/kmod-nvidia/update.rhai b/anda/system/nvidia/kmod-nvidia/update.rhai new file mode 100644 index 0000000000..f25d05da71 --- /dev/null +++ b/anda/system/nvidia/kmod-nvidia/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("NVIDIA/open-gpu-kernel-modules")); diff --git a/anda/system/nvidia/nvidia-driver/nvidia-driver.spec b/anda/system/nvidia/nvidia-driver/nvidia-driver.spec index ccae6e4e9b..a837013229 100644 --- a/anda/system/nvidia/nvidia-driver/nvidia-driver.spec +++ b/anda/system/nvidia/nvidia-driver/nvidia-driver.spec @@ -1,5 +1,5 @@ %global debug_package %{nil} -%global __strip /bin/true +%global __strip %{nil} %global __brp_ldconfig %{nil} %define _build_id_links none @@ -10,7 +10,7 @@ Name: nvidia-driver Version: 575.51.02 -Release: 1%?dist +Release: 2%?dist Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Epoch: 3 License: NVIDIA License @@ -75,7 +75,7 @@ Requires: libnvidia-ml%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: vulkan-loader # dlopened Requires: libnvidia-gpucomp%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: libnvidia-ml = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: libnvidia-ml%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Conflicts: nvidia-x11-drv-libs Conflicts: nvidia-x11-drv-470xx-libs @@ -180,6 +180,11 @@ The NVIDIA X.org X11 driver and associated components. %prep source %{SOURCE99} export VERSION=%{version} +%ifarch %ix86 +export ARCH=x86_64 +%else +export ARCH=%{_arch} +%endif unpack() { set_vars @@ -189,23 +194,8 @@ unpack() { create_tarball } -%ifarch %{ix86} -export ARCH=x86_64 unpack -%setup -D -T -n %{name}-%{version}-i386 -%endif - -%ifarch x86_64 -export ARCH=x86_64 -unpack -%setup -D -T -n %{name}-%{version}-x86_64 -%endif - -%ifarch aarch64 -export ARCH=aarch64 -unpack -%setup -D -T -n %{name}-%{version}-aarch64 -%endif +%setup -D -T -n %{name}-%{version}-%{_arch} %ifarch x86_64 %if 0%{?rhel} == 8 @@ -309,19 +299,6 @@ install -p -m 0755 systemd/nvidia-sleep.sh %{buildroot}%{_bindir}/ install -p -m 0755 -D systemd/system-sleep/nvidia %{buildroot}%{_systemd_util_dir}/system-sleep/nvidia install -p -m 0644 -D nvidia-dbus.conf %{buildroot}%{_datadir}/dbus-1/system.d/nvidia-dbus.conf -%if 0%{?fedora} >= 41 -mkdir -p %{buildroot}%{_unitdir}/systemd-suspend.service.d/ -cat > %{buildroot}%{_unitdir}/systemd-suspend.service.d/10-nvidia.conf << EOF -[Service] -Environment="SYSTEMD_SLEEP_FREEZE_USER_SESSIONS=false" -EOF -mkdir -p %{buildroot}%{_unitdir}/systemd-homed.service.d/ -cat > %{buildroot}%{_unitdir}/systemd-homed.service.d/10-nvidia.conf << EOF -[Service] -Environment="SYSTEMD_HOME_LOCK_FREEZE_SESSION=false" -EOF -%endif - # Ignore powerd binary exiting if hardware is not present # We should check for information in the DMI table sed -i -e 's/ExecStart=/ExecStart=-/g' %{buildroot}%{_unitdir}/nvidia-powerd.service @@ -335,6 +312,17 @@ install -p -m 0644 -D %{SOURCE40} %{buildroot}%{_metainfodir}/com.nvidia.driver. mkdir -p %{buildroot}%{_datadir}/pixmaps/ cp %{SOURCE42} %{buildroot}%{_datadir}/pixmaps/ +# nvsandboxutils configuration +install -p -m 0644 -D sandboxutils-filelist.json %{buildroot}%{_datadir}/nvidia/files.d/sandboxutils-filelist.json + +# dnf needs-restarting plugin +# dnf4 only for the moment: https://github.com/rpm-software-management/dnf5/issues/1815 +%if 0%{?fedora} < 42 || 0%{?rhel} +mkdir -p %{buildroot}%{_sysconfdir}/dnf/plugins/needs-restarting.d +echo %{name} > %{buildroot}%{_sysconfdir}/dnf/plugins/needs-restarting.d/%{name}.conf +echo %{name}-cuda > %{buildroot}%{_sysconfdir}/dnf/plugins/needs-restarting.d/%{name}-cuda.conf +%endif + %check # Using appstreamcli: appstreamcli validate --strict # Icon type local is not supported by appstreamcli for drivers @@ -356,14 +344,14 @@ appstream-util validate --nonet %{buildroot}%{_metainfodir}/com.nvidia.driver.me %systemd_preun nvidia-powerd.service %systemd_preun nvidia-resume.service %systemd_preun nvidia-suspend.service -%systemd_post nvidia-suspend-then-hibernate.service +%systemd_preun nvidia-suspend-then-hibernate.service %postun %systemd_postun nvidia-hibernate.service %systemd_postun nvidia-powerd.service %systemd_postun nvidia-resume.service %systemd_postun nvidia-suspend.service -%systemd_post nvidia-suspend-then-hibernate.service +%systemd_postun nvidia-suspend-then-hibernate.service %endif @@ -391,9 +379,8 @@ appstream-util validate --nonet %{buildroot}%{_metainfodir}/com.nvidia.driver.me %{_unitdir}/nvidia-resume.service %{_unitdir}/nvidia-suspend.service %{_unitdir}/nvidia-suspend-then-hibernate.service -%if 0%{?fedora} >= 41 -%{_unitdir}/systemd-suspend.service.d/10-nvidia.conf -%{_unitdir}/systemd-homed.service.d/10-nvidia.conf +%if 0%{?fedora} < 42 || 0%{?rhel} +%{_sysconfdir}/dnf/plugins/needs-restarting.d/%{name}.conf %endif %if 0%{?fedora} || 0%{?rhel} < 10 @@ -413,10 +400,14 @@ appstream-util validate --nonet %{buildroot}%{_metainfodir}/com.nvidia.driver.me %{_bindir}/nvidia-cuda-mps-server %{_bindir}/nvidia-debugdump %{_bindir}/nvidia-smi +%{_datadir}/nvidia/files.d/sandboxutils-filelist.json %{_mandir}/man1/nvidia-cuda-mps-control.1.* %{_mandir}/man1/nvidia-smi.* %{_prefix}/lib/nvidia/alternate-install-present %{_systemd_util_dir}/system-preset/70-nvidia-driver-cuda.preset +%if 0%{?fedora} < 42 || 0%{?rhel} +%{_sysconfdir}/dnf/plugins/needs-restarting.d/%{name}-cuda.conf +%endif %endif @@ -462,7 +453,9 @@ appstream-util validate --nonet %{buildroot}%{_metainfodir}/com.nvidia.driver.me %{_libdir}/libnvidia-vksc-core.so.%{version} %dir %{_libdir}/nvidia %dir %{_libdir}/nvidia/wine -%{_libdir}/nvidia/wine/*.dll +%{_libdir}/nvidia/wine/_nvngx.dll +%{_libdir}/nvidia/wine/nvngx.dll +%{_libdir}/nvidia/wine/nvngx_dlssg.dll %endif %files cuda-libs @@ -496,8 +489,6 @@ appstream-util validate --nonet %{buildroot}%{_metainfodir}/com.nvidia.driver.me %else %{_libdir}/libnvidia-pkcs11-openssl3.so.%{version} %endif -%{_libdir}/libnvidia-sandboxutils.so.1 -%{_libdir}/libnvidia-sandboxutils.so.%{version} %endif %files -n libnvidia-fbc diff --git a/anda/system/nvidia/nvidia-kmod-common/99-nvidia.conf b/anda/system/nvidia/nvidia-kmod-common/99-nvidia.conf deleted file mode 100644 index 6d64aaeb34..0000000000 --- a/anda/system/nvidia/nvidia-kmod-common/99-nvidia.conf +++ /dev/null @@ -1,3 +0,0 @@ -# Omit the nvidia driver from the ramdisk, to avoid needing to regenerate -# the ramdisk on updates. -omit_drivers+=" nvidia nvidia-drm nvidia-modeset nvidia-peermem nvidia-uvm " diff --git a/anda/system/nvidia/nvidia-kmod-common/nvidia-boot-update b/anda/system/nvidia/nvidia-kmod-common/nvidia-boot-update deleted file mode 100755 index 46cad2f238..0000000000 --- a/anda/system/nvidia/nvidia-kmod-common/nvidia-boot-update +++ /dev/null @@ -1,186 +0,0 @@ -#!/bin/sh - - -# EL8 (grub2 with BootLoaderSpec patches) -# -# kernel options: grub.cfg + grubenv + /etc/kernel/cmdline -# kernel options in /boot/loader/entries/*.conf use kernelopts from /boot/grub2/grubenv -# grubby -# - updates kernelopts in /boot/grub2/grubenv -# - does not update /etc/default/grub -# - does not update kernelopts in grub.cfg -# grub.cfg: -# - UEFI: /etc/grub2-efi.cfg -> /boot/efi/EFI//grub.cfg -# - BIOS: /etc/grub2.cfg -> /boot/grub2/grub.cfg - - -# EL9 (grub2 with BootLoaderSpec patches) -# -# kernel options: grub.cfg + /etc/kernel/cmdline + /boot/loader/entries/*.conf -# manually update: /etc/default/grub + /etc/kernel/cmdline -# grub2-mkconfig does not update /boot/loader/entries/*.conf -# grub.cfg: -# - UEFI: /etc/grub2-efi.cfg -> /boot/efi/EFI//grub.cfg -# - BIOS: /etc/grub2.cfg -> /boot/grub2/grub.cfg - - -# Fedora (grub2 with BootLoaderSpec patches) -# -# kernel options: grub.cfg + /etc/kernel/cmdline + /boot/loader/entries/*.conf -# manually update: /etc/default/grub + /etc/kernel/cmdline -# grub2-mkconfig does not update /boot/loader/entries/*.conf -# grub.cfg: -# - UEFI/BIOS: /boot/grub2/grub.cfg - - -# Fedora (systemd-boot) -# -# kernel options: grub.cfg + /boot/efi/loader/entries/*.conf (UEFI only) -# grubby as an updateloaderentries alias: -# - updates all entries in /boot/efi/loader/entries/*.conf -# - does not work with multiple parameters at once -# - does not update /etc/kernel/cmdline - - -# Complete use case coverage, regardless of boot loaders: -# -# - update options in /etc/default/grub -# - regenerate grub.cfg/grubenv -# - update options in /boot/{efi/}loader/entries/*.conf entries -# - update options in /etc/kernel/cmdline -# - cover both UEFI and BIOS case - -CMDLINE_ARGS_ADD="_dracutopts_in" -CMDLINE_ARGS_REMOVE="_dracutopts_rm" - -print_usage() { -cat <> /etc/default/grub - else - for param in $CMDLINE_ARGS_ADD; do - echo ${GRUB_CMDLINE_LINUX} | grep -q $param - [ $? -eq 1 ] && GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX} ${param}" - done - for param in $CMDLINE_ARGS_REMOVE; do - echo ${GRUB_CMDLINE_LINUX} | grep -q $param - [ $? -eq 0 ] && GRUB_CMDLINE_LINUX="$(echo ${GRUB_CMDLINE_LINUX} | sed -e "s/ $param//g")" - done - sed -i -e "s|^GRUB_CMDLINE_LINUX=.*|GRUB_CMDLINE_LINUX=\"${GRUB_CMDLINE_LINUX}\"|g" /etc/default/grub - fi - - grub2-mkconfig -o $GRUB_CFG &>/dev/null - - fi - - if [ -v BLS_ENTRIES ]; then - - for config_file in $BLS_ENTRIES/*.conf; do - for param in $CMDLINE_ARGS_ADD; do - grep -q $param $config_file - [ $? -eq 1 ] && sed -i -e "s|^options.*|& $param|" $config_file - done - for param in $CMDLINE_ARGS_REMOVE; do - grep -q $param $config_file - [ $? -eq 0 ] && sed -i -e "s| $param||" $config_file - done - done - - fi - -} - -preun() { - - if [ -v GRUB_CFG ]; then - - for param in $CMDLINE_ARGS_ADD; do - echo ${GRUB_CMDLINE_LINUX} | grep -q $param - [ $? -eq 0 ] && GRUB_CMDLINE_LINUX="$(echo ${GRUB_CMDLINE_LINUX} | sed -e "s/ $param//g")" - done - sed -i -e "s|^GRUB_CMDLINE_LINUX=.*|GRUB_CMDLINE_LINUX=\"${GRUB_CMDLINE_LINUX}\"|g" /etc/default/grub - - grub2-mkconfig -o $GRUB_CFG &>/dev/null - - fi - - if [ -v BLS_ENTRIES ]; then - - for config_file in $BLS_ENTRIES/*.conf; do - for param in $CMDLINE_ARGS_ADD; do - grep -q $param $config_file - [ $? -eq 0 ] && sed -i -e "s| $param||" $config_file - done - done - - fi - -} - -case "$1" in - post) - check - post - exit 0 - ;; - preun) - check - preun - exit 0 - ;; - *) - print_usage - exit 0 - ;; -esac diff --git a/anda/system/nvidia/nvidia-kmod-common/nvidia-kmod-common.spec b/anda/system/nvidia/nvidia-kmod-common/nvidia-kmod-common.spec index d639aff4e9..25f8925f0d 100644 --- a/anda/system/nvidia/nvidia-kmod-common/nvidia-kmod-common.spec +++ b/anda/system/nvidia/nvidia-kmod-common/nvidia-kmod-common.spec @@ -4,11 +4,11 @@ # gsp_*.bin: ELF 64-bit LSB executable, UCB RISC-V %global _binaries_in_noarch_packages_terminate_build 0 -%global __strip /bin/true +%global __brp_strip %{nil} Name: nvidia-kmod-common Version: 575.51.02 -Release: 1%?dist +Release: 2%?dist Summary: Common file for NVIDIA's proprietary driver kernel modules Epoch: 3 License: NVIDIA License @@ -17,18 +17,14 @@ URL: http://www.nvidia.com/object/unix.html BuildArch: noarch Source0: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run -Source17: nvidia-boot-update Source18: kernel.conf Source19: nvidia-modeset.conf Source20: nvidia.conf Source21: 60-nvidia.rules -Source24: 99-nvidia.conf # UDev rule location (_udevrulesdir) and systemd macros: BuildRequires: systemd-rpm-macros -# Owns /usr/lib/firmware: -Requires: linux-firmware Requires: nvidia-modprobe Requires: nvidia-kmod = %{?epoch:%{epoch}:}%{version} Provides: nvidia-kmod-common = %{?epoch:%{epoch}:}%{version} @@ -43,13 +39,6 @@ sh %{SOURCE0} -x --target nvidia-kmod-%{version}-x86_64 %setup -T -D -n nvidia-kmod-%{version}-x86_64 %install -# Script for post/preun tasks -install -p -m 0755 -D %{SOURCE17} %{buildroot}%{_sbindir}/nvidia-boot-update -sed -i \ - -e 's/_dracutopts_in/%{_dracutopts_in}/g' \ - -e 's/_dracutopts_rm/%{_dracutopts_rm}/g' \ - %{buildroot}%{_sbindir}/nvidia-boot-update - # Choice of kernel module type: install -p -m 0644 -D %{SOURCE18} %{buildroot}%{_sysconfdir}/nvidia/kernel.conf @@ -59,9 +48,6 @@ install -p -m 0644 -D %{SOURCE19} %{buildroot}%{_sysconfdir}/modprobe.d/nvidia-m # Load nvidia-uvm, enable complete power management: install -p -m 0644 -D %{SOURCE20} %{buildroot}%{_modprobedir}/nvidia.conf -# Avoid Nvidia modules getting in the initrd: -install -p -m 0644 -D %{SOURCE24} %{buildroot}%{_dracut_conf_d}/99-nvidia.conf - # UDev rules # https://github.com/NVIDIA/nvidia-modprobe/blob/master/modprobe-utils/nvidia-modprobe-utils.h#L33-L46 # https://github.com/negativo17/nvidia-kmod-common/issues/11 @@ -72,19 +58,19 @@ install -p -m 644 -D %{SOURCE21} %{buildroot}%{_udevrulesdir}/60-nvidia.rules mkdir -p %{buildroot}%{_prefix}/lib/firmware/nvidia/%{version}/ install -p -m 644 firmware/* %{buildroot}%{_prefix}/lib/firmware/nvidia/%{version} -%post -%{_sbindir}/nvidia-boot-update post +%pre +# Remove the kernel command line adjustments one last time when doing an upgrade +# from a version that was still setting up the command line parameters: +if [ "$1" -eq "2" ] && [ -x %{_bindir}/nvidia-boot-update ]; then + %{_bindir}/nvidia-boot-update preun -%preun -if [ "$1" -eq "0" ]; then - %{_sbindir}/nvidia-boot-update preun fi ||: %files -%{_dracut_conf_d}/99-nvidia.conf %{_modprobedir}/nvidia.conf +%dir %{_prefix}/lib/firmware +%dir %{_prefix}/lib/firmware/nvidia %{_prefix}/lib/firmware/nvidia/%{version} -%{_sbindir}/nvidia-boot-update %config(noreplace) %{_sysconfdir}/modprobe.d/nvidia-modeset.conf %config(noreplace) %{_sysconfdir}/nvidia/kernel.conf %{_udevrulesdir}/60-nvidia.rules diff --git a/anda/system/nvidia/nvidia-kmod/nvidia-kernel-ccflags-y.patch b/anda/system/nvidia/nvidia-kmod/nvidia-kernel-ccflags-y.patch new file mode 100644 index 0000000000..1792b26793 --- /dev/null +++ b/anda/system/nvidia/nvidia-kmod/nvidia-kernel-ccflags-y.patch @@ -0,0 +1,234 @@ +diff -Naur nvidia-kmod-575.51.02-x86_64.old/kernel/Kbuild nvidia-kmod-575.51.02-x86_64/kernel/Kbuild +--- nvidia-kmod-575.51.02-x86_64.old/kernel/Kbuild 2025-04-22 18:54:37.758155663 +0200 ++++ nvidia-kmod-575.51.02-x86_64/kernel/Kbuild 2025-04-22 18:54:45.069483044 +0200 +@@ -75,21 +75,15 @@ + $(eval include $(src)/$(_module)/$(_module).Kbuild)) + + +-# +-# Define CFLAGS that apply to all the NVIDIA kernel modules. EXTRA_CFLAGS +-# is deprecated since 2.6.24 in favor of ccflags-y, but we need to support +-# older kernels which do not have ccflags-y. Newer kernels append +-# $(EXTRA_CFLAGS) to ccflags-y for compatibility. +-# +- +-EXTRA_CFLAGS += -I$(src)/common/inc +-EXTRA_CFLAGS += -I$(src) +-EXTRA_CFLAGS += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-format-extra-args +-EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DNVRM +-EXTRA_CFLAGS += -DNV_VERSION_STRING=\"575.51.02\" ++ccflags-y += -std=gnu17 ++ccflags-y += -I$(src)/common/inc ++ccflags-y += -I$(src) ++ccflags-y += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-format-extra-args ++ccflags-y += -D__KERNEL__ -DMODULE -DNVRM ++ccflags-y += -DNV_VERSION_STRING=\"575.51.02\" + + ifneq ($(SYSSRCHOST1X),) +- EXTRA_CFLAGS += -I$(SYSSRCHOST1X) ++ ccflags-y += -I$(SYSSRCHOST1X) + endif + + # Some Android kernels prohibit driver use of filesystem functions like +@@ -99,57 +93,57 @@ + PLATFORM_IS_ANDROID ?= 0 + + ifeq ($(PLATFORM_IS_ANDROID),1) +- EXTRA_CFLAGS += -DNV_FILESYSTEM_ACCESS_AVAILABLE=0 ++ ccflags-y += -DNV_FILESYSTEM_ACCESS_AVAILABLE=0 + else +- EXTRA_CFLAGS += -DNV_FILESYSTEM_ACCESS_AVAILABLE=1 ++ ccflags-y += -DNV_FILESYSTEM_ACCESS_AVAILABLE=1 + endif + +-EXTRA_CFLAGS += -Wno-unused-function ++ccflags-y += -Wno-unused-function + + ifneq ($(NV_BUILD_TYPE),debug) +- EXTRA_CFLAGS += -Wuninitialized ++ ccflags-y += -Wuninitialized + endif + +-EXTRA_CFLAGS += -fno-strict-aliasing ++ccflags-y += -fno-strict-aliasing + + ifeq ($(ARCH),arm64) +- EXTRA_CFLAGS += -mstrict-align ++ ccflags-y += -mstrict-align + endif + + ifeq ($(NV_BUILD_TYPE),debug) +- EXTRA_CFLAGS += -g ++ ccflags-y += -g + endif + +-EXTRA_CFLAGS += -ffreestanding ++ccflags-y += -ffreestanding + + ifeq ($(ARCH),arm64) +- EXTRA_CFLAGS += -mgeneral-regs-only -march=armv8-a +- EXTRA_CFLAGS += $(call cc-option,-mno-outline-atomics,) ++ ccflags-y += -mgeneral-regs-only -march=armv8-a ++ ccflags-y += $(call cc-option,-mno-outline-atomics,) + endif + + ifeq ($(ARCH),x86_64) +- EXTRA_CFLAGS += -mno-red-zone -mcmodel=kernel ++ ccflags-y += -mno-red-zone -mcmodel=kernel + endif + + ifeq ($(ARCH),powerpc) +- EXTRA_CFLAGS += -mlittle-endian -mno-strict-align ++ ccflags-y += -mlittle-endian -mno-strict-align + endif + +-EXTRA_CFLAGS += -DNV_UVM_ENABLE +-EXTRA_CFLAGS += $(call cc-option,-Werror=undef,) +-EXTRA_CFLAGS += -DNV_SPECTRE_V2=$(NV_SPECTRE_V2) +-EXTRA_CFLAGS += -DNV_KERNEL_INTERFACE_LAYER ++ccflags-y += -DNV_UVM_ENABLE ++ccflags-y += $(call cc-option,-Werror=undef,) ++ccflags-y += -DNV_SPECTRE_V2=$(NV_SPECTRE_V2) ++ccflags-y += -DNV_KERNEL_INTERFACE_LAYER + + # + # Detect SGI UV systems and apply system-specific optimizations. + # + + ifneq ($(wildcard /proc/sgi_uv),) +- EXTRA_CFLAGS += -DNV_CONFIG_X86_UV ++ ccflags-y += -DNV_CONFIG_X86_UV + endif + + ifdef VGX_FORCE_VFIO_PCI_CORE +- EXTRA_CFLAGS += -DNV_VGPU_FORCE_VFIO_PCI_CORE ++ ccflags-y += -DNV_VGPU_FORCE_VFIO_PCI_CORE + endif + + WARNINGS_AS_ERRORS ?= +@@ -183,7 +177,7 @@ + + NV_CFLAGS_FROM_CONFTEST := $(shell $(NV_CONFTEST_CMD) build_cflags) + +-NV_CONFTEST_CFLAGS = $(NV_CFLAGS_FROM_CONFTEST) $(EXTRA_CFLAGS) -fno-pie ++NV_CONFTEST_CFLAGS = $(NV_CFLAGS_FROM_CONFTEST) $(ccflags-y) -fno-pie + NV_CONFTEST_CFLAGS += $(call cc-disable-warning,pointer-sign) + NV_CONFTEST_CFLAGS += $(call cc-option,-fshort-wchar,) + NV_CONFTEST_CFLAGS += $(call cc-option,-Werror=incompatible-pointer-types,) +diff -Naur nvidia-kmod-575.51.02-x86_64.old/kernel-open/Kbuild nvidia-kmod-575.51.02-x86_64/kernel-open/Kbuild +--- nvidia-kmod-575.51.02-x86_64.old/kernel-open/Kbuild 2025-04-22 18:54:37.828156191 +0200 ++++ nvidia-kmod-575.51.02-x86_64/kernel-open/Kbuild 2025-04-22 18:54:45.069786396 +0200 +@@ -75,21 +75,15 @@ + $(eval include $(src)/$(_module)/$(_module).Kbuild)) + + +-# +-# Define CFLAGS that apply to all the NVIDIA kernel modules. EXTRA_CFLAGS +-# is deprecated since 2.6.24 in favor of ccflags-y, but we need to support +-# older kernels which do not have ccflags-y. Newer kernels append +-# $(EXTRA_CFLAGS) to ccflags-y for compatibility. +-# +- +-EXTRA_CFLAGS += -I$(src)/common/inc +-EXTRA_CFLAGS += -I$(src) +-EXTRA_CFLAGS += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-format-extra-args +-EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DNVRM +-EXTRA_CFLAGS += -DNV_VERSION_STRING=\"575.51.02\" ++ccflags-y += -std=gnu17 ++ccflags-y += -I$(src)/common/inc ++ccflags-y += -I$(src) ++ccflags-y += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-format-extra-args ++ccflags-y += -D__KERNEL__ -DMODULE -DNVRM ++ccflags-y += -DNV_VERSION_STRING=\"575.51.02\" + + ifneq ($(SYSSRCHOST1X),) +- EXTRA_CFLAGS += -I$(SYSSRCHOST1X) ++ ccflags-y += -I$(SYSSRCHOST1X) + endif + + # Some Android kernels prohibit driver use of filesystem functions like +@@ -99,57 +93,57 @@ + PLATFORM_IS_ANDROID ?= 0 + + ifeq ($(PLATFORM_IS_ANDROID),1) +- EXTRA_CFLAGS += -DNV_FILESYSTEM_ACCESS_AVAILABLE=0 ++ ccflags-y += -DNV_FILESYSTEM_ACCESS_AVAILABLE=0 + else +- EXTRA_CFLAGS += -DNV_FILESYSTEM_ACCESS_AVAILABLE=1 ++ ccflags-y += -DNV_FILESYSTEM_ACCESS_AVAILABLE=1 + endif + +-EXTRA_CFLAGS += -Wno-unused-function ++ccflags-y += -Wno-unused-function + + ifneq ($(NV_BUILD_TYPE),debug) +- EXTRA_CFLAGS += -Wuninitialized ++ ccflags-y += -Wuninitialized + endif + +-EXTRA_CFLAGS += -fno-strict-aliasing ++ccflags-y += -fno-strict-aliasing + + ifeq ($(ARCH),arm64) +- EXTRA_CFLAGS += -mstrict-align ++ ccflags-y += -mstrict-align + endif + + ifeq ($(NV_BUILD_TYPE),debug) +- EXTRA_CFLAGS += -g ++ ccflags-y += -g + endif + +-EXTRA_CFLAGS += -ffreestanding ++ccflags-y += -ffreestanding + + ifeq ($(ARCH),arm64) +- EXTRA_CFLAGS += -mgeneral-regs-only -march=armv8-a +- EXTRA_CFLAGS += $(call cc-option,-mno-outline-atomics,) ++ ccflags-y += -mgeneral-regs-only -march=armv8-a ++ ccflags-y += $(call cc-option,-mno-outline-atomics,) + endif + + ifeq ($(ARCH),x86_64) +- EXTRA_CFLAGS += -mno-red-zone -mcmodel=kernel ++ ccflags-y += -mno-red-zone -mcmodel=kernel + endif + + ifeq ($(ARCH),powerpc) +- EXTRA_CFLAGS += -mlittle-endian -mno-strict-align ++ ccflags-y += -mlittle-endian -mno-strict-align + endif + +-EXTRA_CFLAGS += -DNV_UVM_ENABLE +-EXTRA_CFLAGS += $(call cc-option,-Werror=undef,) +-EXTRA_CFLAGS += -DNV_SPECTRE_V2=$(NV_SPECTRE_V2) +-EXTRA_CFLAGS += -DNV_KERNEL_INTERFACE_LAYER ++ccflags-y += -DNV_UVM_ENABLE ++ccflags-y += $(call cc-option,-Werror=undef,) ++ccflags-y += -DNV_SPECTRE_V2=$(NV_SPECTRE_V2) ++ccflags-y += -DNV_KERNEL_INTERFACE_LAYER + + # + # Detect SGI UV systems and apply system-specific optimizations. + # + + ifneq ($(wildcard /proc/sgi_uv),) +- EXTRA_CFLAGS += -DNV_CONFIG_X86_UV ++ ccflags-y += -DNV_CONFIG_X86_UV + endif + + ifdef VGX_FORCE_VFIO_PCI_CORE +- EXTRA_CFLAGS += -DNV_VGPU_FORCE_VFIO_PCI_CORE ++ ccflags-y += -DNV_VGPU_FORCE_VFIO_PCI_CORE + endif + + WARNINGS_AS_ERRORS ?= +@@ -183,7 +177,7 @@ + + NV_CFLAGS_FROM_CONFTEST := $(shell $(NV_CONFTEST_CMD) build_cflags) + +-NV_CONFTEST_CFLAGS = $(NV_CFLAGS_FROM_CONFTEST) $(EXTRA_CFLAGS) -fno-pie ++NV_CONFTEST_CFLAGS = $(NV_CFLAGS_FROM_CONFTEST) $(ccflags-y) -fno-pie + NV_CONFTEST_CFLAGS += $(call cc-disable-warning,pointer-sign) + NV_CONFTEST_CFLAGS += $(call cc-option,-fshort-wchar,) + NV_CONFTEST_CFLAGS += $(call cc-option,-Werror=incompatible-pointer-types,) diff --git a/anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec b/anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec index 34345a3d90..dc15ee353e 100644 --- a/anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec +++ b/anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec @@ -5,7 +5,7 @@ Name: nvidia-kmod Version: 575.51.02 -Release: 1%?dist +Release: 2%?dist Summary: NVIDIA display driver kernel module Epoch: 3 License: NVIDIA License @@ -13,6 +13,9 @@ URL: http://www.nvidia.com/object/unix.html ExclusiveArch: x86_64 aarch64 Source0: http://download.nvidia.com/XFree86/Linux-%{_arch}/%{version}/NVIDIA-Linux-%{_arch}-%{version}.run +Patch0: nvidia-kernel-ccflags-y.patch +Requires: nvidia-kmod-common = %{?epoch:%{epoch}:}%{version} +Requires: akmods # Get the needed BuildRequires (in parts depending on what we build for): @@ -32,6 +35,7 @@ kmodtool --target %{_target_cpu} --repo terra.fyralabs.com --kmodname %{name} sh %{SOURCE0} -x --target nvidia-kmod-%{version}-%{_arch} %setup -T -D -n nvidia-kmod-%{version}-%{_arch} +%autopatch -p1 rm -f */dkms.conf @@ -199,4 +203,4 @@ done - Update to 510.54. * Wed Feb 02 2022 Simone Caronni - 3:510.47.03-1 -- Update to 510.47.03. \ No newline at end of file +- Update to 510.47.03. From cc558f47d5b542187f69856365f3398502a91d4f Mon Sep 17 00:00:00 2001 From: Gilver Date: Thu, 24 Apr 2025 08:25:55 -0500 Subject: [PATCH 0871/2977] fix({akmod,dkms}-ipu6): Update patches (#4412) --- ...sensor-driver-symbols-from-CONFIG_VI.patch | 88 ----- ...le-gc5035-compilation-with-kernels-6.patch | 97 ------ ...build-hi556-driver-with-kernels-6.10.patch | 54 ---- ...build-ov01a10-driver-with-kernels-6..patch | 51 --- ...a-ipu6-Fix-building-with-kernel-6.13.patch | 53 --- ...0-IPU6-headers-used-by-PSYS.patch-fo.patch | 49 --- ...-DMA-code-for-ipu6-bus-DMA-changes-i.patch | 306 ------------------ ...o-0001-v6.10-IPU6-headers-used-by-PS.patch | 84 ----- ...ping-registering-ipu_psys_bus-for-ke.patch | 202 ------------ .../ipu6-drivers/akmod/intel-ipu6-kmod.spec | 28 +- ...sensor-driver-symbols-from-CONFIG_VI.patch | 88 ----- ...le-gc5035-compilation-with-kernels-6.patch | 97 ------ ...build-hi556-driver-with-kernels-6.10.patch | 54 ---- ...build-ov01a10-driver-with-kernels-6..patch | 51 --- ...a-ipu6-Fix-building-with-kernel-6.13.patch | 53 --- ...0-IPU6-headers-used-by-PSYS.patch-fo.patch | 49 --- ...-DMA-code-for-ipu6-bus-DMA-changes-i.patch | 306 ------------------ ...o-0001-v6.10-IPU6-headers-used-by-PS.patch | 84 ----- ...ping-registering-ipu_psys_bus-for-ke.patch | 202 ------------ .../ipu6-drivers/dkms/dkms-intel-ipu6.spec | 29 +- 20 files changed, 4 insertions(+), 2021 deletions(-) delete mode 100644 anda/system/ipu6-drivers/akmod/0001-Makefile-Switch-sensor-driver-symbols-from-CONFIG_VI.patch delete mode 100644 anda/system/ipu6-drivers/akmod/0002-Makefile-Re-enable-gc5035-compilation-with-kernels-6.patch delete mode 100644 anda/system/ipu6-drivers/akmod/0003-Makefile-Do-not-build-hi556-driver-with-kernels-6.10.patch delete mode 100644 anda/system/ipu6-drivers/akmod/0004-Makefile-Do-not-build-ov01a10-driver-with-kernels-6..patch delete mode 100644 anda/system/ipu6-drivers/akmod/0006-media-ipu6-Fix-building-with-kernel-6.13.patch delete mode 100644 anda/system/ipu6-drivers/akmod/0007-Modify-0001-v6.10-IPU6-headers-used-by-PSYS.patch-fo.patch delete mode 100644 anda/system/ipu6-drivers/akmod/0008-ipu6-psys-Adjust-DMA-code-for-ipu6-bus-DMA-changes-i.patch delete mode 100644 anda/system/ipu6-drivers/akmod/0009-Add-ipu6-dma.h-to-0001-v6.10-IPU6-headers-used-by-PS.patch delete mode 100644 anda/system/ipu6-drivers/akmod/0010-psys-Do-not-skipping-registering-ipu_psys_bus-for-ke.patch delete mode 100644 anda/system/ipu6-drivers/dkms/0001-Makefile-Switch-sensor-driver-symbols-from-CONFIG_VI.patch delete mode 100644 anda/system/ipu6-drivers/dkms/0002-Makefile-Re-enable-gc5035-compilation-with-kernels-6.patch delete mode 100644 anda/system/ipu6-drivers/dkms/0003-Makefile-Do-not-build-hi556-driver-with-kernels-6.10.patch delete mode 100644 anda/system/ipu6-drivers/dkms/0004-Makefile-Do-not-build-ov01a10-driver-with-kernels-6..patch delete mode 100644 anda/system/ipu6-drivers/dkms/0006-media-ipu6-Fix-building-with-kernel-6.13.patch delete mode 100644 anda/system/ipu6-drivers/dkms/0007-Modify-0001-v6.10-IPU6-headers-used-by-PSYS.patch-fo.patch delete mode 100644 anda/system/ipu6-drivers/dkms/0008-ipu6-psys-Adjust-DMA-code-for-ipu6-bus-DMA-changes-i.patch delete mode 100644 anda/system/ipu6-drivers/dkms/0009-Add-ipu6-dma.h-to-0001-v6.10-IPU6-headers-used-by-PS.patch delete mode 100644 anda/system/ipu6-drivers/dkms/0010-psys-Do-not-skipping-registering-ipu_psys_bus-for-ke.patch diff --git a/anda/system/ipu6-drivers/akmod/0001-Makefile-Switch-sensor-driver-symbols-from-CONFIG_VI.patch b/anda/system/ipu6-drivers/akmod/0001-Makefile-Switch-sensor-driver-symbols-from-CONFIG_VI.patch deleted file mode 100644 index 4e768ef1e7..0000000000 --- a/anda/system/ipu6-drivers/akmod/0001-Makefile-Switch-sensor-driver-symbols-from-CONFIG_VI.patch +++ /dev/null @@ -1,88 +0,0 @@ -From c451aa3f50f8a5ef26d9a36f159c3f9fb8e6ef11 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Mon, 10 Jun 2024 13:05:53 +0200 -Subject: [PATCH 1/9] Makefile: Switch sensor driver symbols from - CONFIG_VIDEO_FOO to CONFIG_ICAMERA_FOO - -Switch the Kconfig symbols for sensor drivers from CONFIG_VIDEO_FOO to -CONFIG_ICAMERA_FOO to avoid these still being set when they should not -because of the CONFIG_VIDEO_FOO symbols inherited from the base kernel. - -Signed-off-by: Hans de Goede ---- - Makefile | 22 +++++++++++----------- - drivers/media/i2c/Makefile | 22 +++++++++++----------- - 2 files changed, 22 insertions(+), 22 deletions(-) - -diff --git a/Makefile b/Makefile -index 49b27300a..356f5e7f3 100644 ---- a/Makefile -+++ b/Makefile -@@ -81,22 +81,22 @@ else - obj-y += drivers/media/pci/intel/ipu6/psys/ - endif - --export CONFIG_VIDEO_HM11B1 = m --export CONFIG_VIDEO_OV01A1S = m --export CONFIG_VIDEO_OV01A10 = m --export CONFIG_VIDEO_OV02C10 = m --export CONFIG_VIDEO_OV02E10 = m --export CONFIG_VIDEO_HM2170 = m --export CONFIG_VIDEO_HM2172 = m --export CONFIG_VIDEO_HI556 = m -+export CONFIG_ICAMERA_HM11B1 = m -+export CONFIG_ICAMERA_OV01A1S = m -+export CONFIG_ICAMERA_OV01A10 = m -+export CONFIG_ICAMERA_OV02C10 = m -+export CONFIG_ICAMERA_OV02E10 = m -+export CONFIG_ICAMERA_HM2170 = m -+export CONFIG_ICAMERA_HM2172 = m -+export CONFIG_ICAMERA_HI556 = m - - ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV2740)),true) --export CONFIG_VIDEO_OV2740 = m --export CONFIG_VIDEO_GC5035 = m -+export CONFIG_ICAMERA_OV2740 = m -+export CONFIG_ICAMERA_GC5035 = m - endif - - ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV05C10)),false) --export CONFIG_VIDEO_OV05C10 = m -+export CONFIG_ICAMERA_OV05C10 = m - endif - - obj-y += drivers/media/i2c/ -diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile -index b4fa25598..2bcc878e7 100644 ---- a/drivers/media/i2c/Makefile -+++ b/drivers/media/i2c/Makefile -@@ -1,15 +1,15 @@ - # SPDX-License-Identifier: GPL-2.0 - # Copyright (c) 2021 Intel Corporation. - --obj-$(CONFIG_VIDEO_HM11B1) += hm11b1.o --obj-$(CONFIG_VIDEO_GC5035) += gc5035.o --obj-$(CONFIG_VIDEO_OV01A1S) += ov01a1s.o --obj-$(CONFIG_VIDEO_OV01A10) += ov01a10.o --obj-$(CONFIG_VIDEO_OV02C10) += ov02c10.o --obj-$(CONFIG_VIDEO_OV02E10) += ov02e10.o --obj-$(CONFIG_VIDEO_OV05C10) += ov05c10.o --obj-$(CONFIG_VIDEO_OV2740) += ov2740.o --obj-$(CONFIG_VIDEO_HM2170) += hm2170.o --obj-$(CONFIG_VIDEO_HM2170) += hm2172.o --obj-$(CONFIG_VIDEO_HI556) += hi556.o -+obj-$(CONFIG_ICAMERA_HM11B1) += hm11b1.o -+obj-$(CONFIG_ICAMERA_GC5035) += gc5035.o -+obj-$(CONFIG_ICAMERA_OV01A1S) += ov01a1s.o -+obj-$(CONFIG_ICAMERA_OV01A10) += ov01a10.o -+obj-$(CONFIG_ICAMERA_OV02C10) += ov02c10.o -+obj-$(CONFIG_ICAMERA_OV02E10) += ov02e10.o -+obj-$(CONFIG_ICAMERA_OV05C10) += ov05c10.o -+obj-$(CONFIG_ICAMERA_OV2740) += ov2740.o -+obj-$(CONFIG_ICAMERA_HM2170) += hm2170.o -+obj-$(CONFIG_ICAMERA_HM2170) += hm2172.o -+obj-$(CONFIG_ICAMERA_HI556) += hi556.o - obj-$(CONFIG_POWER_CTRL_LOGIC) += power_ctrl_logic.o --- -2.48.1 - diff --git a/anda/system/ipu6-drivers/akmod/0002-Makefile-Re-enable-gc5035-compilation-with-kernels-6.patch b/anda/system/ipu6-drivers/akmod/0002-Makefile-Re-enable-gc5035-compilation-with-kernels-6.patch deleted file mode 100644 index d8bb788804..0000000000 --- a/anda/system/ipu6-drivers/akmod/0002-Makefile-Re-enable-gc5035-compilation-with-kernels-6.patch +++ /dev/null @@ -1,97 +0,0 @@ -From b839b8153bd364c22811496c1753145fa475bcc8 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Mon, 10 Jun 2024 13:41:16 +0200 -Subject: [PATCH 2/9] Makefile: Re-enable gc5035 compilation with kernels >= - 6.8 - -For some reason the gc5035 driver has been disabled for kernels >= 6.8, -but it is not upstream yet. - -Fix compilation with kernel >= 6.8 and re-enable the driver. - -Signed-off-by: Hans de Goede ---- - Makefile | 2 +- - drivers/media/i2c/gc5035.c | 19 +++++++++++++++++++ - 2 files changed, 20 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 356f5e7f3..58bc10aed 100644 ---- a/Makefile -+++ b/Makefile -@@ -89,10 +89,10 @@ export CONFIG_ICAMERA_OV02E10 = m - export CONFIG_ICAMERA_HM2170 = m - export CONFIG_ICAMERA_HM2172 = m - export CONFIG_ICAMERA_HI556 = m -+export CONFIG_ICAMERA_GC5035 = m - - ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV2740)),true) - export CONFIG_ICAMERA_OV2740 = m --export CONFIG_ICAMERA_GC5035 = m - endif - - ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV05C10)),false) -diff --git a/drivers/media/i2c/gc5035.c b/drivers/media/i2c/gc5035.c -index 16bbd4845..e825dfa7d 100644 ---- a/drivers/media/i2c/gc5035.c -+++ b/drivers/media/i2c/gc5035.c -@@ -1497,7 +1497,11 @@ static int gc5035_set_fmt(struct v4l2_subdev *sd, - - mutex_lock(&gc5035->mutex); - if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 8, 0) - *v4l2_subdev_get_try_format(sd, sd_state, fmt->pad) = fmt->format; -+#else -+ *v4l2_subdev_state_get_format(sd_state, fmt->pad) = fmt->format; -+#endif - } else { - gc5035->cur_mode = mode; - h_blank = mode->hts_def - mode->width; -@@ -1522,7 +1526,11 @@ static int gc5035_get_fmt(struct v4l2_subdev *sd, - - mutex_lock(&gc5035->mutex); - if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 8, 0) - fmt->format = *v4l2_subdev_get_try_format(sd, sd_state, fmt->pad); -+#else -+ fmt->format = *v4l2_subdev_state_get_format(sd_state, fmt->pad); -+#endif - } else { - fmt->format.width = mode->width; - fmt->format.height = mode->height; -@@ -1714,7 +1722,9 @@ static const struct v4l2_subdev_video_ops gc5035_video_ops = { - }; - - static const struct v4l2_subdev_pad_ops gc5035_pad_ops = { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 8, 0) - .init_cfg = gc5035_entity_init_cfg, -+#endif - .enum_mbus_code = gc5035_enum_mbus_code, - .enum_frame_size = gc5035_enum_frame_sizes, - .get_fmt = gc5035_get_fmt, -@@ -1730,6 +1740,12 @@ static const struct media_entity_operations gc5035_subdev_entity_ops = { - .link_validate = v4l2_subdev_link_validate, - }; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 8, 0) -+static const struct v4l2_subdev_internal_ops gc5035_internal_ops = { -+ .init_state = gc5035_entity_init_cfg, -+}; -+#endif -+ - static int gc5035_set_exposure(struct gc5035 *gc5035, u32 val) - { - u32 caltime = 0; -@@ -2091,6 +2107,9 @@ static int gc5035_probe(struct i2c_client *client) - mutex_init(&gc5035->mutex); - sd = &gc5035->subdev; - v4l2_i2c_subdev_init(sd, client, &gc5035_subdev_ops); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 8, 0) -+ sd->internal_ops = &gc5035_internal_ops; -+#endif - ret = gc5035_initialize_controls(gc5035); - if (ret) { - dev_err_probe(dev, ret, "Failed to initialize controls\n"); --- -2.48.1 - diff --git a/anda/system/ipu6-drivers/akmod/0003-Makefile-Do-not-build-hi556-driver-with-kernels-6.10.patch b/anda/system/ipu6-drivers/akmod/0003-Makefile-Do-not-build-hi556-driver-with-kernels-6.10.patch deleted file mode 100644 index 923f26602b..0000000000 --- a/anda/system/ipu6-drivers/akmod/0003-Makefile-Do-not-build-hi556-driver-with-kernels-6.10.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 580d73c387405534bdef7911e0616ad66953f7ce Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Mon, 13 Jan 2025 13:11:00 +0100 -Subject: [PATCH 3/9] Makefile: Do not build hi556 driver with kernels >= 6.10 - -The mainline kernel hi556 driver has ACPI enumeration, GPIO and clk support -since kernel 6.10, so it can be used instead of the out of tree driver. - -Add a new KV_HI556 variable and stop building the hi556 driver on -kernels >= 6.10. - -Signed-off-by: Hans de Goede ---- - Makefile | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 58bc10aed..472fdec22 100644 ---- a/Makefile -+++ b/Makefile -@@ -24,6 +24,7 @@ KV_IVSC := 6.6.0 - KV_IPU_BRIDGE := 6.6.0 - KV_OV2740 := 6.8.0 - KV_OV05C10 := 6.8.0 -+KV_HI556 := 6.10 - KV_IPU6_ISYS := 6.10.0 - - KERNEL_SRC ?= /lib/modules/$(KERNELRELEASE)/build -@@ -88,17 +89,21 @@ export CONFIG_ICAMERA_OV02C10 = m - export CONFIG_ICAMERA_OV02E10 = m - export CONFIG_ICAMERA_HM2170 = m - export CONFIG_ICAMERA_HM2172 = m --export CONFIG_ICAMERA_HI556 = m - export CONFIG_ICAMERA_GC5035 = m - - ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV2740)),true) - export CONFIG_ICAMERA_OV2740 = m - endif - -+# Note OV05C10 check is reversed, it is not build on too old kernels - ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV05C10)),false) - export CONFIG_ICAMERA_OV05C10 = m - endif - -+ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_HI556)),true) -+export CONFIG_ICAMERA_HI556 = m -+endif -+ - obj-y += drivers/media/i2c/ - - ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_IVSC)),true) --- -2.48.1 - diff --git a/anda/system/ipu6-drivers/akmod/0004-Makefile-Do-not-build-ov01a10-driver-with-kernels-6..patch b/anda/system/ipu6-drivers/akmod/0004-Makefile-Do-not-build-ov01a10-driver-with-kernels-6..patch deleted file mode 100644 index 73f37ea469..0000000000 --- a/anda/system/ipu6-drivers/akmod/0004-Makefile-Do-not-build-ov01a10-driver-with-kernels-6..patch +++ /dev/null @@ -1,51 +0,0 @@ -From 14d41bf82770fcab65dcf3b2eec3f95b7a963aff Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Mon, 13 Jan 2025 13:15:15 +0100 -Subject: [PATCH 4/9] Makefile: Do not build ov01a10 driver with kernels >= 6.8 - -Since commit 47a78052db51 ("media: ov01a10: Enable runtime PM before -registering async sub-device") the mainline ov01a10 driver is fully -usable and it can be used instead of the out of tree driver. - -Add a new KV_OV01A10 variable and stop building the ov01a10 driver on -kernels >= 6.8. - -Signed-off-by: Hans de Goede ---- - Makefile | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 472fdec22..7ae3be835 100644 ---- a/Makefile -+++ b/Makefile -@@ -23,6 +23,7 @@ version_lt = $(shell \ - KV_IVSC := 6.6.0 - KV_IPU_BRIDGE := 6.6.0 - KV_OV2740 := 6.8.0 -+KV_OV01A10 := 6.8.0 - KV_OV05C10 := 6.8.0 - KV_HI556 := 6.10 - KV_IPU6_ISYS := 6.10.0 -@@ -84,7 +85,6 @@ endif - - export CONFIG_ICAMERA_HM11B1 = m - export CONFIG_ICAMERA_OV01A1S = m --export CONFIG_ICAMERA_OV01A10 = m - export CONFIG_ICAMERA_OV02C10 = m - export CONFIG_ICAMERA_OV02E10 = m - export CONFIG_ICAMERA_HM2170 = m -@@ -95,6 +95,10 @@ ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV2740)),true) - export CONFIG_ICAMERA_OV2740 = m - endif - -+ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV01A10)),true) -+export CONFIG_ICAMERA_OV01A10 = m -+endif -+ - # Note OV05C10 check is reversed, it is not build on too old kernels - ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV05C10)),false) - export CONFIG_ICAMERA_OV05C10 = m --- -2.48.1 - diff --git a/anda/system/ipu6-drivers/akmod/0006-media-ipu6-Fix-building-with-kernel-6.13.patch b/anda/system/ipu6-drivers/akmod/0006-media-ipu6-Fix-building-with-kernel-6.13.patch deleted file mode 100644 index a4b0ddbdea..0000000000 --- a/anda/system/ipu6-drivers/akmod/0006-media-ipu6-Fix-building-with-kernel-6.13.patch +++ /dev/null @@ -1,53 +0,0 @@ -From a42273020f4a2e1c633dda6f30c512db56738b67 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Tue, 14 Jan 2025 23:08:04 +0100 -Subject: [PATCH 6/9] media: ipu6: Fix building with kernel 6.13 - -Fix building with kernel 6.13. - -Signed-off-by: Hans de Goede ---- - drivers/media/pci/intel/ipu6/psys/ipu-psys.c | 8 ++++++++ - drivers/media/pci/intel/ipu6/psys/ipu6-psys.c | 4 ++++ - 2 files changed, 12 insertions(+) - -diff --git a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c -index 00e394f20..36f99a3b8 100644 ---- a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c -+++ b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c -@@ -2681,8 +2681,16 @@ MODULE_AUTHOR("Yunliang Ding "); - MODULE_LICENSE("GPL"); - MODULE_DESCRIPTION("Intel ipu processing system driver"); - #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0) || IS_ENABLED(CONFIG_DRM_I915_HAS_SRIOV) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0) - MODULE_IMPORT_NS(DMA_BUF); -+#else -+MODULE_IMPORT_NS("DMA_BUF"); -+#endif - #endif - #if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 10, 0) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0) - MODULE_IMPORT_NS(INTEL_IPU6); -+#else -+MODULE_IMPORT_NS("INTEL_IPU6"); -+#endif - #endif -diff --git a/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c -index 53c845ba3..0c3a5ca62 100644 ---- a/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c -+++ b/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c -@@ -32,7 +32,11 @@ - #include "ipu6-platform-buttress-regs.h" - #endif - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0) - MODULE_IMPORT_NS(DMA_BUF); -+#else -+MODULE_IMPORT_NS("DMA_BUF"); -+#endif - - static bool early_pg_transfer; - module_param(early_pg_transfer, bool, 0664); --- -2.48.1 - diff --git a/anda/system/ipu6-drivers/akmod/0007-Modify-0001-v6.10-IPU6-headers-used-by-PSYS.patch-fo.patch b/anda/system/ipu6-drivers/akmod/0007-Modify-0001-v6.10-IPU6-headers-used-by-PSYS.patch-fo.patch deleted file mode 100644 index d1bccf20a1..0000000000 --- a/anda/system/ipu6-drivers/akmod/0007-Modify-0001-v6.10-IPU6-headers-used-by-PSYS.patch-fo.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 32ce53b82bef51479d49d7d68794e2b801367dd6 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Thu, 30 Jan 2025 22:20:16 +0100 -Subject: [PATCH 7/9] Modify 0001-v6.10-IPU6-headers-used-by-PSYS.patch for - v6.13 - -Modify 0001-v6.10-IPU6-headers-used-by-PSYS.patch so that it also works -with 6.13 kernels. - -Signed-off-by: Hans de Goede ---- - patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch b/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch -index 00fb961d2..6a465a924 100644 ---- a/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch -+++ b/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch -@@ -52,7 +52,7 @@ index 000000000..b26c6aee1 - + - +struct ipu6_bus_device { - + struct auxiliary_device auxdev; --+ struct auxiliary_driver *auxdrv; -++ const struct auxiliary_driver *auxdrv; - + const struct ipu6_auxdrv_data *auxdrv_data; - + struct list_head list; - + void *pdata; -@@ -92,7 +92,7 @@ new file mode 100644 - index 000000000..9b6f56958 - --- /dev/null - +++ b/drivers/media/pci/intel/ipu6/ipu6-buttress.h --@@ -0,0 +1,92 @@ -+@@ -0,0 +1,94 @@ - +/* SPDX-License-Identifier: GPL-2.0-only */ - +/* Copyright (C) 2013--2024 Intel Corporation */ - + -@@ -141,7 +141,9 @@ index 000000000..9b6f56958 - +struct ipu6_buttress { - + struct mutex power_mutex, auth_mutex, cons_mutex, ipc_mutex; - + struct ipu6_buttress_ipc cse; -++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0) - + struct ipu6_buttress_ipc ish; -++#endif - + struct list_head constraints; - + u32 wdt_cached_value; - + bool force_suspend; --- -2.48.1 - diff --git a/anda/system/ipu6-drivers/akmod/0008-ipu6-psys-Adjust-DMA-code-for-ipu6-bus-DMA-changes-i.patch b/anda/system/ipu6-drivers/akmod/0008-ipu6-psys-Adjust-DMA-code-for-ipu6-bus-DMA-changes-i.patch deleted file mode 100644 index 141202d154..0000000000 --- a/anda/system/ipu6-drivers/akmod/0008-ipu6-psys-Adjust-DMA-code-for-ipu6-bus-DMA-changes-i.patch +++ /dev/null @@ -1,306 +0,0 @@ -From a9236f549f28811a5af0c71ce6708d1f259d0e78 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Sat, 1 Feb 2025 08:04:35 +0100 -Subject: [PATCH 8/9] ipu6-psys: Adjust DMA code for ipu6-bus DMA changes in - kernels >= 6.12 - -Upstream commit daabc5c64703 ("media: ipu6: not override the dma_ops of -device in driver") has changed the ipu6-bus code to no longer modify -the aux device's dma_ops, instead new ipu6_dma_*() helpers were introduced -modify the psys driver to use these new helpers. - -This fixes the below DMA warning, which was followed by ipu6_psys_probe() -failing due to dma_alloc_attrs() failing: - -Jan 31 11:59:59 x1 kernel: ------------[ cut here ]------------ -Jan 31 11:59:59 x1 kernel: WARNING: CPU: 3 PID: 8595 at kernel/dma/mapping.c:597 dma_alloc_attrs+0x12b/0x140 -Jan 31 11:59:59 x1 kernel: Modules linked in: intel_ipu6_psys(OE+) rfcomm snd_seq_dummy snd_hrtimer qrtr bnep binfmt_misc vfat fat snd_soc_skl_hda_dsp snd_soc_intel_sof_board_helpers snd_sof_probes snd_soc_intel_hda_dsp_common snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic snd_hda_scodec_component snd_soc_dmic snd_sof_pci_intel_mtl snd_sof_intel_hda_generic soundwire_intel soundwire_cadence snd_sof_intel_hda_common snd_soc_hdac_hda iwlmvm snd_sof_intel_hda_mlink snd_sof_intel_hda snd_sof_pci snd_sof_xtensa_dsp snd_sof snd_sof_utils snd_hda_ext_core mac80211 snd_soc_acpi_intel_match soundwire_generic_allocation snd_soc_acpi intel_uncore_frequency soundwire_bus intel_uncore_frequency_common x86_pkg_temp_thermal snd_soc_core intel_ipu6_isys intel_powerclamp videobuf2_dma_sg coretemp snd_compress videobuf2_memops ac97_bus videobuf2_v4l2 snd_pcm_dmaengine videobuf2_common snd_hda_intel libarc4 snd_intel_dspcfg snd_intel_sdw_acpi kvm_intel snd_hda_codec spi_nor btusb iTCO_wdt btrtl mhi_wwan_mbim intel_pmc_bxt mhi_wwan_ctrl -Jan 31 11:59:59 x1 kernel: snd_hda_core mei_gsc_proxy gpio_usbio(OE) mei_wdt i2c_usbio(OE) mtd iTCO_vendor_support intel_rapl_msr btintel snd_hwdep kvm btbcm btmtk snd_seq snd_ctl_led hid_sensor_accel_3d hid_sensor_gyro_3d iwlwifi bluetooth snd_seq_device rapl processor_thermal_device_pci intel_cstate hid_sensor_trigger think_lmi processor_thermal_device hid_sensor_iio_common processor_thermal_wt_hint industrialio_triggered_buffer intel_uncore usbio(OE) firmware_attributes_class snd_pcm wmi_bmof mhi_pci_generic kfifo_buf processor_thermal_rfim i2c_i801 mei_me cfg80211 processor_thermal_rapl thinkpad_acpi spi_intel_pci mhi industrialio thunderbolt snd_timer spi_intel mei intel_ipu6 i2c_smbus intel_rapl_common idma64 platform_profile processor_thermal_wt_req ipu_bridge rfkill processor_thermal_power_floor snd igen6_edac processor_thermal_mbox int3403_thermal soundcore soc_button_array int340x_thermal_zone intel_pmc_core intel_skl_int3472_tps68470 ov08x40(OE) tps68470_regulator v4l2_fwnode clk_tps68470 intel_vsec v4l2_async -Jan 31 11:59:59 x1 kernel: pmt_telemetry intel_skl_int3472_discrete int3400_thermal intel_hid acpi_tad pmt_class intel_skl_int3472_common acpi_pad sparse_keymap joydev acpi_thermal_rel loop nfnetlink zram lz4hc_compress lz4_compress dm_crypt xe drm_ttm_helper gpu_sched drm_suballoc_helper drm_gpuvm drm_exec hid_sensor_hub intel_ishtp_hid i915 i2c_algo_bit drm_buddy nvme ttm nvme_core drm_display_helper intel_ish_ipc video ucsi_acpi crct10dif_pclmul hid_multitouch crc32_pclmul crc32c_intel polyval_clmulni polyval_generic ghash_clmulni_intel intel_vpu sha512_ssse3 sha256_ssse3 typec_ucsi sha1_ssse3 intel_ishtp cec typec nvme_auth i2c_hid_acpi i2c_hid wmi pinctrl_meteorlake serio_raw v4l2loopback(OE) videodev mc i2c_dev fuse -Jan 31 11:59:59 x1 kernel: CPU: 3 UID: 0 PID: 8595 Comm: modprobe Tainted: G OE 6.12.10-200.fc41.x86_64 #1 -Jan 31 11:59:59 x1 kernel: Tainted: [O]=OOT_MODULE, [E]=UNSIGNED_MODULE -Jan 31 11:59:59 x1 kernel: Hardware name: LENOVO 21KCSIT080/21KCSIT080, BIOS N3YET72W (1.37 ) 10/03/2024 -Jan 31 11:59:59 x1 kernel: RIP: 0010:dma_alloc_attrs+0x12b/0x140 -Jan 31 11:59:59 x1 kernel: Code: 4c 89 e6 48 89 df e8 94 5d 9a 00 49 89 c7 e9 62 ff ff ff 0f 0b 45 31 ff 5b 5d 4c 89 f8 41 5c 41 5d 41 5e 41 5f c3 cc cc cc cc <0f> 0b e9 0d ff ff ff 45 31 ff e9 3e ff ff ff 66 0f 1f 44 00 00 90 -Jan 31 11:59:59 x1 kernel: RSP: 0018:ffffaeefe452fbc8 EFLAGS: 00010246 -Jan 31 11:59:59 x1 kernel: RAX: 0000000000000000 RBX: ffff936a8de60800 RCX: 0000000000000cc0 -Jan 31 11:59:59 x1 kernel: RDX: ffff936af6c65018 RSI: 0000000000002000 RDI: ffff936a8de60800 -Jan 31 11:59:59 x1 kernel: RBP: ffff936a8de60800 R08: 0000000000000000 R09: ffff936af6c65000 -Jan 31 11:59:59 x1 kernel: R10: ffffaeefe452fc00 R11: ffff9371bf9a17c0 R12: 0000000000002000 -Jan 31 11:59:59 x1 kernel: R13: ffff936af6c65018 R14: 0000000000000000 R15: ffff936a9d9be440 -Jan 31 11:59:59 x1 kernel: FS: 00007f8ff258f740(0000) GS:ffff9371bf980000(0000) knlGS:0000000000000000 -Jan 31 11:59:59 x1 kernel: CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 -Jan 31 11:59:59 x1 kernel: CR2: 00007f2e39eee67c CR3: 000000013b884003 CR4: 0000000000f72ef0 -Jan 31 11:59:59 x1 kernel: DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 -Jan 31 11:59:59 x1 kernel: DR3: 0000000000000000 DR6: 00000000ffff07f0 DR7: 0000000000000400 -Jan 31 11:59:59 x1 kernel: PKRU: 55555554 -Jan 31 11:59:59 x1 kernel: Call Trace: -Jan 31 11:59:59 x1 kernel: -Jan 31 11:59:59 x1 kernel: ? dma_alloc_attrs+0x12b/0x140 -Jan 31 11:59:59 x1 kernel: ? __warn.cold+0x93/0xfa -Jan 31 11:59:59 x1 kernel: ? dma_alloc_attrs+0x12b/0x140 -Jan 31 11:59:59 x1 kernel: ? report_bug+0xff/0x140 -Jan 31 11:59:59 x1 kernel: ? handle_bug+0x58/0x90 -Jan 31 11:59:59 x1 kernel: ? exc_invalid_op+0x17/0x70 -Jan 31 11:59:59 x1 kernel: ? asm_exc_invalid_op+0x1a/0x20 -Jan 31 11:59:59 x1 kernel: ? dma_alloc_attrs+0x12b/0x140 -Jan 31 11:59:59 x1 kernel: ipu6_psys_probe+0x37d/0x4b0 [intel_ipu6_psys] -Jan 31 11:59:59 x1 kernel: ? __pfx_ipu6_psys_probe+0x10/0x10 [intel_ipu6_psys] -Jan 31 11:59:59 x1 kernel: auxiliary_bus_probe+0x46/0x80 -Jan 31 11:59:59 x1 kernel: ? driver_sysfs_add+0x57/0xc0 -Jan 31 11:59:59 x1 kernel: really_probe+0xdb/0x340 -Jan 31 11:59:59 x1 kernel: ? pm_runtime_barrier+0x54/0x90 -Jan 31 11:59:59 x1 kernel: ? __pfx___driver_attach+0x10/0x10 -Jan 31 11:59:59 x1 kernel: __driver_probe_device+0x78/0x110 -Jan 31 11:59:59 x1 kernel: driver_probe_device+0x1f/0xa0 -Jan 31 11:59:59 x1 kernel: __driver_attach+0xba/0x1c0 -Jan 31 11:59:59 x1 kernel: bus_for_each_dev+0x8c/0xe0 -Jan 31 11:59:59 x1 kernel: bus_add_driver+0x142/0x220 -Jan 31 11:59:59 x1 kernel: driver_register+0x72/0xd0 -Jan 31 11:59:59 x1 kernel: __auxiliary_driver_register+0x6e/0xd0 -Jan 31 11:59:59 x1 kernel: ? __pfx_ipu6_psys_aux_driver_init+0x10/0x10 [intel_ipu6_psys] -Jan 31 11:59:59 x1 kernel: do_one_initcall+0x58/0x310 -Jan 31 11:59:59 x1 kernel: do_init_module+0x90/0x260 -Jan 31 11:59:59 x1 kernel: __do_sys_init_module+0x17a/0x1b0 -Jan 31 11:59:59 x1 kernel: do_syscall_64+0x82/0x160 -Jan 31 11:59:59 x1 kernel: ? exc_page_fault+0x7e/0x180 -Jan 31 11:59:59 x1 kernel: entry_SYSCALL_64_after_hwframe+0x76/0x7e -Jan 31 11:59:59 x1 kernel: RIP: 0033:0x7f8ff1f0228e -Jan 31 11:59:59 x1 kernel: Code: 48 8b 0d 85 3b 0f 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 49 89 ca b8 af 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 52 3b 0f 00 f7 d8 64 89 01 48 -Jan 31 11:59:59 x1 kernel: RSP: 002b:00007ffdfbde11e8 EFLAGS: 00000246 ORIG_RAX: 00000000000000af -Jan 31 11:59:59 x1 kernel: RAX: ffffffffffffffda RBX: 000055a0687e9240 RCX: 00007f8ff1f0228e -Jan 31 11:59:59 x1 kernel: RDX: 000055a05859a715 RSI: 0000000000041a65 RDI: 00007f8ff13a7010 -Jan 31 11:59:59 x1 kernel: RBP: 00007ffdfbde12a0 R08: 000055a0687e8010 R09: 0000000000000007 -Jan 31 11:59:59 x1 kernel: R10: 0000000000000001 R11: 0000000000000246 R12: 000055a05859a715 -Jan 31 11:59:59 x1 kernel: R13: 0000000000040000 R14: 000055a0687e92e0 R15: 0000000000000000 -Jan 31 11:59:59 x1 kernel: -Jan 31 11:59:59 x1 kernel: ---[ end trace 0000000000000000 ]--- - -Signed-off-by: Hans de Goede ---- - drivers/media/pci/intel/ipu6/psys/ipu-psys.c | 64 ++++++++++++++++++- - drivers/media/pci/intel/ipu6/psys/ipu6-ppg.c | 6 +- - drivers/media/pci/intel/ipu6/psys/ipu6-psys.c | 22 +++++-- - 3 files changed, 85 insertions(+), 7 deletions(-) - -diff --git a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c -index 36f99a3b8..7c512e5ae 100644 ---- a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c -+++ b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c -@@ -52,6 +52,7 @@ - #include "ipu-psys.h" - #include "ipu6-platform-regs.h" - #include "ipu6-fw-com.h" -+#include "ipu6-dma.h" - #endif - - static bool async_fw_init; -@@ -228,9 +229,12 @@ struct ipu_psys_pg *__get_pg_buf(struct ipu_psys *psys, size_t pg_size) - #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) - kpg->pg = dma_alloc_attrs(&psys->adev->dev, pg_size, - &kpg->pg_dma_addr, GFP_KERNEL, 0); --#else -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - kpg->pg = dma_alloc_attrs(dev, pg_size, &kpg->pg_dma_addr, - GFP_KERNEL, 0); -+#else -+ kpg->pg = ipu6_dma_alloc(to_ipu6_bus_device(dev), pg_size, -+ &kpg->pg_dma_addr, GFP_KERNEL, 0); - #endif - if (!kpg->pg) { - kfree(kpg); -@@ -597,6 +601,7 @@ static void ipu_dma_buf_detach(struct dma_buf *dbuf, - attach->priv = NULL; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - static struct sg_table *ipu_dma_buf_map(struct dma_buf_attachment *attach, - enum dma_data_direction dir) - { -@@ -658,6 +663,50 @@ static void ipu_dma_buf_unmap(struct dma_buf_attachment *attach, - #endif - } - -+#else -+ -+static struct sg_table *ipu_dma_buf_map(struct dma_buf_attachment *attach, -+ enum dma_data_direction dir) -+{ -+ struct ipu_dma_buf_attach *ipu_attach = attach->priv; -+ struct ipu6_bus_device *adev = to_ipu6_bus_device(attach->dev); -+ struct pci_dev *pdev = adev->isp->pdev; -+ unsigned long attrs; -+ int ret; -+ -+ attrs = DMA_ATTR_SKIP_CPU_SYNC; -+ ret = dma_map_sgtable(&pdev->dev, ipu_attach->sgt, dir, attrs); -+ if (ret) { -+ dev_dbg(attach->dev, "buf map failed\n"); -+ return ERR_PTR(-EIO); -+ } -+ -+ ret = ipu6_dma_map_sgtable(adev, ipu_attach->sgt, dir, attrs); -+ if (ret) { -+ dma_unmap_sgtable(&pdev->dev, ipu_attach->sgt, dir, attrs); -+ return ERR_PTR(-EIO); -+ } -+ -+ /* -+ * Initial cache flush to avoid writing dirty pages for buffers which -+ * are later marked as IPU_BUFFER_FLAG_NO_FLUSH. -+ */ -+ ipu6_dma_sync_sgtable(adev, ipu_attach->sgt); -+ -+ return ipu_attach->sgt; -+} -+ -+static void ipu_dma_buf_unmap(struct dma_buf_attachment *attach, -+ struct sg_table *sgt, enum dma_data_direction dir) -+{ -+ struct ipu6_bus_device *adev = to_ipu6_bus_device(attach->dev); -+ struct pci_dev *pdev = adev->isp->pdev; -+ -+ ipu6_dma_unmap_sgtable(adev, sgt, dir, DMA_ATTR_SKIP_CPU_SYNC); -+ dma_unmap_sgtable(&pdev->dev, sgt, dir, DMA_ATTR_SKIP_CPU_SYNC); -+} -+#endif -+ - static int ipu_dma_buf_mmap(struct dma_buf *dbuf, struct vm_area_struct *vma) - { - return -ENOTTY; -@@ -2371,7 +2420,12 @@ static int ipu6_psys_probe(struct auxiliary_device *auxdev, - kpg = kzalloc(sizeof(*kpg), GFP_KERNEL); - if (!kpg) - goto out_free_pgs; -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - kpg->pg = dma_alloc_attrs(dev, IPU_PSYS_PG_MAX_SIZE, -+#else -+ kpg->pg = ipu6_dma_alloc(adev, IPU_PSYS_PG_MAX_SIZE, -+#endif - &kpg->pg_dma_addr, - GFP_KERNEL, 0); - if (!kpg->pg) { -@@ -2426,7 +2480,11 @@ out_release_fw_com: - ipu6_fw_com_release(psys->fwcom, 1); - out_free_pgs: - list_for_each_entry_safe(kpg, kpg0, &psys->pgs, list) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - dma_free_attrs(dev, kpg->size, kpg->pg, kpg->pg_dma_addr, 0); -+#else -+ ipu6_dma_free(adev, kpg->size, kpg->pg, kpg->pg_dma_addr, 0); -+#endif - kfree(kpg); - } - -@@ -2484,8 +2542,10 @@ static void ipu6_psys_remove(struct auxiliary_device *auxdev) - #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) - dma_free_attrs(&adev->dev, kpg->size, kpg->pg, - kpg->pg_dma_addr, 0); --#else -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - dma_free_attrs(dev, kpg->size, kpg->pg, kpg->pg_dma_addr, 0); -+#else -+ ipu6_dma_free(psys->adev, kpg->size, kpg->pg, kpg->pg_dma_addr, 0); - #endif - kfree(kpg); - } -diff --git a/drivers/media/pci/intel/ipu6/psys/ipu6-ppg.c b/drivers/media/pci/intel/ipu6/psys/ipu6-ppg.c -index 9038f69cd..5e6fb9a1b 100644 ---- a/drivers/media/pci/intel/ipu6/psys/ipu6-ppg.c -+++ b/drivers/media/pci/intel/ipu6/psys/ipu6-ppg.c -@@ -8,6 +8,7 @@ - #include - - #include "ipu6-ppg.h" -+#include "ipu6-dma.h" - - static bool enable_suspend_resume; - module_param(enable_suspend_resume, bool, 0664); -@@ -75,9 +76,12 @@ __get_buf_set(struct ipu_psys_fh *fh, size_t buf_set_size) - kbuf_set->kaddr = dma_alloc_attrs(&fh->psys->adev->dev, - buf_set_size, &kbuf_set->dma_addr, - GFP_KERNEL, 0); --#else -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - kbuf_set->kaddr = dma_alloc_attrs(dev, buf_set_size, - &kbuf_set->dma_addr, GFP_KERNEL, 0); -+#else -+ kbuf_set->kaddr = ipu6_dma_alloc(to_ipu6_bus_device(dev), buf_set_size, -+ &kbuf_set->dma_addr, GFP_KERNEL, 0); - #endif - if (!kbuf_set->kaddr) { - kfree(kbuf_set); -diff --git a/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c -index 0c3a5ca62..58662ea16 100644 ---- a/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c -+++ b/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c -@@ -30,6 +30,7 @@ - #include "ipu6-ppg.h" - #include "ipu6-platform-regs.h" - #include "ipu6-platform-buttress-regs.h" -+#include "ipu6-dma.h" - #endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0) -@@ -450,10 +451,12 @@ static struct ipu_psys_kcmd *ipu_psys_copy_cmd(struct ipu_psys_command *cmd, - kcmd->kbufs[i]->sgt->sgl, - kcmd->kbufs[i]->sgt->orig_nents, - DMA_BIDIRECTIONAL); --#else -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - dma_sync_sg_for_device(dev, kcmd->kbufs[i]->sgt->sgl, - kcmd->kbufs[i]->sgt->orig_nents, - DMA_BIDIRECTIONAL); -+#else -+ ipu6_dma_sync_sgtable(psys->adev, kcmd->kbufs[i]->sgt); - #endif - } - -@@ -1102,11 +1105,16 @@ int ipu_psys_fh_init(struct ipu_psys_fh *fh) - &kbuf_set->dma_addr, - GFP_KERNEL, - 0); --#else -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - kbuf_set->kaddr = dma_alloc_attrs(dev, - IPU_PSYS_BUF_SET_MAX_SIZE, - &kbuf_set->dma_addr, - GFP_KERNEL, 0); -+#else -+ kbuf_set->kaddr = ipu6_dma_alloc(to_ipu6_bus_device(dev), -+ IPU_PSYS_BUF_SET_MAX_SIZE, -+ &kbuf_set->dma_addr, -+ GFP_KERNEL, 0); - #endif - if (!kbuf_set->kaddr) { - kfree(kbuf_set); -@@ -1124,8 +1132,11 @@ out_free_buf_sets: - #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) - dma_free_attrs(&psys->adev->dev, - kbuf_set->size, kbuf_set->kaddr, --#else -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - dma_free_attrs(dev, kbuf_set->size, kbuf_set->kaddr, -+#else -+ ipu6_dma_free(to_ipu6_bus_device(dev), -+ kbuf_set->size, kbuf_set->kaddr, - #endif - kbuf_set->dma_addr, 0); - list_del(&kbuf_set->list); -@@ -1229,8 +1240,11 @@ int ipu_psys_fh_deinit(struct ipu_psys_fh *fh) - #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) - dma_free_attrs(&psys->adev->dev, - kbuf_set->size, kbuf_set->kaddr, --#else -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - dma_free_attrs(dev, kbuf_set->size, kbuf_set->kaddr, -+#else -+ ipu6_dma_free(to_ipu6_bus_device(dev), -+ kbuf_set->size, kbuf_set->kaddr, - #endif - kbuf_set->dma_addr, 0); - list_del(&kbuf_set->list); --- -2.48.1 - diff --git a/anda/system/ipu6-drivers/akmod/0009-Add-ipu6-dma.h-to-0001-v6.10-IPU6-headers-used-by-PS.patch b/anda/system/ipu6-drivers/akmod/0009-Add-ipu6-dma.h-to-0001-v6.10-IPU6-headers-used-by-PS.patch deleted file mode 100644 index 63b626a834..0000000000 --- a/anda/system/ipu6-drivers/akmod/0009-Add-ipu6-dma.h-to-0001-v6.10-IPU6-headers-used-by-PS.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 47a2e1cf89b789bbc10d3cb3b26b357404633114 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Sat, 1 Feb 2025 08:19:22 +0100 -Subject: [PATCH 9/9] Add ipu6-dma.h to - 0001-v6.10-IPU6-headers-used-by-PSYS.patch - -Add ipu6-dma.h to 0001-v6.10-IPU6-headers-used-by-PSYS.patch, -this is necessary for the DMA code adjustments in the psys code -which were done for the ipu6-bus DMA changes in kernels >= 6.12. - -Signed-off-by: Hans de Goede ---- - ...0001-v6.10-IPU6-headers-used-by-PSYS.patch | 55 +++++++++++++++++++ - 1 file changed, 55 insertions(+) - -diff --git a/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch b/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch -index 6a465a924..b8eeaae66 100644 ---- a/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch -+++ b/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch -@@ -1195,6 +1195,61 @@ index 000000000..92e3c3414 - + int pkg_dir_idx, void __iomem *base, u64 *pkg_dir, - + dma_addr_t pkg_dir_dma_addr); - +#endif /* IPU6_H */ -+diff --git a/drivers/media/pci/intel/ipu6/ipu6-dma.h b/drivers/media/pci/intel/ipu6/ipu6-dma.h -+new file mode 100644 -+index 000000000..b51244add -+--- /dev/null -++++ b/drivers/media/pci/intel/ipu6/ipu6-dma.h -+@@ -0,0 +1,49 @@ -++/* SPDX-License-Identifier: GPL-2.0-only */ -++/* Copyright (C) 2013--2024 Intel Corporation */ -++ -++#ifndef IPU6_DMA_H -++#define IPU6_DMA_H -++ -++#include -++#include -++#include -++#include -++#include -++#include -++ -++#include "ipu6-bus.h" -++ -++struct ipu6_mmu_info; -++ -++struct ipu6_dma_mapping { -++ struct ipu6_mmu_info *mmu_info; -++ struct iova_domain iovad; -++}; -++ -++void ipu6_dma_sync_single(struct ipu6_bus_device *sys, dma_addr_t dma_handle, -++ size_t size); -++void ipu6_dma_sync_sg(struct ipu6_bus_device *sys, struct scatterlist *sglist, -++ int nents); -++void ipu6_dma_sync_sgtable(struct ipu6_bus_device *sys, struct sg_table *sgt); -++void *ipu6_dma_alloc(struct ipu6_bus_device *sys, size_t size, -++ dma_addr_t *dma_handle, gfp_t gfp, -++ unsigned long attrs); -++void ipu6_dma_free(struct ipu6_bus_device *sys, size_t size, void *vaddr, -++ dma_addr_t dma_handle, unsigned long attrs); -++int ipu6_dma_mmap(struct ipu6_bus_device *sys, struct vm_area_struct *vma, -++ void *addr, dma_addr_t iova, size_t size, -++ unsigned long attrs); -++int ipu6_dma_map_sg(struct ipu6_bus_device *sys, struct scatterlist *sglist, -++ int nents, enum dma_data_direction dir, -++ unsigned long attrs); -++void ipu6_dma_unmap_sg(struct ipu6_bus_device *sys, struct scatterlist *sglist, -++ int nents, enum dma_data_direction dir, -++ unsigned long attrs); -++int ipu6_dma_map_sgtable(struct ipu6_bus_device *sys, struct sg_table *sgt, -++ enum dma_data_direction dir, unsigned long attrs); -++void ipu6_dma_unmap_sgtable(struct ipu6_bus_device *sys, struct sg_table *sgt, -++ enum dma_data_direction dir, unsigned long attrs); -++int ipu6_dma_get_sgtable(struct ipu6_bus_device *sys, struct sg_table *sgt, -++ void *cpu_addr, dma_addr_t handle, size_t size, -++ unsigned long attrs); -++#endif /* IPU6_DMA_H */ - -- - 2.43.0 - --- -2.48.1 - diff --git a/anda/system/ipu6-drivers/akmod/0010-psys-Do-not-skipping-registering-ipu_psys_bus-for-ke.patch b/anda/system/ipu6-drivers/akmod/0010-psys-Do-not-skipping-registering-ipu_psys_bus-for-ke.patch deleted file mode 100644 index 6ba5e4a65f..0000000000 --- a/anda/system/ipu6-drivers/akmod/0010-psys-Do-not-skipping-registering-ipu_psys_bus-for-ke.patch +++ /dev/null @@ -1,202 +0,0 @@ -From c1cb2a62cd9d949fda60f5993a72ec0c44f52719 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Wed, 5 Feb 2025 13:20:21 +0100 -Subject: [PATCH 10/11] psys: Do not skipping registering ipu_psys_bus for - kernels >= 6.10 - -The new auxbus code-paths were not registering the ipu_psys_bus used for -psys->dev.bus = &ipu_psys_bus, this was causing udev to not be able to -properly enumerate the device. For example running: - -udevadm test -a add /dev/ipu-psys0 - -would fail with the following error: - -"Failed to clone sd_device object: No such file or directory" - -This udev issue in turn was causing issues with udev rules to set -permissions on /dev/ipu-psys0 not working - -Fix this by: - -1. Rename ipu6_psys_bus to ipu_psys_bus, there is no need for separate -names for this struct with different kernels and having the same name -allows code sharing. - -2. Switching back from using module_auxiliary_driver() to using -module_init() / module_exit() codes for registering the drivers. - -3. Move the now always used ipu_psys_init() and ipu_psys_exit() -out of any ifdefs blocks, so that these functions now always -(un)register the chrdev region and the ipu_psys_bus. - -4. Remove the now duplicate chrdev region handling from the auxbus -ipu6_psys_probe() and ipu6_psys_remove() functions (now handled -by ipu_psys_init() and ipu_psys_exit()). - -Signed-off-by: Hans de Goede ---- - drivers/media/pci/intel/ipu6/psys/ipu-psys.c | 94 +++++++++----------- - 1 file changed, 40 insertions(+), 54 deletions(-) - -diff --git a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c -index 7c512e5ae..c06cd515a 100644 ---- a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c -+++ b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c -@@ -92,7 +92,7 @@ static struct bus_type ipu_psys_bus = { - .name = IPU_PSYS_NAME, - }; - #else --static const struct bus_type ipu6_psys_bus = { -+static const struct bus_type ipu_psys_bus = { - .name = "intel-ipu6-psys", - }; - #endif -@@ -2331,17 +2331,9 @@ static int ipu6_psys_probe(struct auxiliary_device *auxdev, - - ipu_ver = adev->isp->hw_ver; - -- rval = alloc_chrdev_region(&ipu_psys_dev_t, 0, -- IPU_PSYS_NUM_DEVICES, IPU6_PSYS_NAME); -- if (rval) { -- dev_err(dev, "can't alloc psys chrdev region (%d)\n", -- rval); -- return rval; -- } -- - rval = ipu6_mmu_hw_init(adev->mmu); - if (rval) -- goto out_unregister_chr_region; -+ return rval; - - mutex_lock(&ipu_psys_mutex); - -@@ -2453,7 +2445,7 @@ static int ipu6_psys_probe(struct auxiliary_device *auxdev, - goto out_free_pgs; - } - -- psys->dev.bus = &ipu6_psys_bus; -+ psys->dev.bus = &ipu_psys_bus; - psys->dev.parent = dev; - psys->dev.devt = MKDEV(MAJOR(ipu_psys_dev_t), minor); - psys->dev.release = ipu_psys_dev_release; -@@ -2500,10 +2492,6 @@ out_unlock: - /* Safe to call even if the init is not called */ - mutex_unlock(&ipu_psys_mutex); - ipu6_mmu_hw_cleanup(adev->mmu); -- --out_unregister_chr_region: -- unregister_chrdev_region(ipu_psys_dev_t, IPU_PSYS_NUM_DEVICES); -- - return rval; - } - #endif -@@ -2521,9 +2509,6 @@ static void ipu6_psys_remove(struct auxiliary_device *auxdev) - #endif - struct ipu_psys_pg *kpg, *kpg0; - --#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 10, 0) -- unregister_chrdev_region(ipu_psys_dev_t, IPU_PSYS_NUM_DEVICES); --#endif - #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) - #ifdef CONFIG_DEBUG_FS - if (isp->ipu_dir) -@@ -2658,38 +2643,6 @@ static struct ipu_bus_driver ipu_psys_driver = { - }, - }; - --static int __init ipu_psys_init(void) --{ -- int rval = alloc_chrdev_region(&ipu_psys_dev_t, 0, -- IPU_PSYS_NUM_DEVICES, IPU_PSYS_NAME); -- if (rval) { -- pr_err("can't alloc psys chrdev region (%d)\n", rval); -- return rval; -- } -- -- rval = bus_register(&ipu_psys_bus); -- if (rval) { -- pr_warn("can't register psys bus (%d)\n", rval); -- goto out_bus_register; -- } -- -- ipu_bus_register_driver(&ipu_psys_driver); -- -- return rval; -- --out_bus_register: -- unregister_chrdev_region(ipu_psys_dev_t, IPU_PSYS_NUM_DEVICES); -- -- return rval; --} -- --static void __exit ipu_psys_exit(void) --{ -- ipu_bus_unregister_driver(&ipu_psys_driver); -- bus_unregister(&ipu_psys_bus); -- unregister_chrdev_region(ipu_psys_dev_t, IPU_PSYS_NUM_DEVICES); --} -- - static const struct pci_device_id ipu_pci_tbl[] = { - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, IPU6_PCI_ID)}, - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, IPU6SE_PCI_ID)}, -@@ -2700,9 +2653,6 @@ static const struct pci_device_id ipu_pci_tbl[] = { - {0,} - }; - MODULE_DEVICE_TABLE(pci, ipu_pci_tbl); -- --module_init(ipu_psys_init); --module_exit(ipu_psys_exit); - #else - static const struct ipu6_auxdrv_data ipu6_psys_auxdrv_data = { - .isr_threaded = psys_isr_threaded, -@@ -2727,9 +2677,45 @@ static struct auxiliary_driver ipu6_psys_aux_driver = { - .pm = &psys_pm_ops, - }, - }; --module_auxiliary_driver(ipu6_psys_aux_driver); - #endif - -+static int __init ipu_psys_init(void) -+{ -+ int rval = alloc_chrdev_region(&ipu_psys_dev_t, 0, -+ IPU_PSYS_NUM_DEVICES, ipu_psys_bus.name); -+ if (rval) { -+ pr_err("can't alloc psys chrdev region (%d)\n", rval); -+ return rval; -+ } -+ -+ rval = bus_register(&ipu_psys_bus); -+ if (rval) { -+ pr_err("can't register psys bus (%d)\n", rval); -+ unregister_chrdev_region(ipu_psys_dev_t, IPU_PSYS_NUM_DEVICES); -+ return rval; -+ } -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) -+ ipu_bus_register_driver(&ipu_psys_driver); -+#else -+ auxiliary_driver_register(&ipu6_psys_aux_driver); -+#endif -+ return 0; -+} -+module_init(ipu_psys_init); -+ -+static void __exit ipu_psys_exit(void) -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) -+ ipu_bus_unregister_driver(&ipu_psys_driver); -+#else -+ auxiliary_driver_unregister(&ipu6_psys_aux_driver); -+#endif -+ bus_unregister(&ipu_psys_bus); -+ unregister_chrdev_region(ipu_psys_dev_t, IPU_PSYS_NUM_DEVICES); -+} -+module_exit(ipu_psys_exit); -+ - MODULE_AUTHOR("Antti Laakso "); - MODULE_AUTHOR("Bin Han "); - MODULE_AUTHOR("Renwei Wu "); --- -2.48.1 - diff --git a/anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec b/anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec index 181485e2b5..e5928571dc 100644 --- a/anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec +++ b/anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec @@ -21,22 +21,8 @@ URL: https://github.com/intel/ipu6-drivers Source0: https://github.com/intel/ipu6-drivers/archive/%{ipu6_commit}/ipu6-drivers-%{ipu6_shortcommit}.tar.gz Source1: https://github.com/intel/usbio-drivers/archive/%{usbio_commit}/usbio-drivers-%{usbio_shortcommit}.tar.gz # Patches -# https://github.com/intel/ipu6-drivers/pull/322 -Patch1: 0001-Makefile-Switch-sensor-driver-symbols-from-CONFIG_VI.patch -Patch2: 0002-Makefile-Re-enable-gc5035-compilation-with-kernels-6.patch -Patch3: 0003-Makefile-Do-not-build-hi556-driver-with-kernels-6.10.patch -Patch4: 0004-Makefile-Do-not-build-ov01a10-driver-with-kernels-6..patch # https://github.com/intel/ipu6-drivers/pull/321 -Patch5: 0005-media-ipu6-Fix-out-of-tree-builds.patch -Patch6: 0006-media-ipu6-Fix-building-with-kernel-6.13.patch -Patch7: 0007-Modify-0001-v6.10-IPU6-headers-used-by-PSYS.patch-fo.patch -# https://github.com/intel/ipu6-drivers/pull/324 -Patch8: 0008-ipu6-psys-Adjust-DMA-code-for-ipu6-bus-DMA-changes-i.patch -Patch9: 0009-Add-ipu6-dma.h-to-0001-v6.10-IPU6-headers-used-by-PS.patch -# https://github.com/intel/ipu6-drivers/pull/327 -Patch10: 0010-psys-Do-not-skipping-registering-ipu_psys_bus-for-ke.patch -Patch11: 0011-psys-Use-cdev_device_add-for-dev-ipu-psys0.patch -# https://github.com/intel/usbio-drivers/pull/33 +Patch0: 0005-media-ipu6-Fix-out-of-tree-builds.patch Patch20: 0010-usbio-Fix-GPIO-and-I2C-driver-modaliases.patch # https://github.com/intel/usbio-drivers/pull/34 Patch21: 0011-usbio-Fix-I2C-max-transfer-size.patch @@ -67,17 +53,7 @@ kmodtool --target %{_target_cpu} --repo terra --kmodname %{modulename} %{?build %setup -q -c -a 1 (cd ipu6-drivers-%{ipu6_commit} -%patch 1 -p1 -%patch 2 -p1 -%patch 3 -p1 -%patch 4 -p1 -%patch 5 -p1 -%patch 6 -p1 -%patch 7 -p1 -%patch 8 -p1 -%patch 9 -p1 -%patch 10 -p1 -%patch 11 -p1 +%patch 0 -p1 %patch 101 -p1 patch -p1 < patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch ) diff --git a/anda/system/ipu6-drivers/dkms/0001-Makefile-Switch-sensor-driver-symbols-from-CONFIG_VI.patch b/anda/system/ipu6-drivers/dkms/0001-Makefile-Switch-sensor-driver-symbols-from-CONFIG_VI.patch deleted file mode 100644 index 4e768ef1e7..0000000000 --- a/anda/system/ipu6-drivers/dkms/0001-Makefile-Switch-sensor-driver-symbols-from-CONFIG_VI.patch +++ /dev/null @@ -1,88 +0,0 @@ -From c451aa3f50f8a5ef26d9a36f159c3f9fb8e6ef11 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Mon, 10 Jun 2024 13:05:53 +0200 -Subject: [PATCH 1/9] Makefile: Switch sensor driver symbols from - CONFIG_VIDEO_FOO to CONFIG_ICAMERA_FOO - -Switch the Kconfig symbols for sensor drivers from CONFIG_VIDEO_FOO to -CONFIG_ICAMERA_FOO to avoid these still being set when they should not -because of the CONFIG_VIDEO_FOO symbols inherited from the base kernel. - -Signed-off-by: Hans de Goede ---- - Makefile | 22 +++++++++++----------- - drivers/media/i2c/Makefile | 22 +++++++++++----------- - 2 files changed, 22 insertions(+), 22 deletions(-) - -diff --git a/Makefile b/Makefile -index 49b27300a..356f5e7f3 100644 ---- a/Makefile -+++ b/Makefile -@@ -81,22 +81,22 @@ else - obj-y += drivers/media/pci/intel/ipu6/psys/ - endif - --export CONFIG_VIDEO_HM11B1 = m --export CONFIG_VIDEO_OV01A1S = m --export CONFIG_VIDEO_OV01A10 = m --export CONFIG_VIDEO_OV02C10 = m --export CONFIG_VIDEO_OV02E10 = m --export CONFIG_VIDEO_HM2170 = m --export CONFIG_VIDEO_HM2172 = m --export CONFIG_VIDEO_HI556 = m -+export CONFIG_ICAMERA_HM11B1 = m -+export CONFIG_ICAMERA_OV01A1S = m -+export CONFIG_ICAMERA_OV01A10 = m -+export CONFIG_ICAMERA_OV02C10 = m -+export CONFIG_ICAMERA_OV02E10 = m -+export CONFIG_ICAMERA_HM2170 = m -+export CONFIG_ICAMERA_HM2172 = m -+export CONFIG_ICAMERA_HI556 = m - - ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV2740)),true) --export CONFIG_VIDEO_OV2740 = m --export CONFIG_VIDEO_GC5035 = m -+export CONFIG_ICAMERA_OV2740 = m -+export CONFIG_ICAMERA_GC5035 = m - endif - - ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV05C10)),false) --export CONFIG_VIDEO_OV05C10 = m -+export CONFIG_ICAMERA_OV05C10 = m - endif - - obj-y += drivers/media/i2c/ -diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile -index b4fa25598..2bcc878e7 100644 ---- a/drivers/media/i2c/Makefile -+++ b/drivers/media/i2c/Makefile -@@ -1,15 +1,15 @@ - # SPDX-License-Identifier: GPL-2.0 - # Copyright (c) 2021 Intel Corporation. - --obj-$(CONFIG_VIDEO_HM11B1) += hm11b1.o --obj-$(CONFIG_VIDEO_GC5035) += gc5035.o --obj-$(CONFIG_VIDEO_OV01A1S) += ov01a1s.o --obj-$(CONFIG_VIDEO_OV01A10) += ov01a10.o --obj-$(CONFIG_VIDEO_OV02C10) += ov02c10.o --obj-$(CONFIG_VIDEO_OV02E10) += ov02e10.o --obj-$(CONFIG_VIDEO_OV05C10) += ov05c10.o --obj-$(CONFIG_VIDEO_OV2740) += ov2740.o --obj-$(CONFIG_VIDEO_HM2170) += hm2170.o --obj-$(CONFIG_VIDEO_HM2170) += hm2172.o --obj-$(CONFIG_VIDEO_HI556) += hi556.o -+obj-$(CONFIG_ICAMERA_HM11B1) += hm11b1.o -+obj-$(CONFIG_ICAMERA_GC5035) += gc5035.o -+obj-$(CONFIG_ICAMERA_OV01A1S) += ov01a1s.o -+obj-$(CONFIG_ICAMERA_OV01A10) += ov01a10.o -+obj-$(CONFIG_ICAMERA_OV02C10) += ov02c10.o -+obj-$(CONFIG_ICAMERA_OV02E10) += ov02e10.o -+obj-$(CONFIG_ICAMERA_OV05C10) += ov05c10.o -+obj-$(CONFIG_ICAMERA_OV2740) += ov2740.o -+obj-$(CONFIG_ICAMERA_HM2170) += hm2170.o -+obj-$(CONFIG_ICAMERA_HM2170) += hm2172.o -+obj-$(CONFIG_ICAMERA_HI556) += hi556.o - obj-$(CONFIG_POWER_CTRL_LOGIC) += power_ctrl_logic.o --- -2.48.1 - diff --git a/anda/system/ipu6-drivers/dkms/0002-Makefile-Re-enable-gc5035-compilation-with-kernels-6.patch b/anda/system/ipu6-drivers/dkms/0002-Makefile-Re-enable-gc5035-compilation-with-kernels-6.patch deleted file mode 100644 index d8bb788804..0000000000 --- a/anda/system/ipu6-drivers/dkms/0002-Makefile-Re-enable-gc5035-compilation-with-kernels-6.patch +++ /dev/null @@ -1,97 +0,0 @@ -From b839b8153bd364c22811496c1753145fa475bcc8 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Mon, 10 Jun 2024 13:41:16 +0200 -Subject: [PATCH 2/9] Makefile: Re-enable gc5035 compilation with kernels >= - 6.8 - -For some reason the gc5035 driver has been disabled for kernels >= 6.8, -but it is not upstream yet. - -Fix compilation with kernel >= 6.8 and re-enable the driver. - -Signed-off-by: Hans de Goede ---- - Makefile | 2 +- - drivers/media/i2c/gc5035.c | 19 +++++++++++++++++++ - 2 files changed, 20 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 356f5e7f3..58bc10aed 100644 ---- a/Makefile -+++ b/Makefile -@@ -89,10 +89,10 @@ export CONFIG_ICAMERA_OV02E10 = m - export CONFIG_ICAMERA_HM2170 = m - export CONFIG_ICAMERA_HM2172 = m - export CONFIG_ICAMERA_HI556 = m -+export CONFIG_ICAMERA_GC5035 = m - - ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV2740)),true) - export CONFIG_ICAMERA_OV2740 = m --export CONFIG_ICAMERA_GC5035 = m - endif - - ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV05C10)),false) -diff --git a/drivers/media/i2c/gc5035.c b/drivers/media/i2c/gc5035.c -index 16bbd4845..e825dfa7d 100644 ---- a/drivers/media/i2c/gc5035.c -+++ b/drivers/media/i2c/gc5035.c -@@ -1497,7 +1497,11 @@ static int gc5035_set_fmt(struct v4l2_subdev *sd, - - mutex_lock(&gc5035->mutex); - if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 8, 0) - *v4l2_subdev_get_try_format(sd, sd_state, fmt->pad) = fmt->format; -+#else -+ *v4l2_subdev_state_get_format(sd_state, fmt->pad) = fmt->format; -+#endif - } else { - gc5035->cur_mode = mode; - h_blank = mode->hts_def - mode->width; -@@ -1522,7 +1526,11 @@ static int gc5035_get_fmt(struct v4l2_subdev *sd, - - mutex_lock(&gc5035->mutex); - if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 8, 0) - fmt->format = *v4l2_subdev_get_try_format(sd, sd_state, fmt->pad); -+#else -+ fmt->format = *v4l2_subdev_state_get_format(sd_state, fmt->pad); -+#endif - } else { - fmt->format.width = mode->width; - fmt->format.height = mode->height; -@@ -1714,7 +1722,9 @@ static const struct v4l2_subdev_video_ops gc5035_video_ops = { - }; - - static const struct v4l2_subdev_pad_ops gc5035_pad_ops = { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 8, 0) - .init_cfg = gc5035_entity_init_cfg, -+#endif - .enum_mbus_code = gc5035_enum_mbus_code, - .enum_frame_size = gc5035_enum_frame_sizes, - .get_fmt = gc5035_get_fmt, -@@ -1730,6 +1740,12 @@ static const struct media_entity_operations gc5035_subdev_entity_ops = { - .link_validate = v4l2_subdev_link_validate, - }; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 8, 0) -+static const struct v4l2_subdev_internal_ops gc5035_internal_ops = { -+ .init_state = gc5035_entity_init_cfg, -+}; -+#endif -+ - static int gc5035_set_exposure(struct gc5035 *gc5035, u32 val) - { - u32 caltime = 0; -@@ -2091,6 +2107,9 @@ static int gc5035_probe(struct i2c_client *client) - mutex_init(&gc5035->mutex); - sd = &gc5035->subdev; - v4l2_i2c_subdev_init(sd, client, &gc5035_subdev_ops); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 8, 0) -+ sd->internal_ops = &gc5035_internal_ops; -+#endif - ret = gc5035_initialize_controls(gc5035); - if (ret) { - dev_err_probe(dev, ret, "Failed to initialize controls\n"); --- -2.48.1 - diff --git a/anda/system/ipu6-drivers/dkms/0003-Makefile-Do-not-build-hi556-driver-with-kernels-6.10.patch b/anda/system/ipu6-drivers/dkms/0003-Makefile-Do-not-build-hi556-driver-with-kernels-6.10.patch deleted file mode 100644 index 923f26602b..0000000000 --- a/anda/system/ipu6-drivers/dkms/0003-Makefile-Do-not-build-hi556-driver-with-kernels-6.10.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 580d73c387405534bdef7911e0616ad66953f7ce Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Mon, 13 Jan 2025 13:11:00 +0100 -Subject: [PATCH 3/9] Makefile: Do not build hi556 driver with kernels >= 6.10 - -The mainline kernel hi556 driver has ACPI enumeration, GPIO and clk support -since kernel 6.10, so it can be used instead of the out of tree driver. - -Add a new KV_HI556 variable and stop building the hi556 driver on -kernels >= 6.10. - -Signed-off-by: Hans de Goede ---- - Makefile | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 58bc10aed..472fdec22 100644 ---- a/Makefile -+++ b/Makefile -@@ -24,6 +24,7 @@ KV_IVSC := 6.6.0 - KV_IPU_BRIDGE := 6.6.0 - KV_OV2740 := 6.8.0 - KV_OV05C10 := 6.8.0 -+KV_HI556 := 6.10 - KV_IPU6_ISYS := 6.10.0 - - KERNEL_SRC ?= /lib/modules/$(KERNELRELEASE)/build -@@ -88,17 +89,21 @@ export CONFIG_ICAMERA_OV02C10 = m - export CONFIG_ICAMERA_OV02E10 = m - export CONFIG_ICAMERA_HM2170 = m - export CONFIG_ICAMERA_HM2172 = m --export CONFIG_ICAMERA_HI556 = m - export CONFIG_ICAMERA_GC5035 = m - - ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV2740)),true) - export CONFIG_ICAMERA_OV2740 = m - endif - -+# Note OV05C10 check is reversed, it is not build on too old kernels - ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV05C10)),false) - export CONFIG_ICAMERA_OV05C10 = m - endif - -+ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_HI556)),true) -+export CONFIG_ICAMERA_HI556 = m -+endif -+ - obj-y += drivers/media/i2c/ - - ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_IVSC)),true) --- -2.48.1 - diff --git a/anda/system/ipu6-drivers/dkms/0004-Makefile-Do-not-build-ov01a10-driver-with-kernels-6..patch b/anda/system/ipu6-drivers/dkms/0004-Makefile-Do-not-build-ov01a10-driver-with-kernels-6..patch deleted file mode 100644 index 73f37ea469..0000000000 --- a/anda/system/ipu6-drivers/dkms/0004-Makefile-Do-not-build-ov01a10-driver-with-kernels-6..patch +++ /dev/null @@ -1,51 +0,0 @@ -From 14d41bf82770fcab65dcf3b2eec3f95b7a963aff Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Mon, 13 Jan 2025 13:15:15 +0100 -Subject: [PATCH 4/9] Makefile: Do not build ov01a10 driver with kernels >= 6.8 - -Since commit 47a78052db51 ("media: ov01a10: Enable runtime PM before -registering async sub-device") the mainline ov01a10 driver is fully -usable and it can be used instead of the out of tree driver. - -Add a new KV_OV01A10 variable and stop building the ov01a10 driver on -kernels >= 6.8. - -Signed-off-by: Hans de Goede ---- - Makefile | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 472fdec22..7ae3be835 100644 ---- a/Makefile -+++ b/Makefile -@@ -23,6 +23,7 @@ version_lt = $(shell \ - KV_IVSC := 6.6.0 - KV_IPU_BRIDGE := 6.6.0 - KV_OV2740 := 6.8.0 -+KV_OV01A10 := 6.8.0 - KV_OV05C10 := 6.8.0 - KV_HI556 := 6.10 - KV_IPU6_ISYS := 6.10.0 -@@ -84,7 +85,6 @@ endif - - export CONFIG_ICAMERA_HM11B1 = m - export CONFIG_ICAMERA_OV01A1S = m --export CONFIG_ICAMERA_OV01A10 = m - export CONFIG_ICAMERA_OV02C10 = m - export CONFIG_ICAMERA_OV02E10 = m - export CONFIG_ICAMERA_HM2170 = m -@@ -95,6 +95,10 @@ ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV2740)),true) - export CONFIG_ICAMERA_OV2740 = m - endif - -+ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV01A10)),true) -+export CONFIG_ICAMERA_OV01A10 = m -+endif -+ - # Note OV05C10 check is reversed, it is not build on too old kernels - ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_OV05C10)),false) - export CONFIG_ICAMERA_OV05C10 = m --- -2.48.1 - diff --git a/anda/system/ipu6-drivers/dkms/0006-media-ipu6-Fix-building-with-kernel-6.13.patch b/anda/system/ipu6-drivers/dkms/0006-media-ipu6-Fix-building-with-kernel-6.13.patch deleted file mode 100644 index a4b0ddbdea..0000000000 --- a/anda/system/ipu6-drivers/dkms/0006-media-ipu6-Fix-building-with-kernel-6.13.patch +++ /dev/null @@ -1,53 +0,0 @@ -From a42273020f4a2e1c633dda6f30c512db56738b67 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Tue, 14 Jan 2025 23:08:04 +0100 -Subject: [PATCH 6/9] media: ipu6: Fix building with kernel 6.13 - -Fix building with kernel 6.13. - -Signed-off-by: Hans de Goede ---- - drivers/media/pci/intel/ipu6/psys/ipu-psys.c | 8 ++++++++ - drivers/media/pci/intel/ipu6/psys/ipu6-psys.c | 4 ++++ - 2 files changed, 12 insertions(+) - -diff --git a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c -index 00e394f20..36f99a3b8 100644 ---- a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c -+++ b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c -@@ -2681,8 +2681,16 @@ MODULE_AUTHOR("Yunliang Ding "); - MODULE_LICENSE("GPL"); - MODULE_DESCRIPTION("Intel ipu processing system driver"); - #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0) || IS_ENABLED(CONFIG_DRM_I915_HAS_SRIOV) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0) - MODULE_IMPORT_NS(DMA_BUF); -+#else -+MODULE_IMPORT_NS("DMA_BUF"); -+#endif - #endif - #if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 10, 0) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0) - MODULE_IMPORT_NS(INTEL_IPU6); -+#else -+MODULE_IMPORT_NS("INTEL_IPU6"); -+#endif - #endif -diff --git a/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c -index 53c845ba3..0c3a5ca62 100644 ---- a/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c -+++ b/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c -@@ -32,7 +32,11 @@ - #include "ipu6-platform-buttress-regs.h" - #endif - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0) - MODULE_IMPORT_NS(DMA_BUF); -+#else -+MODULE_IMPORT_NS("DMA_BUF"); -+#endif - - static bool early_pg_transfer; - module_param(early_pg_transfer, bool, 0664); --- -2.48.1 - diff --git a/anda/system/ipu6-drivers/dkms/0007-Modify-0001-v6.10-IPU6-headers-used-by-PSYS.patch-fo.patch b/anda/system/ipu6-drivers/dkms/0007-Modify-0001-v6.10-IPU6-headers-used-by-PSYS.patch-fo.patch deleted file mode 100644 index d1bccf20a1..0000000000 --- a/anda/system/ipu6-drivers/dkms/0007-Modify-0001-v6.10-IPU6-headers-used-by-PSYS.patch-fo.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 32ce53b82bef51479d49d7d68794e2b801367dd6 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Thu, 30 Jan 2025 22:20:16 +0100 -Subject: [PATCH 7/9] Modify 0001-v6.10-IPU6-headers-used-by-PSYS.patch for - v6.13 - -Modify 0001-v6.10-IPU6-headers-used-by-PSYS.patch so that it also works -with 6.13 kernels. - -Signed-off-by: Hans de Goede ---- - patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch b/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch -index 00fb961d2..6a465a924 100644 ---- a/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch -+++ b/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch -@@ -52,7 +52,7 @@ index 000000000..b26c6aee1 - + - +struct ipu6_bus_device { - + struct auxiliary_device auxdev; --+ struct auxiliary_driver *auxdrv; -++ const struct auxiliary_driver *auxdrv; - + const struct ipu6_auxdrv_data *auxdrv_data; - + struct list_head list; - + void *pdata; -@@ -92,7 +92,7 @@ new file mode 100644 - index 000000000..9b6f56958 - --- /dev/null - +++ b/drivers/media/pci/intel/ipu6/ipu6-buttress.h --@@ -0,0 +1,92 @@ -+@@ -0,0 +1,94 @@ - +/* SPDX-License-Identifier: GPL-2.0-only */ - +/* Copyright (C) 2013--2024 Intel Corporation */ - + -@@ -141,7 +141,9 @@ index 000000000..9b6f56958 - +struct ipu6_buttress { - + struct mutex power_mutex, auth_mutex, cons_mutex, ipc_mutex; - + struct ipu6_buttress_ipc cse; -++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0) - + struct ipu6_buttress_ipc ish; -++#endif - + struct list_head constraints; - + u32 wdt_cached_value; - + bool force_suspend; --- -2.48.1 - diff --git a/anda/system/ipu6-drivers/dkms/0008-ipu6-psys-Adjust-DMA-code-for-ipu6-bus-DMA-changes-i.patch b/anda/system/ipu6-drivers/dkms/0008-ipu6-psys-Adjust-DMA-code-for-ipu6-bus-DMA-changes-i.patch deleted file mode 100644 index 141202d154..0000000000 --- a/anda/system/ipu6-drivers/dkms/0008-ipu6-psys-Adjust-DMA-code-for-ipu6-bus-DMA-changes-i.patch +++ /dev/null @@ -1,306 +0,0 @@ -From a9236f549f28811a5af0c71ce6708d1f259d0e78 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Sat, 1 Feb 2025 08:04:35 +0100 -Subject: [PATCH 8/9] ipu6-psys: Adjust DMA code for ipu6-bus DMA changes in - kernels >= 6.12 - -Upstream commit daabc5c64703 ("media: ipu6: not override the dma_ops of -device in driver") has changed the ipu6-bus code to no longer modify -the aux device's dma_ops, instead new ipu6_dma_*() helpers were introduced -modify the psys driver to use these new helpers. - -This fixes the below DMA warning, which was followed by ipu6_psys_probe() -failing due to dma_alloc_attrs() failing: - -Jan 31 11:59:59 x1 kernel: ------------[ cut here ]------------ -Jan 31 11:59:59 x1 kernel: WARNING: CPU: 3 PID: 8595 at kernel/dma/mapping.c:597 dma_alloc_attrs+0x12b/0x140 -Jan 31 11:59:59 x1 kernel: Modules linked in: intel_ipu6_psys(OE+) rfcomm snd_seq_dummy snd_hrtimer qrtr bnep binfmt_misc vfat fat snd_soc_skl_hda_dsp snd_soc_intel_sof_board_helpers snd_sof_probes snd_soc_intel_hda_dsp_common snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic snd_hda_scodec_component snd_soc_dmic snd_sof_pci_intel_mtl snd_sof_intel_hda_generic soundwire_intel soundwire_cadence snd_sof_intel_hda_common snd_soc_hdac_hda iwlmvm snd_sof_intel_hda_mlink snd_sof_intel_hda snd_sof_pci snd_sof_xtensa_dsp snd_sof snd_sof_utils snd_hda_ext_core mac80211 snd_soc_acpi_intel_match soundwire_generic_allocation snd_soc_acpi intel_uncore_frequency soundwire_bus intel_uncore_frequency_common x86_pkg_temp_thermal snd_soc_core intel_ipu6_isys intel_powerclamp videobuf2_dma_sg coretemp snd_compress videobuf2_memops ac97_bus videobuf2_v4l2 snd_pcm_dmaengine videobuf2_common snd_hda_intel libarc4 snd_intel_dspcfg snd_intel_sdw_acpi kvm_intel snd_hda_codec spi_nor btusb iTCO_wdt btrtl mhi_wwan_mbim intel_pmc_bxt mhi_wwan_ctrl -Jan 31 11:59:59 x1 kernel: snd_hda_core mei_gsc_proxy gpio_usbio(OE) mei_wdt i2c_usbio(OE) mtd iTCO_vendor_support intel_rapl_msr btintel snd_hwdep kvm btbcm btmtk snd_seq snd_ctl_led hid_sensor_accel_3d hid_sensor_gyro_3d iwlwifi bluetooth snd_seq_device rapl processor_thermal_device_pci intel_cstate hid_sensor_trigger think_lmi processor_thermal_device hid_sensor_iio_common processor_thermal_wt_hint industrialio_triggered_buffer intel_uncore usbio(OE) firmware_attributes_class snd_pcm wmi_bmof mhi_pci_generic kfifo_buf processor_thermal_rfim i2c_i801 mei_me cfg80211 processor_thermal_rapl thinkpad_acpi spi_intel_pci mhi industrialio thunderbolt snd_timer spi_intel mei intel_ipu6 i2c_smbus intel_rapl_common idma64 platform_profile processor_thermal_wt_req ipu_bridge rfkill processor_thermal_power_floor snd igen6_edac processor_thermal_mbox int3403_thermal soundcore soc_button_array int340x_thermal_zone intel_pmc_core intel_skl_int3472_tps68470 ov08x40(OE) tps68470_regulator v4l2_fwnode clk_tps68470 intel_vsec v4l2_async -Jan 31 11:59:59 x1 kernel: pmt_telemetry intel_skl_int3472_discrete int3400_thermal intel_hid acpi_tad pmt_class intel_skl_int3472_common acpi_pad sparse_keymap joydev acpi_thermal_rel loop nfnetlink zram lz4hc_compress lz4_compress dm_crypt xe drm_ttm_helper gpu_sched drm_suballoc_helper drm_gpuvm drm_exec hid_sensor_hub intel_ishtp_hid i915 i2c_algo_bit drm_buddy nvme ttm nvme_core drm_display_helper intel_ish_ipc video ucsi_acpi crct10dif_pclmul hid_multitouch crc32_pclmul crc32c_intel polyval_clmulni polyval_generic ghash_clmulni_intel intel_vpu sha512_ssse3 sha256_ssse3 typec_ucsi sha1_ssse3 intel_ishtp cec typec nvme_auth i2c_hid_acpi i2c_hid wmi pinctrl_meteorlake serio_raw v4l2loopback(OE) videodev mc i2c_dev fuse -Jan 31 11:59:59 x1 kernel: CPU: 3 UID: 0 PID: 8595 Comm: modprobe Tainted: G OE 6.12.10-200.fc41.x86_64 #1 -Jan 31 11:59:59 x1 kernel: Tainted: [O]=OOT_MODULE, [E]=UNSIGNED_MODULE -Jan 31 11:59:59 x1 kernel: Hardware name: LENOVO 21KCSIT080/21KCSIT080, BIOS N3YET72W (1.37 ) 10/03/2024 -Jan 31 11:59:59 x1 kernel: RIP: 0010:dma_alloc_attrs+0x12b/0x140 -Jan 31 11:59:59 x1 kernel: Code: 4c 89 e6 48 89 df e8 94 5d 9a 00 49 89 c7 e9 62 ff ff ff 0f 0b 45 31 ff 5b 5d 4c 89 f8 41 5c 41 5d 41 5e 41 5f c3 cc cc cc cc <0f> 0b e9 0d ff ff ff 45 31 ff e9 3e ff ff ff 66 0f 1f 44 00 00 90 -Jan 31 11:59:59 x1 kernel: RSP: 0018:ffffaeefe452fbc8 EFLAGS: 00010246 -Jan 31 11:59:59 x1 kernel: RAX: 0000000000000000 RBX: ffff936a8de60800 RCX: 0000000000000cc0 -Jan 31 11:59:59 x1 kernel: RDX: ffff936af6c65018 RSI: 0000000000002000 RDI: ffff936a8de60800 -Jan 31 11:59:59 x1 kernel: RBP: ffff936a8de60800 R08: 0000000000000000 R09: ffff936af6c65000 -Jan 31 11:59:59 x1 kernel: R10: ffffaeefe452fc00 R11: ffff9371bf9a17c0 R12: 0000000000002000 -Jan 31 11:59:59 x1 kernel: R13: ffff936af6c65018 R14: 0000000000000000 R15: ffff936a9d9be440 -Jan 31 11:59:59 x1 kernel: FS: 00007f8ff258f740(0000) GS:ffff9371bf980000(0000) knlGS:0000000000000000 -Jan 31 11:59:59 x1 kernel: CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 -Jan 31 11:59:59 x1 kernel: CR2: 00007f2e39eee67c CR3: 000000013b884003 CR4: 0000000000f72ef0 -Jan 31 11:59:59 x1 kernel: DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 -Jan 31 11:59:59 x1 kernel: DR3: 0000000000000000 DR6: 00000000ffff07f0 DR7: 0000000000000400 -Jan 31 11:59:59 x1 kernel: PKRU: 55555554 -Jan 31 11:59:59 x1 kernel: Call Trace: -Jan 31 11:59:59 x1 kernel: -Jan 31 11:59:59 x1 kernel: ? dma_alloc_attrs+0x12b/0x140 -Jan 31 11:59:59 x1 kernel: ? __warn.cold+0x93/0xfa -Jan 31 11:59:59 x1 kernel: ? dma_alloc_attrs+0x12b/0x140 -Jan 31 11:59:59 x1 kernel: ? report_bug+0xff/0x140 -Jan 31 11:59:59 x1 kernel: ? handle_bug+0x58/0x90 -Jan 31 11:59:59 x1 kernel: ? exc_invalid_op+0x17/0x70 -Jan 31 11:59:59 x1 kernel: ? asm_exc_invalid_op+0x1a/0x20 -Jan 31 11:59:59 x1 kernel: ? dma_alloc_attrs+0x12b/0x140 -Jan 31 11:59:59 x1 kernel: ipu6_psys_probe+0x37d/0x4b0 [intel_ipu6_psys] -Jan 31 11:59:59 x1 kernel: ? __pfx_ipu6_psys_probe+0x10/0x10 [intel_ipu6_psys] -Jan 31 11:59:59 x1 kernel: auxiliary_bus_probe+0x46/0x80 -Jan 31 11:59:59 x1 kernel: ? driver_sysfs_add+0x57/0xc0 -Jan 31 11:59:59 x1 kernel: really_probe+0xdb/0x340 -Jan 31 11:59:59 x1 kernel: ? pm_runtime_barrier+0x54/0x90 -Jan 31 11:59:59 x1 kernel: ? __pfx___driver_attach+0x10/0x10 -Jan 31 11:59:59 x1 kernel: __driver_probe_device+0x78/0x110 -Jan 31 11:59:59 x1 kernel: driver_probe_device+0x1f/0xa0 -Jan 31 11:59:59 x1 kernel: __driver_attach+0xba/0x1c0 -Jan 31 11:59:59 x1 kernel: bus_for_each_dev+0x8c/0xe0 -Jan 31 11:59:59 x1 kernel: bus_add_driver+0x142/0x220 -Jan 31 11:59:59 x1 kernel: driver_register+0x72/0xd0 -Jan 31 11:59:59 x1 kernel: __auxiliary_driver_register+0x6e/0xd0 -Jan 31 11:59:59 x1 kernel: ? __pfx_ipu6_psys_aux_driver_init+0x10/0x10 [intel_ipu6_psys] -Jan 31 11:59:59 x1 kernel: do_one_initcall+0x58/0x310 -Jan 31 11:59:59 x1 kernel: do_init_module+0x90/0x260 -Jan 31 11:59:59 x1 kernel: __do_sys_init_module+0x17a/0x1b0 -Jan 31 11:59:59 x1 kernel: do_syscall_64+0x82/0x160 -Jan 31 11:59:59 x1 kernel: ? exc_page_fault+0x7e/0x180 -Jan 31 11:59:59 x1 kernel: entry_SYSCALL_64_after_hwframe+0x76/0x7e -Jan 31 11:59:59 x1 kernel: RIP: 0033:0x7f8ff1f0228e -Jan 31 11:59:59 x1 kernel: Code: 48 8b 0d 85 3b 0f 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 49 89 ca b8 af 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 52 3b 0f 00 f7 d8 64 89 01 48 -Jan 31 11:59:59 x1 kernel: RSP: 002b:00007ffdfbde11e8 EFLAGS: 00000246 ORIG_RAX: 00000000000000af -Jan 31 11:59:59 x1 kernel: RAX: ffffffffffffffda RBX: 000055a0687e9240 RCX: 00007f8ff1f0228e -Jan 31 11:59:59 x1 kernel: RDX: 000055a05859a715 RSI: 0000000000041a65 RDI: 00007f8ff13a7010 -Jan 31 11:59:59 x1 kernel: RBP: 00007ffdfbde12a0 R08: 000055a0687e8010 R09: 0000000000000007 -Jan 31 11:59:59 x1 kernel: R10: 0000000000000001 R11: 0000000000000246 R12: 000055a05859a715 -Jan 31 11:59:59 x1 kernel: R13: 0000000000040000 R14: 000055a0687e92e0 R15: 0000000000000000 -Jan 31 11:59:59 x1 kernel: -Jan 31 11:59:59 x1 kernel: ---[ end trace 0000000000000000 ]--- - -Signed-off-by: Hans de Goede ---- - drivers/media/pci/intel/ipu6/psys/ipu-psys.c | 64 ++++++++++++++++++- - drivers/media/pci/intel/ipu6/psys/ipu6-ppg.c | 6 +- - drivers/media/pci/intel/ipu6/psys/ipu6-psys.c | 22 +++++-- - 3 files changed, 85 insertions(+), 7 deletions(-) - -diff --git a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c -index 36f99a3b8..7c512e5ae 100644 ---- a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c -+++ b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c -@@ -52,6 +52,7 @@ - #include "ipu-psys.h" - #include "ipu6-platform-regs.h" - #include "ipu6-fw-com.h" -+#include "ipu6-dma.h" - #endif - - static bool async_fw_init; -@@ -228,9 +229,12 @@ struct ipu_psys_pg *__get_pg_buf(struct ipu_psys *psys, size_t pg_size) - #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) - kpg->pg = dma_alloc_attrs(&psys->adev->dev, pg_size, - &kpg->pg_dma_addr, GFP_KERNEL, 0); --#else -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - kpg->pg = dma_alloc_attrs(dev, pg_size, &kpg->pg_dma_addr, - GFP_KERNEL, 0); -+#else -+ kpg->pg = ipu6_dma_alloc(to_ipu6_bus_device(dev), pg_size, -+ &kpg->pg_dma_addr, GFP_KERNEL, 0); - #endif - if (!kpg->pg) { - kfree(kpg); -@@ -597,6 +601,7 @@ static void ipu_dma_buf_detach(struct dma_buf *dbuf, - attach->priv = NULL; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - static struct sg_table *ipu_dma_buf_map(struct dma_buf_attachment *attach, - enum dma_data_direction dir) - { -@@ -658,6 +663,50 @@ static void ipu_dma_buf_unmap(struct dma_buf_attachment *attach, - #endif - } - -+#else -+ -+static struct sg_table *ipu_dma_buf_map(struct dma_buf_attachment *attach, -+ enum dma_data_direction dir) -+{ -+ struct ipu_dma_buf_attach *ipu_attach = attach->priv; -+ struct ipu6_bus_device *adev = to_ipu6_bus_device(attach->dev); -+ struct pci_dev *pdev = adev->isp->pdev; -+ unsigned long attrs; -+ int ret; -+ -+ attrs = DMA_ATTR_SKIP_CPU_SYNC; -+ ret = dma_map_sgtable(&pdev->dev, ipu_attach->sgt, dir, attrs); -+ if (ret) { -+ dev_dbg(attach->dev, "buf map failed\n"); -+ return ERR_PTR(-EIO); -+ } -+ -+ ret = ipu6_dma_map_sgtable(adev, ipu_attach->sgt, dir, attrs); -+ if (ret) { -+ dma_unmap_sgtable(&pdev->dev, ipu_attach->sgt, dir, attrs); -+ return ERR_PTR(-EIO); -+ } -+ -+ /* -+ * Initial cache flush to avoid writing dirty pages for buffers which -+ * are later marked as IPU_BUFFER_FLAG_NO_FLUSH. -+ */ -+ ipu6_dma_sync_sgtable(adev, ipu_attach->sgt); -+ -+ return ipu_attach->sgt; -+} -+ -+static void ipu_dma_buf_unmap(struct dma_buf_attachment *attach, -+ struct sg_table *sgt, enum dma_data_direction dir) -+{ -+ struct ipu6_bus_device *adev = to_ipu6_bus_device(attach->dev); -+ struct pci_dev *pdev = adev->isp->pdev; -+ -+ ipu6_dma_unmap_sgtable(adev, sgt, dir, DMA_ATTR_SKIP_CPU_SYNC); -+ dma_unmap_sgtable(&pdev->dev, sgt, dir, DMA_ATTR_SKIP_CPU_SYNC); -+} -+#endif -+ - static int ipu_dma_buf_mmap(struct dma_buf *dbuf, struct vm_area_struct *vma) - { - return -ENOTTY; -@@ -2371,7 +2420,12 @@ static int ipu6_psys_probe(struct auxiliary_device *auxdev, - kpg = kzalloc(sizeof(*kpg), GFP_KERNEL); - if (!kpg) - goto out_free_pgs; -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - kpg->pg = dma_alloc_attrs(dev, IPU_PSYS_PG_MAX_SIZE, -+#else -+ kpg->pg = ipu6_dma_alloc(adev, IPU_PSYS_PG_MAX_SIZE, -+#endif - &kpg->pg_dma_addr, - GFP_KERNEL, 0); - if (!kpg->pg) { -@@ -2426,7 +2480,11 @@ out_release_fw_com: - ipu6_fw_com_release(psys->fwcom, 1); - out_free_pgs: - list_for_each_entry_safe(kpg, kpg0, &psys->pgs, list) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - dma_free_attrs(dev, kpg->size, kpg->pg, kpg->pg_dma_addr, 0); -+#else -+ ipu6_dma_free(adev, kpg->size, kpg->pg, kpg->pg_dma_addr, 0); -+#endif - kfree(kpg); - } - -@@ -2484,8 +2542,10 @@ static void ipu6_psys_remove(struct auxiliary_device *auxdev) - #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) - dma_free_attrs(&adev->dev, kpg->size, kpg->pg, - kpg->pg_dma_addr, 0); --#else -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - dma_free_attrs(dev, kpg->size, kpg->pg, kpg->pg_dma_addr, 0); -+#else -+ ipu6_dma_free(psys->adev, kpg->size, kpg->pg, kpg->pg_dma_addr, 0); - #endif - kfree(kpg); - } -diff --git a/drivers/media/pci/intel/ipu6/psys/ipu6-ppg.c b/drivers/media/pci/intel/ipu6/psys/ipu6-ppg.c -index 9038f69cd..5e6fb9a1b 100644 ---- a/drivers/media/pci/intel/ipu6/psys/ipu6-ppg.c -+++ b/drivers/media/pci/intel/ipu6/psys/ipu6-ppg.c -@@ -8,6 +8,7 @@ - #include - - #include "ipu6-ppg.h" -+#include "ipu6-dma.h" - - static bool enable_suspend_resume; - module_param(enable_suspend_resume, bool, 0664); -@@ -75,9 +76,12 @@ __get_buf_set(struct ipu_psys_fh *fh, size_t buf_set_size) - kbuf_set->kaddr = dma_alloc_attrs(&fh->psys->adev->dev, - buf_set_size, &kbuf_set->dma_addr, - GFP_KERNEL, 0); --#else -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - kbuf_set->kaddr = dma_alloc_attrs(dev, buf_set_size, - &kbuf_set->dma_addr, GFP_KERNEL, 0); -+#else -+ kbuf_set->kaddr = ipu6_dma_alloc(to_ipu6_bus_device(dev), buf_set_size, -+ &kbuf_set->dma_addr, GFP_KERNEL, 0); - #endif - if (!kbuf_set->kaddr) { - kfree(kbuf_set); -diff --git a/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c -index 0c3a5ca62..58662ea16 100644 ---- a/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c -+++ b/drivers/media/pci/intel/ipu6/psys/ipu6-psys.c -@@ -30,6 +30,7 @@ - #include "ipu6-ppg.h" - #include "ipu6-platform-regs.h" - #include "ipu6-platform-buttress-regs.h" -+#include "ipu6-dma.h" - #endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0) -@@ -450,10 +451,12 @@ static struct ipu_psys_kcmd *ipu_psys_copy_cmd(struct ipu_psys_command *cmd, - kcmd->kbufs[i]->sgt->sgl, - kcmd->kbufs[i]->sgt->orig_nents, - DMA_BIDIRECTIONAL); --#else -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - dma_sync_sg_for_device(dev, kcmd->kbufs[i]->sgt->sgl, - kcmd->kbufs[i]->sgt->orig_nents, - DMA_BIDIRECTIONAL); -+#else -+ ipu6_dma_sync_sgtable(psys->adev, kcmd->kbufs[i]->sgt); - #endif - } - -@@ -1102,11 +1105,16 @@ int ipu_psys_fh_init(struct ipu_psys_fh *fh) - &kbuf_set->dma_addr, - GFP_KERNEL, - 0); --#else -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - kbuf_set->kaddr = dma_alloc_attrs(dev, - IPU_PSYS_BUF_SET_MAX_SIZE, - &kbuf_set->dma_addr, - GFP_KERNEL, 0); -+#else -+ kbuf_set->kaddr = ipu6_dma_alloc(to_ipu6_bus_device(dev), -+ IPU_PSYS_BUF_SET_MAX_SIZE, -+ &kbuf_set->dma_addr, -+ GFP_KERNEL, 0); - #endif - if (!kbuf_set->kaddr) { - kfree(kbuf_set); -@@ -1124,8 +1132,11 @@ out_free_buf_sets: - #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) - dma_free_attrs(&psys->adev->dev, - kbuf_set->size, kbuf_set->kaddr, --#else -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - dma_free_attrs(dev, kbuf_set->size, kbuf_set->kaddr, -+#else -+ ipu6_dma_free(to_ipu6_bus_device(dev), -+ kbuf_set->size, kbuf_set->kaddr, - #endif - kbuf_set->dma_addr, 0); - list_del(&kbuf_set->list); -@@ -1229,8 +1240,11 @@ int ipu_psys_fh_deinit(struct ipu_psys_fh *fh) - #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) - dma_free_attrs(&psys->adev->dev, - kbuf_set->size, kbuf_set->kaddr, --#else -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) - dma_free_attrs(dev, kbuf_set->size, kbuf_set->kaddr, -+#else -+ ipu6_dma_free(to_ipu6_bus_device(dev), -+ kbuf_set->size, kbuf_set->kaddr, - #endif - kbuf_set->dma_addr, 0); - list_del(&kbuf_set->list); --- -2.48.1 - diff --git a/anda/system/ipu6-drivers/dkms/0009-Add-ipu6-dma.h-to-0001-v6.10-IPU6-headers-used-by-PS.patch b/anda/system/ipu6-drivers/dkms/0009-Add-ipu6-dma.h-to-0001-v6.10-IPU6-headers-used-by-PS.patch deleted file mode 100644 index 63b626a834..0000000000 --- a/anda/system/ipu6-drivers/dkms/0009-Add-ipu6-dma.h-to-0001-v6.10-IPU6-headers-used-by-PS.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 47a2e1cf89b789bbc10d3cb3b26b357404633114 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Sat, 1 Feb 2025 08:19:22 +0100 -Subject: [PATCH 9/9] Add ipu6-dma.h to - 0001-v6.10-IPU6-headers-used-by-PSYS.patch - -Add ipu6-dma.h to 0001-v6.10-IPU6-headers-used-by-PSYS.patch, -this is necessary for the DMA code adjustments in the psys code -which were done for the ipu6-bus DMA changes in kernels >= 6.12. - -Signed-off-by: Hans de Goede ---- - ...0001-v6.10-IPU6-headers-used-by-PSYS.patch | 55 +++++++++++++++++++ - 1 file changed, 55 insertions(+) - -diff --git a/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch b/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch -index 6a465a924..b8eeaae66 100644 ---- a/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch -+++ b/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch -@@ -1195,6 +1195,61 @@ index 000000000..92e3c3414 - + int pkg_dir_idx, void __iomem *base, u64 *pkg_dir, - + dma_addr_t pkg_dir_dma_addr); - +#endif /* IPU6_H */ -+diff --git a/drivers/media/pci/intel/ipu6/ipu6-dma.h b/drivers/media/pci/intel/ipu6/ipu6-dma.h -+new file mode 100644 -+index 000000000..b51244add -+--- /dev/null -++++ b/drivers/media/pci/intel/ipu6/ipu6-dma.h -+@@ -0,0 +1,49 @@ -++/* SPDX-License-Identifier: GPL-2.0-only */ -++/* Copyright (C) 2013--2024 Intel Corporation */ -++ -++#ifndef IPU6_DMA_H -++#define IPU6_DMA_H -++ -++#include -++#include -++#include -++#include -++#include -++#include -++ -++#include "ipu6-bus.h" -++ -++struct ipu6_mmu_info; -++ -++struct ipu6_dma_mapping { -++ struct ipu6_mmu_info *mmu_info; -++ struct iova_domain iovad; -++}; -++ -++void ipu6_dma_sync_single(struct ipu6_bus_device *sys, dma_addr_t dma_handle, -++ size_t size); -++void ipu6_dma_sync_sg(struct ipu6_bus_device *sys, struct scatterlist *sglist, -++ int nents); -++void ipu6_dma_sync_sgtable(struct ipu6_bus_device *sys, struct sg_table *sgt); -++void *ipu6_dma_alloc(struct ipu6_bus_device *sys, size_t size, -++ dma_addr_t *dma_handle, gfp_t gfp, -++ unsigned long attrs); -++void ipu6_dma_free(struct ipu6_bus_device *sys, size_t size, void *vaddr, -++ dma_addr_t dma_handle, unsigned long attrs); -++int ipu6_dma_mmap(struct ipu6_bus_device *sys, struct vm_area_struct *vma, -++ void *addr, dma_addr_t iova, size_t size, -++ unsigned long attrs); -++int ipu6_dma_map_sg(struct ipu6_bus_device *sys, struct scatterlist *sglist, -++ int nents, enum dma_data_direction dir, -++ unsigned long attrs); -++void ipu6_dma_unmap_sg(struct ipu6_bus_device *sys, struct scatterlist *sglist, -++ int nents, enum dma_data_direction dir, -++ unsigned long attrs); -++int ipu6_dma_map_sgtable(struct ipu6_bus_device *sys, struct sg_table *sgt, -++ enum dma_data_direction dir, unsigned long attrs); -++void ipu6_dma_unmap_sgtable(struct ipu6_bus_device *sys, struct sg_table *sgt, -++ enum dma_data_direction dir, unsigned long attrs); -++int ipu6_dma_get_sgtable(struct ipu6_bus_device *sys, struct sg_table *sgt, -++ void *cpu_addr, dma_addr_t handle, size_t size, -++ unsigned long attrs); -++#endif /* IPU6_DMA_H */ - -- - 2.43.0 - --- -2.48.1 - diff --git a/anda/system/ipu6-drivers/dkms/0010-psys-Do-not-skipping-registering-ipu_psys_bus-for-ke.patch b/anda/system/ipu6-drivers/dkms/0010-psys-Do-not-skipping-registering-ipu_psys_bus-for-ke.patch deleted file mode 100644 index 6ba5e4a65f..0000000000 --- a/anda/system/ipu6-drivers/dkms/0010-psys-Do-not-skipping-registering-ipu_psys_bus-for-ke.patch +++ /dev/null @@ -1,202 +0,0 @@ -From c1cb2a62cd9d949fda60f5993a72ec0c44f52719 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Wed, 5 Feb 2025 13:20:21 +0100 -Subject: [PATCH 10/11] psys: Do not skipping registering ipu_psys_bus for - kernels >= 6.10 - -The new auxbus code-paths were not registering the ipu_psys_bus used for -psys->dev.bus = &ipu_psys_bus, this was causing udev to not be able to -properly enumerate the device. For example running: - -udevadm test -a add /dev/ipu-psys0 - -would fail with the following error: - -"Failed to clone sd_device object: No such file or directory" - -This udev issue in turn was causing issues with udev rules to set -permissions on /dev/ipu-psys0 not working - -Fix this by: - -1. Rename ipu6_psys_bus to ipu_psys_bus, there is no need for separate -names for this struct with different kernels and having the same name -allows code sharing. - -2. Switching back from using module_auxiliary_driver() to using -module_init() / module_exit() codes for registering the drivers. - -3. Move the now always used ipu_psys_init() and ipu_psys_exit() -out of any ifdefs blocks, so that these functions now always -(un)register the chrdev region and the ipu_psys_bus. - -4. Remove the now duplicate chrdev region handling from the auxbus -ipu6_psys_probe() and ipu6_psys_remove() functions (now handled -by ipu_psys_init() and ipu_psys_exit()). - -Signed-off-by: Hans de Goede ---- - drivers/media/pci/intel/ipu6/psys/ipu-psys.c | 94 +++++++++----------- - 1 file changed, 40 insertions(+), 54 deletions(-) - -diff --git a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c -index 7c512e5ae..c06cd515a 100644 ---- a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c -+++ b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c -@@ -92,7 +92,7 @@ static struct bus_type ipu_psys_bus = { - .name = IPU_PSYS_NAME, - }; - #else --static const struct bus_type ipu6_psys_bus = { -+static const struct bus_type ipu_psys_bus = { - .name = "intel-ipu6-psys", - }; - #endif -@@ -2331,17 +2331,9 @@ static int ipu6_psys_probe(struct auxiliary_device *auxdev, - - ipu_ver = adev->isp->hw_ver; - -- rval = alloc_chrdev_region(&ipu_psys_dev_t, 0, -- IPU_PSYS_NUM_DEVICES, IPU6_PSYS_NAME); -- if (rval) { -- dev_err(dev, "can't alloc psys chrdev region (%d)\n", -- rval); -- return rval; -- } -- - rval = ipu6_mmu_hw_init(adev->mmu); - if (rval) -- goto out_unregister_chr_region; -+ return rval; - - mutex_lock(&ipu_psys_mutex); - -@@ -2453,7 +2445,7 @@ static int ipu6_psys_probe(struct auxiliary_device *auxdev, - goto out_free_pgs; - } - -- psys->dev.bus = &ipu6_psys_bus; -+ psys->dev.bus = &ipu_psys_bus; - psys->dev.parent = dev; - psys->dev.devt = MKDEV(MAJOR(ipu_psys_dev_t), minor); - psys->dev.release = ipu_psys_dev_release; -@@ -2500,10 +2492,6 @@ out_unlock: - /* Safe to call even if the init is not called */ - mutex_unlock(&ipu_psys_mutex); - ipu6_mmu_hw_cleanup(adev->mmu); -- --out_unregister_chr_region: -- unregister_chrdev_region(ipu_psys_dev_t, IPU_PSYS_NUM_DEVICES); -- - return rval; - } - #endif -@@ -2521,9 +2509,6 @@ static void ipu6_psys_remove(struct auxiliary_device *auxdev) - #endif - struct ipu_psys_pg *kpg, *kpg0; - --#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 10, 0) -- unregister_chrdev_region(ipu_psys_dev_t, IPU_PSYS_NUM_DEVICES); --#endif - #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) - #ifdef CONFIG_DEBUG_FS - if (isp->ipu_dir) -@@ -2658,38 +2643,6 @@ static struct ipu_bus_driver ipu_psys_driver = { - }, - }; - --static int __init ipu_psys_init(void) --{ -- int rval = alloc_chrdev_region(&ipu_psys_dev_t, 0, -- IPU_PSYS_NUM_DEVICES, IPU_PSYS_NAME); -- if (rval) { -- pr_err("can't alloc psys chrdev region (%d)\n", rval); -- return rval; -- } -- -- rval = bus_register(&ipu_psys_bus); -- if (rval) { -- pr_warn("can't register psys bus (%d)\n", rval); -- goto out_bus_register; -- } -- -- ipu_bus_register_driver(&ipu_psys_driver); -- -- return rval; -- --out_bus_register: -- unregister_chrdev_region(ipu_psys_dev_t, IPU_PSYS_NUM_DEVICES); -- -- return rval; --} -- --static void __exit ipu_psys_exit(void) --{ -- ipu_bus_unregister_driver(&ipu_psys_driver); -- bus_unregister(&ipu_psys_bus); -- unregister_chrdev_region(ipu_psys_dev_t, IPU_PSYS_NUM_DEVICES); --} -- - static const struct pci_device_id ipu_pci_tbl[] = { - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, IPU6_PCI_ID)}, - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, IPU6SE_PCI_ID)}, -@@ -2700,9 +2653,6 @@ static const struct pci_device_id ipu_pci_tbl[] = { - {0,} - }; - MODULE_DEVICE_TABLE(pci, ipu_pci_tbl); -- --module_init(ipu_psys_init); --module_exit(ipu_psys_exit); - #else - static const struct ipu6_auxdrv_data ipu6_psys_auxdrv_data = { - .isr_threaded = psys_isr_threaded, -@@ -2727,9 +2677,45 @@ static struct auxiliary_driver ipu6_psys_aux_driver = { - .pm = &psys_pm_ops, - }, - }; --module_auxiliary_driver(ipu6_psys_aux_driver); - #endif - -+static int __init ipu_psys_init(void) -+{ -+ int rval = alloc_chrdev_region(&ipu_psys_dev_t, 0, -+ IPU_PSYS_NUM_DEVICES, ipu_psys_bus.name); -+ if (rval) { -+ pr_err("can't alloc psys chrdev region (%d)\n", rval); -+ return rval; -+ } -+ -+ rval = bus_register(&ipu_psys_bus); -+ if (rval) { -+ pr_err("can't register psys bus (%d)\n", rval); -+ unregister_chrdev_region(ipu_psys_dev_t, IPU_PSYS_NUM_DEVICES); -+ return rval; -+ } -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) -+ ipu_bus_register_driver(&ipu_psys_driver); -+#else -+ auxiliary_driver_register(&ipu6_psys_aux_driver); -+#endif -+ return 0; -+} -+module_init(ipu_psys_init); -+ -+static void __exit ipu_psys_exit(void) -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 10, 0) -+ ipu_bus_unregister_driver(&ipu_psys_driver); -+#else -+ auxiliary_driver_unregister(&ipu6_psys_aux_driver); -+#endif -+ bus_unregister(&ipu_psys_bus); -+ unregister_chrdev_region(ipu_psys_dev_t, IPU_PSYS_NUM_DEVICES); -+} -+module_exit(ipu_psys_exit); -+ - MODULE_AUTHOR("Antti Laakso "); - MODULE_AUTHOR("Bin Han "); - MODULE_AUTHOR("Renwei Wu "); --- -2.48.1 - diff --git a/anda/system/ipu6-drivers/dkms/dkms-intel-ipu6.spec b/anda/system/ipu6-drivers/dkms/dkms-intel-ipu6.spec index 82bcc5d401..29aa079677 100644 --- a/anda/system/ipu6-drivers/dkms/dkms-intel-ipu6.spec +++ b/anda/system/ipu6-drivers/dkms/dkms-intel-ipu6.spec @@ -20,22 +20,8 @@ Source0: https://github.com/intel/ipu6-drivers/archive/%{ipu6_commit}/ipu Source1: https://github.com/intel/usbio-drivers/archive/%{usbio_commit}/usbio-drivers-%{usbio_shortcommit}.tar.gz Source2: no-weak-modules.conf # Patches -# https://github.com/intel/ipu6-drivers/pull/322 -Patch1: 0001-Makefile-Switch-sensor-driver-symbols-from-CONFIG_VI.patch -Patch2: 0002-Makefile-Re-enable-gc5035-compilation-with-kernels-6.patch -Patch3: 0003-Makefile-Do-not-build-hi556-driver-with-kernels-6.10.patch -Patch4: 0004-Makefile-Do-not-build-ov01a10-driver-with-kernels-6..patch # https://github.com/intel/ipu6-drivers/pull/321 -Patch5: 0005-media-ipu6-Fix-out-of-tree-builds.patch -Patch6: 0006-media-ipu6-Fix-building-with-kernel-6.13.patch -Patch7: 0007-Modify-0001-v6.10-IPU6-headers-used-by-PSYS.patch-fo.patch -# https://github.com/intel/ipu6-drivers/pull/324 -Patch8: 0008-ipu6-psys-Adjust-DMA-code-for-ipu6-bus-DMA-changes-i.patch -Patch9: 0009-Add-ipu6-dma.h-to-0001-v6.10-IPU6-headers-used-by-PS.patch -# https://github.com/intel/ipu6-drivers/pull/327 -Patch10: 0010-psys-Do-not-skipping-registering-ipu_psys_bus-for-ke.patch -Patch11: 0011-psys-Use-cdev_device_add-for-dev-ipu-psys0.patch -# https://github.com/intel/usbio-drivers/pull/33 +Patch0: 0005-media-ipu6-Fix-out-of-tree-builds.patch Patch20: 0010-usbio-Fix-GPIO-and-I2C-driver-modaliases.patch # https://github.com/intel/usbio-drivers/pull/34 Patch21: 0011-usbio-Fix-I2C-max-transfer-size.patch @@ -56,20 +42,9 @@ This package enables the Intel IPU6 image processor. %prep %setup -q -c -a 1 (cd ipu6-drivers-%{ipu6_commit} -%patch 1 -p1 -%patch 2 -p1 -%patch 3 -p1 -%patch 4 -p1 -%patch 5 -p1 -%patch 6 -p1 -%patch 7 -p1 -%patch 8 -p1 -%patch 9 -p1 -%patch 10 -p1 -%patch 11 -p1 +%patch 0 -p1 %patch 101 -p1 patch -p1 < patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch -sed -i "s/^PACKAGE_VERSION=\".*\"$/PACKAGE_VERSION=\"%{version}\"/g" ./dkms.conf ) (cd usbio-drivers-%{usbio_commit} %patch 20 -p1 From 8e98e8fe29c8b3b3341d785156ed55c746b92f15 Mon Sep 17 00:00:00 2001 From: Gilver Date: Thu, 24 Apr 2025 08:29:02 -0500 Subject: [PATCH 0872/2977] feat(zig-master): Make internal version more plain (#4413) Signed-off-by: Gilver --- anda/langs/zig/zig-master.spec | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/anda/langs/zig/zig-master.spec b/anda/langs/zig/zig-master.spec index 93da27ba14..ffe842c647 100644 --- a/anda/langs/zig/zig-master.spec +++ b/anda/langs/zig/zig-master.spec @@ -43,7 +43,7 @@ Name: zig-master Version: %(echo %{ver} | sed 's/-/~/g') -Release: 1%{?dist} +Release: 2%{?dist} Summary: Programming language for maintaining robust, optimal, and reusable software License: MIT AND NCSA AND LGPL-2.1-or-later AND LGPL-2.1-or-later WITH GCC-exception-2.0 AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND BSD-3-Clause AND Inner-Net-2.0 AND ISC AND LicenseRef-Fedora-Public-Domain AND GFDL-1.1-or-later AND ZPL-2.1 URL: https://ziglang.org @@ -136,7 +136,7 @@ Documentation for Zig. For more information, visit %{url} -DZIG_TARGET_MCPU:STRING=baseline \ -DZIG_TARGET_TRIPLE:STRING=native \ \ - -DZIG_VERSION:STRING="%{ver}" + -DZIG_VERSION:STRING="%(v=%{ver}; echo ${v:0:6})" %if %{with bootstrap} %cmake_build --target stage3 @@ -167,11 +167,6 @@ DESTDIR="%{buildroot}" zig build install %{zig_install_options} install -D -pv -m 0644 -t %{buildroot}%{_mandir}/man1/zig.1 %endif - -%if %{with macro} -install -D -pv -m 0644 %{SOURCE2} %{buildroot}%{_rpmmacrodir}/macros.%{name} -%endif - %if %{with test} %check # Run reduced set of tests, based on the Zig CI From 53508b9a314fd7e1d8051ac24213906e7a9cc693 Mon Sep 17 00:00:00 2001 From: Gilver Date: Thu, 24 Apr 2025 09:23:35 -0500 Subject: [PATCH 0873/2977] add: egl{-wayland,-x11} (#4411) * add: egl{-wayland,-x11} * Actually wanna make sure people don't report stuff to Negativo so * Update anda/lib/nvidia/egl-wayland/anda.hcl Co-authored-by: madomado Signed-off-by: Gilver * Update anda/lib/nvidia/egl-x11/anda.hcl Co-authored-by: madomado Signed-off-by: Gilver --------- Signed-off-by: Gilver Co-authored-by: madomado --- anda/lib/nvidia/egl-wayland/anda.hcl | 8 + .../egl-wayland-linux-drm-syncobj.patch | 293 ++++++++++++++++++ anda/lib/nvidia/egl-wayland/egl-wayland.spec | 85 +++++ anda/lib/nvidia/egl-wayland/update.rhai | 1 + anda/lib/nvidia/egl-x11/anda.hcl | 8 + .../nvidia/egl-x11/egl-x11-meson-0.58.patch | 12 + anda/lib/nvidia/egl-x11/egl-x11.spec | 70 +++++ anda/lib/nvidia/egl-x11/update.rhai | 1 + 8 files changed, 478 insertions(+) create mode 100644 anda/lib/nvidia/egl-wayland/anda.hcl create mode 100644 anda/lib/nvidia/egl-wayland/egl-wayland-linux-drm-syncobj.patch create mode 100644 anda/lib/nvidia/egl-wayland/egl-wayland.spec create mode 100644 anda/lib/nvidia/egl-wayland/update.rhai create mode 100644 anda/lib/nvidia/egl-x11/anda.hcl create mode 100644 anda/lib/nvidia/egl-x11/egl-x11-meson-0.58.patch create mode 100644 anda/lib/nvidia/egl-x11/egl-x11.spec create mode 100644 anda/lib/nvidia/egl-x11/update.rhai diff --git a/anda/lib/nvidia/egl-wayland/anda.hcl b/anda/lib/nvidia/egl-wayland/anda.hcl new file mode 100644 index 0000000000..264e33372f --- /dev/null +++ b/anda/lib/nvidia/egl-wayland/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "egl-wayland.spec" + } + labels { + subrepo = "nvidia" + } +} diff --git a/anda/lib/nvidia/egl-wayland/egl-wayland-linux-drm-syncobj.patch b/anda/lib/nvidia/egl-wayland/egl-wayland-linux-drm-syncobj.patch new file mode 100644 index 0000000000..67b7d5837b --- /dev/null +++ b/anda/lib/nvidia/egl-wayland/egl-wayland-linux-drm-syncobj.patch @@ -0,0 +1,293 @@ +diff -Naur egl-wayland-f1fd51456710b567717a970dd4e1b2347792ac13.old/Makefile.am egl-wayland-f1fd51456710b567717a970dd4e1b2347792ac13/Makefile.am +--- egl-wayland-f1fd51456710b567717a970dd4e1b2347792ac13.old/Makefile.am 2025-04-03 09:19:13.939642717 +0200 ++++ egl-wayland-f1fd51456710b567717a970dd4e1b2347792ac13/Makefile.am 2025-04-03 09:26:17.650860088 +0200 +@@ -138,10 +138,10 @@ + $(libnvidia_egl_wayland_la_dmabuf_built_client_headers):%-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/linux-dmabuf/%.xml + $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ + +-$(libnvidia_egl_wayland_la_drm_syncobj_built_private_protocols):%-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/staging/linux-drm-syncobj/%.xml ++$(libnvidia_egl_wayland_la_drm_syncobj_built_private_protocols):%-protocol.c : src/%.xml + $(AM_V_GEN)$(WAYLAND_SCANNER) $(WAYLAND_PRIVATE_CODEGEN) < $< > $@ + +-$(libnvidia_egl_wayland_la_drm_syncobj_built_client_headers):%-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/staging/linux-drm-syncobj/%.xml ++$(libnvidia_egl_wayland_la_drm_syncobj_built_client_headers):%-client-protocol.h : src/%.xml + $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ + + $(libnvidia_egl_wayland_la_presentation_time_private_protocols):%-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/stable/presentation-time/%.xml +diff -Naur egl-wayland-f1fd51456710b567717a970dd4e1b2347792ac13.old/src/meson.build egl-wayland-f1fd51456710b567717a970dd4e1b2347792ac13/src/meson.build +--- egl-wayland-f1fd51456710b567717a970dd4e1b2347792ac13.old/src/meson.build 2025-04-03 09:19:13.940399943 +0200 ++++ egl-wayland-f1fd51456710b567717a970dd4e1b2347792ac13/src/meson.build 2025-04-03 09:26:01.489288838 +0200 +@@ -20,7 +20,7 @@ + wl_protos_dir = wl_protos.get_pkgconfig_variable('pkgdatadir') + wl_dmabuf_xml = join_paths(wl_protos_dir, 'unstable', 'linux-dmabuf', 'linux-dmabuf-unstable-v1.xml') + wp_presentation_time_xml = join_paths(wl_protos_dir, 'stable', 'presentation-time', 'presentation-time.xml') +-wl_drm_syncobj_xml = join_paths(wl_protos_dir, 'staging', 'linux-drm-syncobj', 'linux-drm-syncobj-v1.xml') ++wl_drm_syncobj_xml = 'linux-drm-syncobj-v1.xml' + + client_header = generator(prog_scanner, + output : '@BASENAME@-client-protocol.h', +diff -Naur egl-wayland-f1fd51456710b567717a970dd4e1b2347792ac13.old/src/linux-drm-syncobj-v1.xml egl-wayland-f1fd51456710b567717a970dd4e1b2347792ac13/src/linux-drm-syncobj-v1.xml +--- egl-wayland-f1fd51456710b567717a970dd4e1b2347792ac13.old/src/linux-drm-syncobj-v1.xml 1970-01-01 01:00:00.000000000 +0100 ++++ egl-wayland-f1fd51456710b567717a970dd4e1b2347792ac13/src/linux-drm-syncobj-v1.xml 2025-04-03 17:40:08.215837759 +0200 +@@ -0,0 +1,261 @@ ++ ++ ++ ++ Copyright 2016 The Chromium Authors. ++ Copyright 2017 Intel Corporation ++ Copyright 2018 Collabora, Ltd ++ Copyright 2021 Simon Ser ++ ++ Permission is hereby granted, free of charge, to any person obtaining a ++ copy of this software and associated documentation files (the "Software"), ++ to deal in the Software without restriction, including without limitation ++ the rights to use, copy, modify, merge, publish, distribute, sublicense, ++ and/or sell copies of the Software, and to permit persons to whom the ++ Software is furnished to do so, subject to the following conditions: ++ ++ The above copyright notice and this permission notice (including the next ++ paragraph) shall be included in all copies or substantial portions of the ++ Software. ++ ++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++ DEALINGS IN THE SOFTWARE. ++ ++ ++ ++ This protocol allows clients to request explicit synchronization for ++ buffers. It is tied to the Linux DRM synchronization object framework. ++ ++ Synchronization refers to co-ordination of pipelined operations performed ++ on buffers. Most GPU clients will schedule an asynchronous operation to ++ render to the buffer, then immediately send the buffer to the compositor ++ to be attached to a surface. ++ ++ With implicit synchronization, ensuring that the rendering operation is ++ complete before the compositor displays the buffer is an implementation ++ detail handled by either the kernel or userspace graphics driver. ++ ++ By contrast, with explicit synchronization, DRM synchronization object ++ timeline points mark when the asynchronous operations are complete. When ++ submitting a buffer, the client provides a timeline point which will be ++ waited on before the compositor accesses the buffer, and another timeline ++ point that the compositor will signal when it no longer needs to access the ++ buffer contents for the purposes of the surface commit. ++ ++ Linux DRM synchronization objects are documented at: ++ https://dri.freedesktop.org/docs/drm/gpu/drm-mm.html#drm-sync-objects ++ ++ Warning! The protocol described in this file is currently in the testing ++ phase. Backward compatible changes may be added together with the ++ corresponding interface version bump. Backward incompatible changes can ++ only be done by creating a new major version of the extension. ++ ++ ++ ++ ++ This global is a factory interface, allowing clients to request ++ explicit synchronization for buffers on a per-surface basis. ++ ++ See wp_linux_drm_syncobj_surface_v1 for more information. ++ ++ ++ ++ ++ Destroy this explicit synchronization factory object. Other objects ++ shall not be affected by this request. ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Instantiate an interface extension for the given wl_surface to provide ++ explicit synchronization. ++ ++ If the given wl_surface already has an explicit synchronization object ++ associated, the surface_exists protocol error is raised. ++ ++ Graphics APIs, like EGL or Vulkan, that manage the buffer queue and ++ commits of a wl_surface themselves, are likely to be using this ++ extension internally. If a client is using such an API for a ++ wl_surface, it should not directly use this extension on that surface, ++ to avoid raising a surface_exists protocol error. ++ ++ ++ ++ ++ ++ ++ ++ Import a DRM synchronization object timeline. ++ ++ If the FD cannot be imported, the invalid_timeline error is raised. ++ ++ ++ ++ ++ ++ ++ ++ ++ This object represents an explicit synchronization object timeline ++ imported by the client to the compositor. ++ ++ ++ ++ ++ Destroy the synchronization object timeline. Other objects are not ++ affected by this request, in particular timeline points set by ++ set_acquire_point and set_release_point are not unset. ++ ++ ++ ++ ++ ++ ++ This object is an add-on interface for wl_surface to enable explicit ++ synchronization. ++ ++ Each surface can be associated with only one object of this interface at ++ any time. ++ ++ Explicit synchronization is guaranteed to be supported for buffers ++ created with any version of the linux-dmabuf protocol. Compositors are ++ free to support explicit synchronization for additional buffer types. ++ If at surface commit time the attached buffer does not support explicit ++ synchronization, an unsupported_buffer error is raised. ++ ++ As long as the wp_linux_drm_syncobj_surface_v1 object is alive, the ++ compositor may ignore implicit synchronization for buffers attached and ++ committed to the wl_surface. The delivery of wl_buffer.release events ++ for buffers attached to the surface becomes undefined. ++ ++ Clients must set both acquire and release points if and only if a ++ non-null buffer is attached in the same surface commit. See the ++ no_buffer, no_acquire_point and no_release_point protocol errors. ++ ++ If at surface commit time the acquire and release DRM syncobj timelines ++ are identical, the acquire point value must be strictly less than the ++ release point value, or else the conflicting_points protocol error is ++ raised. ++ ++ ++ ++ ++ Destroy this surface synchronization object. ++ ++ Any timeline point set by this object with set_acquire_point or ++ set_release_point since the last commit may be discarded by the ++ compositor. Any timeline point set by this object before the last ++ commit will not be affected. ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Set the timeline point that must be signalled before the compositor may ++ sample from the buffer attached with wl_surface.attach. ++ ++ The 64-bit unsigned value combined from point_hi and point_lo is the ++ point value. ++ ++ The acquire point is double-buffered state, and will be applied on the ++ next wl_surface.commit request for the associated surface. Thus, it ++ applies only to the buffer that is attached to the surface at commit ++ time. ++ ++ If an acquire point has already been attached during the same commit ++ cycle, the new point replaces the old one. ++ ++ If the associated wl_surface was destroyed, a no_surface error is ++ raised. ++ ++ If at surface commit time there is a pending acquire timeline point set ++ but no pending buffer attached, a no_buffer error is raised. If at ++ surface commit time there is a pending buffer attached but no pending ++ acquire timeline point set, the no_acquire_point protocol error is ++ raised. ++ ++ ++ ++ ++ ++ ++ ++ ++ Set the timeline point that must be signalled by the compositor when it ++ has finished its usage of the buffer attached with wl_surface.attach ++ for the relevant commit. ++ ++ Once the timeline point is signaled, and assuming the associated buffer ++ is not pending release from other wl_surface.commit requests, no ++ additional explicit or implicit synchronization with the compositor is ++ required to safely re-use the buffer. ++ ++ Note that clients cannot rely on the release point being always ++ signaled after the acquire point: compositors may release buffers ++ without ever reading from them. In addition, the compositor may use ++ different presentation paths for different commits, which may have ++ different release behavior. As a result, the compositor may signal the ++ release points in a different order than the client committed them. ++ ++ Because signaling a timeline point also signals every previous point, ++ it is generally not safe to use the same timeline object for the ++ release points of multiple buffers. The out-of-order signaling ++ described above may lead to a release point being signaled before the ++ compositor has finished reading. To avoid this, it is strongly ++ recommended that each buffer should use a separate timeline for its ++ release points. ++ ++ The 64-bit unsigned value combined from point_hi and point_lo is the ++ point value. ++ ++ The release point is double-buffered state, and will be applied on the ++ next wl_surface.commit request for the associated surface. Thus, it ++ applies only to the buffer that is attached to the surface at commit ++ time. ++ ++ If a release point has already been attached during the same commit ++ cycle, the new point replaces the old one. ++ ++ If the associated wl_surface was destroyed, a no_surface error is ++ raised. ++ ++ If at surface commit time there is a pending release timeline point set ++ but no pending buffer attached, a no_buffer error is raised. If at ++ surface commit time there is a pending buffer attached but no pending ++ release timeline point set, the no_release_point protocol error is ++ raised. ++ ++ ++ ++ ++ ++ ++ diff --git a/anda/lib/nvidia/egl-wayland/egl-wayland.spec b/anda/lib/nvidia/egl-wayland/egl-wayland.spec new file mode 100644 index 0000000000..3aeb87f7d0 --- /dev/null +++ b/anda/lib/nvidia/egl-wayland/egl-wayland.spec @@ -0,0 +1,85 @@ +%global commit f1fd51456710b567717a970dd4e1b2347792ac13 +%global date 20250313 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global tag %{version} + +Name: egl-wayland +Version: 1.1.19%{!?tag:~%{date}git%{shortcommit}} +Release: 2%{?dist} +Summary: EGLStream-based Wayland external platform +License: MIT +URL: https://github.com/NVIDIA/%{name} + +%if 0%{?tag:1} +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +%else +Source0: %{url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +%endif +# Explicit synchronization is in since 1.34: +Patch0: %{name}-linux-drm-syncobj.patch + +BuildRequires: cmake +BuildRequires: meson +BuildRequires: libtool +BuildRequires: pkgconfig(egl) >= 1.5 +BuildRequires: pkgconfig(eglexternalplatform) >= 1.1 +BuildRequires: pkgconfig(libdrm) +BuildRequires: pkgconfig(wayland-client) +BuildRequires: pkgconfig(wayland-egl-backend) >= 3 +BuildRequires: pkgconfig(wayland-protocols) +BuildRequires: pkgconfig(wayland-scanner) +BuildRequires: pkgconfig(wayland-server) + +# Required for directory ownership +Requires: libglvnd-egl%{?_isa} + +%description +EGL External Platform library to add client-side Wayland support to EGL on top +of EGLDevice and EGLStream families of extensions. + +This library implements an EGL External Platform interface to work along with +EGL drivers that support the external platform mechanism. + +%package devel +Summary: EGLStream-based Wayland external platform development files +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +EGL External Platform library to add client-side Wayland support to EGL on top +of EGLDevice and EGLStream families of extensions. + +This library implements an EGL External Platform interface to work along with +EGL drivers that support the external platform mechanism. + +This package contains development files. + +%prep +%if 0%{?tag:1} +%autosetup -p1 +%else +%autosetup -p1 -n %{name}-%{commit} +%endif + +%build +%meson +%meson_build + +%install +%meson_install +find %{buildroot} -name '*.la' -delete + +%files +%doc README.md +%license COPYING +%{_libdir}/libnvidia-egl-wayland.so.1 +%{_libdir}/libnvidia-egl-wayland.so.1.1.19 +%{_datadir}/egl/egl_external_platform.d/10_nvidia_wayland.json + +%files devel +%{_datadir}/pkgconfig/wayland-eglstream-protocols.pc +%{_datadir}/wayland-eglstream/ +%{_libdir}/libnvidia-egl-wayland.so +%{_libdir}/pkgconfig/wayland-eglstream.pc + +%changelog +%autochangelog diff --git a/anda/lib/nvidia/egl-wayland/update.rhai b/anda/lib/nvidia/egl-wayland/update.rhai new file mode 100644 index 0000000000..1e1e15eb01 --- /dev/null +++ b/anda/lib/nvidia/egl-wayland/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("NVIDIA/egl-wayland")); diff --git a/anda/lib/nvidia/egl-x11/anda.hcl b/anda/lib/nvidia/egl-x11/anda.hcl new file mode 100644 index 0000000000..b164f257ea --- /dev/null +++ b/anda/lib/nvidia/egl-x11/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "egl-x11.spec" + } + labels { + subrepo = "nvidia" + } +} diff --git a/anda/lib/nvidia/egl-x11/egl-x11-meson-0.58.patch b/anda/lib/nvidia/egl-x11/egl-x11-meson-0.58.patch new file mode 100644 index 0000000000..ef41794c63 --- /dev/null +++ b/anda/lib/nvidia/egl-x11/egl-x11-meson-0.58.patch @@ -0,0 +1,12 @@ +diff -Naur egl-x11-2be2296e1439b2e4a7f73d976d63982383ae2938.old/src/x11/meson.build egl-x11-2be2296e1439b2e4a7f73d976d63982383ae2938/src/x11/meson.build +--- egl-x11-2be2296e1439b2e4a7f73d976d63982383ae2938.old/src/x11/meson.build 2024-09-04 09:15:04.539451788 +0200 ++++ egl-x11-2be2296e1439b2e4a7f73d976d63982383ae2938/src/x11/meson.build 2024-09-04 09:19:07.641999858 +0200 +@@ -21,7 +21,7 @@ + dep_xcb_dri3 = dependency('xcb-dri3') + dep_dl = meson.get_compiler('c').find_library('dl', required : false) + +-enable_xlib = (get_option('xlib').allowed() and dep_x11.found() and dep_x11_xcb.found()) ++enable_xlib = (get_option('xlib').enabled() and dep_x11.found() and dep_x11_xcb.found()) + + x11_deps = [ + dep_libdrm, diff --git a/anda/lib/nvidia/egl-x11/egl-x11.spec b/anda/lib/nvidia/egl-x11/egl-x11.spec new file mode 100644 index 0000000000..b6da10ef66 --- /dev/null +++ b/anda/lib/nvidia/egl-x11/egl-x11.spec @@ -0,0 +1,70 @@ +%global commit 0558d54cdbc563706d44671ba7d846fc12b96485 +%global date 20250324 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global tag %{version} + +Name: egl-x11 +Version: 1.0.1%{!?tag:~%{date}git%{shortcommit}} +Release: 6%{?dist} +Summary: NVIDIA XLib and XCB EGL Platform Library +License: Apache-2.0 +URL: https://github.com/NVIDIA/egl-x11 + +%if 0%{?tag:1} +Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +%else +Source0: %{url}/archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz +%endif +# Allow building with an older meson: +Patch0: egl-x11-meson-0.58.patch + +BuildRequires: gcc +BuildRequires: meson +BuildRequires: pkgconfig(eglexternalplatform) >= 1.2 +BuildRequires: pkgconfig(egl) +BuildRequires: pkgconfig(gbm) >= 21.2.0 +BuildRequires: pkgconfig(libdrm) >= 2.4.99 +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(x11-xcb) +# Minimum version 1.17.0 for explicit sync support (Fedora 40+): +BuildRequires: pkgconfig(xcb) +BuildRequires: pkgconfig(xcb-dri3) +BuildRequires: pkgconfig(xcb-present) + +# Required for directory ownership +Requires: libglvnd-egl%{?_isa} + +%description +This is an EGL platform library for the NVIDIA driver to support XWayland via +xlib (using EGL_KHR_platform_x11) or xcb (using EGL_EXT_platform_xcb). + +%prep +%if 0%{?tag:1} +%autosetup -p1 +%else +%autosetup -p1 -n %{name}-%{commit} +%endif + +%build +%meson \ + -D xcb=true \ + -D xlib=enabled +%meson_build + +%install +%meson_install + +rm -fv %{buildroot}%{_libdir}/*.so + +%files +%license LICENSE +%doc README.md +%{_libdir}/libnvidia-egl-xcb.so.1 +%{_libdir}/libnvidia-egl-xcb.so.1.0.1 +%{_libdir}/libnvidia-egl-xlib.so.1 +%{_libdir}/libnvidia-egl-xlib.so.1.0.1 +%{_datadir}/egl/egl_external_platform.d/20_nvidia_xcb.json +%{_datadir}/egl/egl_external_platform.d/20_nvidia_xlib.json + +%changelog +%autochangelog diff --git a/anda/lib/nvidia/egl-x11/update.rhai b/anda/lib/nvidia/egl-x11/update.rhai new file mode 100644 index 0000000000..fc93335f50 --- /dev/null +++ b/anda/lib/nvidia/egl-x11/update.rhai @@ -0,0 +1 @@ +rpm.version(gh_tag("NVIDIA/egl-x11")); From 18d3300fe64a4535809721a1ca932f0690a1f6c7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 24 Apr 2025 14:39:52 +0000 Subject: [PATCH 0874/2977] bump: egl-wayland egl-x11 --- anda/lib/nvidia/egl-wayland/egl-wayland.spec | 4 ++-- anda/lib/nvidia/egl-x11/egl-x11.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/lib/nvidia/egl-wayland/egl-wayland.spec b/anda/lib/nvidia/egl-wayland/egl-wayland.spec index 3aeb87f7d0..267c711bed 100644 --- a/anda/lib/nvidia/egl-wayland/egl-wayland.spec +++ b/anda/lib/nvidia/egl-wayland/egl-wayland.spec @@ -4,8 +4,8 @@ %global tag %{version} Name: egl-wayland -Version: 1.1.19%{!?tag:~%{date}git%{shortcommit}} -Release: 2%{?dist} +Version: 1.1.19 +Release: 1%?dist Summary: EGLStream-based Wayland external platform License: MIT URL: https://github.com/NVIDIA/%{name} diff --git a/anda/lib/nvidia/egl-x11/egl-x11.spec b/anda/lib/nvidia/egl-x11/egl-x11.spec index b6da10ef66..3dc0646dea 100644 --- a/anda/lib/nvidia/egl-x11/egl-x11.spec +++ b/anda/lib/nvidia/egl-x11/egl-x11.spec @@ -4,8 +4,8 @@ %global tag %{version} Name: egl-x11 -Version: 1.0.1%{!?tag:~%{date}git%{shortcommit}} -Release: 6%{?dist} +Version: 1.0.1 +Release: 1%?dist Summary: NVIDIA XLib and XCB EGL Platform Library License: Apache-2.0 URL: https://github.com/NVIDIA/egl-x11 From 2434f5731711a6cc7a42474b8947d53111888b30 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 24 Apr 2025 18:26:18 +0000 Subject: [PATCH 0875/2977] bump: nerd-fonts --- anda/fonts/nerd-fonts/nerd-fonts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/fonts/nerd-fonts/nerd-fonts.spec b/anda/fonts/nerd-fonts/nerd-fonts.spec index 2040d9aaa0..7060558edc 100644 --- a/anda/fonts/nerd-fonts/nerd-fonts.spec +++ b/anda/fonts/nerd-fonts/nerd-fonts.spec @@ -4,7 +4,7 @@ Nerd Fonts is a project that patches developer targeted fonts with a high number of glyphs (icons).} Name: nerd-fonts -Version: 3.3.0 +Version: 3.4.0 Release: 1%?dist URL: https://nerdfonts.com/ Source0: https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v%version/readme.md From 4126e4cd26c219cfbcfc16782096d3b7ffb7e812 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 24 Apr 2025 18:47:59 +0000 Subject: [PATCH 0876/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 530c1cb1f5..d220d8792c 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.23.143136 +Version: 2025.04.24.182651 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 4c33510c00cc346df9fcf4d17ce926fcc2c12195 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 24 Apr 2025 19:21:07 +0000 Subject: [PATCH 0877/2977] bump: zig yt-dlp --- anda/langs/zig/zig-master.spec | 4 ++-- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/langs/zig/zig-master.spec b/anda/langs/zig/zig-master.spec index ffe842c647..7b986b933f 100644 --- a/anda/langs/zig/zig-master.spec +++ b/anda/langs/zig/zig-master.spec @@ -7,7 +7,7 @@ %define llvm_compat 20 %endif %global llvm_version 20.0.0 -%global ver 0.15.0-dev.383+927f233ff +%global ver 0.15.0-dev.384+c06fecd46 %bcond bootstrap 1 %bcond docs %{without bootstrap} %bcond test 1 @@ -43,7 +43,7 @@ Name: zig-master Version: %(echo %{ver} | sed 's/-/~/g') -Release: 2%{?dist} +Release: 1%?dist Summary: Programming language for maintaining robust, optimal, and reusable software License: MIT AND NCSA AND LGPL-2.1-or-later AND LGPL-2.1-or-later WITH GCC-exception-2.0 AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND BSD-3-Clause AND Inner-Net-2.0 AND ISC AND LicenseRef-Fedora-Public-Domain AND GFDL-1.1-or-later AND ZPL-2.1 URL: https://ziglang.org diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index d220d8792c..417c582aac 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.24.182651 +Version: 2025.04.24.191048 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 976a8f19c27532950ef233fd2fc36f9a4dac44f3 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 24 Apr 2025 19:38:22 +0000 Subject: [PATCH 0878/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 417c582aac..ff8c72a85d 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.24.191048 +Version: 2025.04.24.191836 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 83c38209f72a7dd16e8e03bbcdeb5de50466dacc Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 24 Apr 2025 19:58:55 +0000 Subject: [PATCH 0879/2977] bump: discord-ptb-openasar discord-ptb --- anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec | 2 +- anda/apps/discord-ptb/discord-ptb.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec index 2874e4ce91..bd57028248 100644 --- a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec +++ b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-ptb-openasar -Version: 0.0.138 +Version: 0.0.139 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-ptb/discord-ptb.spec b/anda/apps/discord-ptb/discord-ptb.spec index c7653426fc..b1ab1e95d2 100644 --- a/anda/apps/discord-ptb/discord-ptb.spec +++ b/anda/apps/discord-ptb/discord-ptb.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-ptb -Version: 0.0.138 +Version: 0.0.139 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers. URL: https://discord.com From a14993d5f74e7f408e4a7fdfc0ba38ca388fa816 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 24 Apr 2025 20:28:01 +0000 Subject: [PATCH 0880/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index ff8c72a85d..5e7dbdca33 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.24.191836 +Version: 2025.04.24.202040 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From c01dc601710ad208d7b87bd9d9490b27b534ac34 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 24 Apr 2025 21:55:54 +0000 Subject: [PATCH 0881/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 688ab0de9e..543e738c63 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.184.1-pre +%global ver 0.184.2-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker From 77e3f660353b101c7b6d7f0775e98f5a3d21e521 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 25 Apr 2025 01:47:49 +0000 Subject: [PATCH 0882/2977] bump(nightly): micro nightly nim-nightly vala-nightly --- anda/devs/micro/micro-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/langs/vala/vala-nightly/vala-nightly.spec | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/anda/devs/micro/micro-nightly.spec b/anda/devs/micro/micro-nightly.spec index 156ebdbbb4..526256ae4e 100644 --- a/anda/devs/micro/micro-nightly.spec +++ b/anda/devs/micro/micro-nightly.spec @@ -12,8 +12,8 @@ # Naming variable as something other than "commit" is necessary # to stop %%gometa from putting commit hash in release -%global commit_hash 79fe4ae3e3965e8d55e259b392f6357f1da88526 -%global commit_date 20250416 +%global commit_hash e5c3a3edc3bb916173a96834d72516a217524ba6 +%global commit_date 20250425 %global shortcommit %{sub %{commit_hash} 1 7} %global ver 2.0.14 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 36df5c0de3..561ff05783 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit f125353b6f689ccae2b70e540c8d0356b9ade285 +%global commit 57d8397f536f46ea1e8623da9bd66477b9e656fa %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250424 +%global commit_date 20250425 %global ver 0.185.0 %bcond_with check diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 79c859201f..2495bae63c 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit d966ee3fc3874f63b4e32a7edc7566982bb570ce +%global commit 8c9a645bdf8bbd14f7fc9e95c475f7fb963de3f3 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250423 +%global commit_date 20250425 %global debug_package %nil Name: nim-nightly diff --git a/anda/langs/vala/vala-nightly/vala-nightly.spec b/anda/langs/vala/vala-nightly/vala-nightly.spec index e7cdf10ece..b56efb907b 100644 --- a/anda/langs/vala/vala-nightly/vala-nightly.spec +++ b/anda/langs/vala/vala-nightly/vala-nightly.spec @@ -3,11 +3,11 @@ %global priority 90 %global real_name vala -%global commit 34978cd533f2ab687985ae22dfd98ddb12888558 +%global commit 7a55303675779995a96f3c3e715fff349174046d %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global repo https://gitlab.gnome.org/GNOME/%{real_name}.git -%global commit_date 20250419 +%global commit_date 20250425 %global snapshot_info %{commit_date}.%{shortcommit} Name: vala-nightly From 00c64a226b04036b6f88f32aa716a18f91f3e53a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 25 Apr 2025 02:02:52 +0000 Subject: [PATCH 0883/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index d8e78e155f..86f0fb01d1 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-24 +%global ver 2025-04-25 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 97bf12b6c8fba8bdd1ec1beb97c12fdd9d141d19 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 25 Apr 2025 03:57:39 +0000 Subject: [PATCH 0884/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 5e7dbdca33..17c0be1ab1 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.24.202040 +Version: 2025.04.25.034233 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 264b29b9c471cff2fee917fd81aa8b11752a5e1e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 25 Apr 2025 05:20:07 +0000 Subject: [PATCH 0885/2977] bump: srpm-macros --- anda/terra/srpm-macros/anda-srpm-macros.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/terra/srpm-macros/anda-srpm-macros.spec b/anda/terra/srpm-macros/anda-srpm-macros.spec index 92b728a0d2..da54770630 100644 --- a/anda/terra/srpm-macros/anda-srpm-macros.spec +++ b/anda/terra/srpm-macros/anda-srpm-macros.spec @@ -1,5 +1,5 @@ Name: anda-srpm-macros -Version: 0.2.9 +Version: 0.2.10 Release: 1%?dist Summary: SRPM macros for extra Fedora packages From c2184023382f1c3b3429c78c2d624f7464113700 Mon Sep 17 00:00:00 2001 From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com> Date: Fri, 25 Apr 2025 05:20:20 +0000 Subject: [PATCH 0886/2977] fix(umu-launcher): update dependencies (#4422) * build: drop python3-filelock * build: add python3-xxhash * build: add python3-cbor2 --- anda/games/umu/umu-launcher.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anda/games/umu/umu-launcher.spec b/anda/games/umu/umu-launcher.spec index 244a5deaeb..0b16997b93 100644 --- a/anda/games/umu/umu-launcher.spec +++ b/anda/games/umu/umu-launcher.spec @@ -32,8 +32,9 @@ Requires: python Requires: python3 %if %{?fedora} <= 41 Requires: python3-xlib -Requires: python3-filelock Requires: python3-pyzstd +Requires: python3-xxhash +Requires: python3-cbor2 AutoReqProv: no %endif From 101013792d309849c919610921a421cc4aa91520 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 25 Apr 2025 07:18:35 +0000 Subject: [PATCH 0887/2977] bump: eza --- anda/langs/rust/eza/rust-eza.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/rust/eza/rust-eza.spec b/anda/langs/rust/eza/rust-eza.spec index 871d4034a3..7d909c2da6 100644 --- a/anda/langs/rust/eza/rust-eza.spec +++ b/anda/langs/rust/eza/rust-eza.spec @@ -4,7 +4,7 @@ %global crate eza Name: rust-eza -Version: 0.21.1 +Version: 0.21.2 Release: 1%?dist Summary: Modern replacement for ls From 70a3606d880330efcddd1c23687ddfa51ae13b8b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 25 Apr 2025 07:31:59 +0000 Subject: [PATCH 0888/2977] bump: osu-lazer --- anda/games/osu-lazer/osu-lazer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index e6aa4f9e42..c23da15b04 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -1,4 +1,4 @@ -%define osuresver 2025.422.0 +%define osuresver 2025.425.0 %global debug_package %{nil} %define __strip /bin/true From 8b8ff8d48bf64cc0d84ad0cc1e314691ea6f881d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 25 Apr 2025 09:55:53 +0000 Subject: [PATCH 0889/2977] bump: mpv --- anda/langs/python/mpv/python-mpv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/python/mpv/python-mpv.spec b/anda/langs/python/mpv/python-mpv.spec index 9e42548f52..f65f454d3a 100644 --- a/anda/langs/python/mpv/python-mpv.spec +++ b/anda/langs/python/mpv/python-mpv.spec @@ -1,7 +1,7 @@ %define debug_package %nil Name: python3-mpv -Version: 1.0.7 +Version: 1.0.8 Release: 1%?dist Summary: Python interface to the awesome mpv media player License: GPL-2.0+ OR LGPL-2.1+ From ce4a7073bb6bddf148bb5821dff57b2eb1873935 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 25 Apr 2025 10:20:00 +0000 Subject: [PATCH 0890/2977] bump: lomiri-system-settings gradle --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- anda/tools/buildsys/gradle/gradle.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 194d18bec2..aead122c2d 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit 7c873b18b44f737fafe3296f84651111d6cbb128 +%global commit 931e31af9ce87aa12fb00f9545c80994361dc3b2 %forgemeta Name: lomiri-system-settings diff --git a/anda/tools/buildsys/gradle/gradle.spec b/anda/tools/buildsys/gradle/gradle.spec index da16ccc2a7..6d8e588e86 100644 --- a/anda/tools/buildsys/gradle/gradle.spec +++ b/anda/tools/buildsys/gradle/gradle.spec @@ -1,5 +1,5 @@ Name: gradle -Version: 8.13.0 +Version: 8.14.0 Release: 1%?dist Summary: Powerful build system for the JVM URL: https://gradle.org/ From 35b724617eff2996eff88ba1b19f0ece4b8162cb Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 25 Apr 2025 14:28:06 +0000 Subject: [PATCH 0891/2977] bump: preview stable yt-dlp --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 543e738c63..6e7564f0e8 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.184.2-pre +%global ver 0.184.3-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ # Use Mold as the linker diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index e5dfe94ec2..d32f9c5ebd 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.183.10 +Version: 0.183.11 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 17c0be1ab1..0ba82efa04 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.25.034233 +Version: 2025.04.25.041124 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From ca368ba77c0ac96c7678187e7b0247990216eaec Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 25 Apr 2025 14:42:36 +0000 Subject: [PATCH 0892/2977] bump: youtube-music --- anda/apps/youtube-music/youtube-music.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/youtube-music/youtube-music.spec b/anda/apps/youtube-music/youtube-music.spec index 86b0b43f2f..914eb701fe 100644 --- a/anda/apps/youtube-music/youtube-music.spec +++ b/anda/apps/youtube-music/youtube-music.spec @@ -12,7 +12,7 @@ %global vendor_pnpm 1 Name: youtube-music -Version: 3.8.0 +Version: 3.8.1 Release: 1%?dist Summary: YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader) Source1: youtube-music.desktop From 8c622d51db0cbacd33e2a09048e52199b0161d70 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 25 Apr 2025 16:59:36 +0000 Subject: [PATCH 0893/2977] bump: inputplumber --- anda/games/inputplumber/inputplumber.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index e07948c24b..c1043e4b24 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.54.1 +Version: 0.55.0 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later From aae75fdddbccc2ed75857826f05d9c1ac7d85883 Mon Sep 17 00:00:00 2001 From: Gilver Date: Fri, 25 Apr 2025 12:00:55 -0500 Subject: [PATCH 0894/2977] feat(zig-master): Fix build commands for future bootstrapping, port Fedora patches (#4427) * feat(zig-master): Bootstrap build Signed-off-by: Gilver * chore: Bump release Signed-off-by: Gilver * Fix up the docs build flag Signed-off-by: Gilver * fix: zig_build_options macro Signed-off-by: Gilver * fix: Don't self-bootstrap for now Signed-off-by: Gilver * Update zig-master.spec Signed-off-by: Gilver * Add files via upload Signed-off-by: Gilver * feat: Port all applicable Fedora patches * Oops Signed-off-by: Gilver * fix: Add back that space Signed-off-by: Gilver * chore: Changelog Signed-off-by: Gilver --------- Signed-off-by: Gilver --- ...ve-native-lib-directories-from-rpath.patch | 18 ++++++++++++++ ...bounds-of-main-zig-executable-to-9G.patch} | 0 ...ib-dir-as-directory-instead-of-as-st.patch | 18 ++++++++++++++ anda/langs/zig/zig-master.spec | 24 +++++++++++-------- 4 files changed, 50 insertions(+), 10 deletions(-) create mode 100644 anda/langs/zig/0000-remove-native-lib-directories-from-rpath.patch rename anda/langs/zig/{0000-increase-upper-bounds-of-main-zig-executable-to-9G.patch => 0001-increase-upper-bounds-of-main-zig-executable-to-9G.patch} (100%) create mode 100644 anda/langs/zig/0002-build-pass-zig-lib-dir-as-directory-instead-of-as-st.patch diff --git a/anda/langs/zig/0000-remove-native-lib-directories-from-rpath.patch b/anda/langs/zig/0000-remove-native-lib-directories-from-rpath.patch new file mode 100644 index 0000000000..1e1c1f1709 --- /dev/null +++ b/anda/langs/zig/0000-remove-native-lib-directories-from-rpath.patch @@ -0,0 +1,18 @@ +--- a/src/main.zig 2025-04-25 06:01:31.337458939 -0500 ++++ b/src/main.zig 2025-04-25 06:03:02.239473385 -0500 +@@ -4072,6 +4072,15 @@ + + try create_module.lib_directories.ensureUnusedCapacity(arena, paths.lib_dirs.items.len); + for (paths.lib_dirs.items) |path| addLibDirectoryWarn2(&create_module.lib_directories, path, true); ++ ++ for (paths.lib_dirs.items) |native_lib_dir| { ++ for (0.., create_module.rpath_list.items) |i, rpath_dir| { ++ if (std.mem.eql(u8, native_lib_dir, rpath_dir)) { ++ _ = create_module.rpath_list.orderedRemove(i); ++ break; ++ } ++ } ++ } + } + + if (create_module.libc_paths_file) |paths_file| { diff --git a/anda/langs/zig/0000-increase-upper-bounds-of-main-zig-executable-to-9G.patch b/anda/langs/zig/0001-increase-upper-bounds-of-main-zig-executable-to-9G.patch similarity index 100% rename from anda/langs/zig/0000-increase-upper-bounds-of-main-zig-executable-to-9G.patch rename to anda/langs/zig/0001-increase-upper-bounds-of-main-zig-executable-to-9G.patch diff --git a/anda/langs/zig/0002-build-pass-zig-lib-dir-as-directory-instead-of-as-st.patch b/anda/langs/zig/0002-build-pass-zig-lib-dir-as-directory-instead-of-as-st.patch new file mode 100644 index 0000000000..21438943cc --- /dev/null +++ b/anda/langs/zig/0002-build-pass-zig-lib-dir-as-directory-instead-of-as-st.patch @@ -0,0 +1,18 @@ +--- a/build.zig 2025-04-25 05:56:25.033100994 -0500 ++++ b/build.zig 2025-04-25 05:57:16.965173352 -0500 +@@ -1392,7 +1392,14 @@ + // in a temporary directory + "--cache-root", b.cache_root.path orelse ".", + }); +- cmd.addArgs(&.{ "--zig-lib-dir", b.fmt("{}", .{b.graph.zig_lib_directory}) }); ++ if (b.graph.zig_lib_directory.path) |zig_lib_dir| { ++ cmd.addArgs(&.{"--zig-lib-dir"}); ++ if (fs.path.isAbsolute(zig_lib_dir)) { ++ cmd.addArgs(&.{zig_lib_dir}); ++ } else { ++ cmd.addDirectoryArg(b.path(zig_lib_dir)); ++ } ++ } + cmd.addArgs(&.{"-i"}); + cmd.addFileArg(b.path(b.fmt("doc/langref/{s}", .{entry.name}))); + diff --git a/anda/langs/zig/zig-master.spec b/anda/langs/zig/zig-master.spec index 7b986b933f..a2b6275472 100644 --- a/anda/langs/zig/zig-master.spec +++ b/anda/langs/zig/zig-master.spec @@ -11,11 +11,7 @@ %bcond bootstrap 1 %bcond docs %{without bootstrap} %bcond test 1 -%if 0%{?fedora} <= 40 -%global zig_cache_dir %{_builddir}/zig-cache -%else %global zig_cache_dir %{builddir}/zig-cache -%endif %global zig_build_options %{shrink: \ --verbose \ --release=fast \ @@ -29,7 +25,7 @@ --cache-dir "%{zig_cache_dir}" \ --global-cache-dir "%{zig_cache_dir}" \ \ - -Dversion-string="%{version}" \ + -Dversion-string="%(v=%{ver}; echo ${v:0:6})" \ -Dstatic-llvm=false \ -Denable-llvm=true \ -Dno-langref=true \ @@ -43,13 +39,15 @@ Name: zig-master Version: %(echo %{ver} | sed 's/-/~/g') -Release: 1%?dist +Release: 2%?dist Summary: Programming language for maintaining robust, optimal, and reusable software License: MIT AND NCSA AND LGPL-2.1-or-later AND LGPL-2.1-or-later WITH GCC-exception-2.0 AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND BSD-3-Clause AND Inner-Net-2.0 AND ISC AND LicenseRef-Fedora-Public-Domain AND GFDL-1.1-or-later AND ZPL-2.1 URL: https://ziglang.org Source0: %{url}/builds/zig-%{ver}.tar.xz Source1: %{url}/builds/zig-%{ver}.tar.xz.minisig -Patch0: 0000-increase-upper-bounds-of-main-zig-executable-to-9G.patch +Patch0: 0000-remove-native-lib-directories-from-rpath.patch +Patch1: 0001-increase-upper-bounds-of-main-zig-executable-to-9G.patch +Patch2: 0002-build-pass-zig-lib-dir-as-directory-instead-of-as-st.patch BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ @@ -63,7 +61,7 @@ BuildRequires: help2man # for signature verification BuildRequires: minisign %if %{without bootstrap} -BuildRequires: %{name} = %{version} +BuildRequires: %{name} >= %{version} %endif %if %{with test} BuildRequires: elfutils-libelf-devel @@ -108,7 +106,7 @@ Zig Standard Library Summary: Documentation for Zig Conflicts: zig-doc BuildArch: noarch -Requires: %{name} = %{version} +Requires: %{name} >= %{version} %description doc Documentation for Zig. For more information, visit %{url} @@ -117,6 +115,10 @@ Documentation for Zig. For more information, visit %{url} %prep /usr/bin/minisign -V -m %{SOURCE0} -x %{SOURCE1} -P %{public_key} %autosetup -p1 -n zig-%{ver} +%if %{without bootstrap} +# Ensure that the pre-build stage1 binary is not used +rm -f stage1/zig1.wasm +%endif %build # zig doesn't know how to dynamically link llvm on its own so we need cmake to generate a header ahead of time @@ -155,7 +157,7 @@ help2man --no-discard-stderr --no-info "./zig-out/bin/zig" --version-option=vers ./zig-out/bin/zig build docs \ --verbose \ --global-cache-dir "%{zig_cache_dir}" \ - -Dversion-string="%{version}" + -Dversion-string="%(v=%{ver}; echo ${v:0:6})" %endif %install @@ -191,5 +193,7 @@ install -D -pv -m 0644 -t %{buildroot}%{_mandir}/man1/zig.1 %endif %changelog +* Fri Apr 25 2025 Gilver E. - 0.15.0~dev.384+c06fecd46-2 +- Ported Fedora Zig patches * Wed Apr 23 2025 Gilver E. - Initial package From 6309310fb42c707492fb0139e8cce324d1abe613 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Fri, 25 Apr 2025 10:07:55 -0700 Subject: [PATCH 0895/2977] fix(ipu6-camera-hal): Update patches, update build, add update script because apparently I forgot to do that (#4248) (#4430) * Update ipu6-camera-hal.spec * Create update.rhai * Bump commit? * Nightly for date function * Cursed * Update ipu6-camera-hal.spec * fix: Install and build * fix: Ifcond typo * Add myself as packager I guess * fix: Whoops * I am becoming the Joker * Not taking anymore chances this is so annoying * fix: Drop old lib file * fix: Finally fully drop hal_adapter (thank God) --------- (cherry picked from commit aafe2ed488ced6a392b525c335ab2609f0efce7f) Signed-off-by: Gilver Co-authored-by: Gilver --- .../ipu6-camera-hal/0000-lib-path.patch | 32 ----- .../0001-CMakeLists-fixes.patch | 48 ------- .../ipu6-camera-hal/0001-Drop-Werror.patch | 36 +++++ .../ipu6-camera-hal/0002-set-mainline.patch | 20 --- .../ipu6-camera-hal/60-intel-ipu6.rules | 30 +++-- anda/system/ipu6-camera-hal/anda.hcl | 2 +- .../ipu6-camera-hal/icamera_ipu6_isys.conf | 3 - .../ipu6-camera-hal/ipu6-camera-hal.spec | 124 ++++++------------ .../ipu6-camera-hal/ipu6-driver-select.sh | 20 ++- anda/system/ipu6-camera-hal/update.rhai | 9 ++ 10 files changed, 113 insertions(+), 211 deletions(-) delete mode 100644 anda/system/ipu6-camera-hal/0000-lib-path.patch delete mode 100644 anda/system/ipu6-camera-hal/0001-CMakeLists-fixes.patch create mode 100644 anda/system/ipu6-camera-hal/0001-Drop-Werror.patch delete mode 100644 anda/system/ipu6-camera-hal/0002-set-mainline.patch delete mode 100644 anda/system/ipu6-camera-hal/icamera_ipu6_isys.conf create mode 100644 anda/system/ipu6-camera-hal/update.rhai diff --git a/anda/system/ipu6-camera-hal/0000-lib-path.patch b/anda/system/ipu6-camera-hal/0000-lib-path.patch deleted file mode 100644 index df8913015d..0000000000 --- a/anda/system/ipu6-camera-hal/0000-lib-path.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- ipu6-camera-hal-8863bda8b15bef415f112700d0fb04e00a48dbee.old/cmake/libcamhal.pc.cmakein 2024-08-06 08:24:01.897232057 +0200 -+++ ipu6-camera-hal-8863bda8b15bef415f112700d0fb04e00a48dbee/cmake/libcamhal.pc.cmakein 2024-08-06 08:25:08.361731743 +0200 -@@ -1,6 +1,6 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix}/@CMAKE_INSTALL_SUB_PATH@ --libdir=${prefix}/lib/@CMAKE_INSTALL_SUB_PATH@ -+libdir=${prefix}/lib64/@CMAKE_INSTALL_SUB_PATH@ - includedir=${prefix}/include/@CMAKE_INSTALL_SUB_PATH@/libcamhal - - Name: libcamhal ---- a/src/hal/hal_adaptor/HalAdaptor.cpp -+++ b/src/hal/hal_adaptor/HalAdaptor.cpp -@@ -62,7 +62,7 @@ static void load_camera_hal_library() { - CheckAndLogError((strlen(pciID) == 0), VOID_VALUE, "%s, Failed to read PCI id. %d", __func__, - ret); - -- std::string libName = "/usr/lib/"; -+ std::string libName = "/usr/lib64/"; - if (IPU6_UPSTREAM) { - if (strstr(pciID, "0x7d19") != nullptr /* MTL */) { - libName += "ipu_mtl_upstream"; ---- ipu6-camera-hal-8863bda8b15bef415f112700d0fb04e00a48dbee.old/src/platformdata/PlatformData.h 2024-08-06 08:24:01.919232222 +0200 -+++ ipu6-camera-hal-8863bda8b15bef415f112700d0fb04e00a48dbee/src/platformdata/PlatformData.h 2024-08-06 08:25:08.362731750 +0200 -@@ -89,7 +89,7 @@ - #define MAX_CAMERA_NUMBER 100 - // Temporarily using current path to save aiqd file for none CAL platforms. - #define CAMERA_CACHE_DIR "./" --#define CAMERA_DEFAULT_CFG_PATH "/etc/camera/" -+#define CAMERA_DEFAULT_CFG_PATH "/usr/share/camera/" - #define CAMERA_GRAPH_DESCRIPTOR_FILE "gcss/graph_descriptor.xml" - #define CAMERA_GRAPH_SETTINGS_DIR "gcss/" - #endif diff --git a/anda/system/ipu6-camera-hal/0001-CMakeLists-fixes.patch b/anda/system/ipu6-camera-hal/0001-CMakeLists-fixes.patch deleted file mode 100644 index 82924624ce..0000000000 --- a/anda/system/ipu6-camera-hal/0001-CMakeLists-fixes.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -266,7 +266,7 @@ add_library(camhal_static STATIC ${LIBCAMHAL_SRCS}) - if (NOT CAL_BUILD AND (NOT "${CMAKE_INSTALL_SUB_PATH}" STREQUAL "")) - set(CMAKE_SKIP_RPATH TRUE) - set_target_properties(camhal PROPERTIES LINK_FLAGS -- "-Wl,-rpath,/usr/lib/${CMAKE_INSTALL_SUB_PATH}") -+ "-Wl,-rpath,${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${CMAKE_INSTALL_SUB_PATH}") - add_compile_definitions(SUB_CONFIG_PATH="${CMAKE_INSTALL_SUB_PATH}") - endif() - set_target_properties(camhal_static PROPERTIES OUTPUT_NAME "camhal") -@@ -399,9 +399,9 @@ endif() #ENABLE_SANDBOXING - if (NOT CAL_BUILD) - # Install headers - if ("${CMAKE_INSTALL_SUB_PATH}" STREQUAL "") -- install(DIRECTORY include/ DESTINATION usr/include/libcamhal) -+ install(DIRECTORY include/ DESTINATION include/libcamhal) - if (SUPPORT_LIVE_TUNING) -- install(FILES modules/livetune/LiveTuning.h DESTINATION usr/include/libcamhal/api) -+ install(FILES modules/livetune/LiveTuning.h DESTINATION include/libcamhal/api) - endif() #SUPPORT_LIVE_TUNING - endif() - -@@ -421,18 +421,18 @@ endif() - # Install libraries - if (${CMAKE_VERSION} VERSION_LESS 3.11) - install(TARGETS camhal camhal_static -- LIBRARY DESTINATION usr/lib/${CMAKE_INSTALL_SUB_PATH} -- ARCHIVE DESTINATION usr/lib/${CMAKE_INSTALL_SUB_PATH} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${CMAKE_INSTALL_SUB_PATH} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${CMAKE_INSTALL_SUB_PATH} - ) - else() --install(TARGETS camhal camhal_static DESTINATION usr/lib/${CMAKE_INSTALL_SUB_PATH}) -+install(TARGETS camhal camhal_static DESTINATION ${CMAKE_INSTALL_LIBDIR}/${CMAKE_INSTALL_SUB_PATH}) - endif() - - # Install package config file - configure_file(${PROJECT_SOURCE_DIR}/cmake/libcamhal.pc.cmakein - ${PROJECT_SOURCE_DIR}/libcamhal.pc @ONLY) - install(FILES libcamhal.pc -- DESTINATION usr/${CMAKE_INSTALL_LIBDIR}/${CMAKE_INSTALL_SUB_PATH}/pkgconfig) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/${CMAKE_INSTALL_SUB_PATH}/pkgconfig) - - endif() #NOT CAL_BUILD - - - diff --git a/anda/system/ipu6-camera-hal/0001-Drop-Werror.patch b/anda/system/ipu6-camera-hal/0001-Drop-Werror.patch new file mode 100644 index 0000000000..24470dad69 --- /dev/null +++ b/anda/system/ipu6-camera-hal/0001-Drop-Werror.patch @@ -0,0 +1,36 @@ +From 1ec565d6b067d165cfbf8f68fc008e68fa94cfc0 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Sun, 2 Feb 2025 08:52:52 +0100 +Subject: [PATCH] Drop -Werror +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Drop -Werror to stop the following false-positive gcc-15 warning +breaking the build: + +/builddir/build/BUILD/ipu6-camera-hal-0.0-build/ipu6-camera-hal-b6f6eeb68f06cd0d4a2463b8950847b1b98cebaa/src/core/psysprocessor/PGCommon.cpp: In member function ‘icamera::PGCommon::init()’: +/builddir/build/BUILD/ipu6-camera-hal-0.0-build/ipu6-camera-hal-b6f6eeb68f06cd0d4a2463b8950847b1b98cebaa/src/core/psysprocessor/PGCommon.cpp:122:73: error: argument 1 range [18446744071562067968, 18446744073709551615] exceeds maximum object size 9223372036854775807 [-Werror=alloc-size-larger-than=] + 122 | mPgTerminals = std::unique_ptr(new uint8_t[mTerminalCount]); + | ^ + +Signed-off-by: Hans de Goede +--- + CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f7b515a..27a20fa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -80,7 +80,6 @@ message(STATUS "install prefix: " ${CMAKE_INSTALL_PREFIX}) + set (CMAKE_CXX_STANDARD 11) + add_compile_options( + -Wall +- -Werror + -fstack-protector + -fPIE + -fPIC +-- +2.48.1 + diff --git a/anda/system/ipu6-camera-hal/0002-set-mainline.patch b/anda/system/ipu6-camera-hal/0002-set-mainline.patch deleted file mode 100644 index 057036a047..0000000000 --- a/anda/system/ipu6-camera-hal/0002-set-mainline.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/v4l2/MediaControl.cpp -+++ b/src/v4l2/MediaControl.cpp -@@ -886,6 +886,15 @@ int MediaControl::mediaCtlSetup(int cameraId, MediaCtlConf* mc, int width, int h - ivscName.c_str(), link.sinkEntityName.c_str()); - link.srcEntity = ivsc->info.id; - link.srcEntityName = ivscName; -+ /* -+ * Since mainline kernel commit 48f5fd8967f8 ("media: -+ * ivsc: csi: Swap SINK and SOURCE pads") the src-pad -+ * on the mainline ivsc mc-entity is pad 1, where on -+ * older versions it is pad 0, so this needs to be set -+ * dynamically. -+ * The src-pad is the other pad of the found ivsc sink. -+ */ -+ link.srcPad = !ivsc->links[i].sink->index; - break; - } - } - - diff --git a/anda/system/ipu6-camera-hal/60-intel-ipu6.rules b/anda/system/ipu6-camera-hal/60-intel-ipu6.rules index 967b72cb12..1fc0806b5b 100644 --- a/anda/system/ipu6-camera-hal/60-intel-ipu6.rules +++ b/anda/system/ipu6-camera-hal/60-intel-ipu6.rules @@ -1,16 +1,28 @@ # Tiger Lake -SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x9a19", RUN+="/usr/bin/echo /usr/lib64/ipu_tgl > /etc/ld.so.conf.d/ipu6-x86_64.conf" +SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x9a19", GOTO="ipu6_tgl" # Alder Lake-N -SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x465d", RUN+="/usr/bin/echo /usr/lib64/ipu_adl > /etc/ld.so.conf.d/ipu6-x86_64.conf" +SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x465d", GOTO="ipu6_adl" # Alder Lake-P -SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x462e", RUN+="/usr/bin/echo /usr/lib64/ipu_adl > /etc/ld.so.conf.d/ipu6-x86_64.conf" +SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x462e", GOTO="ipu6_adl" # Raptor Lake-P -SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0xa75d", RUN+="/usr/bin/echo /usr/lib64/ipu_adl > /etc/ld.so.conf.d/ipu6-x86_64.conf" +SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0xa75d", GOTO="ipu6_adl" # Meteor Lake -SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x7d19", RUN+="/usr/bin/echo /usr/lib64/ipu_mtl > /etc/ld.so.conf.d/ipu6-x86_64.conf" -# Lunar Lake -SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x645d", RUN+="/usr/bin/echo /usr/lib64/ipu_lnl > /etc/ld.so.conf.d/ipu6-x86_64.conf" -# Jasper Lake -SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x4e19", RUN+="/usr/bin/echo /usr/lib64/ipu_jsl > /etc/ld.so.conf.d/ipu6-x86_64.conf" +SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x7d19", GOTO="ipu6_mtl" + +GOTO="ipu6_end" + +LABEL="ipu6_tgl" +RUN+="/bin/ln -sf /usr/share/defaults/etc/camera/ipu6/v4l2-relayd /run/v4l2-relayd" +GOTO="ipu6_end" + +LABEL="ipu6_adl" +RUN+="/bin/ln -sf /usr/share/defaults/etc/camera/ipu6ep/v4l2-relayd /run/v4l2-relayd" +GOTO="ipu6_end" + +LABEL="ipu6_mtl" +RUN+="/bin/ln -sf /usr/share/defaults/etc/camera/ipu6epmtl/v4l2-relayd /run/v4l2-relayd" +GOTO="ipu6_end" + +LABEL="ipu6_end" KERNEL=="ipu-psys0", TAG+="uaccess" diff --git a/anda/system/ipu6-camera-hal/anda.hcl b/anda/system/ipu6-camera-hal/anda.hcl index b156dc5ec2..1718d7a1f3 100644 --- a/anda/system/ipu6-camera-hal/anda.hcl +++ b/anda/system/ipu6-camera-hal/anda.hcl @@ -4,6 +4,6 @@ project pkg { spec = "ipu6-camera-hal.spec" } labels { - weekly = 1 + nightly = 1 } } diff --git a/anda/system/ipu6-camera-hal/icamera_ipu6_isys.conf b/anda/system/ipu6-camera-hal/icamera_ipu6_isys.conf deleted file mode 100644 index 5631cb2d2d..0000000000 --- a/anda/system/ipu6-camera-hal/icamera_ipu6_isys.conf +++ /dev/null @@ -1,3 +0,0 @@ -# Move the special isys /dev/video# node out of the way of -# normal v4l2 devices such as v4l2loopback -options icamera_ipu6_isys video_nr=8,9,10,11,12,13,14,15 diff --git a/anda/system/ipu6-camera-hal/ipu6-camera-hal.spec b/anda/system/ipu6-camera-hal/ipu6-camera-hal.spec index 51ba9cedfe..64aa0068dd 100644 --- a/anda/system/ipu6-camera-hal/ipu6-camera-hal.spec +++ b/anda/system/ipu6-camera-hal/ipu6-camera-hal.spec @@ -1,31 +1,25 @@ -%global commit 289e645dffbd0ea633f10bb4f93855f1e4429e9a -%global commitdate 20240509 +%global commit 8346d93d032a33b0db15bba5ad87854308c3dff5 +%global commit_date 20240509 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global build_cflags %{__build_flags_lang_c} %{?_distro_extra_cflags} -Wno-alloc-size-larger-than %global build_cxxflags %{__build_flags_lang_cxx} %{?_distro_extra_cxxflags} -Wno-alloc-size-larger-than %global __cmake_in_source_build 1 +%global ver 1.0.0 Name: ipu6-camera-hal Summary: Hardware abstraction layer for Intel IPU6 -URL: https://github.com/intel/ipu6-camera-hal -Version: %{commitdate}.%{shortcommit} -Release: 2%{?dist} +Version: %{ver}^%{commit_date}git.%{shortcommit} +Release: 1%{?dist} License: Apache-2.0 -Source0: https://github.com/intel/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +URL: https://github.com/intel/ipu6-camera-hal +Source0: %{url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz Source1: 60-intel-ipu6.rules Source2: v4l2-relayd-adl Source3: v4l2-relayd-tgl -Source4: icamera_ipu6_isys.conf -Source5: ipu6-driver-select.sh -### RPM Fusion | [ipu6-camera-hal] Update to the latest commit | MODIFIED -## https://lists.rpmfusion.org/archives/list/rpmfusion-commits@lists.rpmfusion.org/thread/O6IPZMHMP7A3LQBDY4AEORTDEX4P6ESY -Patch00: 0000-lib-path.patch -### intel/ipu6-camera-hal | PR #113 | CMakeLists fixes -## https://github.com/intel/ipu6-camera-hal/pull/113 -Patch01: 0001-CMakeLists-fixes.patch -### intel/ipu6-camera-hal | PR #114 | MediaControl: Dymically set mainline IVSC media-entity src-pad index -## https://github.com/intel/ipu6-camera-hal/pull/114 -Patch02: 0002-set-mainline.patch +Source4: ipu6-driver-select.sh +### RPM Fusion | [ipu6-camera-hal] Fix build with gcc15 +## https://lists.rpmfusion.org/archives/list/rpmfusion-commits@lists.rpmfusion.org/thread/TDMTM3WHMTHKCIN3XAUVWK3OBARW5SKO +Patch0: 0001-Drop-Werror.patch BuildRequires: systemd-rpm-macros BuildRequires: ipu6-camera-bins-devel >= 0.0-11 BuildRequires: cmake @@ -33,8 +27,13 @@ BuildRequires: gcc BuildRequires: g++ BuildRequires: expat-devel BuildRequires: libdrm-devel -ExclusiveArch: x86_64 Requires: ipu6-camera-bins >= 0.0-11 +# Fix the stupid issue when changing versioning schemes +%if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 +Provides: %{name} = %{commit_date}.%{shortcommit}-%{release} +%endif +ExclusiveArch: x86_64 +Packager: Gilver E. %description This package provides the basic Hardware Avstraction Layer (HAL) access APIs for IPU6. @@ -49,78 +48,33 @@ This provides the necessary header files for IPU6 HAL development. %prep %autosetup -p1 -n %{name}-%{commit} -sed -i "s|/etc/camera/|/usr/share/camera/|g" \ - src/platformdata/PlatformData.h - %build -for i in ipu_tgl ipu_adl ipu_mtl; do - export PKG_CONFIG_PATH=%{_libdir}/$i/pkgconfig/ - export LDFLAGS="$RPM_LD_FLAGS -Wl,-rpath=%{_libdir}/$i" - mkdir $i && pushd $i - if [ $i = "ipu_tgl" ]; then - IPU_VERSION=ipu6 - elif [ $i = "ipu_adl" ]; then - IPU_VERSION=ipu6ep - elif [ $i = "ipu_mtl" ]; then - IPU_VERSION=ipu6epmtl - else - IPU_VERSION=ipu - fi - %cmake \ - -DBUILD_CAMHAL_ADAPTOR=ON \ - -DBUILD_CAMHAL_PLUGIN=ON \ - -DBUILD_CAMHAL_TESTS=OFF \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_SUB_PATH:PATH="$i" \ - -DCMAKE_INSTALL_SYSCONFDIR=%{_datadir} \ - -DIPU_VER="$IPU_VERSION" \ - -DUSE_PG_LITE_PIPE=ON .. - %make_build - popd -done - -### hal_adaptor.so dispatches between different libcamhal.so builds so only build it once! -mkdir hal_adaptor && pushd hal_adaptor -%cmake ../src/hal/hal_adaptor -%make_build -popd +%cmake -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_SYSCONFDIR:PATH="%{_datadir}/defaults/etc" \ + -DBUILD_CAMHAL_ADAPTOR=ON \ + -DBUILD_CAMHAL_PLUGIN=ON \ + -DIPU_VERSIONS="ipu6;ipu6ep;ipu6epmtl" \ + -DUSE_PG_LITE_PIPE=ON +%cmake_build %install -for i in ipu_tgl ipu_adl ipu_mtl; do - pushd $i - %make_install - rm %{buildroot}%{_libdir}/$i/libcamhal.a - rm -r %{buildroot}%{_libdir}/$i/pkgconfig - popd -done - -pushd hal_adaptor -%make_install -popd +%cmake_install +# camera-hal will try to use the static libs instead of .so files if present +# Fedora does -devel-static packages, maybe I could do this as well in a different spec so it will not affect builds? +rm %{buildroot}%{_libdir}/libcamhal/plugins/*.a install -Dpm 0644 %{SOURCE1} %{buildroot}%{_udevrulesdir}/60-intel-ipu6.rules ### v4l2-relayd configuration examples (mtl uses same config as adl) -install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/camera/ipu_adl/v4l2-relayd -install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/camera/ipu_mtl/v4l2-relayd -install -Dpm 0644 %{SOURCE3} %{buildroot}%{_datadir}/camera/ipu_tgl/v4l2-relayd - -### Make kmod-intel-ipu6 use /dev/video7 leaving /dev/video0 for loopback -install -Dpm 0644 %{SOURCE4} %{buildroot}%{_modprobedir}/icamera_ipu6_isys.conf +install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/defaults/etc/camera/ipu6/v4l2-relayd +install -Dpm 0644 %{SOURCE3} %{buildroot}%{_datadir}/defaults/etc/camera/ipu6ep/v4l2-relayd +install -Dpm 0644 %{SOURCE3} %{buildroot}%{_datadir}/defaults/etc/camera/ipu6epmtl/v4l2-relayd ### Script to switch between proprietary and open IPU6 stacks -install -Dpm 0755 %{SOURCE5} %{buildroot}%{_bindir}/ipu6-driver-select - -### Needed for GStreamer ICamera builds. -ln -sf hal_adaptor %{buildroot}%{_includedir}/libcamhal -ln -sf hal_adaptor.pc %{buildroot}%{_libdir}/pkgconfig/libcamhal.pc +install -Dpm 0755 %{SOURCE4} %{buildroot}%{_bindir}/ipu6-driver-select %posttrans -### Ensure that v4l2-relayd service enabled if ipu6-driver-select is installed -if [ ! -f /etc/modprobe.d/ipu6-driver-select.conf ]; then - /usr/bin/ipu6-driver-select proprietary -fi ### Skip triggering if udevd isn't accessible if [ -S /run/udev/control ]; then /usr/bin/udevadm control --reload @@ -128,20 +82,18 @@ if [ -S /run/udev/control ]; then fi %files +%doc README.md +%doc SECURITY.md %license LICENSE -%ghost %{_sysconfdir}/modprobe.d/ipu6-driver-select.conf %{_bindir}/ipu6-driver-select -%{_libdir}/ipu*/libcamhal.so* -%{_libdir}/libhal_adaptor.so.* -%{_datadir}/camera -%{_modprobedir}/icamera_ipu6_isys.conf +%{_libdir}/libcamhal.so.* +%{_libdir}/libcamhal +%{_datadir}/defaults %{_udevrulesdir}/60-intel-ipu6.rules %files devel -%{_includedir}/hal_adaptor %{_includedir}/libcamhal -%{_libdir}/libhal_adaptor.so -%{_libdir}/pkgconfig/hal_adaptor.pc +%{_libdir}/libcamhal.so %{_libdir}/pkgconfig/libcamhal.pc diff --git a/anda/system/ipu6-camera-hal/ipu6-driver-select.sh b/anda/system/ipu6-camera-hal/ipu6-driver-select.sh index 4f7333d3b9..d6a4862ab1 100644 --- a/anda/system/ipu6-camera-hal/ipu6-driver-select.sh +++ b/anda/system/ipu6-camera-hal/ipu6-driver-select.sh @@ -3,12 +3,12 @@ set -e function show_help () { - echo "Usage: 'ipu6-driver-select [ proprietary | open ]'" + echo "Usage: 'ipu6-driver-select [ proprietary | foss ]'" exit 1 } -function needs_reboot () { - echo "Reboot your system for the changes to take effect" +function needs_pipewire_restart () { + echo "Run 'systemctl --user restart pipewire' for the changes to take effect" exit 0 } @@ -17,17 +17,13 @@ if (( $# != 1 )); then fi case "$1" in - "open") - echo "blacklist icamera-ipu6" > /etc/modprobe.d/ipu6-driver-select.conf - echo "blacklist icamera-ipu6-isys" >> /etc/modprobe.d/ipu6-driver-select.conf - echo "blacklist icamera-ipu6-psys" >> /etc/modprobe.d/ipu6-driver-select.conf - systemctl disable v4l2-relayd.service - needs_reboot + "foss") + systemctl disable --now v4l2-relayd.service + needs_pipewire_restart ;; "proprietary") - echo "blacklist intel-ipu6" > /etc/modprobe.d/ipu6-driver-select.conf - systemctl enable v4l2-relayd.service - needs_reboot + systemctl enable --now v4l2-relayd.service + needs_pipewire_restart ;; *) show_help diff --git a/anda/system/ipu6-camera-hal/update.rhai b/anda/system/ipu6-camera-hal/update.rhai new file mode 100644 index 0000000000..2c9fac76e3 --- /dev/null +++ b/anda/system/ipu6-camera-hal/update.rhai @@ -0,0 +1,9 @@ +rpm.global("commit", gh_commit("intel/ipu6-camera-hal")); +if rpm.changed() { + rpm.release(); + rpm.global("commit_date", date()); + let v = gh("intel/ipu6-camera-hal"); + v.truncate(6); + v.crop(1); + rpm.global("ver", v); +} From 7a6edb0a4baaafafe74c631542bede14ae594bab Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Fri, 25 Apr 2025 10:11:30 -0700 Subject: [PATCH 0896/2977] fix(zed, zed-nightly, zed-preview): Build and licenses (#4198) (#4435) * fix: zed{nightly,preview} * Actual license hell * LOL * Bump all the releases * Small change to try CI again * Ehhhh * Custom global macro? * More efficient license macro * Update zed-preview.spec * Update zed.spec * use large labels * Update zed-nightly.spec * Update zed-preview.spec * Update zed-nightly.spec * Update zed.spec * Update zed-nightly.spec * Update zed-preview.spec * Update zed.spec --------- (cherry picked from commit 156336a8b5ddeec29d1193733ba46e4adee2c288) Signed-off-by: Gilver Co-authored-by: Gilver Co-authored-by: lea --- anda/devs/zed/nightly/anda.hcl | 1 + anda/devs/zed/nightly/zed-nightly.spec | 49 +++++++++++++++++++++----- anda/devs/zed/preview/anda.hcl | 3 ++ anda/devs/zed/preview/zed-preview.spec | 47 +++++++++++++++++++----- anda/devs/zed/stable/anda.hcl | 3 ++ anda/devs/zed/stable/zed.spec | 47 +++++++++++++++++++----- 6 files changed, 125 insertions(+), 25 deletions(-) diff --git a/anda/devs/zed/nightly/anda.hcl b/anda/devs/zed/nightly/anda.hcl index d8f39ce7e0..e92820997f 100644 --- a/anda/devs/zed/nightly/anda.hcl +++ b/anda/devs/zed/nightly/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { nightly = 1 + large = 1 } } diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 561ff05783..0f531fe8cc 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -7,28 +7,44 @@ # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ -# Use Mold as the linker -%global build_rustflags %build_rustflags -C link-arg=-fuse-ld=mold %global crate zed %global app_id dev.zed.Zed-Nightly +%global rustflags_debuginfo 0 + +# Zed needs a special approach to fetch the dep licenses +%global zed_license_online %{shrink: \ + %{__cargo} tree \ + -Z avoid-dev-deps \ + --workspace \ + --edges no-build,no-dev,no-proc-macro \ + --target all \ + %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} \ + --prefix none \ + --format "{l}: {p}" \ + | sed -e "s: ($(pwd)[^)]*)::g" -e "s: / :/:g" -e "/\/.*:/{s/\// OR /}" \ + | sed -e '/.*(\*).*/d' -e '/^: pet/ s/./MIT&/' \ + | sort -u \ +}\ + Name: zed-nightly Version: %ver^%commit_date.%shortcommit -Release: 1%?dist +Release: 2%?dist Summary: Zed is a high-performance, multiplayer code editor - -License: MIT +SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later +License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 AND ISC) AND AGPL.3.0-only AND AGPL-3.0-or-later AND (Apache-2.0 OR BSL-1.0 OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception) AND Apache-2.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR MIT OR Apache-2.0) AND BSD-2-Clause AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR Apache-2.0) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND CC0-1.0 AND GPL-3.0-or-later AND (ISC AND (Apache-2.0 OR ISC) AND OpenSSL) AND (ISC AND (Apache-2.0 OR ISC)) AND ISC AND (MIT AND (MIT OR Apache-2.0)) AND (MIT AND BSD-3-Clause) AND (MIT OR Apache-2.0 OR CC0-1.0) AND (MIT OR Apache-2.0 OR NCSA) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND MPL-2.0 AND Unicode-3.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND Zlib URL: https://zed.dev/ -Source0: https://github.com/zed-industries/zed/archive/%{commit}.zip +Source0: https://github.com/zed-industries/zed/archive/%{commit}.tar.gz Conflicts: zed -Provides: zed +Conflicts: zed-preview BuildRequires: cargo-rpm-macros >= 24 BuildRequires: anda-srpm-macros BuildRequires: gcc -BuildRequires: g++ +BuildRequires: gcc-c++ +BuildRequires: gettext-envsubst BuildRequires: clang BuildRequires: mold BuildRequires: cmake @@ -87,18 +103,33 @@ install -Dm644 crates/zed/resources/app-icon-nightly.png %{buildroot}%{_datadir} install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml +# The license generation script doesn't generate licenses for ALL compiled dependencies, just direct deps of Zed, and it does not "group" licenses +%{zed_license_online} > LICENSE.dependencies +mv assets/icons/LICENSES LICENSE.icons +mv assets/themes/LICENSES LICENSE.themes +mv assets/fonts/plex-mono/license.txt LICENSE.fonts + %if %{with check} %check %cargo_test %endif %files +%doc CODE_OF_CONDUCT.md +%doc README.md +%license LICENSE-AGPL +%license LICENSE-APACHE +%license LICENSE-GPL +%license LICENSE.dependencies +%license LICENSE.fonts +%license LICENSE.icons +%license LICENSE.themes +%license assets/licenses.md %{_libexecdir}/zed-editor %{_bindir}/zed %{_datadir}/applications/%app_id.desktop %{_datadir}/pixmaps/%app_id.png %{_metainfodir}/%app_id.metainfo.xml -%license assets/licenses.md %changelog %autochangelog diff --git a/anda/devs/zed/preview/anda.hcl b/anda/devs/zed/preview/anda.hcl index 1851aadd09..4f9b04a0c5 100644 --- a/anda/devs/zed/preview/anda.hcl +++ b/anda/devs/zed/preview/anda.hcl @@ -2,4 +2,7 @@ project pkg { rpm { spec = "zed-preview.spec" } + labels { + large = 1 + } } diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 6e7564f0e8..05dd74496f 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -3,28 +3,44 @@ %global ver 0.184.3-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ -# Use Mold as the linker -%global build_rustflags %build_rustflags -C link-arg=-fuse-ld=mold %global crate zed %global app_id dev.zed.Zed-Preview +%global rustflags_debuginfo 0 + +# Zed needs a special approach to fetch the dep licenses +%global zed_license_online %{shrink: \ + %{__cargo} tree \ + -Z avoid-dev-deps \ + --workspace \ + --edges no-build,no-dev,no-proc-macro \ + --target all \ + %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} \ + --prefix none \ + --format "{l}: {p}" \ + | sed -e "s: ($(pwd)[^)]*)::g" -e "s: / :/:g" -e "/\/.*:/{s/\// OR /}" \ + | sed -e '/.*(\*).*/d' -e '/^: pet/ s/./MIT&/' \ + | sort -u \ +}\ + Name: zed-preview Version: %(echo %ver | sed 's/-/~/') -Release: pre1%?dist +Release: pre2%?dist Summary: Zed is a high-performance, multiplayer code editor - -License: MIT +SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later +License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 AND ISC) AND AGPL.3.0-only AND AGPL-3.0-or-later AND (Apache-2.0 OR BSL-1.0 OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception) AND Apache-2.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR MIT OR Apache-2.0) AND BSD-2-Clause AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR Apache-2.0) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND CC0-1.0 AND GPL-3.0-or-later AND (ISC AND (Apache-2.0 OR ISC) AND OpenSSL) AND (ISC AND (Apache-2.0 OR ISC)) AND ISC AND (MIT AND (MIT OR Apache-2.0)) AND (MIT AND BSD-3-Clause) AND (MIT OR Apache-2.0 OR CC0-1.0) AND (MIT OR Apache-2.0 OR NCSA) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND MPL-2.0 AND Unicode-3.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND Zlib URL: https://zed.dev/ Source0: https://github.com/zed-industries/zed/archive/refs/tags/v%{ver}.tar.gz Conflicts: zed -Provides: zed +Conflicts: zed-nightly BuildRequires: cargo-rpm-macros >= 24 BuildRequires: anda-srpm-macros BuildRequires: gcc -BuildRequires: g++ +BuildRequires: gcc-c++ +BuildRequires: gettext-envsubst BuildRequires: clang BuildRequires: cmake BuildRequires: mold @@ -83,18 +99,33 @@ install -Dm644 crates/zed/resources/app-icon-preview.png %{buildroot}%{_datadir} install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml +# The license generation script doesn't generate licenses for ALL compiled dependencies, just direct deps of Zed, and it does not "group" licenses +%{zed_license_online} > LICENSE.dependencies +mv assets/icons/LICENSES LICENSE.icons +mv assets/themes/LICENSES LICENSE.themes +mv assets/fonts/plex-mono/license.txt LICENSE.fonts + %if %{with check} %check %cargo_test %endif %files +%doc CODE_OF_CONDUCT.md +%doc README.md +%license LICENSE-AGPL +%license LICENSE-APACHE +%license LICENSE-GPL +%license LICENSE.dependencies +%license LICENSE.fonts +%license LICENSE.icons +%license LICENSE.themes +%license assets/licenses.md %{_libexecdir}/zed-editor %{_bindir}/zed %{_datadir}/applications/%app_id.desktop %{_datadir}/pixmaps/%app_id.png %{_metainfodir}/%app_id.metainfo.xml -%license assets/licenses.md %changelog %autochangelog diff --git a/anda/devs/zed/stable/anda.hcl b/anda/devs/zed/stable/anda.hcl index 443cfb8019..1291962830 100644 --- a/anda/devs/zed/stable/anda.hcl +++ b/anda/devs/zed/stable/anda.hcl @@ -2,4 +2,7 @@ project pkg { rpm { spec = "zed.spec" } + labels { + large = 1 + } } diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index d32f9c5ebd..c9cfc867b7 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -2,28 +2,44 @@ # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ -# Use Mold as the linker -%global build_rustflags %build_rustflags -C link-arg=-fuse-ld=mold %global crate zed %global app_id dev.zed.Zed +%global rustflags_debuginfo 0 + +# Zed needs a special approach to fetch the dep licenses +%global zed_license_online %{shrink: \ + %{__cargo} tree \ + -Z avoid-dev-deps \ + --workspace \ + --edges no-build,no-dev,no-proc-macro \ + --target all \ + %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} \ + --prefix none \ + --format "{l}: {p}" \ + | sed -e "s: ($(pwd)[^)]*)::g" -e "s: / :/:g" -e "/\/.*:/{s/\// OR /}" \ + | sed -e '/.*(\*).*/d' -e '/^: pet/ s/./MIT&/' \ + | sort -u \ +}\ + Name: zed Version: 0.183.11 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor - -License: MIT +SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later +License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 AND ISC) AND AGPL.3.0-only AND AGPL-3.0-or-later AND (Apache-2.0 OR BSL-1.0 OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception) AND Apache-2.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR MIT OR Apache-2.0) AND BSD-2-Clause AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR Apache-2.0) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND CC0-1.0 AND GPL-3.0-or-later AND (ISC AND (Apache-2.0 OR ISC) AND OpenSSL) AND (ISC AND (Apache-2.0 OR ISC)) AND ISC AND (MIT AND (MIT OR Apache-2.0)) AND (MIT AND BSD-3-Clause) AND (MIT OR Apache-2.0 OR CC0-1.0) AND (MIT OR Apache-2.0 OR NCSA) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND MPL-2.0 AND Unicode-3.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND Zlib URL: https://zed.dev/ Source0: https://github.com/zed-industries/zed/archive/refs/tags/v%{version}.tar.gz -Conflicts: zed -Provides: zed +Conflicts: zed-nightly +Conflicts: zed-preview BuildRequires: cargo-rpm-macros >= 24 BuildRequires: anda-srpm-macros BuildRequires: gcc -BuildRequires: g++ +BuildRequires: gcc-c++ +BuildRequires: gettext-envsubst BuildRequires: clang BuildRequires: cmake BuildRequires: mold @@ -83,18 +99,33 @@ install -Dm644 crates/zed/resources/app-icon.png %{buildroot}%{_datadir}/pixmaps install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml +# The license generation script doesn't generate licenses for ALL compiled dependencies, just direct deps of Zed, and it does not "group" licenses +%{zed_license_online} > LICENSE.dependencies +mv assets/icons/LICENSES LICENSE.icons +mv assets/themes/LICENSES LICENSE.themes +mv assets/fonts/plex-mono/license.txt LICENSE.fonts + %if %{with check} %check %cargo_test %endif %files +%doc CODE_OF_CONDUCT.md +%doc README.md +%license LICENSE-AGPL +%license LICENSE-APACHE +%license LICENSE-GPL +%license LICENSE.dependencies +%license LICENSE.fonts +%license LICENSE.icons +%license LICENSE.themes +%license assets/licenses.md %{_libexecdir}/zed-editor %{_bindir}/zed %{_datadir}/applications/%app_id.desktop %{_datadir}/pixmaps/%app_id.png %{_metainfodir}/%app_id.metainfo.xml -%license assets/licenses.md %changelog %autochangelog From 41be45dab28277d6de3a3e249dab8d62e8e5af4d Mon Sep 17 00:00:00 2001 From: Gilver Date: Fri, 25 Apr 2025 12:18:17 -0500 Subject: [PATCH 0897/2977] fix({dkms-}v4l2loopback{-kmod}): Requires help2man (#4429) * fix(kmod): Requires help2man Signed-off-by: Gilver * fix(dkms): Requires help2man Signed-off-by: Gilver * Update dkms-v4l2loopback.spec Signed-off-by: Gilver * Update v4l2loopback-kmod.spec Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/system/v4l2loopback/akmod/v4l2loopback-kmod.spec | 3 ++- anda/system/v4l2loopback/dkms/dkms-v4l2loopback.spec | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/anda/system/v4l2loopback/akmod/v4l2loopback-kmod.spec b/anda/system/v4l2loopback/akmod/v4l2loopback-kmod.spec index 83955b85ba..f3bc760d55 100644 --- a/anda/system/v4l2loopback/akmod/v4l2loopback-kmod.spec +++ b/anda/system/v4l2loopback/akmod/v4l2loopback-kmod.spec @@ -18,7 +18,7 @@ This module allows you to create \"virtual video devices.\" Normal \(v4l2\) appl Name: %{modulename}-kmod Summary: Kernel module (kmod) for V4L2 loopback devices Version: 0.14.0 -Release: 3%?dist +Release: 4%?dist License: GPL-2.0-or-later URL: https://github.com/v4l2loopback/v4l2loopback Source0: %{url}/archive/v%{version}/%{modulename}-%{version}.tar.gz @@ -30,6 +30,7 @@ BuildRequires: kmodtool Requires: akmods Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} Requires: %{modulename}-akmod-modules = %{?epoch:%{epoch}:}%{version} +Requires: help2man Requires: kernel-devel Conflicts: dkms-%{modulename} Packager: Cappy Ishihara diff --git a/anda/system/v4l2loopback/dkms/dkms-v4l2loopback.spec b/anda/system/v4l2loopback/dkms/dkms-v4l2loopback.spec index 2945881096..0e7b2ff8dc 100644 --- a/anda/system/v4l2loopback/dkms/dkms-v4l2loopback.spec +++ b/anda/system/v4l2loopback/dkms/dkms-v4l2loopback.spec @@ -5,7 +5,7 @@ This module allows you to create \"virtual video devices.\" Normal \(v4l2\) appl Name: dkms-%{modulename} Version: 0.14.0 -Release: 1%?dist +Release: 2%?dist Summary: Utils for V4L2 loopback devices License: GPL-2.0-or-later URL: https://github.com/v4l2loopback/v4l2loopback @@ -14,6 +14,7 @@ Source1: no-weak-modules.conf BuildRequires: systemd-rpm-macros Requires: %{modulename} = %{?epoch:%{epoch}:}%{version} Requires: dkms +Requires: help2man Conflicts: akmod-%{modulename} BuildArch: noarch Packager: Gilver E. From 7831992c64e0199ae409530fc622d15a31896587 Mon Sep 17 00:00:00 2001 From: Gilver Date: Fri, 25 Apr 2025 12:37:33 -0500 Subject: [PATCH 0898/2977] fix(andax/nvidia.rhai): Track stable NVIDIA drivers (#4428) Signed-off-by: Gilver --- andax/nvidia.rhai | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/andax/nvidia.rhai b/andax/nvidia.rhai index 9dcb4d0b6b..9d0ae3a4f8 100644 --- a/andax/nvidia.rhai +++ b/andax/nvidia.rhai @@ -12,6 +12,6 @@ fn nvidia_component_version(component) { } fn nvidia_driver_version() { - let matches = find_all(`(?m)^\s+[\d.]+/`, get("https://download.nvidia.com/XFree86/Linux-x86_64/")); - return(matches[matches.len() - 1][1]); + let driver = get("https://gfwsl.geforce.com/services_toolkit/services/com/nvidia/services/AjaxDriverService.php?func=DriverManualLookup&osID=12&languageCode=1033&numberOfResults=1&beta=0").json().IDS[0].downloadInfo.DisplayVersion; + return(driver); } From c659380f9f29df4e5ad5a49d331089d51c83d61a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 25 Apr 2025 17:37:46 +0000 Subject: [PATCH 0899/2977] bump(branch): gstreamer1-plugin-libav gstreamer1-plugins-ugly --- .../gstreamer1-plugin-libav/gstreamer1-plugin-libav.spec | 2 +- .../gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugin-libav/gstreamer1-plugin-libav.spec b/anda/multimedia/gstreamer1/gstreamer1-plugin-libav/gstreamer1-plugin-libav.spec index d72c9fcf3f..8a6d8e6431 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugin-libav/gstreamer1-plugin-libav.spec +++ b/anda/multimedia/gstreamer1/gstreamer1-plugin-libav/gstreamer1-plugin-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-plugin-libav -Version: 1.26.0 +Version: 1.26.1 Release: 1%?dist Summary: GStreamer Libav plugin License: LGPLv2+ diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec b/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec index 27658010ce..60f54f6b3f 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec +++ b/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec @@ -1,7 +1,7 @@ %global majorminor 1.0 Name: gstreamer1-plugins-ugly -Version: 1.26.0 +Version: 1.26.1 Release: 1%?dist Summary: GStreamer streaming media framework "ugly" plugins License: LGPLv2+ and LGPLv2 From 2ffb1d9554c95f80a86b5aadcac665cbda90250d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 25 Apr 2025 17:39:44 +0000 Subject: [PATCH 0900/2977] bump: compat-nvidia-repo dkms-nvidia nvidia-driver nvidia-kmod-common nvidia-kmod nvidia-modprobe nvidia-persistenced nvidia-settings nvidia-xconfig --- anda/lib/nvidia/compat-nvidia-repo/compat-nvidia-repo.spec | 2 +- anda/system/nvidia/dkms-nvidia/dkms-nvidia.spec | 4 ++-- anda/system/nvidia/nvidia-driver/nvidia-driver.spec | 4 ++-- anda/system/nvidia/nvidia-kmod-common/nvidia-kmod-common.spec | 4 ++-- anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec | 4 ++-- anda/system/nvidia/nvidia-modprobe/nvidia-modprobe.spec | 2 +- .../nvidia/nvidia-persistenced/nvidia-persistenced.spec | 2 +- anda/system/nvidia/nvidia-settings/nvidia-settings.spec | 2 +- anda/system/nvidia/nvidia-xconfig/nvidia-xconfig.spec | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/anda/lib/nvidia/compat-nvidia-repo/compat-nvidia-repo.spec b/anda/lib/nvidia/compat-nvidia-repo/compat-nvidia-repo.spec index 4411d1e5fa..24a8f678cc 100644 --- a/anda/lib/nvidia/compat-nvidia-repo/compat-nvidia-repo.spec +++ b/anda/lib/nvidia/compat-nvidia-repo/compat-nvidia-repo.spec @@ -1,5 +1,5 @@ Name: compat-nvidia-repo -Version: 575.51.02 +Version: 570.144 Epoch: 3 Release: 1%?dist Summary: Compatibility package required by official CUDA packages diff --git a/anda/system/nvidia/dkms-nvidia/dkms-nvidia.spec b/anda/system/nvidia/dkms-nvidia/dkms-nvidia.spec index 2921ca287f..c5adf5a534 100644 --- a/anda/system/nvidia/dkms-nvidia/dkms-nvidia.spec +++ b/anda/system/nvidia/dkms-nvidia/dkms-nvidia.spec @@ -4,8 +4,8 @@ %global modulename nvidia Name: dkms-%{modulename} -Version: 575.51.02 -Release: 2%?dist +Version: 570.144 +Release: 1%?dist Summary: NVIDIA display driver kernel module Epoch: 3 License: NVIDIA License diff --git a/anda/system/nvidia/nvidia-driver/nvidia-driver.spec b/anda/system/nvidia/nvidia-driver/nvidia-driver.spec index a837013229..ba71d6f4f0 100644 --- a/anda/system/nvidia/nvidia-driver/nvidia-driver.spec +++ b/anda/system/nvidia/nvidia-driver/nvidia-driver.spec @@ -9,8 +9,8 @@ %endif Name: nvidia-driver -Version: 575.51.02 -Release: 2%?dist +Version: 570.144 +Release: 1%?dist Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Epoch: 3 License: NVIDIA License diff --git a/anda/system/nvidia/nvidia-kmod-common/nvidia-kmod-common.spec b/anda/system/nvidia/nvidia-kmod-common/nvidia-kmod-common.spec index 25f8925f0d..e5d5a14e32 100644 --- a/anda/system/nvidia/nvidia-kmod-common/nvidia-kmod-common.spec +++ b/anda/system/nvidia/nvidia-kmod-common/nvidia-kmod-common.spec @@ -7,8 +7,8 @@ %global __brp_strip %{nil} Name: nvidia-kmod-common -Version: 575.51.02 -Release: 2%?dist +Version: 570.144 +Release: 1%?dist Summary: Common file for NVIDIA's proprietary driver kernel modules Epoch: 3 License: NVIDIA License diff --git a/anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec b/anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec index dc15ee353e..d63498907a 100644 --- a/anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec +++ b/anda/system/nvidia/nvidia-kmod/nvidia-kmod.spec @@ -4,8 +4,8 @@ %global debug_package %{nil} Name: nvidia-kmod -Version: 575.51.02 -Release: 2%?dist +Version: 570.144 +Release: 1%?dist Summary: NVIDIA display driver kernel module Epoch: 3 License: NVIDIA License diff --git a/anda/system/nvidia/nvidia-modprobe/nvidia-modprobe.spec b/anda/system/nvidia/nvidia-modprobe/nvidia-modprobe.spec index 50f73378a8..484266b1ce 100644 --- a/anda/system/nvidia/nvidia-modprobe/nvidia-modprobe.spec +++ b/anda/system/nvidia/nvidia-modprobe/nvidia-modprobe.spec @@ -1,5 +1,5 @@ Name: nvidia-modprobe -Version: 575.51.02 +Version: 570.144 Release: 1%?dist Summary: NVIDIA kernel module loader Epoch: 3 diff --git a/anda/system/nvidia/nvidia-persistenced/nvidia-persistenced.spec b/anda/system/nvidia/nvidia-persistenced/nvidia-persistenced.spec index 2a0302c6d1..9280c94fcc 100644 --- a/anda/system/nvidia/nvidia-persistenced/nvidia-persistenced.spec +++ b/anda/system/nvidia/nvidia-persistenced/nvidia-persistenced.spec @@ -1,5 +1,5 @@ Name: nvidia-persistenced -Version: 575.51.02 +Version: 570.144 Release: 1%?dist Summary: A daemon to maintain persistent software state in the NVIDIA driver Epoch: 3 diff --git a/anda/system/nvidia/nvidia-settings/nvidia-settings.spec b/anda/system/nvidia/nvidia-settings/nvidia-settings.spec index 925fdcd15b..f3bc84bb87 100644 --- a/anda/system/nvidia/nvidia-settings/nvidia-settings.spec +++ b/anda/system/nvidia/nvidia-settings/nvidia-settings.spec @@ -1,5 +1,5 @@ Name: nvidia-settings -Version: 575.51.02 +Version: 570.144 Release: 1%?dist Summary: Configure the NVIDIA graphics driver Epoch: 3 diff --git a/anda/system/nvidia/nvidia-xconfig/nvidia-xconfig.spec b/anda/system/nvidia/nvidia-xconfig/nvidia-xconfig.spec index a23874a971..5bf817ddf4 100644 --- a/anda/system/nvidia/nvidia-xconfig/nvidia-xconfig.spec +++ b/anda/system/nvidia/nvidia-xconfig/nvidia-xconfig.spec @@ -1,5 +1,5 @@ Name: nvidia-xconfig -Version: 575.51.02 +Version: 570.144 Release: 1%?dist Summary: NVIDIA X configuration file editor Epoch: 3 From 2d7e22220f7040332f2f25f8bf8c7bf89c67c93d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 25 Apr 2025 18:50:42 +0000 Subject: [PATCH 0901/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index 52915d3c23..ecb541085c 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.4.8 +Version: 2025.4.9 Release: 1%?dist Summary: Front-end to your dev env From c6464124e327ebaca2d9c2efb54401cab39f9158 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 25 Apr 2025 19:27:33 +0000 Subject: [PATCH 0902/2977] bump: anki-bin --- anda/apps/anki-bin/anki-bin.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/apps/anki-bin/anki-bin.spec b/anda/apps/anki-bin/anki-bin.spec index 34a128f7b7..d392ffcf85 100644 --- a/anda/apps/anki-bin/anki-bin.spec +++ b/anda/apps/anki-bin/anki-bin.spec @@ -1,9 +1,9 @@ -%global xurl https://files.pythonhosted.org/packages/0e/ff/a67920e3bb66fe3563372efd3e0f0f36915506c5034e55669af4b72f0d07/anki-25.02.3-cp39-abi3-manylinux_2_35_x86_64.whl -%global aurl https://files.pythonhosted.org/packages/c3/db/0ddf1bd374c9c578df4a050fcffeef4796073315a02accb442d86253d0d3/anki-25.02.3-cp39-abi3-manylinux_2_35_aarch64.whl -%global qurl https://files.pythonhosted.org/packages/5f/60/1cd30c4577967d3bb1ac047ddfeeb22f43bf02f00da611ca8681a8dd0512/aqt-25.02.3-py3-none-any.whl +%global xurl https://files.pythonhosted.org/packages/e3/02/b33d4b92ebeba69d321814af706cdd734e6db7ff8f4ec06b312fa1983ea7/anki-25.02.4-cp39-abi3-manylinux_2_35_x86_64.whl +%global aurl https://files.pythonhosted.org/packages/af/28/789ad6f2ed63281756a609862f778df4cb2ac85b3bc65722a1d6773c16c8/anki-25.02.4-cp39-abi3-manylinux_2_35_aarch64.whl +%global qurl https://files.pythonhosted.org/packages/04/f0/1bef63c18a1cb00bfb1d26bd6532315f7c28681af9636a3bb82fbbffe767/aqt-25.02.4-py3-none-any.whl Name: anki-bin -Version: 25.02.3 +Version: 25.02.4 Release: 1%?dist Summary: Flashcard program for using space repetition learning (Installed with wheel) License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5 From d574293f84bb14dc1bbb4fc7195f8de35c270a1d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 25 Apr 2025 20:55:49 +0000 Subject: [PATCH 0903/2977] bump: gitoxide --- anda/langs/rust/gitoxide/rust-gitoxide.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/rust/gitoxide/rust-gitoxide.spec b/anda/langs/rust/gitoxide/rust-gitoxide.spec index a1add469b8..b522673f2b 100644 --- a/anda/langs/rust/gitoxide/rust-gitoxide.spec +++ b/anda/langs/rust/gitoxide/rust-gitoxide.spec @@ -5,7 +5,7 @@ %global crate gitoxide Name: rust-gitoxide -Version: 0.42.0 +Version: 0.43.0 Release: 1%?dist Summary: Command-line application for interacting with git repositories From 821a5b10f3d9c22cfea20f62381eca20ae2a4712 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 25 Apr 2025 22:22:26 +0000 Subject: [PATCH 0904/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index a6dfe17d78..d3c0e99ddb 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.659 +Version: 0.0.660 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index a98172bd8a..3311d0dd0a 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.659 +Version: 0.0.660 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From c975e5932aa63a30ccfb776e00974128df93c60a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 25 Apr 2025 23:16:57 +0000 Subject: [PATCH 0905/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 05dd74496f..220ff5f7e8 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.184.3-pre +%global ver 0.184.4-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ From b182c836dfd64ba0673b8e220e5d3fd77093977d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 26 Apr 2025 01:26:18 +0000 Subject: [PATCH 0906/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 86f0fb01d1..6ff0e2f81d 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-25 +%global ver 2025-04-26 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From a0505e95a4fa203a597b944e959993df3f358ee1 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 26 Apr 2025 01:43:41 +0000 Subject: [PATCH 0907/2977] bump(nightly): mpv nightly nightly vala-nightly nvidia-patch --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 6 +++--- anda/langs/vala/vala-nightly/vala-nightly.spec | 4 ++-- anda/system/nvidia-patch/nvidia-patch.spec | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 1a92b5e777..6e41661825 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit f147df1393ddd2d4ec702b9768662e2cc6f7778a +%global commit 2b38b382cf24a7a03a955bcbb8e3eaa1b3e035c9 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250423 +%global commit_date 20250426 %global ver 0.40.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 0fe3a02212..447da4cae4 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 4e91d11a60bf3f52a15936cef65eae7135906b28 +%global commit 38445dca2ac2af176c7f3b205d88d697cf8c89c8 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-04-23 +%global fulldate 2025-04-25 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 0f531fe8cc..7dc92ff7da 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 57d8397f536f46ea1e8623da9bd66477b9e656fa +%global commit d46890978aeac4840a458f952fc7c88b56cf27b3 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250425 +%global commit_date 20250426 %global ver 0.185.0 %bcond_with check @@ -30,7 +30,7 @@ Name: zed-nightly Version: %ver^%commit_date.%shortcommit -Release: 2%?dist +Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 AND ISC) AND AGPL.3.0-only AND AGPL-3.0-or-later AND (Apache-2.0 OR BSL-1.0 OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception) AND Apache-2.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR MIT OR Apache-2.0) AND BSD-2-Clause AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR Apache-2.0) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND CC0-1.0 AND GPL-3.0-or-later AND (ISC AND (Apache-2.0 OR ISC) AND OpenSSL) AND (ISC AND (Apache-2.0 OR ISC)) AND ISC AND (MIT AND (MIT OR Apache-2.0)) AND (MIT AND BSD-3-Clause) AND (MIT OR Apache-2.0 OR CC0-1.0) AND (MIT OR Apache-2.0 OR NCSA) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND MPL-2.0 AND Unicode-3.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND Zlib diff --git a/anda/langs/vala/vala-nightly/vala-nightly.spec b/anda/langs/vala/vala-nightly/vala-nightly.spec index b56efb907b..048b2a6971 100644 --- a/anda/langs/vala/vala-nightly/vala-nightly.spec +++ b/anda/langs/vala/vala-nightly/vala-nightly.spec @@ -3,11 +3,11 @@ %global priority 90 %global real_name vala -%global commit 7a55303675779995a96f3c3e715fff349174046d +%global commit ad05e703e9bc2e39eff891aace667cb260fc6ebd %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global repo https://gitlab.gnome.org/GNOME/%{real_name}.git -%global commit_date 20250425 +%global commit_date 20250426 %global snapshot_info %{commit_date}.%{shortcommit} Name: vala-nightly diff --git a/anda/system/nvidia-patch/nvidia-patch.spec b/anda/system/nvidia-patch/nvidia-patch.spec index 4f7e246e7d..178ccab02e 100644 --- a/anda/system/nvidia-patch/nvidia-patch.spec +++ b/anda/system/nvidia-patch/nvidia-patch.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} -%global commit 93e97e3c458f7270a937993deb778c15f9f16406 +%global commit a9d20a1e864004484f4920ffa6b11b8fd6ec27cc %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250422 +%global commit_date 20250426 %global patches %{_datadir}/src/nvidia-patch From 4315ecec687ab706bd752aa5b8e0548a4f0d4306 Mon Sep 17 00:00:00 2001 From: Jon Mulder Date: Sat, 26 Apr 2025 01:29:37 -0400 Subject: [PATCH 0908/2977] fix(wl-kmod): process 6.13 and 6.14 patches (#4448) Apply the patches within the spec. Fixes: https://github.com/terrapkg/packages/pull/3591 Link: https://github.com/rpmfusion/wl-kmod/commit/5c24789c6b3615acf88301225d2c5dd53bf37772 Link: https://github.com/rpmfusion/wl-kmod/commit/2ec1bd6182d6e30eddd44c629d7c19e4f3856e27 fix(wl-kmod): bump release version --- anda/system/wl-kmod/wl-kmod.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/anda/system/wl-kmod/wl-kmod.spec b/anda/system/wl-kmod/wl-kmod.spec index 5fe855f427..7221f0d952 100644 --- a/anda/system/wl-kmod/wl-kmod.spec +++ b/anda/system/wl-kmod/wl-kmod.spec @@ -10,7 +10,7 @@ Name: wl-kmod Version: 6.30.223.271 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Kernel module for Broadcom wireless devices Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -99,6 +99,8 @@ pushd %{name}-%{version}-src %patch -P 24 -p1 -b .kernel_6.10_adaptation %patch -P 25 -p1 -b .wpa_supplicant-2.11_adaptation %patch -P 26 -p1 -b .kernel_6.12_adaptation +%patch -P 27 -p1 -b .kernel_6.13_adaptation +%patch -P 28 -p1 -b .kernel_6.14_adaptation ### NOTE: These MUST be added to as new EL versions are released. %if 0%{?rhel} == 9 From b0dfc93f2d8019e65374e74ed7c0146d9a769e2d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 26 Apr 2025 06:30:02 +0000 Subject: [PATCH 0909/2977] bump: gitoxide --- anda/langs/rust/gitoxide/rust-gitoxide.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/rust/gitoxide/rust-gitoxide.spec b/anda/langs/rust/gitoxide/rust-gitoxide.spec index b522673f2b..a1add469b8 100644 --- a/anda/langs/rust/gitoxide/rust-gitoxide.spec +++ b/anda/langs/rust/gitoxide/rust-gitoxide.spec @@ -5,7 +5,7 @@ %global crate gitoxide Name: rust-gitoxide -Version: 0.43.0 +Version: 0.42.0 Release: 1%?dist Summary: Command-line application for interacting with git repositories From 645cec74146405804f332a01be313ce8df75cdd3 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 26 Apr 2025 07:50:19 +0000 Subject: [PATCH 0910/2977] bump: gitoxide --- anda/langs/rust/gitoxide/rust-gitoxide.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/rust/gitoxide/rust-gitoxide.spec b/anda/langs/rust/gitoxide/rust-gitoxide.spec index a1add469b8..0082107900 100644 --- a/anda/langs/rust/gitoxide/rust-gitoxide.spec +++ b/anda/langs/rust/gitoxide/rust-gitoxide.spec @@ -5,7 +5,7 @@ %global crate gitoxide Name: rust-gitoxide -Version: 0.42.0 +Version: 0.44.0 Release: 1%?dist Summary: Command-line application for interacting with git repositories From ac101a29bf76787ea433d1d9b8ee188e2a66a90b Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 26 Apr 2025 03:46:10 -0500 Subject: [PATCH 0911/2977] fix(nvidia-driver): Disable comment note stripping (#4444) * fix(nvidia-driver): Disable comment note stripping Signed-off-by: Gilver * %dnl Signed-off-by: Gilver * The funny? Signed-off-by: Gilver * Quotes? Signed-off-by: Gilver * %ifnarch Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/system/nvidia/nvidia-driver/nvidia-driver.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/anda/system/nvidia/nvidia-driver/nvidia-driver.spec b/anda/system/nvidia/nvidia-driver/nvidia-driver.spec index ba71d6f4f0..6bf973a7b3 100644 --- a/anda/system/nvidia/nvidia-driver/nvidia-driver.spec +++ b/anda/system/nvidia/nvidia-driver/nvidia-driver.spec @@ -1,5 +1,6 @@ %global debug_package %{nil} %global __strip %{nil} +%global __brp_strip_comment_note %{nil} %global __brp_ldconfig %{nil} %define _build_id_links none @@ -448,14 +449,14 @@ appstream-util validate --nonet %{buildroot}%{_metainfodir}/com.nvidia.driver.me %endif %ifarch x86_64 %{_datadir}/vulkansc/icd.d/nvidia_icd.%{_target_cpu}.json +%if v"%{version}" > v"570.144" %{_libdir}/libnvidia-present.so.%{version} +%endif %{_libdir}/libnvidia-vksc-core.so.1 %{_libdir}/libnvidia-vksc-core.so.%{version} %dir %{_libdir}/nvidia %dir %{_libdir}/nvidia/wine -%{_libdir}/nvidia/wine/_nvngx.dll -%{_libdir}/nvidia/wine/nvngx.dll -%{_libdir}/nvidia/wine/nvngx_dlssg.dll +%{_libdir}/nvidia/wine/*.dll %endif %files cuda-libs @@ -479,10 +480,16 @@ appstream-util validate --nonet %{buildroot}%{_metainfodir}/com.nvidia.driver.me %ifarch x86_64 aarch64 %{_libdir}/libcudadebugger.so.1 %{_libdir}/libcudadebugger.so.%{version} +%if v"%{version}" > v"570.144" %{_libdir}/libnvidia-nvvm70.so.4 +%endif +%if v"%{version}" <= v"570.144" +%ifnarch aarch64 %{_libdir}/libnvidia-sandboxutils.so.1 %{_libdir}/libnvidia-sandboxutils.so.%{version} %endif +%endif +%endif %ifarch x86_64 %if 0%{?rhel} == 8 %{_libdir}/libnvidia-pkcs11.so.%{version} From f79eaaf422f786a364d9e0d27f55bb8cf58a0fdb Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 26 Apr 2025 16:23:11 +0000 Subject: [PATCH 0912/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index ecb541085c..38d59b1f50 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.4.9 +Version: 2025.4.10 Release: 1%?dist Summary: Front-end to your dev env From 350c9dbced79486749ba93aabf53ece28d06dac1 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 26 Apr 2025 19:48:45 +0000 Subject: [PATCH 0913/2977] bump: youtube-music --- anda/apps/youtube-music/youtube-music.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/youtube-music/youtube-music.spec b/anda/apps/youtube-music/youtube-music.spec index 914eb701fe..63b273c34f 100644 --- a/anda/apps/youtube-music/youtube-music.spec +++ b/anda/apps/youtube-music/youtube-music.spec @@ -12,7 +12,7 @@ %global vendor_pnpm 1 Name: youtube-music -Version: 3.8.1 +Version: 3.9.0 Release: 1%?dist Summary: YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader) Source1: youtube-music.desktop From 8029332715ce69f6d14c8ff3eea59a491311cc4a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 26 Apr 2025 22:19:35 +0000 Subject: [PATCH 0914/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 0ba82efa04..e090c87fdc 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.25.041124 +Version: 2025.04.26.220851 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 212c37b253c6d0b0b80ff8ec7ce52277cec8179d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 26 Apr 2025 22:46:12 +0000 Subject: [PATCH 0915/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index e090c87fdc..c7983e2094 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.26.220851 +Version: 2025.04.26.223944 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 121a61c67a636c78df7bd0993967af07595c68b3 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 26 Apr 2025 22:58:16 +0000 Subject: [PATCH 0916/2977] bump: eww --- anda/desktops/waylands/eww/eww.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/desktops/waylands/eww/eww.spec b/anda/desktops/waylands/eww/eww.spec index 81cd983f21..4a9034ba50 100644 --- a/anda/desktops/waylands/eww/eww.spec +++ b/anda/desktops/waylands/eww/eww.spec @@ -1,7 +1,7 @@ # Generated by rust2rpm 27 -%global commit a9aa0f96892f20e4741e94f4cd46ca31106e492c +%global commit c999033c297582cd56b57d2a6062bfd36cc1dfed %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250325 +%global commit_date 20250426 %global ver v0.6.0 %bcond check 0 From 7c4c0f28d884e0a89c2c2fb76435f6e466ee67e4 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 27 Apr 2025 01:39:54 +0000 Subject: [PATCH 0917/2977] bump: ruffle yt-dlp --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 6ff0e2f81d..45d6295d18 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-26 +%global ver 2025-04-27 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index c7983e2094..e5f5f0b419 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.26.223944 +Version: 2025.04.27.001650 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 941a7405d2698a05ab0b0c2a83cde711554e2198 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 27 Apr 2025 01:52:37 +0000 Subject: [PATCH 0918/2977] bump(nightly): mpv nightly nightly --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/system/readymade/nightly/readymade-nightly.spec | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 6e41661825..cef8082585 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 2b38b382cf24a7a03a955bcbb8e3eaa1b3e035c9 +%global commit b47c805fa2aa444fb4c6a6a1a921034a6232719a %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250426 +%global commit_date 20250427 %global ver 0.40.0 Name: mpv-nightly diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 7dc92ff7da..94711d8f36 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit d46890978aeac4840a458f952fc7c88b56cf27b3 +%global commit bb7a5b13df57209a36934c34f786902b30a437f8 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250426 +%global commit_date 20250427 %global ver 0.185.0 %bcond_with check diff --git a/anda/system/readymade/nightly/readymade-nightly.spec b/anda/system/readymade/nightly/readymade-nightly.spec index 82600f89d1..a20d7be27d 100644 --- a/anda/system/readymade/nightly/readymade-nightly.spec +++ b/anda/system/readymade/nightly/readymade-nightly.spec @@ -1,5 +1,5 @@ -%global commit dd3cd312d848d04e6d93bb1ae8863fe05ce01092 -%global commit_date 20250424 +%global commit ebe8fdd6d4d4e3bd9323ff3a5722fd9ef3a8f38a +%global commit_date 20250427 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: readymade-nightly From 4de7f7775d0f059be45004082285878fa66ad79a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 27 Apr 2025 03:01:52 +0000 Subject: [PATCH 0919/2977] bump: libhelium --- anda/lib/libhelium/libhelium.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/libhelium/libhelium.spec b/anda/lib/libhelium/libhelium.spec index c70a6be32e..a1411605a7 100644 --- a/anda/lib/libhelium/libhelium.spec +++ b/anda/lib/libhelium/libhelium.spec @@ -1,4 +1,4 @@ -%global ver 1.8.24 +%global ver 1.8.25 %global sanitized_ver %(echo %{ver} | sed -E 's/-/~/g') Summary: The Application Framework for tauOS apps Name: libhelium From 323fe081109bee84de38a7df2f37395eed7ca273 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 27 Apr 2025 05:18:02 +0000 Subject: [PATCH 0920/2977] bump: zig --- anda/langs/zig/zig-master.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/langs/zig/zig-master.spec b/anda/langs/zig/zig-master.spec index a2b6275472..b20b8efab6 100644 --- a/anda/langs/zig/zig-master.spec +++ b/anda/langs/zig/zig-master.spec @@ -7,7 +7,7 @@ %define llvm_compat 20 %endif %global llvm_version 20.0.0 -%global ver 0.15.0-dev.384+c06fecd46 +%global ver 0.15.0-dev.386+2e35fdd03 %bcond bootstrap 1 %bcond docs %{without bootstrap} %bcond test 1 @@ -39,7 +39,7 @@ Name: zig-master Version: %(echo %{ver} | sed 's/-/~/g') -Release: 2%?dist +Release: 1%?dist Summary: Programming language for maintaining robust, optimal, and reusable software License: MIT AND NCSA AND LGPL-2.1-or-later AND LGPL-2.1-or-later WITH GCC-exception-2.0 AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND BSD-3-Clause AND Inner-Net-2.0 AND ISC AND LicenseRef-Fedora-Public-Domain AND GFDL-1.1-or-later AND ZPL-2.1 URL: https://ziglang.org From 47ab2561066126fda46cc288fb91354de00f0097 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 27 Apr 2025 07:49:42 +0000 Subject: [PATCH 0921/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index d3c0e99ddb..06d26c1d73 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.660 +Version: 0.0.661 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 3311d0dd0a..f564ce36dc 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.660 +Version: 0.0.661 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 8b68265932d407ad675f83f82e7479cb164a938e Mon Sep 17 00:00:00 2001 From: madomado Date: Sun, 27 Apr 2025 16:55:00 +0800 Subject: [PATCH 0922/2977] fix(gst1-plugins-bad): update.rhai is somehow broken? (#4457) Signed-off-by: madomado --- anda/multimedia/gstreamer1/gstreamer1-plugins-bad/update.rhai | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/update.rhai b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/update.rhai index 0fb6809d01..01fd54bf73 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/update.rhai +++ b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/update.rhai @@ -5,7 +5,9 @@ let bodhi_branch = bump::as_bodhi_ver(labels.branch); let pkg = "gstreamer1-plugins-bad-free"; let branch = bump::as_bodhi_ver(labels.branch); -bump::follow_bodhi_vr(rpm, "gstreamer1-plugins-bad-free", branch); +let vr = bodhi_vr("gstreamer1-plugins-bad-free", branch); +rpm.version(vr[1]); +rpm.release(vr[2]); let opencv_ver = bump::bodhi("opencv", bodhi_branch); open_file("anda/multimedia/gstreamer1/gstreamer1-plugins-bad/OPENCV_VERSION.txt", "w").write(opencv_ver); From e65ef4bdafe8f3d002980f5640b941eae73d16fc Mon Sep 17 00:00:00 2001 From: Gilver Date: Sun, 27 Apr 2025 05:40:11 -0500 Subject: [PATCH 0923/2977] feat(zig-master): Self bootstrap builds take two (#4456) Signed-off-by: Gilver --- anda/langs/zig/zig-master.spec | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/anda/langs/zig/zig-master.spec b/anda/langs/zig/zig-master.spec index b20b8efab6..65be3d53c7 100644 --- a/anda/langs/zig/zig-master.spec +++ b/anda/langs/zig/zig-master.spec @@ -8,7 +8,7 @@ %endif %global llvm_version 20.0.0 %global ver 0.15.0-dev.386+2e35fdd03 -%bcond bootstrap 1 +%bcond bootstrap 0 %bcond docs %{without bootstrap} %bcond test 1 %global zig_cache_dir %{builddir}/zig-cache @@ -39,8 +39,8 @@ Name: zig-master Version: %(echo %{ver} | sed 's/-/~/g') -Release: 1%?dist -Summary: Programming language for maintaining robust, optimal, and reusable software +Release: 2%?dist +Summary: Master builds of the Zig language License: MIT AND NCSA AND LGPL-2.1-or-later AND LGPL-2.1-or-later WITH GCC-exception-2.0 AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND BSD-3-Clause AND Inner-Net-2.0 AND ISC AND LicenseRef-Fedora-Public-Domain AND GFDL-1.1-or-later AND ZPL-2.1 URL: https://ziglang.org Source0: %{url}/builds/zig-%{ver}.tar.xz @@ -61,7 +61,7 @@ BuildRequires: help2man # for signature verification BuildRequires: minisign %if %{without bootstrap} -BuildRequires: %{name} >= %{version} +BuildRequires: %{name} <= %{version} %endif %if %{with test} BuildRequires: elfutils-libelf-devel @@ -89,8 +89,9 @@ ExclusiveArch: %{zig_arches} Packager: Gilver E. %description -Zig is an open-source programming language designed for robustness, optimality, -and clarity. This package provides the zig compiler and the associated runtime. +Zig is an open source alternative to C. +This package provides the master/"prerelease" builds of the Zig compiler and the associated runtime. +Please note these are not stable releases and should only be used for Zig projects that use these or Git versions of Zig. # The Zig stdlib only contains uncompiled code %package libs @@ -106,7 +107,7 @@ Zig Standard Library Summary: Documentation for Zig Conflicts: zig-doc BuildArch: noarch -Requires: %{name} >= %{version} +Requires: %{name} = %{version} %description doc Documentation for Zig. For more information, visit %{url} @@ -154,10 +155,22 @@ help2man --no-discard-stderr --no-info "./zig-out/bin/zig" --version-option=vers %if %{with docs} # Use the newly made stage 3 compiler to generate docs -./zig-out/bin/zig build docs \ +# Zig has an extremely annoying issue with transitive failures when trying to build the docs, retry until it succeeds +r=3 + +for ((i=0; i Date: Sun, 27 Apr 2025 06:15:25 -0500 Subject: [PATCH 0924/2977] chore: Update cuda-gcc (#4458) * chore: Spec changes needed for update Signed-off-by: Gilver * Update update.rhai Signed-off-by: Gilver * Update cuda-gcc.spec Signed-off-by: Gilver * Maybe just let the Rhai take care of this Signed-off-by: Gilver * Update cuda-gcc.spec Signed-off-by: Gilver * Update update.rhai Signed-off-by: Gilver * Update cuda-gcc.spec Signed-off-by: Gilver * Update update.rhai Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/lib/nvidia/cuda-gcc/cuda-gcc.spec | 10 +++++++--- anda/lib/nvidia/cuda-gcc/update.rhai | 6 +++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/anda/lib/nvidia/cuda-gcc/cuda-gcc.spec b/anda/lib/nvidia/cuda-gcc/cuda-gcc.spec index 57ddf951f6..0c6be30a7c 100644 --- a/anda/lib/nvidia/cuda-gcc/cuda-gcc.spec +++ b/anda/lib/nvidia/cuda-gcc/cuda-gcc.spec @@ -1,8 +1,12 @@ +%if 0%{?fedora} < 42 || 0%{?rhel} <= 10 %global gcc_major 13 +%else +%global gcc_major 14 +%endif Name: cuda-gcc Version: 13.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GNU Compiler Collection CUDA compatibility package License: BSD URL: http://gcc.gnu.org @@ -29,14 +33,14 @@ cat > %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh < %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh <= "F42" { + rpm.version(bump::bodhi("gcc14", bump::as_bodhi_ver(labels.branch))); +} else { + rpm.version(bump::bodhi("gcc13", bump::as_bodhi_ver(labels.branch))); +} From 70d33178a9ed1e8f34d6cfdf4f436bcf0275e289 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 27 Apr 2025 11:35:27 +0000 Subject: [PATCH 0925/2977] bump(branch): cuda-gcc --- anda/lib/nvidia/cuda-gcc/cuda-gcc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/nvidia/cuda-gcc/cuda-gcc.spec b/anda/lib/nvidia/cuda-gcc/cuda-gcc.spec index 0c6be30a7c..f8da7b37e9 100644 --- a/anda/lib/nvidia/cuda-gcc/cuda-gcc.spec +++ b/anda/lib/nvidia/cuda-gcc/cuda-gcc.spec @@ -5,8 +5,8 @@ %endif Name: cuda-gcc -Version: 13.3.1 -Release: 3%{?dist} +Version: 14.2.1 +Release: 1%?dist Summary: GNU Compiler Collection CUDA compatibility package License: BSD URL: http://gcc.gnu.org From eca776842b545fb901bb37a9a75265950eb5500e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 27 Apr 2025 13:13:35 +0000 Subject: [PATCH 0926/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index 38d59b1f50..f8b6a0963c 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.4.10 +Version: 2025.4.11 Release: 1%?dist Summary: Front-end to your dev env From a1a64c759e4595d895f17b9872c7a21a1eaa6c28 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sun, 27 Apr 2025 11:15:02 -0500 Subject: [PATCH 0927/2977] add: LCEVCdec (#4463) * add: LCEVCdec * Update LCEVCdec.spec Signed-off-by: Gilver * Update LCEVCdec.spec Signed-off-by: Gilver --------- Signed-off-by: Gilver --- .../lcevcdec/LCEVCdec-cstdint.patch | 11 ++ anda/multimedia/lcevcdec/LCEVCdec-docs.patch | 14 ++ .../lcevcdec/LCEVCdec-soversion.patch | 22 +++ anda/multimedia/lcevcdec/LCEVCdec.spec | 173 ++++++++++++++++++ anda/multimedia/lcevcdec/anda.hcl | 9 + anda/multimedia/lcevcdec/update.rhai | 1 + 6 files changed, 230 insertions(+) create mode 100644 anda/multimedia/lcevcdec/LCEVCdec-cstdint.patch create mode 100644 anda/multimedia/lcevcdec/LCEVCdec-docs.patch create mode 100644 anda/multimedia/lcevcdec/LCEVCdec-soversion.patch create mode 100644 anda/multimedia/lcevcdec/LCEVCdec.spec create mode 100644 anda/multimedia/lcevcdec/anda.hcl create mode 100644 anda/multimedia/lcevcdec/update.rhai diff --git a/anda/multimedia/lcevcdec/LCEVCdec-cstdint.patch b/anda/multimedia/lcevcdec/LCEVCdec-cstdint.patch new file mode 100644 index 0000000000..b1a35ca845 --- /dev/null +++ b/anda/multimedia/lcevcdec/LCEVCdec-cstdint.patch @@ -0,0 +1,11 @@ +diff -Naur LCEVCdec-3.3.5.old/src/api/src/buffer_manager.h LCEVCdec-3.3.5/src/api/src/buffer_manager.h +--- LCEVCdec-3.3.5.old/src/api/src/buffer_manager.h 2025-03-22 11:46:05.946962992 +0100 ++++ LCEVCdec-3.3.5/src/api/src/buffer_manager.h 2025-03-22 11:46:36.029979290 +0100 +@@ -15,6 +15,7 @@ + #ifndef VN_API_BUFFER_MANAGER_H_ + #define VN_API_BUFFER_MANAGER_H_ + ++#include + #include + #include + #include diff --git a/anda/multimedia/lcevcdec/LCEVCdec-docs.patch b/anda/multimedia/lcevcdec/LCEVCdec-docs.patch new file mode 100644 index 0000000000..ec6e2146a9 --- /dev/null +++ b/anda/multimedia/lcevcdec/LCEVCdec-docs.patch @@ -0,0 +1,14 @@ +diff -Naur LCEVCdec-3.3.5.old/docs/sphinx/CMakeLists.txt LCEVCdec-3.3.5/docs/sphinx/CMakeLists.txt +--- LCEVCdec-3.3.5.old/docs/sphinx/CMakeLists.txt 2025-03-23 16:27:09.553289475 +0100 ++++ LCEVCdec-3.3.5/docs/sphinx/CMakeLists.txt 2025-03-24 08:54:32.562734384 +0100 +@@ -41,8 +41,8 @@ + documentation ALL + DEPENDS doxygen + COMMAND +- ${SPHINX_EXECUTABLE} -b html -W -n -a -Dversion=${GIT_SHORT_VERSION} ++ ${SPHINX_EXECUTABLE} ${SPHINX_SOURCE} ${SPHINX_BUILD} ++ -b html -W -n -a -Dversion=${GIT_SHORT_VERSION} + -Drelease=${GIT_VERSION} -Dbreathe_projects.LCEVC_DEC=${DOXYGEN_OUTPUT_DIR}/xml +- ${SPHINX_SOURCE} ${SPHINX_BUILD} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMENT "Generating docs with Sphinx") diff --git a/anda/multimedia/lcevcdec/LCEVCdec-soversion.patch b/anda/multimedia/lcevcdec/LCEVCdec-soversion.patch new file mode 100644 index 0000000000..f4533e882f --- /dev/null +++ b/anda/multimedia/lcevcdec/LCEVCdec-soversion.patch @@ -0,0 +1,22 @@ +diff -Naur LCEVCdec-3.3.5.old/src/api/CMakeLists.txt LCEVCdec-3.3.5/src/api/CMakeLists.txt +--- LCEVCdec-3.3.5.old/src/api/CMakeLists.txt 2025-03-23 16:27:09.553851133 +0100 ++++ LCEVCdec-3.3.5/src/api/CMakeLists.txt 2025-03-26 16:53:24.642189905 +0100 +@@ -57,6 +57,7 @@ + + include(GNUInstallDirs) + ++set_target_properties(lcevc_dec_api PROPERTIES SOVERSION ${GIT_SHORT_VERSION} VERSION ${GIT_VERSION}) + get_target_property(IS_APPLE_FRAMEWORK lcevc_dec_api FRAMEWORK) + if (IS_APPLE_FRAMEWORK) + install(TARGETS lcevc_dec_api DESTINATION lib) +diff -Naur LCEVCdec-3.3.5.old/src/core/decoder/CMakeLists.txt LCEVCdec-3.3.5/src/core/decoder/CMakeLists.txt +--- LCEVCdec-3.3.5.old/src/core/decoder/CMakeLists.txt 2025-03-23 16:27:09.556081884 +0100 ++++ LCEVCdec-3.3.5/src/core/decoder/CMakeLists.txt 2025-03-26 16:53:10.698019829 +0100 +@@ -170,6 +170,7 @@ + + # ------------------------------------------------------------------------------- + ++set_target_properties(lcevc_dec_core PROPERTIES SOVERSION ${GIT_SHORT_VERSION} VERSION ${GIT_VERSION}) + get_target_property(IS_APPLE_FRAMEWORK lcevc_dec_core FRAMEWORK) + if (IS_APPLE_FRAMEWORK) + install(TARGETS lcevc_dec_core DESTINATION lib) diff --git a/anda/multimedia/lcevcdec/LCEVCdec.spec b/anda/multimedia/lcevcdec/LCEVCdec.spec new file mode 100644 index 0000000000..ce1cc0a618 --- /dev/null +++ b/anda/multimedia/lcevcdec/LCEVCdec.spec @@ -0,0 +1,173 @@ +# This information is required if not building from a GIT checkout. +# See cmake/modules/VNovaSetup.cmake: +%global gitlonghash bf7e0d91c969502e90a925942510a1ca8088afec +%global gitdate 20250320 +%global githash %(c=%{gitlonghash}; echo ${c:0:7}) +%global gitbranch main + +# Tests require network, as described in src/func_tests/README.md, and each test type +# (Qualcomm dev kit, Ubuntu, etc.) requires the download of a few gigabytes of videos +# from https://lcevcdec.nbg1.your-objectstorage.com. The videos used for testing +# are described in the "Content attribution" paragraph of the README.md file. +# So disable tests by default: +%bcond python_tests 0 + +# python3-sphinxcontrib-plantuml currently missing from Fedora: +%bcond docs 0 + +Name: LCEVCdec +Version: 3.3.5 +Release: 1%{?dist} +Summary: MPEG-5 LCEVC Decoder +License: BSD-3-Clause-Clear +URL: https://docs.v-nova.com/v-nova/lcevc/lcevc-sdk-overview + +Source0: https://github.com/v-novaltd/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0: %{name}-cstdint.patch +Patch1: %{name}-docs.patch +Patch2: %{name}-soversion.patch + +BuildRequires: cmake +BuildRequires: cmake(CLI11) +BuildRequires: cmake(fmt) +BuildRequires: cmake(nlohmann_json) +BuildRequires: cmake(range-v3) +BuildRequires: gcc-c++ +BuildRequires: git +BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavdevice) +BuildRequires: pkgconfig(libxxhash) +BuildRequires: pkgconfig(gtest) + +%if %{with docs} +BuildRequires: doxygen +BuildRequires: sphinx +BuildRequires: plantuml +BuildRequires: python3-breathe +BuildRequires: python3-sphinx +BuildRequires: python3-sphinx_rtd_theme +BuildRequires: python3-sphinxcontrib-plantuml +%endif + +%if %{with tests} +BuildRequires: python3 +BuildRequires: python3-GitPython +BuildRequires: python3-numpy +BuildRequires: python3-requests +%endif + +%description +Low Complexity Enhancement Video Codec Decoder (LCEVCdec) is the primary MPEG-5 +Part 2 decoder SDK repository maintained by V-Nova. + +Features: + - Decode LCEVC compliant bitstreams + - Support for a range of formats including YUV, NV12 and RGBA + - Support for a range of colour formats including BT709 and BT2020 + - Support for HDR and 10-bit streams + - Support for ABR ladders + - CPU pixel processing stage + - Extensive API + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: plutovg-devel%{?_isa} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%package static +Summary: Static libraries for %{name} +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + +%description static +Static library files for %{name}. + +%package samples +Summary: Sample programs for %{name} + +%description samples +Sample programs that use %{name}. + +%prep +%autosetup -p1 + +# This information is required if not building from a GIT checkout. +# See cmake/modules/VNovaSetup.cmake: +echo -n %{gitlonghash} > .gitlonghash +echo -n %{gitdate} | date +%Y-%m-%d > .gitdate +echo -n %{githash} > .githash +echo -n %{gitbranch} > .gitbranch +echo -n %{version} > .gitversion +echo -n %(echo %version | cut -d. -f1) > .gitshortversion + +%if %{with tests} +# Adjust configuration file for tests: +sed -i \ + -e 's/BIN_DIR = build/BIN_DIR = %{_vpath_builddir}/g' \ + src/func_tests/config.ini +%endif + +%build +%cmake \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DVN_SDK_EXECUTABLES=ON \ + -DVN_SDK_UNIT_TESTS=ON \ + -DVN_SDK_API_LAYER=ON \ + -DVN_SDK_JSON_CONFIG=ON \ +%if %{with docs} + -DVN_SDK_DOCS=ON +%else + -DVN_SDK_DOCS=OFF +%endif + +%cmake_build + +%install +%cmake_install +%ifnarch %ix86 +mv %{buildroot}%{_prefix}/lib/*.a %{buildroot}%{_libdir}/ +rm -fr %{buildroot}%{_prefix}/lib +%endif + +# Let RPM pick up docs in the files section +rm -fr %{buildroot}%{_docdir} + +%if %{with tests} +%check +python3 src/func_tests/run_tests.py +%endif + +%files +%license LICENSE.md COPYING +%doc README.md +%{_libdir}/liblcevc_dec_api.so.3 +%{_libdir}/liblcevc_dec_api.so.%{version} +%{_libdir}/liblcevc_dec_core.so.3 +%{_libdir}/liblcevc_dec_core.so.%{version} + +%files devel +%{_includedir}/LCEVC +%{_libdir}/liblcevc_dec_api.so +%{_libdir}/liblcevc_dec_core.so +%{_libdir}/pkgconfig/lcevc_dec.pc + +%files static +%{_libdir}/liblcevc_dec_api_utility.a +%{_libdir}/liblcevc_dec_core_sequencing.a +%{_libdir}/liblcevc_dec_unit_test_utilities.a +%{_libdir}/liblcevc_dec_utility.a + +%files samples +%{_bindir}/lcevc_dec_sample +%{_bindir}/lcevc_dec_test_harness +%{_bindir}/lcevc_dec_test_unit +%{_bindir}/lcevc_dec_utility_test_unit +%{_bindir}/lcevc_core_test_unit +%{_bindir}/lcevc_core_sequencing_test_unit + +%changelog +%autochangelog diff --git a/anda/multimedia/lcevcdec/anda.hcl b/anda/multimedia/lcevcdec/anda.hcl new file mode 100644 index 0000000000..fc1d38512a --- /dev/null +++ b/anda/multimedia/lcevcdec/anda.hcl @@ -0,0 +1,9 @@ +project pkg { + arches = ["x86_64", "aarch64", "i386"] + rpm { + spec = "LCEVCdec.spec" + } + labels { + mock = 1 + } +} diff --git a/anda/multimedia/lcevcdec/update.rhai b/anda/multimedia/lcevcdec/update.rhai new file mode 100644 index 0000000000..63fabc1bd9 --- /dev/null +++ b/anda/multimedia/lcevcdec/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("v-novaltd/LCEVCdec")); From 1af19fdf9d31cd4a70a272d8350b85c6db0946a0 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sun, 27 Apr 2025 11:15:11 -0500 Subject: [PATCH 0928/2977] fix(zed): License fetching (#4445) * fix(zed): License macro shouldn't have brackets around it * fix: Unmacro the command I guess * fix(zed-nightly): Weird merge bug??? Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/devs/zed/nightly/zed-nightly.spec | 31 ++++++++++++-------------- anda/devs/zed/preview/zed-preview.spec | 29 +++++++++++------------- anda/devs/zed/stable/zed.spec | 31 ++++++++++++-------------- 3 files changed, 41 insertions(+), 50 deletions(-) diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 94711d8f36..0789b0ceb9 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -13,24 +13,9 @@ %global rustflags_debuginfo 0 -# Zed needs a special approach to fetch the dep licenses -%global zed_license_online %{shrink: \ - %{__cargo} tree \ - -Z avoid-dev-deps \ - --workspace \ - --edges no-build,no-dev,no-proc-macro \ - --target all \ - %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} \ - --prefix none \ - --format "{l}: {p}" \ - | sed -e "s: ($(pwd)[^)]*)::g" -e "s: / :/:g" -e "/\/.*:/{s/\// OR /}" \ - | sed -e '/.*(\*).*/d' -e '/^: pet/ s/./MIT&/' \ - | sort -u \ -}\ - Name: zed-nightly Version: %ver^%commit_date.%shortcommit -Release: 1%?dist +Release: 2%?dist Summary: Zed is a high-performance, multiplayer code editor SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 AND ISC) AND AGPL.3.0-only AND AGPL-3.0-or-later AND (Apache-2.0 OR BSL-1.0 OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception) AND Apache-2.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR MIT OR Apache-2.0) AND BSD-2-Clause AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR Apache-2.0) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND CC0-1.0 AND GPL-3.0-or-later AND (ISC AND (Apache-2.0 OR ISC) AND OpenSSL) AND (ISC AND (Apache-2.0 OR ISC)) AND ISC AND (MIT AND (MIT OR Apache-2.0)) AND (MIT AND BSD-3-Clause) AND (MIT OR Apache-2.0 OR CC0-1.0) AND (MIT OR Apache-2.0 OR NCSA) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND MPL-2.0 AND Unicode-3.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND Zlib @@ -104,7 +89,19 @@ install -Dm644 crates/zed/resources/app-icon-nightly.png %{buildroot}%{_datadir} install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml # The license generation script doesn't generate licenses for ALL compiled dependencies, just direct deps of Zed, and it does not "group" licenses -%{zed_license_online} > LICENSE.dependencies +# Zed also needs a special approach to fetch the dep licenses +%{__cargo} tree \ + -Z avoid-dev-deps \ + --workspace \ + --edges no-build,no-dev,no-proc-macro \ + --target all \ + %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} \ + --prefix none \ + --format "{l}: {p}" \ + | sed -e "s: ($(pwd)[^)]*)::g" -e "s: / :/:g" -e "/\/.*:/{s/\// OR /}" \ + | sed -e '/.*(\*).*/d' -e '/^: pet/ s/./MIT&/' \ + | sort -u \ +> LICENSE.dependencies mv assets/icons/LICENSES LICENSE.icons mv assets/themes/LICENSES LICENSE.themes mv assets/fonts/plex-mono/license.txt LICENSE.fonts diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 220ff5f7e8..e40ad6e4b0 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -9,21 +9,6 @@ %global rustflags_debuginfo 0 -# Zed needs a special approach to fetch the dep licenses -%global zed_license_online %{shrink: \ - %{__cargo} tree \ - -Z avoid-dev-deps \ - --workspace \ - --edges no-build,no-dev,no-proc-macro \ - --target all \ - %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} \ - --prefix none \ - --format "{l}: {p}" \ - | sed -e "s: ($(pwd)[^)]*)::g" -e "s: / :/:g" -e "/\/.*:/{s/\// OR /}" \ - | sed -e '/.*(\*).*/d' -e '/^: pet/ s/./MIT&/' \ - | sort -u \ -}\ - Name: zed-preview Version: %(echo %ver | sed 's/-/~/') Release: pre2%?dist @@ -100,7 +85,19 @@ install -Dm644 crates/zed/resources/app-icon-preview.png %{buildroot}%{_datadir} install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml # The license generation script doesn't generate licenses for ALL compiled dependencies, just direct deps of Zed, and it does not "group" licenses -%{zed_license_online} > LICENSE.dependencies +# Zed also needs a special approach to fetch the dep licenses +%{__cargo} tree \ + -Z avoid-dev-deps \ + --workspace \ + --edges no-build,no-dev,no-proc-macro \ + --target all \ + %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} \ + --prefix none \ + --format "{l}: {p}" \ + | sed -e "s: ($(pwd)[^)]*)::g" -e "s: / :/:g" -e "/\/.*:/{s/\// OR /}" \ + | sed -e '/.*(\*).*/d' -e '/^: pet/ s/./MIT&/' \ + | sort -u \ +> LICENSE.dependencies mv assets/icons/LICENSES LICENSE.icons mv assets/themes/LICENSES LICENSE.themes mv assets/fonts/plex-mono/license.txt LICENSE.fonts diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index c9cfc867b7..273019982f 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -8,24 +8,9 @@ %global rustflags_debuginfo 0 -# Zed needs a special approach to fetch the dep licenses -%global zed_license_online %{shrink: \ - %{__cargo} tree \ - -Z avoid-dev-deps \ - --workspace \ - --edges no-build,no-dev,no-proc-macro \ - --target all \ - %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} \ - --prefix none \ - --format "{l}: {p}" \ - | sed -e "s: ($(pwd)[^)]*)::g" -e "s: / :/:g" -e "/\/.*:/{s/\// OR /}" \ - | sed -e '/.*(\*).*/d' -e '/^: pet/ s/./MIT&/' \ - | sort -u \ -}\ - Name: zed Version: 0.183.11 -Release: 1%?dist +Release: 2%?dist Summary: Zed is a high-performance, multiplayer code editor SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 AND ISC) AND AGPL.3.0-only AND AGPL-3.0-or-later AND (Apache-2.0 OR BSL-1.0 OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception) AND Apache-2.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR MIT OR Apache-2.0) AND BSD-2-Clause AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR Apache-2.0) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND CC0-1.0 AND GPL-3.0-or-later AND (ISC AND (Apache-2.0 OR ISC) AND OpenSSL) AND (ISC AND (Apache-2.0 OR ISC)) AND ISC AND (MIT AND (MIT OR Apache-2.0)) AND (MIT AND BSD-3-Clause) AND (MIT OR Apache-2.0 OR CC0-1.0) AND (MIT OR Apache-2.0 OR NCSA) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND MPL-2.0 AND Unicode-3.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND Zlib @@ -100,7 +85,19 @@ install -Dm644 crates/zed/resources/app-icon.png %{buildroot}%{_datadir}/pixmaps install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml # The license generation script doesn't generate licenses for ALL compiled dependencies, just direct deps of Zed, and it does not "group" licenses -%{zed_license_online} > LICENSE.dependencies +# Zed also needs a special approach to fetch the dep licenses +%{__cargo} tree \ + -Z avoid-dev-deps \ + --workspace \ + --edges no-build,no-dev,no-proc-macro \ + --target all \ + %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} \ + --prefix none \ + --format "{l}: {p}" \ + | sed -e "s: ($(pwd)[^)]*)::g" -e "s: / :/:g" -e "/\/.*:/{s/\// OR /}" \ + | sed -e '/.*(\*).*/d' -e '/^: pet/ s/./MIT&/' \ + | sort -u \ +> LICENSE.dependencies mv assets/icons/LICENSES LICENSE.icons mv assets/themes/LICENSES LICENSE.themes mv assets/fonts/plex-mono/license.txt LICENSE.fonts From 5e63223d90958694cca3a8e067c07fab2db1a58e Mon Sep 17 00:00:00 2001 From: Gilver Date: Sun, 27 Apr 2025 11:15:34 -0500 Subject: [PATCH 0929/2977] fix: Zig transitve failure failsafe (#4464) Signed-off-by: Gilver --- anda/langs/zig/zig-master.spec | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/anda/langs/zig/zig-master.spec b/anda/langs/zig/zig-master.spec index 65be3d53c7..b7dd4f7688 100644 --- a/anda/langs/zig/zig-master.spec +++ b/anda/langs/zig/zig-master.spec @@ -156,21 +156,23 @@ help2man --no-discard-stderr --no-info "./zig-out/bin/zig" --version-option=vers %if %{with docs} # Use the newly made stage 3 compiler to generate docs # Zig has an extremely annoying issue with transitive failures when trying to build the docs, retry until it succeeds -r=3 - -for ((i=0; i Date: Sun, 27 Apr 2025 16:21:49 +0000 Subject: [PATCH 0930/2977] bump: starship --- anda/langs/rust/starship/rust-starship.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/rust/starship/rust-starship.spec b/anda/langs/rust/starship/rust-starship.spec index 6062fdc859..47517be24f 100644 --- a/anda/langs/rust/starship/rust-starship.spec +++ b/anda/langs/rust/starship/rust-starship.spec @@ -4,7 +4,7 @@ %global crate starship Name: rust-starship -Version: 1.22.1 +Version: 1.23.0 Release: 1%?dist Summary: Minimal, blazing-fast, and infinitely customizable prompt for any shell! ☄🌌️ From 0def47baf97892169f44fb655fc1c574f2fec8f7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 27 Apr 2025 18:24:01 +0000 Subject: [PATCH 0931/2977] bump: jellyfin-rpc --- anda/langs/rust/jellyfin-rpc/rust-jellyfin-rpc-cli.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/langs/rust/jellyfin-rpc/rust-jellyfin-rpc-cli.spec b/anda/langs/rust/jellyfin-rpc/rust-jellyfin-rpc-cli.spec index a3263a8a40..a405cdb3eb 100644 --- a/anda/langs/rust/jellyfin-rpc/rust-jellyfin-rpc-cli.spec +++ b/anda/langs/rust/jellyfin-rpc/rust-jellyfin-rpc-cli.spec @@ -5,8 +5,8 @@ %global crate jellyfin-rpc-cli Name: rust-jellyfin-rpc-cli -Version: 1.3.1 -Release: 2%?dist +Version: 1.3.3 +Release: 1%?dist Summary: Displays the content you're currently watching on Discord! License: GPL-3.0-or-later From cc7240ca2e1383d1c5b3f0e2806a473c935b5dbe Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 28 Apr 2025 01:50:38 +0000 Subject: [PATCH 0932/2977] bump(nightly): mpv nightly micro nightly prismlauncher-nightly nightly --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/micro/micro-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 6 +++--- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/system/readymade/nightly/readymade-nightly.spec | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index cef8082585..34f15f987e 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit b47c805fa2aa444fb4c6a6a1a921034a6232719a +%global commit f8cef99033e2e46e610f7378334f59cd242dacb4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250427 +%global commit_date 20250428 %global ver 0.40.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 447da4cae4..bf3e0c8fee 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 38445dca2ac2af176c7f3b205d88d697cf8c89c8 +%global commit 7daabdddef7c0993df4bf13be2c11bd0723e47cf %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-04-25 +%global fulldate 2025-04-27 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 diff --git a/anda/devs/micro/micro-nightly.spec b/anda/devs/micro/micro-nightly.spec index 526256ae4e..475c657d4f 100644 --- a/anda/devs/micro/micro-nightly.spec +++ b/anda/devs/micro/micro-nightly.spec @@ -12,8 +12,8 @@ # Naming variable as something other than "commit" is necessary # to stop %%gometa from putting commit hash in release -%global commit_hash e5c3a3edc3bb916173a96834d72516a217524ba6 -%global commit_date 20250425 +%global commit_hash 333770bbd0e23baa8dc33541d15c2edd8c5f4489 +%global commit_date 20250428 %global shortcommit %{sub %{commit_hash} 1 7} %global ver 2.0.14 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 0789b0ceb9..9aa08c5838 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit bb7a5b13df57209a36934c34f786902b30a437f8 +%global commit 609c528ceb5f408fe2f9062eb3f0bced9b99fd26 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250427 +%global commit_date 20250428 %global ver 0.185.0 %bcond_with check @@ -15,7 +15,7 @@ Name: zed-nightly Version: %ver^%commit_date.%shortcommit -Release: 2%?dist +Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 AND ISC) AND AGPL.3.0-only AND AGPL-3.0-or-later AND (Apache-2.0 OR BSL-1.0 OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception) AND Apache-2.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR MIT OR Apache-2.0) AND BSD-2-Clause AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR Apache-2.0) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND CC0-1.0 AND GPL-3.0-or-later AND (ISC AND (Apache-2.0 OR ISC) AND OpenSSL) AND (ISC AND (Apache-2.0 OR ISC)) AND ISC AND (MIT AND (MIT OR Apache-2.0)) AND (MIT AND BSD-3-Clause) AND (MIT OR Apache-2.0 OR CC0-1.0) AND (MIT OR Apache-2.0 OR NCSA) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND MPL-2.0 AND Unicode-3.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND Zlib diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index b54215c802..d22e4f1051 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 60e279bf395b2a353c79b53780f5965371a80506 +%global commit f58ee6af7aad560e97707b69b69b303a17314097 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250421 +%global commit_date 20250428 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/system/readymade/nightly/readymade-nightly.spec b/anda/system/readymade/nightly/readymade-nightly.spec index a20d7be27d..dfe7509002 100644 --- a/anda/system/readymade/nightly/readymade-nightly.spec +++ b/anda/system/readymade/nightly/readymade-nightly.spec @@ -1,5 +1,5 @@ -%global commit ebe8fdd6d4d4e3bd9323ff3a5722fd9ef3a8f38a -%global commit_date 20250427 +%global commit a544f9a13536ffae8e1916bfaa63d1026017a14e +%global commit_date 20250428 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: readymade-nightly From 2d8e297d7f35e9441de8b91843e5cf825cd2cbab Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 28 Apr 2025 03:03:41 +0000 Subject: [PATCH 0933/2977] bump: fluent-kde-theme --- anda/themes/fluent-kde-theme/fluent-kde-theme.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/themes/fluent-kde-theme/fluent-kde-theme.spec b/anda/themes/fluent-kde-theme/fluent-kde-theme.spec index 673f0ef570..b35d46a3f0 100644 --- a/anda/themes/fluent-kde-theme/fluent-kde-theme.spec +++ b/anda/themes/fluent-kde-theme/fluent-kde-theme.spec @@ -1,5 +1,5 @@ -%global commit 9d6b7d4733707c38f72e8a614528f1df591419f3 -%global commit_date 20240827 +%global commit 315251f3e0099fc7afa7ab183880141a478f584e +%global commit_date 20250428 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: fluent-kde-theme From e67dbc51ff71c08d8bf0a84859cb1336e4e08c76 Mon Sep 17 00:00:00 2001 From: Jaiden Riordan Date: Mon, 28 Apr 2025 09:13:42 -0500 Subject: [PATCH 0934/2977] feat(readymade): make rdm build on commit (#4476) Signed-off-by: Jaiden Riordan --- anda/system/readymade/nightly/anda.hcl | 1 - 1 file changed, 1 deletion(-) diff --git a/anda/system/readymade/nightly/anda.hcl b/anda/system/readymade/nightly/anda.hcl index 094f9bb371..9a6037464b 100644 --- a/anda/system/readymade/nightly/anda.hcl +++ b/anda/system/readymade/nightly/anda.hcl @@ -3,6 +3,5 @@ project pkg { spec = "readymade-nightly.spec" } labels { - nightly = 1 } } From bf322e250792c6df9d5c44612e56b4dedab675b5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 28 Apr 2025 14:30:19 +0000 Subject: [PATCH 0935/2977] bump: nightly --- anda/system/readymade/nightly/readymade-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/readymade/nightly/readymade-nightly.spec b/anda/system/readymade/nightly/readymade-nightly.spec index dfe7509002..2cd384d489 100644 --- a/anda/system/readymade/nightly/readymade-nightly.spec +++ b/anda/system/readymade/nightly/readymade-nightly.spec @@ -1,4 +1,4 @@ -%global commit a544f9a13536ffae8e1916bfaa63d1026017a14e +%global commit 89a59cd74ccfacb1b9774832a90708b701dbe7a6 %global commit_date 20250428 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From 77a8049da9fdcf5e74951264437f3b879db5cce8 Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 28 Apr 2025 10:15:10 -0500 Subject: [PATCH 0936/2977] chore(cuda-gcc): Remove from NVIDIA subrepo to use with packages that need CUDA compatible compilers (#4471) Signed-off-by: Gilver --- anda/lib/nvidia/cuda-gcc/anda.hcl | 1 - 1 file changed, 1 deletion(-) diff --git a/anda/lib/nvidia/cuda-gcc/anda.hcl b/anda/lib/nvidia/cuda-gcc/anda.hcl index b7ae3ad50a..48ea127f9d 100644 --- a/anda/lib/nvidia/cuda-gcc/anda.hcl +++ b/anda/lib/nvidia/cuda-gcc/anda.hcl @@ -5,6 +5,5 @@ project pkg { } labels { updbranch = 1 - subrepo = "nvidia" } } From 69fee075dc5a69ee43521eb2cc0dd8fff45c8a7d Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 28 Apr 2025 10:15:30 -0500 Subject: [PATCH 0937/2977] fix(starship): Update patches (#4472) * Delete anda/langs/rust/starship/0001-gix-0.61.1-0.61.0.patch Signed-off-by: Gilver * Update starship-fix-metadata-auto.diff Signed-off-by: Gilver * Confusion Signed-off-by: Gilver * fix?: Update patch via upload Signed-off-by: Gilver * Update starship-fix-metadata-auto.diff Signed-off-by: Gilver * Update starship-fix-metadata-auto.diff Signed-off-by: Gilver * Update starship-fix-metadata-auto.diff Signed-off-by: Gilver * fix: Words cannot describe how much I hate rust2rpm Signed-off-by: Gilver * Update rust-starship.spec Signed-off-by: Gilver * Oof Signed-off-by: Gilver * Update rust-starship.spec Signed-off-by: Gilver * Update rust-starship.spec Signed-off-by: Gilver --------- Signed-off-by: Gilver --- .../starship/0001-gix-0.61.1-0.61.0.patch | 25 --------- anda/langs/rust/starship/rust-starship.spec | 54 +++---------------- .../starship/starship-fix-metadata-auto.diff | 16 ++++-- 3 files changed, 18 insertions(+), 77 deletions(-) delete mode 100644 anda/langs/rust/starship/0001-gix-0.61.1-0.61.0.patch diff --git a/anda/langs/rust/starship/0001-gix-0.61.1-0.61.0.patch b/anda/langs/rust/starship/0001-gix-0.61.1-0.61.0.patch deleted file mode 100644 index 5d61cce573..0000000000 --- a/anda/langs/rust/starship/0001-gix-0.61.1-0.61.0.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b62e3879abe83e0b879421a023d8e944e31f00cb Mon Sep 17 00:00:00 2001 -From: madomado -Date: Mon, 25 Mar 2024 18:33:25 +0800 -Subject: [PATCH] gix 0.61.1 -> 0.61.0 - ---- - Cargo.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Cargo.toml b/Cargo.toml -index d98ba90..c3059c9 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -82,7 +82,7 @@ version = "1.0.4" - version = "0.4.3" - - [dependencies.gix] --version = "0.61.1" -+version = "0.61.0" - features = [ - "max-performance-safe", - "revision", --- -2.44.0 - diff --git a/anda/langs/rust/starship/rust-starship.spec b/anda/langs/rust/starship/rust-starship.spec index 47517be24f..476004b035 100644 --- a/anda/langs/rust/starship/rust-starship.spec +++ b/anda/langs/rust/starship/rust-starship.spec @@ -20,6 +20,12 @@ BuildRequires: cmake BuildRequires: mold BuildRequires: git-core +# Old devel packages +Obsoletes: %{name}+gix-faster-devel < 1.23.0 +Obsoletes: %{name}+gix-features-devel < 1.23.0 +Obsoletes: %{name}+gix-max-perf-devel < 1.23.0 +Obsoletes: %{name}+libz-ng-sys-devel < 1.23.0 + %global _description %{expand: The minimal, blazing-fast, and infinitely customizable prompt for any shell! ☄🌌️.} @@ -88,54 +94,6 @@ use the "config-schema" feature of the "%{crate}" crate. %files -n %{name}+config-schema-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+gix-faster-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+gix-faster-devel %{_description} - -This package contains library source intended for building other packages which -use the "gix-faster" feature of the "%{crate}" crate. - -%files -n %{name}+gix-faster-devel -%ghost %{crate_instdir}/Cargo.toml - -%package -n %{name}+gix-features-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+gix-features-devel %{_description} - -This package contains library source intended for building other packages which -use the "gix-features" feature of the "%{crate}" crate. - -%files -n %{name}+gix-features-devel -%ghost %{crate_instdir}/Cargo.toml - -%package -n %{name}+gix-max-perf-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+gix-max-perf-devel %{_description} - -This package contains library source intended for building other packages which -use the "gix-max-perf" feature of the "%{crate}" crate. - -%files -n %{name}+gix-max-perf-devel -%ghost %{crate_instdir}/Cargo.toml - -%package -n %{name}+libz-ng-sys-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+libz-ng-sys-devel %{_description} - -This package contains library source intended for building other packages which -use the "libz-ng-sys" feature of the "%{crate}" crate. - -%files -n %{name}+libz-ng-sys-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+notify-devel Summary: %{summary} BuildArch: noarch diff --git a/anda/langs/rust/starship/starship-fix-metadata-auto.diff b/anda/langs/rust/starship/starship-fix-metadata-auto.diff index 18e975f69b..ce9f689d72 100644 --- a/anda/langs/rust/starship/starship-fix-metadata-auto.diff +++ b/anda/langs/rust/starship/starship-fix-metadata-auto.diff @@ -1,6 +1,6 @@ ---- starship-1.22.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ starship-1.22.1/Cargo.toml 2025-01-12T14:01:45.200436+00:00 -@@ -273,18 +273,3 @@ +--- a/Cargo.toml 2025-04-27 10:52:14.000000000 -0500 ++++ b/Cargo.toml 2025-04-27 12:39:59.385400385 -0500 +@@ -265,22 +265,6 @@ ] default-features = false @@ -8,7 +8,7 @@ -version = "0.2.0" - -[target."cfg(windows)".dependencies.windows] --version = "0.59.0" +-version = "0.61.0" -features = [ - "Win32_Foundation", - "Win32_UI_Shell", @@ -19,3 +19,11 @@ - -[target."cfg(windows)".build-dependencies.winres] -version = "0.1.12" +- + [profile.bench] + lto = "thin" + codegen-units = 16 + [dev-dependencies] + mockall = "0.13.1" + tempfile = "3.19.1" + From 7789afee6e2f5a3d00c86d7e4a54f49e003f2716 Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 28 Apr 2025 10:15:45 -0500 Subject: [PATCH 0938/2977] fix(egl-wayland,egl-x11): Needs an i686 build, remove the update script (#4473) * fix(egl-wayland): Needs an i686 build Signed-off-by: Gilver * fix(egl-x11): Needs an i686 build Signed-off-by: Gilver * Delete anda/lib/nvidia/egl-x11/update.rhai Signed-off-by: Gilver * Delete anda/lib/nvidia/egl-wayland/update.rhai Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/lib/nvidia/egl-wayland/anda.hcl | 2 ++ anda/lib/nvidia/egl-wayland/update.rhai | 1 - anda/lib/nvidia/egl-x11/anda.hcl | 2 ++ anda/lib/nvidia/egl-x11/update.rhai | 1 - 4 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 anda/lib/nvidia/egl-wayland/update.rhai delete mode 100644 anda/lib/nvidia/egl-x11/update.rhai diff --git a/anda/lib/nvidia/egl-wayland/anda.hcl b/anda/lib/nvidia/egl-wayland/anda.hcl index 264e33372f..0835a48e32 100644 --- a/anda/lib/nvidia/egl-wayland/anda.hcl +++ b/anda/lib/nvidia/egl-wayland/anda.hcl @@ -1,8 +1,10 @@ project pkg { + arches = ["x86_64", "aarch64", "i386"] rpm { spec = "egl-wayland.spec" } labels { subrepo = "nvidia" + mock = 1 } } diff --git a/anda/lib/nvidia/egl-wayland/update.rhai b/anda/lib/nvidia/egl-wayland/update.rhai deleted file mode 100644 index 1e1e15eb01..0000000000 --- a/anda/lib/nvidia/egl-wayland/update.rhai +++ /dev/null @@ -1 +0,0 @@ -rpm.version(gh("NVIDIA/egl-wayland")); diff --git a/anda/lib/nvidia/egl-x11/anda.hcl b/anda/lib/nvidia/egl-x11/anda.hcl index b164f257ea..7ffbac854e 100644 --- a/anda/lib/nvidia/egl-x11/anda.hcl +++ b/anda/lib/nvidia/egl-x11/anda.hcl @@ -1,8 +1,10 @@ project pkg { + arches = ["x86_64", "aarch64", "i386"] rpm { spec = "egl-x11.spec" } labels { subrepo = "nvidia" + mock = 1 } } diff --git a/anda/lib/nvidia/egl-x11/update.rhai b/anda/lib/nvidia/egl-x11/update.rhai deleted file mode 100644 index fc93335f50..0000000000 --- a/anda/lib/nvidia/egl-x11/update.rhai +++ /dev/null @@ -1 +0,0 @@ -rpm.version(gh_tag("NVIDIA/egl-x11")); From 7aaf19f4fa05d05a08f9f7642e2f474817a278ef Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 28 Apr 2025 15:28:58 +0000 Subject: [PATCH 0939/2977] bump: codium nightly --- anda/devs/codium/codium.spec | 2 +- anda/system/readymade/nightly/readymade-nightly.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/codium/codium.spec b/anda/devs/codium/codium.spec index 7e528fd1e4..bf5225ffed 100644 --- a/anda/devs/codium/codium.spec +++ b/anda/devs/codium/codium.spec @@ -12,7 +12,7 @@ %endif Name: codium -Version: 1.99.32704 +Version: 1.99.32846 Release: 1%?dist Summary: Code editing. Redefined. License: MIT diff --git a/anda/system/readymade/nightly/readymade-nightly.spec b/anda/system/readymade/nightly/readymade-nightly.spec index 2cd384d489..7e28d81caf 100644 --- a/anda/system/readymade/nightly/readymade-nightly.spec +++ b/anda/system/readymade/nightly/readymade-nightly.spec @@ -1,4 +1,4 @@ -%global commit 89a59cd74ccfacb1b9774832a90708b701dbe7a6 +%global commit 7b0e1583bf02245964830970749402380673d405 %global commit_date 20250428 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From 364f7d3539f0df41efcad5e1e216f75a562e84d4 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 28 Apr 2025 15:43:49 +0000 Subject: [PATCH 0940/2977] bump: maple --- anda/fonts/maple/maple-fonts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/fonts/maple/maple-fonts.spec b/anda/fonts/maple/maple-fonts.spec index 0f008f79ca..853fad7599 100644 --- a/anda/fonts/maple/maple-fonts.spec +++ b/anda/fonts/maple/maple-fonts.spec @@ -1,6 +1,6 @@ %define debug_package %nil %define _ttfontsdir %{_datadir}/fonts/maple -%global upstream_ver v7.0 +%global upstream_ver v7.1 %define sanitized_ver %(echo "$( sed 's/^.//;s/-/~/' <<< "%{upstream_ver}" )") Name: maple-fonts From 0573f9e8450cab3b0167fc08c79d8dba688ea5cf Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 28 Apr 2025 17:17:42 +0000 Subject: [PATCH 0941/2977] bump: lomiri-system-settings --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index aead122c2d..73751a310c 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit 931e31af9ce87aa12fb00f9545c80994361dc3b2 +%global commit e583c542521ada6c88c5e7c09eb745b6794bc7b6 %forgemeta Name: lomiri-system-settings From 7a18522b3d4e964365fde125d2140ea0840d44f9 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 28 Apr 2025 17:45:35 +0000 Subject: [PATCH 0942/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index e40ad6e4b0..1ad80203c3 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.184.4-pre +%global ver 0.184.5-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ From 9757df21adf8f854c372738f4588675fa99baef8 Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 28 Apr 2025 13:14:35 -0500 Subject: [PATCH 0943/2977] fix(cuda-gcc): Ifcond for GCC version tracking (#4491) * fix(cuda-gcc): Ifcond for GCC version tracking * chore: Bump release --- anda/{lib/nvidia => tools}/cuda-gcc/anda.hcl | 0 anda/{lib/nvidia => tools}/cuda-gcc/cuda-gcc.spec | 4 ++-- anda/{lib/nvidia => tools}/cuda-gcc/update.rhai | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename anda/{lib/nvidia => tools}/cuda-gcc/anda.hcl (100%) rename anda/{lib/nvidia => tools}/cuda-gcc/cuda-gcc.spec (95%) rename anda/{lib/nvidia => tools}/cuda-gcc/update.rhai (100%) diff --git a/anda/lib/nvidia/cuda-gcc/anda.hcl b/anda/tools/cuda-gcc/anda.hcl similarity index 100% rename from anda/lib/nvidia/cuda-gcc/anda.hcl rename to anda/tools/cuda-gcc/anda.hcl diff --git a/anda/lib/nvidia/cuda-gcc/cuda-gcc.spec b/anda/tools/cuda-gcc/cuda-gcc.spec similarity index 95% rename from anda/lib/nvidia/cuda-gcc/cuda-gcc.spec rename to anda/tools/cuda-gcc/cuda-gcc.spec index f8da7b37e9..8c6b392ec9 100644 --- a/anda/lib/nvidia/cuda-gcc/cuda-gcc.spec +++ b/anda/tools/cuda-gcc/cuda-gcc.spec @@ -1,4 +1,4 @@ -%if 0%{?fedora} < 42 || 0%{?rhel} <= 10 +%if 0%{?fedora} < 042 %global gcc_major 13 %else %global gcc_major 14 @@ -6,7 +6,7 @@ Name: cuda-gcc Version: 14.2.1 -Release: 1%?dist +Release: 2%?dist Summary: GNU Compiler Collection CUDA compatibility package License: BSD URL: http://gcc.gnu.org diff --git a/anda/lib/nvidia/cuda-gcc/update.rhai b/anda/tools/cuda-gcc/update.rhai similarity index 100% rename from anda/lib/nvidia/cuda-gcc/update.rhai rename to anda/tools/cuda-gcc/update.rhai From 7ac598413a94edf6d33cc009373b6c3a6de5373e Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 28 Apr 2025 13:14:45 -0500 Subject: [PATCH 0944/2977] fix(egl): Bump release back up (#4490) * fix(egl-wayland): Bump release back up Signed-off-by: Gilver * fix(egl-x11): Bump release back up Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/lib/nvidia/egl-wayland/egl-wayland.spec | 2 +- anda/lib/nvidia/egl-x11/egl-x11.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/nvidia/egl-wayland/egl-wayland.spec b/anda/lib/nvidia/egl-wayland/egl-wayland.spec index 267c711bed..9f4985a34d 100644 --- a/anda/lib/nvidia/egl-wayland/egl-wayland.spec +++ b/anda/lib/nvidia/egl-wayland/egl-wayland.spec @@ -5,7 +5,7 @@ Name: egl-wayland Version: 1.1.19 -Release: 1%?dist +Release: 2%?dist Summary: EGLStream-based Wayland external platform License: MIT URL: https://github.com/NVIDIA/%{name} diff --git a/anda/lib/nvidia/egl-x11/egl-x11.spec b/anda/lib/nvidia/egl-x11/egl-x11.spec index 3dc0646dea..342ef6ebb9 100644 --- a/anda/lib/nvidia/egl-x11/egl-x11.spec +++ b/anda/lib/nvidia/egl-x11/egl-x11.spec @@ -5,7 +5,7 @@ Name: egl-x11 Version: 1.0.1 -Release: 1%?dist +Release: 2%?dist Summary: NVIDIA XLib and XCB EGL Platform Library License: Apache-2.0 URL: https://github.com/NVIDIA/egl-x11 From 515e10435ec571084b37e7d293b4cf96888bb53b Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 28 Apr 2025 13:47:41 -0500 Subject: [PATCH 0945/2977] fix(egl-x11): Bump release to 6 (#4501) Signed-off-by: Gilver --- anda/lib/nvidia/egl-x11/egl-x11.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/nvidia/egl-x11/egl-x11.spec b/anda/lib/nvidia/egl-x11/egl-x11.spec index 342ef6ebb9..b3f6471905 100644 --- a/anda/lib/nvidia/egl-x11/egl-x11.spec +++ b/anda/lib/nvidia/egl-x11/egl-x11.spec @@ -5,7 +5,7 @@ Name: egl-x11 Version: 1.0.1 -Release: 2%?dist +Release: 6%?dist Summary: NVIDIA XLib and XCB EGL Platform Library License: Apache-2.0 URL: https://github.com/NVIDIA/egl-x11 From 3fd3989efb74755286b91eb6d453025cc62f077f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 28 Apr 2025 19:37:18 +0000 Subject: [PATCH 0946/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index e5f5f0b419..d274ca3fc6 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.27.001650 +Version: 2025.04.28.192122 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 6155829332bc00e46acbb477344a05c866d1964c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 28 Apr 2025 19:47:21 +0000 Subject: [PATCH 0947/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 06d26c1d73..262fd1202f 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.661 +Version: 0.0.662 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index f564ce36dc..1f41a0c8a3 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.661 +Version: 0.0.662 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 61cd422b028add35c2cb34307f6c6b30babac0b2 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 28 Apr 2025 20:23:12 +0000 Subject: [PATCH 0948/2977] bump: sbctl --- anda/tools/sbctl/sbctl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/sbctl/sbctl.spec b/anda/tools/sbctl/sbctl.spec index 13c3f15f6a..aba3b0d989 100644 --- a/anda/tools/sbctl/sbctl.spec +++ b/anda/tools/sbctl/sbctl.spec @@ -1,5 +1,5 @@ Name: sbctl -Version: 0.16 +Version: 0.17 Release: 1%?dist Summary: Secure Boot key manager From 43a65ba7428390ad015c153c1c523b4bfc3ed6d2 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 28 Apr 2025 21:01:09 +0000 Subject: [PATCH 0949/2977] bump: discord-ptb-openasar discord-ptb --- anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec | 2 +- anda/apps/discord-ptb/discord-ptb.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec index bd57028248..44776eb02b 100644 --- a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec +++ b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-ptb-openasar -Version: 0.0.139 +Version: 0.0.140 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-ptb/discord-ptb.spec b/anda/apps/discord-ptb/discord-ptb.spec index b1ab1e95d2..9cd68f9a9c 100644 --- a/anda/apps/discord-ptb/discord-ptb.spec +++ b/anda/apps/discord-ptb/discord-ptb.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-ptb -Version: 0.0.139 +Version: 0.0.140 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers. URL: https://discord.com From 002ddda358495d7e1d6b0651fafd849d991f5e04 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 28 Apr 2025 21:24:25 +0000 Subject: [PATCH 0950/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index d274ca3fc6..2ef552f294 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.28.192122 +Version: 2025.04.28.205844 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 09a556aab5e7128c06557f8e5ad15f799f34c758 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 28 Apr 2025 22:26:53 +0000 Subject: [PATCH 0951/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 2ef552f294..07e78450d1 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.28.205844 +Version: 2025.04.28.221931 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From a0930925a6d712a7fa2ea4b82f40b492c15c4cd8 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 28 Apr 2025 22:42:38 +0000 Subject: [PATCH 0952/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 07e78450d1..9444a28384 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.28.221931 +Version: 2025.04.28.223149 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 4f1aac8aff738f87c9fe9a8cfbf0356e41dd05eb Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 28 Apr 2025 22:57:11 +0000 Subject: [PATCH 0953/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 9444a28384..5e28c857a6 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.28.223149 +Version: 2025.04.28.224217 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 7ef0f8c51094fbb8c0573472804f65b43b760e6e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 28 Apr 2025 23:46:51 +0000 Subject: [PATCH 0954/2977] bump: electron --- anda/tools/electron/electron.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/electron/electron.spec b/anda/tools/electron/electron.spec index 3d405135ff..b81109c317 100644 --- a/anda/tools/electron/electron.spec +++ b/anda/tools/electron/electron.spec @@ -12,7 +12,7 @@ %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so Name: electron -Version: 35.2.1 +Version: 36.0.0 Release: 1%?dist Summary: Build cross platform desktop apps with web technologies License: MIT From bc5cb20dafc99f02d3ebe4f7654f025be464d231 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 29 Apr 2025 01:28:27 +0000 Subject: [PATCH 0955/2977] bump: ruffle inputplumber mise --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- anda/games/inputplumber/inputplumber.spec | 2 +- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 45d6295d18..c9637a0d78 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-27 +%global ver 2025-04-29 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index c1043e4b24..f405be2603 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.55.0 +Version: 0.55.1 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index f8b6a0963c..3c2c662035 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.4.11 +Version: 2025.4.12 Release: 1%?dist Summary: Front-end to your dev env From 88cc1354812d6a65bba3b5a474941912f0dea0bc Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 29 Apr 2025 01:48:28 +0000 Subject: [PATCH 0956/2977] bump(nightly): mpv nightly micro nightly prismlauncher-nightly nim-nightly rpi-utils --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/micro/micro-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/tools/rpi-utils/rpi-utils.spec | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 34f15f987e..d978f4f595 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit f8cef99033e2e46e610f7378334f59cd242dacb4 +%global commit 61be67071617889282bc477e8d701333ea834783 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250428 +%global commit_date 20250429 %global ver 0.40.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index bf3e0c8fee..a3b219ea0c 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 7daabdddef7c0993df4bf13be2c11bd0723e47cf +%global commit 9a4419ce85b11b66af6b1c6974be6c848a4cc5e4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-04-27 +%global fulldate 2025-04-28 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 diff --git a/anda/devs/micro/micro-nightly.spec b/anda/devs/micro/micro-nightly.spec index 475c657d4f..55851985fa 100644 --- a/anda/devs/micro/micro-nightly.spec +++ b/anda/devs/micro/micro-nightly.spec @@ -12,8 +12,8 @@ # Naming variable as something other than "commit" is necessary # to stop %%gometa from putting commit hash in release -%global commit_hash 333770bbd0e23baa8dc33541d15c2edd8c5f4489 -%global commit_date 20250428 +%global commit_hash b61c8a4e1ae6810f307b2fc4bc30c25f2fb04729 +%global commit_date 20250429 %global shortcommit %{sub %{commit_hash} 1 7} %global ver 2.0.14 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 9aa08c5838..5b0f048414 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 609c528ceb5f408fe2f9062eb3f0bced9b99fd26 +%global commit 4dc8ce8cf7e27c6fc2ed3f532f47a1b4183998d5 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250428 +%global commit_date 20250429 %global ver 0.185.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index d22e4f1051..5ef4a1cacc 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit f58ee6af7aad560e97707b69b69b303a17314097 +%global commit a6006c3a33ec5a7f8f297767add066290190170c %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250428 +%global commit_date 20250429 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 2495bae63c..cf7fdee9e6 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 8c9a645bdf8bbd14f7fc9e95c475f7fb963de3f3 +%global commit eea4ce0e2cf1dfdd2a90c2ab7f93888efc7ccf4e %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250425 +%global commit_date 20250429 %global debug_package %nil Name: nim-nightly diff --git a/anda/tools/rpi-utils/rpi-utils.spec b/anda/tools/rpi-utils/rpi-utils.spec index f7622b5b5d..0c5a7f81b7 100644 --- a/anda/tools/rpi-utils/rpi-utils.spec +++ b/anda/tools/rpi-utils/rpi-utils.spec @@ -1,5 +1,5 @@ -%global commit f92b9735ba3141103c73cd0bf9781644caa91e42 -%global commit_date 20250417 +%global commit c57d8c29c46993d93f191218bbc1dc3a73fc7918 +%global commit_date 20250429 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define _unpackaged_files_terminate_build 0 From dcbc6748a400e3436fe7361eaf660b9be2eef073 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 29 Apr 2025 04:22:40 +0000 Subject: [PATCH 0957/2977] bump: maple --- anda/fonts/maple/maple-fonts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/fonts/maple/maple-fonts.spec b/anda/fonts/maple/maple-fonts.spec index 853fad7599..54ad723786 100644 --- a/anda/fonts/maple/maple-fonts.spec +++ b/anda/fonts/maple/maple-fonts.spec @@ -1,6 +1,6 @@ %define debug_package %nil %define _ttfontsdir %{_datadir}/fonts/maple -%global upstream_ver v7.1 +%global upstream_ver v7.2 %define sanitized_ver %(echo "$( sed 's/^.//;s/-/~/' <<< "%{upstream_ver}" )") Name: maple-fonts From 9adcf5ccad1bf6c882c981c2eff69264f31f0e68 Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 29 Apr 2025 00:03:44 -0500 Subject: [PATCH 0958/2977] chore (andax/nvidia.rhai): Bump CUDA component version (#4503) Signed-off-by: Gilver --- andax/nvidia.rhai | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/andax/nvidia.rhai b/andax/nvidia.rhai index 9d0ae3a4f8..780de31ef0 100644 --- a/andax/nvidia.rhai +++ b/andax/nvidia.rhai @@ -2,7 +2,7 @@ // This module is used to parse the NVIDIA website for the latest driver version fn nvidia_component_list() { - let series = "12.6.3"; + let series = "12.8.1"; let url = `https://developer.download.nvidia.com/compute/cuda/redist/redistrib_${series}.json`; return get(url).json(); } From 8ef23c8acf6139518c7b3d7047863f48bd4ad1f7 Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 29 Apr 2025 00:03:49 -0500 Subject: [PATCH 0959/2977] chore: Update cuda-nvcc (#4502) Signed-off-by: Gilver --- anda/tools/cuda-nvcc/cuda-nvcc.spec | 87 +++++------------------------ 1 file changed, 14 insertions(+), 73 deletions(-) diff --git a/anda/tools/cuda-nvcc/cuda-nvcc.spec b/anda/tools/cuda-nvcc/cuda-nvcc.spec index e85dab437c..e6e663d87b 100644 --- a/anda/tools/cuda-nvcc/cuda-nvcc.spec +++ b/anda/tools/cuda-nvcc/cuda-nvcc.spec @@ -4,12 +4,12 @@ %global __strip /bin/true %global _missing_build_ids_terminate_build 0 %global _build_id_links none -%global major_package_version 12-6 +%global major_package_version 12-8 Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.6.85 -Release: 1%{?dist} +Version: 12.8.61 +Release: 2%{?dist} Summary: CUDA Compiler (NVCC) License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit @@ -19,12 +19,15 @@ Source0: https://developer.download.nvidia.com/compute/cuda/redist/%{real Source1: https://developer.download.nvidia.com/compute/cuda/redist/%{real_name}/linux-sbsa/%{real_name}-linux-sbsa-%{version}-archive.tar.xz Source3: nvcc.profile -Requires(post): ldconfig Conflicts: %{name}-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release} -# CUDA 12.4 does not support GCC 14+: -%if 0%{?fedora} >= 40 +# CUDA 12.8 does not support GCC 15+: +%if 0%{?fedora} >= 42 Requires: cuda-gcc +%else +# CUDA 12.8 supports GCC 14: +Obsoletes: cuda-gcc +Provides: cuda-gcc %endif %description @@ -72,8 +75,6 @@ sed -i \ -e 's|INCLUDE_DIR|%{_includedir}/cuda|g' \ %{buildroot}/%{_bindir}/nvcc.profile -%{?ldconfig_scriptlets} - %files %license LICENSE %{_bindir}/bin2c @@ -95,6 +96,7 @@ sed -i \ %{_includedir}/crt/cudacc_ext.h %{_includedir}/crt/device_double_functions.h %{_includedir}/crt/device_double_functions.hpp +%{_includedir}/crt/device_fp128_functions.h %{_includedir}/crt/device_functions.h %{_includedir}/crt/device_functions.hpp %{_includedir}/crt/func_macro.h @@ -112,78 +114,17 @@ sed -i \ %{_includedir}/crt/sm_80_rt.hpp %{_includedir}/crt/sm_90_rt.h %{_includedir}/crt/sm_90_rt.hpp +%{_includedir}/crt/sm_100_rt.h +%{_includedir}/crt/sm_100_rt.hpp %{_includedir}/crt/storage_class.h %{_includedir}/fatbinary_section.h %{_includedir}/nvPTXCompiler.h %{_includedir}/nvvm.h + %{_libdir}/libnvptxcompiler_static.a %{_libdir}/libnvvm.so %{_libdir}/libnvvm.so.4 %{_libdir}/libnvvm.so.4.0.0 %changelog -* Fri Dec 13 2024 Simone Caronni - 1:12.6.85-1 -- Update to 12.6.85. -- Require new cuda-gcc profile package. - -* Thu Sep 19 2024 Simone Caronni - 1:12.6.68-1 -- Update to 12.6.68. - -* Thu Jul 11 2024 Simone Caronni - 1:12.5.82-1 -- Update to 12.5.82. - -* Thu Jul 11 2024 Simone Caronni - 1:12.4.99-1 -- Update to 12.4.99. - -* Fri Mar 22 2024 Simone Caronni - 1:12.4.99-2 -- Correct GCC requirements. - -* Tue Mar 12 2024 Simone Caronni - 1:12.4.99-1 -- Update to 12.4.99. -- Drop ppc64le. - -* Sat Jan 06 2024 Simone Caronni - 1:12.3.107-1 -- Update to 12.3.107. - -* Tue Nov 28 2023 Simone Caronni - 1:12.3.103-1 -- Update to 12.3.103. - -* Thu Sep 28 2023 Simone Caronni - 1:12.2.140-1 -- Update to 12.2.140. - -* Tue Jul 11 2023 Simone Caronni - 1:12.2.91-1 -- Update to 12.2.91. - -* Thu Jun 08 2023 Simone Caronni - 1:12.1.105-1 -- Update to 12.1.105. - -* Tue Apr 11 2023 Simone Caronni - 1:12.1.66-1 -- Update to 12.1.66. - -* Mon Mar 13 2023 Simone Caronni - 1:12.0.140-2 -- Add requirement on cuda-gcc for Fedora 38+. - -* Sat Feb 25 2023 Simone Caronni - 1:12.0.140-1 -- Update to 12.0.140. - -* Tue Dec 13 2022 Simone Caronni - 1:12.0.76-1 -- Update to 12.0.76. - -* Fri Nov 11 2022 Simone Caronni - 1:11.8.89-1 -- Update to 11.8.89. -- Use aarch64 archive in place of sbsa. - -* Sun Sep 04 2022 Simone Caronni - 1:11.7.99-1 -- Update to 11.7.99. - -* Thu Jun 23 2022 Simone Caronni - 1:11.7.64-1 -- Update to 11.7.64. - -* Thu Mar 31 2022 Simone Caronni - 1:11.6.124-1 -- Update to 11.6.124 (CUDA 11.6.2). - -* Tue Mar 08 2022 Simone Caronni - 1:11.6.112-1 -- Update to 11.6.112 (CUDA 11.6.1). - -* Fri Jan 28 2022 Simone Caronni - 1:11.6.55-1 -- First build with the new tarball components. +%autochangelog From 3ebbf87ab103a06f7008e7b728c5edd522915a5f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 29 Apr 2025 05:19:14 +0000 Subject: [PATCH 0960/2977] bump: cuda-cccl cuda-cudart cuda-cuobjdump cuda-cupti cuda-cuxxfilt cuda-gdb cuda-nvdisasm cuda-nvml cuda-nvprof cuda-nvprune cuda-nvrtc cuda-nvtx cuda-profiler cuda-sanitizer cuda libcublas libcudla libcufft libcurand libcusparse libnpp libnvfatbin libnvjpeg cuda-nvcc --- anda/lib/nvidia/cuda-cccl/cuda-cccl.spec | 4 ++-- anda/lib/nvidia/cuda-cudart/cuda-cudart.spec | 4 ++-- anda/lib/nvidia/cuda-cuobjdump/cuda-cuobjdump.spec | 4 ++-- anda/lib/nvidia/cuda-cupti/cuda-cupti.spec | 4 ++-- anda/lib/nvidia/cuda-cuxxfilt/cuda-cuxxfilt.spec | 4 ++-- anda/lib/nvidia/cuda-gdb/cuda-gdb.spec | 4 ++-- anda/lib/nvidia/cuda-nvdisasm/cuda-nvdisasm.spec | 4 ++-- anda/lib/nvidia/cuda-nvml/cuda-nvml.spec | 4 ++-- anda/lib/nvidia/cuda-nvprof/cuda-nvprof.spec | 4 ++-- anda/lib/nvidia/cuda-nvprune/cuda-nvprune.spec | 4 ++-- anda/lib/nvidia/cuda-nvrtc/cuda-nvrtc.spec | 4 ++-- anda/lib/nvidia/cuda-nvtx/cuda-nvtx.spec | 4 ++-- anda/lib/nvidia/cuda-profiler/cuda-profiler.spec | 2 +- anda/lib/nvidia/cuda-sanitizer/cuda-sanitizer.spec | 4 ++-- anda/lib/nvidia/cuda/cuda.spec | 4 ++-- anda/lib/nvidia/libcublas/libcublas.spec | 4 ++-- anda/lib/nvidia/libcudla/libcudla.spec | 4 ++-- anda/lib/nvidia/libcufft/libcufft.spec | 4 ++-- anda/lib/nvidia/libcurand/libcurand.spec | 4 ++-- anda/lib/nvidia/libcusparse/libcusparse.spec | 4 ++-- anda/lib/nvidia/libnpp/libnpp.spec | 4 ++-- anda/lib/nvidia/libnvfatbin/libnvfatbin.spec | 4 ++-- anda/lib/nvidia/libnvjpeg/libnvjpeg.spec | 4 ++-- anda/tools/cuda-nvcc/cuda-nvcc.spec | 4 ++-- 24 files changed, 47 insertions(+), 47 deletions(-) diff --git a/anda/lib/nvidia/cuda-cccl/cuda-cccl.spec b/anda/lib/nvidia/cuda-cccl/cuda-cccl.spec index 3a02187274..c72bbdcd6a 100644 --- a/anda/lib/nvidia/cuda-cccl/cuda-cccl.spec +++ b/anda/lib/nvidia/cuda-cccl/cuda-cccl.spec @@ -5,8 +5,8 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.6.77 -Release: 1%{?dist} +Version: 12.8.90 +Release: 1%?dist Summary: CXX Core Compute Libraries License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-cudart/cuda-cudart.spec b/anda/lib/nvidia/cuda-cudart/cuda-cudart.spec index 400d6e9d7f..e6e4f17529 100644 --- a/anda/lib/nvidia/cuda-cudart/cuda-cudart.spec +++ b/anda/lib/nvidia/cuda-cudart/cuda-cudart.spec @@ -8,8 +8,8 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.6.77 -Release: 1%{?dist} +Version: 12.8.90 +Release: 1%?dist Summary: CUDA Runtime API library License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-cuobjdump/cuda-cuobjdump.spec b/anda/lib/nvidia/cuda-cuobjdump/cuda-cuobjdump.spec index a74b2922f6..0b89893640 100644 --- a/anda/lib/nvidia/cuda-cuobjdump/cuda-cuobjdump.spec +++ b/anda/lib/nvidia/cuda-cuobjdump/cuda-cuobjdump.spec @@ -8,8 +8,8 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.6.77 -Release: 1%{?dist} +Version: 12.8.90 +Release: 1%?dist Summary: Utility to extract information from CUDA binary files License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-cupti/cuda-cupti.spec b/anda/lib/nvidia/cuda-cupti/cuda-cupti.spec index f6bbe558ff..be039463d3 100644 --- a/anda/lib/nvidia/cuda-cupti/cuda-cupti.spec +++ b/anda/lib/nvidia/cuda-cupti/cuda-cupti.spec @@ -8,8 +8,8 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.6.80 -Release: 1%{?dist} +Version: 12.8.90 +Release: 1%?dist Summary: NVIDIA CUDA Profiling Tools Interface (CUPTI) library License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-cuxxfilt/cuda-cuxxfilt.spec b/anda/lib/nvidia/cuda-cuxxfilt/cuda-cuxxfilt.spec index 253a6000bc..f1797cdc4c 100644 --- a/anda/lib/nvidia/cuda-cuxxfilt/cuda-cuxxfilt.spec +++ b/anda/lib/nvidia/cuda-cuxxfilt/cuda-cuxxfilt.spec @@ -8,8 +8,8 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.6.77 -Release: 1%{?dist} +Version: 12.8.90 +Release: 1%?dist Summary: CUDA cuxxfilt (demangler) License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-gdb/cuda-gdb.spec b/anda/lib/nvidia/cuda-gdb/cuda-gdb.spec index a6bc660ad9..eab5b3647c 100644 --- a/anda/lib/nvidia/cuda-gdb/cuda-gdb.spec +++ b/anda/lib/nvidia/cuda-gdb/cuda-gdb.spec @@ -7,8 +7,8 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.6.77 -Release: 1%{?dist} +Version: 12.8.90 +Release: 1%?dist Summary: CUDA GDB tool for debugging CUDA applications License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-nvdisasm/cuda-nvdisasm.spec b/anda/lib/nvidia/cuda-nvdisasm/cuda-nvdisasm.spec index 39dd0b596e..eab4639b29 100644 --- a/anda/lib/nvidia/cuda-nvdisasm/cuda-nvdisasm.spec +++ b/anda/lib/nvidia/cuda-nvdisasm/cuda-nvdisasm.spec @@ -8,8 +8,8 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.6.77 -Release: 1%{?dist} +Version: 12.8.90 +Release: 1%?dist Summary: Utility to extract information from CUDA binary files License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-nvml/cuda-nvml.spec b/anda/lib/nvidia/cuda-nvml/cuda-nvml.spec index 9573b2c88d..7d0ab8a19e 100644 --- a/anda/lib/nvidia/cuda-nvml/cuda-nvml.spec +++ b/anda/lib/nvidia/cuda-nvml/cuda-nvml.spec @@ -8,8 +8,8 @@ Name: cuda-nvml Epoch: 1 -Version: 12.6.77 -Release: 1%{?dist} +Version: 12.8.90 +Release: 1%?dist Summary: NVIDIA Management library (NVML) License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-nvprof/cuda-nvprof.spec b/anda/lib/nvidia/cuda-nvprof/cuda-nvprof.spec index 1b617b888b..89caad40e6 100644 --- a/anda/lib/nvidia/cuda-nvprof/cuda-nvprof.spec +++ b/anda/lib/nvidia/cuda-nvprof/cuda-nvprof.spec @@ -8,8 +8,8 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.6.80 -Release: 1%{?dist} +Version: 12.8.90 +Release: 1%?dist Summary: CUDA command line profiling tool License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-nvprune/cuda-nvprune.spec b/anda/lib/nvidia/cuda-nvprune/cuda-nvprune.spec index c318f03500..a85429362c 100644 --- a/anda/lib/nvidia/cuda-nvprune/cuda-nvprune.spec +++ b/anda/lib/nvidia/cuda-nvprune/cuda-nvprune.spec @@ -8,8 +8,8 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.6.77 -Release: 1%{?dist} +Version: 12.8.90 +Release: 1%?dist Summary: CUDA tool to prune host object files and libraries License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-nvrtc/cuda-nvrtc.spec b/anda/lib/nvidia/cuda-nvrtc/cuda-nvrtc.spec index 71c27b526c..8f619747b1 100644 --- a/anda/lib/nvidia/cuda-nvrtc/cuda-nvrtc.spec +++ b/anda/lib/nvidia/cuda-nvrtc/cuda-nvrtc.spec @@ -8,8 +8,8 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.6.85 -Release: 1%{?dist} +Version: 12.8.93 +Release: 1%?dist Summary: CUDA runtime compilation library (NVRTC) License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-nvtx/cuda-nvtx.spec b/anda/lib/nvidia/cuda-nvtx/cuda-nvtx.spec index 40c8075abe..7318de2d67 100644 --- a/anda/lib/nvidia/cuda-nvtx/cuda-nvtx.spec +++ b/anda/lib/nvidia/cuda-nvtx/cuda-nvtx.spec @@ -8,8 +8,8 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.6.77 -Release: 1%{?dist} +Version: 12.8.90 +Release: 1%?dist Summary: NVIDIA Tools Extension (NVTX) library License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-profiler/cuda-profiler.spec b/anda/lib/nvidia/cuda-profiler/cuda-profiler.spec index dffd6acc12..f53976d4d6 100644 --- a/anda/lib/nvidia/cuda-profiler/cuda-profiler.spec +++ b/anda/lib/nvidia/cuda-profiler/cuda-profiler.spec @@ -5,7 +5,7 @@ Name: cuda-profiler Epoch: 1 -Version: 12.6.77 +Version: 12.8.90 Release: 1%?dist Summary: CUDA Profiler API License: CUDA Toolkit diff --git a/anda/lib/nvidia/cuda-sanitizer/cuda-sanitizer.spec b/anda/lib/nvidia/cuda-sanitizer/cuda-sanitizer.spec index d49098d4e7..a95929fcc6 100644 --- a/anda/lib/nvidia/cuda-sanitizer/cuda-sanitizer.spec +++ b/anda/lib/nvidia/cuda-sanitizer/cuda-sanitizer.spec @@ -8,8 +8,8 @@ Name: cuda-sanitizer Epoch: 1 -Version: 12.6.77 -Release: 1%{?dist} +Version: 12.8.93 +Release: 1%?dist Summary: CUDA Compute Sanitizer API License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda/cuda.spec b/anda/lib/nvidia/cuda/cuda.spec index b9865dd314..c78a30d686 100644 --- a/anda/lib/nvidia/cuda/cuda.spec +++ b/anda/lib/nvidia/cuda/cuda.spec @@ -2,8 +2,8 @@ %global major_package_version 12-6 Name: cuda -Version: 12.6.77 -Release: 1%{?dist} +Version: 12.8.90 +Release: 1%?dist Summary: NVIDIA Compute Unified Device Architecture Toolkit Epoch: 1 License: CUDA Toolkit diff --git a/anda/lib/nvidia/libcublas/libcublas.spec b/anda/lib/nvidia/libcublas/libcublas.spec index c1f3763816..ed72b6f76f 100644 --- a/anda/lib/nvidia/libcublas/libcublas.spec +++ b/anda/lib/nvidia/libcublas/libcublas.spec @@ -6,8 +6,8 @@ Name: libcublas Epoch: 1 -Version: 12.6.4.1 -Release: 1%{?dist} +Version: 12.8.4.1 +Release: 1%?dist Summary: NVIDIA CUDA Basic Linear Algebra Subroutines (cuBLAS) libraries License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/libcudla/libcudla.spec b/anda/lib/nvidia/libcudla/libcudla.spec index 1334b8dcaf..22f5e4509e 100644 --- a/anda/lib/nvidia/libcudla/libcudla.spec +++ b/anda/lib/nvidia/libcudla/libcudla.spec @@ -6,8 +6,8 @@ Name: libcudla Epoch: 1 -Version: 12.6.77 -Release: 1%{?dist} +Version: 12.8.90 +Release: 1%?dist Summary: NVIDIA CUDA Deep Learning Accelerator (DLA) engines (Jetson Xavier and Orin) License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/libcufft/libcufft.spec b/anda/lib/nvidia/libcufft/libcufft.spec index 39d99163f9..28aaee2383 100644 --- a/anda/lib/nvidia/libcufft/libcufft.spec +++ b/anda/lib/nvidia/libcufft/libcufft.spec @@ -6,8 +6,8 @@ Name: libcufft Epoch: 2 -Version: 11.3.0.4 -Release: 1%{?dist} +Version: 11.3.3.83 +Release: 1%?dist Summary: NVIDIA CUDA Fast Fourier Transform library (cuFFT) libraries License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/libcurand/libcurand.spec b/anda/lib/nvidia/libcurand/libcurand.spec index 49a2b1f4b9..bec45dd06c 100644 --- a/anda/lib/nvidia/libcurand/libcurand.spec +++ b/anda/lib/nvidia/libcurand/libcurand.spec @@ -6,8 +6,8 @@ Name: libcurand Epoch: 2 -Version: 10.3.7.77 -Release: 1%{?dist} +Version: 10.3.9.90 +Release: 1%?dist Summary: NVIDIA CUDA Random Number Generation library (cuRAND) License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/libcusparse/libcusparse.spec b/anda/lib/nvidia/libcusparse/libcusparse.spec index fdbe4c7ab3..d4592dd970 100644 --- a/anda/lib/nvidia/libcusparse/libcusparse.spec +++ b/anda/lib/nvidia/libcusparse/libcusparse.spec @@ -6,8 +6,8 @@ Name: libcusparse Epoch: 1 -Version: 12.5.4.2 -Release: 1%{?dist} +Version: 12.5.8.93 +Release: 1%?dist Summary: NVIDIA CUDA Sparse Matrix library (cuSPARSE) library License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/libnpp/libnpp.spec b/anda/lib/nvidia/libnpp/libnpp.spec index f5ba72b44b..0fc28e60b5 100644 --- a/anda/lib/nvidia/libnpp/libnpp.spec +++ b/anda/lib/nvidia/libnpp/libnpp.spec @@ -6,8 +6,8 @@ Name: libnpp Epoch: 1 -Version: 12.3.1.54 -Release: 1%{?dist} +Version: 12.3.3.100 +Release: 1%?dist Summary: NVIDIA Performance Primitives libraries License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/libnvfatbin/libnvfatbin.spec b/anda/lib/nvidia/libnvfatbin/libnvfatbin.spec index 9ce45567d1..034ba6016a 100644 --- a/anda/lib/nvidia/libnvfatbin/libnvfatbin.spec +++ b/anda/lib/nvidia/libnvfatbin/libnvfatbin.spec @@ -6,8 +6,8 @@ Name: libnvfatbin Epoch: 1 -Version: 12.6.77 -Release: 1%{?dist} +Version: 12.8.90 +Release: 1%?dist Summary: CUDA Fatbin Creator API License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/libnvjpeg/libnvjpeg.spec b/anda/lib/nvidia/libnvjpeg/libnvjpeg.spec index 808cde3fb0..6da7f9c6f6 100644 --- a/anda/lib/nvidia/libnvjpeg/libnvjpeg.spec +++ b/anda/lib/nvidia/libnvjpeg/libnvjpeg.spec @@ -6,8 +6,8 @@ Name: libnvjpeg Epoch: 1 -Version: 12.3.3.54 -Release: 1%{?dist} +Version: 12.3.5.92 +Release: 1%?dist Summary: CUDA NVIDIA JPEG decoder (nvJPEG) License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/tools/cuda-nvcc/cuda-nvcc.spec b/anda/tools/cuda-nvcc/cuda-nvcc.spec index e6e663d87b..ec5e389288 100644 --- a/anda/tools/cuda-nvcc/cuda-nvcc.spec +++ b/anda/tools/cuda-nvcc/cuda-nvcc.spec @@ -8,8 +8,8 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.8.61 -Release: 2%{?dist} +Version: 12.8.93 +Release: 1%?dist Summary: CUDA Compiler (NVCC) License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit From 59e3dc39de06999e6da78d3202f6ef8936d36cb9 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 29 Apr 2025 05:58:42 +0000 Subject: [PATCH 0961/2977] bump: bun nightly --- anda/devs/bun/bun-bin.spec | 2 +- anda/system/readymade/nightly/readymade-nightly.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/devs/bun/bun-bin.spec b/anda/devs/bun/bun-bin.spec index 7c03e7451c..8e9def2a29 100644 --- a/anda/devs/bun/bun-bin.spec +++ b/anda/devs/bun/bun-bin.spec @@ -6,7 +6,7 @@ %endif Name: bun-bin -Version: 1.2.10 +Version: 1.2.11 Release: 1%?dist Summary: Incredibly fast JavaScript runtime, bundler, test runner, and package manager – all in one License: MIT diff --git a/anda/system/readymade/nightly/readymade-nightly.spec b/anda/system/readymade/nightly/readymade-nightly.spec index 7e28d81caf..3b90510666 100644 --- a/anda/system/readymade/nightly/readymade-nightly.spec +++ b/anda/system/readymade/nightly/readymade-nightly.spec @@ -1,5 +1,5 @@ -%global commit 7b0e1583bf02245964830970749402380673d405 -%global commit_date 20250428 +%global commit dc6b76d5ffeb552c2b8234b053b5a439628b661e +%global commit_date 20250429 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: readymade-nightly From 85658ae1843374028764e38474972648f98a9ad7 Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 29 Apr 2025 02:20:25 -0500 Subject: [PATCH 0962/2977] refactor: Rebase FFmpeg (#3489) * Disable LCEVC support for now * Add missing patches * Update ffmpeg.spec Signed-off-by: Gilver * Update ffmpeg.spec Signed-off-by: Gilver * Update ffmpeg-chromium.patch Signed-off-by: Gilver * Update ffmpeg-HandBrake.patch Signed-off-by: Gilver * Update ffmpeg-svt-vp9.patch Signed-off-by: Gilver * Add files via upload Signed-off-by: Gilver --------- Signed-off-by: Gilver Co-authored-by: Cappy Ishihara --- anda/multimedia/ffmpeg/ffmpeg-HandBrake.patch | 1904 +++++++++++++ anda/multimedia/ffmpeg/ffmpeg-chromium.patch | 30 + anda/multimedia/ffmpeg/ffmpeg-nvcc.patch | 12 + anda/multimedia/ffmpeg/ffmpeg-svt-vp9.patch | 762 +++++ anda/multimedia/ffmpeg/ffmpeg.spec | 2469 ++++------------- 5 files changed, 3309 insertions(+), 1868 deletions(-) create mode 100644 anda/multimedia/ffmpeg/ffmpeg-HandBrake.patch create mode 100644 anda/multimedia/ffmpeg/ffmpeg-chromium.patch create mode 100644 anda/multimedia/ffmpeg/ffmpeg-nvcc.patch create mode 100644 anda/multimedia/ffmpeg/ffmpeg-svt-vp9.patch diff --git a/anda/multimedia/ffmpeg/ffmpeg-HandBrake.patch b/anda/multimedia/ffmpeg/ffmpeg-HandBrake.patch new file mode 100644 index 0000000000..0326da27f5 --- /dev/null +++ b/anda/multimedia/ffmpeg/ffmpeg-HandBrake.patch @@ -0,0 +1,1904 @@ +diff -Naur ffmpeg-7.1.1.old/configure ffmpeg-7.1.1/configure +--- ffmpeg-7.1.1.old/configure 2025-03-24 10:54:39.093543820 +0100 ++++ ffmpeg-7.1.1/configure 2025-03-24 10:54:39.281929795 +0100 +@@ -3338,6 +3338,7 @@ + av1_mediacodec_decoder_deps="mediacodec" + av1_mediacodec_encoder_deps="mediacodec" + av1_mediacodec_encoder_select="extract_extradata_bsf" ++av1_mf_encoder_deps="mediafoundation" + av1_nvenc_encoder_deps="nvenc NV_ENC_PIC_PARAMS_AV1" + av1_nvenc_encoder_select="atsc_a53" + av1_qsv_decoder_select="qsvdec" +diff -Naur ffmpeg-7.1.1.old/libavcodec/allcodecs.c ffmpeg-7.1.1/libavcodec/allcodecs.c +--- ffmpeg-7.1.1.old/libavcodec/allcodecs.c 2025-03-24 10:54:39.094862193 +0100 ++++ ffmpeg-7.1.1/libavcodec/allcodecs.c 2025-03-24 10:54:39.282298069 +0100 +@@ -839,6 +839,7 @@ + extern const FFCodec ff_av1_qsv_decoder; + extern const FFCodec ff_av1_qsv_encoder; + extern const FFCodec ff_av1_amf_encoder; ++extern const FFCodec ff_av1_mf_encoder; + extern const FFCodec ff_av1_vaapi_encoder; + extern const FFCodec ff_libopenh264_encoder; + extern const FFCodec ff_libopenh264_decoder; +diff -Naur ffmpeg-7.1.1.old/libavcodec/amfenc_av1.c ffmpeg-7.1.1/libavcodec/amfenc_av1.c +--- ffmpeg-7.1.1.old/libavcodec/amfenc_av1.c 2025-03-24 10:54:38.133756381 +0100 ++++ ffmpeg-7.1.1/libavcodec/amfenc_av1.c 2025-03-24 10:54:39.277830845 +0100 +@@ -116,6 +116,7 @@ + { "none", "no adaptive quantization", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_AQ_MODE_NONE }, 0, 0, VE, .unit = "adaptive_quantisation_mode" }, + { "caq", "context adaptive quantization", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_AQ_MODE_CAQ }, 0, 0, VE, .unit = "adaptive_quantisation_mode" }, + ++ { "forced_idr", "Force I frames to be IDR frames", OFFSET(forced_idr), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, + + { "align", "alignment mode", OFFSET(align), AV_OPT_TYPE_INT, {.i64 = AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE_NO_RESTRICTIONS }, AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE_64X16_ONLY, AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE_NO_RESTRICTIONS, VE, .unit = "align" }, + { "64x16", "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE_64X16_ONLY }, 0, 0, VE, .unit = "align" }, +@@ -186,6 +187,8 @@ + AMFRate framerate; + AMFSize framesize = AMFConstructSize(avctx->width, avctx->height); + amf_int64 color_depth; ++ amf_int64 color_primaries; ++ amf_int64 transfer_characteristic; + amf_int64 color_profile; + enum AVPixelFormat pix_fmt; + +@@ -238,7 +241,11 @@ + } + + /// Color profile ++ color_primaries = ff_amf_get_color_primaries(avctx); ++ transfer_characteristic = ff_amf_get_transfer_characteristic(avctx); + color_profile = ff_amf_get_color_profile(avctx); ++ AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_COLOR_PRIMARIES, color_primaries); ++ AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_TRANSFER_CHARACTERISTIC, transfer_characteristic); + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_COLOR_PROFILE, color_profile); + + /// Color Depth +@@ -250,16 +257,6 @@ + } + + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_COLOR_BIT_DEPTH, color_depth); +- AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_COLOR_PROFILE, color_profile); +- if (color_depth == AMF_COLOR_BIT_DEPTH_8) { +- /// Color Transfer Characteristics (AMF matches ISO/IEC) +- AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_TRANSFER_CHARACTERISTIC, AMF_COLOR_TRANSFER_CHARACTERISTIC_BT709); +- /// Color Primaries (AMF matches ISO/IEC) +- AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_COLOR_PRIMARIES, AMF_COLOR_PRIMARIES_BT709); +- } else { +- AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_TRANSFER_CHARACTERISTIC, AMF_COLOR_TRANSFER_CHARACTERISTIC_SMPTE2084); +- AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_COLOR_PRIMARIES, AMF_COLOR_PRIMARIES_BT2020); +- } + + profile_level = avctx->level; + if (profile_level == AV_LEVEL_UNKNOWN) { +diff -Naur ffmpeg-7.1.1.old/libavcodec/amfenc.c ffmpeg-7.1.1/libavcodec/amfenc.c +--- ffmpeg-7.1.1.old/libavcodec/amfenc.c 2025-03-24 10:54:38.032755166 +0100 ++++ ffmpeg-7.1.1/libavcodec/amfenc.c 2025-03-24 10:54:39.279550845 +0100 +@@ -415,10 +415,6 @@ + else + pix_fmt = avctx->pix_fmt; + +- if (pix_fmt == AV_PIX_FMT_P010) { +- AMF_RETURN_IF_FALSE(ctx, ctx->version >= AMF_MAKE_FULL_VERSION(1, 4, 32, 0), AVERROR_UNKNOWN, "10-bit encoder is not supported by AMD GPU drivers versions lower than 23.30.\n"); +- } +- + ctx->format = amf_av_to_amf_format(pix_fmt); + AMF_RETURN_IF_FALSE(ctx, ctx->format != AMF_SURFACE_UNKNOWN, AVERROR(EINVAL), + "Format %s is not supported\n", av_get_pix_fmt_name(pix_fmt)); +@@ -766,11 +762,50 @@ + switch (avctx->codec->id) { + case AV_CODEC_ID_H264: + AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_INSERT_AUD, !!ctx->aud); ++ switch (frame->pict_type) { ++ case AV_PICTURE_TYPE_I: ++ if (ctx->forced_idr) { ++ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_INSERT_SPS, 1); ++ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_INSERT_PPS, 1); ++ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_PICTURE_TYPE_IDR); ++ } else { ++ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_PICTURE_TYPE_I); ++ } ++ break; ++ case AV_PICTURE_TYPE_P: ++ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_PICTURE_TYPE_P); ++ break; ++ case AV_PICTURE_TYPE_B: ++ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_PICTURE_TYPE_B); ++ break; ++ } + break; + case AV_CODEC_ID_HEVC: + AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_HEVC_INSERT_AUD, !!ctx->aud); ++ switch (frame->pict_type) { ++ case AV_PICTURE_TYPE_I: ++ if (ctx->forced_idr) { ++ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_HEVC_INSERT_HEADER, 1); ++ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_HEVC_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_IDR); ++ } else { ++ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_HEVC_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_I); ++ } ++ break; ++ case AV_PICTURE_TYPE_P: ++ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_HEVC_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_P); ++ break; ++ } ++ break; ++ case AV_CODEC_ID_AV1: ++ if (frame->pict_type == AV_PICTURE_TYPE_I) { ++ if (ctx->forced_idr) { ++ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_AV1_FORCE_INSERT_SEQUENCE_HEADER, 1); ++ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_AV1_FORCE_FRAME_TYPE, AMF_VIDEO_ENCODER_AV1_FORCE_FRAME_TYPE_KEY); ++ } else { ++ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_AV1_FORCE_FRAME_TYPE, AMF_VIDEO_ENCODER_AV1_FORCE_FRAME_TYPE_INTRA_ONLY); ++ } ++ } + break; +- //case AV_CODEC_ID_AV1 not supported + default: + break; + } +@@ -878,6 +913,115 @@ + return ret; + } + ++int ff_amf_get_color_primaries(AVCodecContext *avctx) ++{ ++ amf_int64 color_primaries = AMF_COLOR_PRIMARIES_UNDEFINED; ++ switch (avctx->color_primaries) { ++ case AVCOL_PRI_BT709: ++ color_primaries = AMF_COLOR_PRIMARIES_BT709; ++ break; ++ case AVCOL_PRI_UNSPECIFIED: ++ color_primaries = AMF_COLOR_PRIMARIES_UNSPECIFIED; ++ break; ++ case AVCOL_PRI_RESERVED: ++ color_primaries = AMF_COLOR_PRIMARIES_RESERVED; ++ break; ++ case AVCOL_PRI_BT470M: ++ color_primaries = AMF_COLOR_PRIMARIES_BT470M; ++ break; ++ case AVCOL_PRI_BT470BG: ++ color_primaries = AMF_COLOR_PRIMARIES_BT470BG; ++ break; ++ case AVCOL_PRI_SMPTE170M: ++ color_primaries = AMF_COLOR_PRIMARIES_SMPTE170M; ++ break; ++ case AVCOL_PRI_SMPTE240M: ++ color_primaries = AMF_COLOR_PRIMARIES_SMPTE240M; ++ break; ++ case AVCOL_PRI_FILM: ++ color_primaries = AMF_COLOR_PRIMARIES_FILM; ++ break; ++ case AVCOL_PRI_BT2020: ++ color_primaries = AMF_COLOR_PRIMARIES_BT2020; ++ break; ++ case AVCOL_PRI_SMPTE428: ++ color_primaries = AMF_COLOR_PRIMARIES_SMPTE428; ++ break; ++ case AVCOL_PRI_SMPTE431: ++ color_primaries = AMF_COLOR_PRIMARIES_SMPTE431; ++ break; ++ case AVCOL_PRI_SMPTE432: ++ color_primaries = AMF_COLOR_PRIMARIES_SMPTE432; ++ break; ++ case AVCOL_PRI_EBU3213: ++ color_primaries = AMF_COLOR_PRIMARIES_JEDEC_P22; ++ break; ++ } ++ return color_primaries; ++} ++ ++int ff_amf_get_transfer_characteristic(AVCodecContext *avctx) ++{ ++ amf_int64 transfer_characteristic = AMF_COLOR_TRANSFER_CHARACTERISTIC_UNDEFINED; ++ switch (avctx->color_trc) { ++ case AVCOL_TRC_BT709: ++ transfer_characteristic = AMF_COLOR_TRANSFER_CHARACTERISTIC_BT709; ++ break; ++ case AVCOL_TRC_UNSPECIFIED: ++ transfer_characteristic = AMF_COLOR_TRANSFER_CHARACTERISTIC_UNSPECIFIED; ++ break; ++ case AVCOL_TRC_RESERVED: ++ transfer_characteristic = AMF_COLOR_TRANSFER_CHARACTERISTIC_RESERVED; ++ break; ++ case AVCOL_TRC_GAMMA22: ++ transfer_characteristic = AMF_COLOR_TRANSFER_CHARACTERISTIC_GAMMA22; ++ break; ++ case AVCOL_TRC_GAMMA28: ++ transfer_characteristic = AMF_COLOR_TRANSFER_CHARACTERISTIC_GAMMA28; ++ break; ++ case AVCOL_TRC_SMPTE170M: ++ transfer_characteristic = AMF_COLOR_TRANSFER_CHARACTERISTIC_SMPTE170M; ++ break; ++ case AVCOL_TRC_SMPTE240M: ++ transfer_characteristic = AMF_COLOR_TRANSFER_CHARACTERISTIC_SMPTE240M; ++ break; ++ case AVCOL_TRC_LINEAR: ++ transfer_characteristic = AMF_COLOR_TRANSFER_CHARACTERISTIC_LINEAR; ++ break; ++ case AVCOL_TRC_LOG: ++ transfer_characteristic = AMF_COLOR_TRANSFER_CHARACTERISTIC_LOG; ++ break; ++ case AVCOL_TRC_LOG_SQRT: ++ transfer_characteristic = AMF_COLOR_TRANSFER_CHARACTERISTIC_LOG_SQRT; ++ break; ++ case AVCOL_TRC_IEC61966_2_4: ++ transfer_characteristic = AMF_COLOR_TRANSFER_CHARACTERISTIC_IEC61966_2_4; ++ break; ++ case AVCOL_TRC_BT1361_ECG: ++ transfer_characteristic = AMF_COLOR_TRANSFER_CHARACTERISTIC_BT1361_ECG; ++ break; ++ case AVCOL_TRC_IEC61966_2_1: ++ transfer_characteristic = AMF_COLOR_TRANSFER_CHARACTERISTIC_IEC61966_2_1; ++ break; ++ case AVCOL_TRC_BT2020_10: ++ transfer_characteristic = AMF_COLOR_TRANSFER_CHARACTERISTIC_BT2020_10; ++ break; ++ case AVCOL_TRC_BT2020_12: ++ transfer_characteristic = AMF_COLOR_TRANSFER_CHARACTERISTIC_BT2020_12; ++ break; ++ case AVCOL_TRC_SMPTE2084: ++ transfer_characteristic = AMF_COLOR_TRANSFER_CHARACTERISTIC_SMPTE2084; ++ break; ++ case AVCOL_TRC_SMPTE428: ++ transfer_characteristic = AMF_COLOR_TRANSFER_CHARACTERISTIC_SMPTE428; ++ break; ++ case AVCOL_TRC_ARIB_STD_B67: ++ transfer_characteristic = AMF_COLOR_TRANSFER_CHARACTERISTIC_ARIB_STD_B67; ++ break; ++ } ++ return transfer_characteristic; ++} ++ + int ff_amf_get_color_profile(AVCodecContext *avctx) + { + amf_int64 color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_UNKNOWN; +diff -Naur ffmpeg-7.1.1.old/libavcodec/amfenc.h ffmpeg-7.1.1/libavcodec/amfenc.h +--- ffmpeg-7.1.1.old/libavcodec/amfenc.h 2025-03-24 10:54:37.990754660 +0100 ++++ ffmpeg-7.1.1/libavcodec/amfenc.h 2025-03-24 10:54:39.277763348 +0100 +@@ -114,6 +114,7 @@ + int max_b_frames; + int qvbr_quality_level; + int hw_high_motion_quality_boost; ++ int forced_idr; + + // HEVC - specific options + +@@ -173,6 +174,8 @@ + */ + extern const enum AVPixelFormat ff_amf_pix_fmts[]; + ++int ff_amf_get_color_primaries(AVCodecContext *avctx); ++int ff_amf_get_transfer_characteristic(AVCodecContext *avctx); + int ff_amf_get_color_profile(AVCodecContext *avctx); + + /** +diff -Naur ffmpeg-7.1.1.old/libavcodec/amfenc_h264.c ffmpeg-7.1.1/libavcodec/amfenc_h264.c +--- ffmpeg-7.1.1.old/libavcodec/amfenc_h264.c 2025-03-24 10:54:38.175756886 +0100 ++++ ffmpeg-7.1.1/libavcodec/amfenc_h264.c 2025-03-24 10:54:39.277925894 +0100 +@@ -133,6 +133,7 @@ + { "me_half_pel", "Enable ME Half Pixel", OFFSET(me_half_pel), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, VE }, + { "me_quarter_pel", "Enable ME Quarter Pixel", OFFSET(me_quarter_pel),AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, VE }, + ++ { "forced_idr", "Force I frames to be IDR frames", OFFSET(forced_idr) , AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, + { "aud", "Inserts AU Delimiter NAL unit", OFFSET(aud) , AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, VE }, + + +@@ -201,6 +202,8 @@ + AMFRate framerate; + AMFSize framesize = AMFConstructSize(avctx->width, avctx->height); + int deblocking_filter = (avctx->flags & AV_CODEC_FLAG_LOOP_FILTER) ? 1 : 0; ++ amf_int64 color_primaries; ++ amf_int64 transfer_characteristic; + amf_int64 color_profile; + enum AVPixelFormat pix_fmt; + +@@ -273,7 +276,11 @@ + AMF_ASSIGN_PROPERTY_RATIO(res, ctx->encoder, AMF_VIDEO_ENCODER_ASPECT_RATIO, ratio); + } + ++ color_primaries = ff_amf_get_color_primaries(avctx); ++ transfer_characteristic = ff_amf_get_transfer_characteristic(avctx); + color_profile = ff_amf_get_color_profile(avctx); ++ AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_OUTPUT_COLOR_PRIMARIES, color_primaries); ++ AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_OUTPUT_TRANSFER_CHARACTERISTIC, transfer_characteristic); + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_OUTPUT_COLOR_PROFILE, color_profile); + + /// Color Range (Support for older Drivers) +@@ -287,10 +294,6 @@ + AMF_RETURN_IF_FALSE(ctx, pix_fmt != AV_PIX_FMT_P010, AVERROR_INVALIDDATA, "10-bit input video is not supported by AMF H264 encoder\n"); + + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_COLOR_BIT_DEPTH, AMF_COLOR_BIT_DEPTH_8); +- /// Color Transfer Characteristics (AMF matches ISO/IEC) +- AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_OUTPUT_TRANSFER_CHARACTERISTIC, (amf_int64)avctx->color_trc); +- /// Color Primaries (AMF matches ISO/IEC) +- AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_OUTPUT_COLOR_PRIMARIES, (amf_int64)avctx->color_primaries); + + // autodetect rate control method + if (ctx->rate_control_mode == AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_UNKNOWN) { +diff -Naur ffmpeg-7.1.1.old/libavcodec/amfenc_hevc.c ffmpeg-7.1.1/libavcodec/amfenc_hevc.c +--- ffmpeg-7.1.1.old/libavcodec/amfenc_hevc.c 2025-03-24 10:54:37.991754672 +0100 ++++ ffmpeg-7.1.1/libavcodec/amfenc_hevc.c 2025-03-24 10:54:39.278019962 +0100 +@@ -100,6 +100,7 @@ + { "me_half_pel", "Enable ME Half Pixel", OFFSET(me_half_pel), AV_OPT_TYPE_BOOL,{ .i64 = -1 }, -1, 1, VE }, + { "me_quarter_pel", "Enable ME Quarter Pixel ", OFFSET(me_quarter_pel),AV_OPT_TYPE_BOOL,{ .i64 = -1 }, -1, 1, VE }, + ++ { "forced_idr", "Force I frames to be IDR frames", OFFSET(forced_idr) ,AV_OPT_TYPE_BOOL,{ .i64 = 0 }, 0, 1, VE }, + { "aud", "Inserts AU Delimiter NAL unit", OFFSET(aud) ,AV_OPT_TYPE_BOOL,{ .i64 = -1 }, -1, 1, VE }, + + +@@ -167,6 +168,8 @@ + AMFSize framesize = AMFConstructSize(avctx->width, avctx->height); + int deblocking_filter = (avctx->flags & AV_CODEC_FLAG_LOOP_FILTER) ? 1 : 0; + amf_int64 color_depth; ++ amf_int64 color_primaries; ++ amf_int64 transfer_characteristic; + amf_int64 color_profile; + enum AVPixelFormat pix_fmt; + +@@ -241,7 +244,11 @@ + AMF_ASSIGN_PROPERTY_RATIO(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_ASPECT_RATIO, ratio); + } + ++ color_primaries = ff_amf_get_color_primaries(avctx); ++ transfer_characteristic = ff_amf_get_transfer_characteristic(avctx); + color_profile = ff_amf_get_color_profile(avctx); ++ AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_OUTPUT_COLOR_PRIMARIES, color_primaries); ++ AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_OUTPUT_TRANSFER_CHARACTERISTIC, transfer_characteristic); + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_OUTPUT_COLOR_PROFILE, color_profile); + /// Color Range (Support for older Drivers) + AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_NOMINAL_RANGE, !!(avctx->color_range == AVCOL_RANGE_JPEG)); +@@ -253,15 +260,6 @@ + color_depth = AMF_COLOR_BIT_DEPTH_10; + } + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_COLOR_BIT_DEPTH, color_depth); +- if (color_depth == AMF_COLOR_BIT_DEPTH_8) { +- /// Color Transfer Characteristics (AMF matches ISO/IEC) +- AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_OUTPUT_TRANSFER_CHARACTERISTIC, AMF_COLOR_TRANSFER_CHARACTERISTIC_BT709); +- /// Color Primaries (AMF matches ISO/IEC) +- AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_OUTPUT_COLOR_PRIMARIES, AMF_COLOR_PRIMARIES_BT709); +- } else { +- AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_OUTPUT_TRANSFER_CHARACTERISTIC, AMF_COLOR_TRANSFER_CHARACTERISTIC_SMPTE2084); +- AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_OUTPUT_COLOR_PRIMARIES, AMF_COLOR_PRIMARIES_BT2020); +- } + + // Picture control properties + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_NUM_GOPS_PER_IDR, ctx->gops_per_idr); +diff -Naur ffmpeg-7.1.1.old/libavcodec/av1dec.c ffmpeg-7.1.1/libavcodec/av1dec.c +--- ffmpeg-7.1.1.old/libavcodec/av1dec.c 2025-03-24 10:54:38.093755899 +0100 ++++ ffmpeg-7.1.1/libavcodec/av1dec.c 2025-03-24 10:54:39.273932914 +0100 +@@ -1002,6 +1002,8 @@ + break; + } + case ITU_T_T35_PROVIDER_CODE_DOLBY: { ++ AVBufferRef *rpu_buf; ++ AVFrameSideData *rpu; + int provider_oriented_code = bytestream2_get_be32(&gb); + if (itut_t35->itu_t_t35_country_code != ITU_T_T35_COUNTRY_CODE_US || + provider_oriented_code != 0x800) +@@ -1014,6 +1016,18 @@ + break; // ignore + } + ++ rpu_buf = av_buffer_alloc(itut_t35->payload_size); ++ if (rpu_buf) { ++ memcpy(rpu_buf->data, itut_t35->payload, itut_t35->payload_size); ++ rpu = av_frame_new_side_data_from_buf(frame, AV_FRAME_DATA_DOVI_RPU_BUFFER_T35, rpu_buf); ++ if (!rpu) { ++ av_buffer_unref(&rpu_buf); ++ return AVERROR(ENOMEM); ++ } ++ } else { ++ return AVERROR(ENOMEM); ++ } ++ + ret = ff_dovi_attach_side_data(&s->dovi, frame); + if (ret < 0) + return ret; +diff -Naur ffmpeg-7.1.1.old/libavcodec/bsf/hevc_mp4toannexb.c ffmpeg-7.1.1/libavcodec/bsf/hevc_mp4toannexb.c +--- ffmpeg-7.1.1.old/libavcodec/bsf/hevc_mp4toannexb.c 2025-03-24 10:54:38.075755683 +0100 ++++ ffmpeg-7.1.1/libavcodec/bsf/hevc_mp4toannexb.c 2025-03-24 10:54:39.273106358 +0100 +@@ -125,6 +125,7 @@ + AVPacket *in; + GetByteContext gb; + ++ int has_sps = 0, has_pps = 0; + int got_irap = 0; + int i, ret = 0; + +@@ -158,11 +159,14 @@ + } + + nalu_type = (bytestream2_peek_byte(&gb) >> 1) & 0x3f; ++ has_sps = (has_sps || nalu_type == HEVC_NAL_SPS); ++ has_pps = (has_pps || nalu_type == HEVC_NAL_PPS); + + /* prepend extradata to IRAP frames */ + is_irap = nalu_type >= HEVC_NAL_BLA_W_LP && + nalu_type <= HEVC_NAL_RSV_IRAP_VCL23; +- add_extradata = is_irap && !got_irap; ++ /* ignore the extradata if IRAP frame has sps and pps */ ++ add_extradata = is_irap && !got_irap && !(has_sps && has_pps); + extra_size = add_extradata * ctx->par_out->extradata_size; + got_irap |= is_irap; + +diff -Naur ffmpeg-7.1.1.old/libavcodec/ccaption_dec.c ffmpeg-7.1.1/libavcodec/ccaption_dec.c +--- ffmpeg-7.1.1.old/libavcodec/ccaption_dec.c 2025-03-24 10:54:38.169756814 +0100 ++++ ffmpeg-7.1.1/libavcodec/ccaption_dec.c 2025-03-24 10:54:39.268544045 +0100 +@@ -889,12 +889,13 @@ + + if (ctx->buffer[bidx].str[0] || ctx->real_time) { + ff_dlog(ctx, "cdp writing data (%s)\n", ctx->buffer[bidx].str); +- start_time = ctx->buffer_time[0]; +- sub->pts = start_time; +- end_time = ctx->buffer_time[1]; +- if (!ctx->real_time) ++ if (!ctx->real_time) { ++ start_time = ctx->buffer_time[0]; ++ sub->pts = start_time; ++ end_time = ctx->buffer_time[1]; + sub->end_display_time = av_rescale_q(end_time - start_time, + AV_TIME_BASE_Q, ms_tb); ++ } + else + sub->end_display_time = -1; + ret = ff_ass_add_rect2(sub, ctx->buffer[bidx].str, ctx->readorder++, 0, NULL, NULL, &nb_rect_allocated); +diff -Naur ffmpeg-7.1.1.old/libavcodec/dvdsubdec.c ffmpeg-7.1.1/libavcodec/dvdsubdec.c +--- ffmpeg-7.1.1.old/libavcodec/dvdsubdec.c 2025-03-24 10:54:37.975754480 +0100 ++++ ffmpeg-7.1.1/libavcodec/dvdsubdec.c 2025-03-24 10:54:39.267391144 +0100 +@@ -45,6 +45,8 @@ + int buf_size; + int forced_subs_only; + uint8_t used_color[256]; ++ int64_t pts; ++ int output_empty_rects; + } DVDSubContext; + + static void yuv_a_to_rgba(const uint8_t *ycbcr, const uint8_t *alpha, uint32_t *rgba, int num_values) +@@ -230,7 +232,10 @@ + uint32_t size; + int64_t offset1, offset2; + +- if (buf_size < 10) ++ if (buf_size < 2) ++ return AVERROR(EAGAIN); ++ ++ if (buf_size == 2 && AV_RB16(buf) == 0) + return -1; + + if (AV_RB16(buf) == 0) { /* HD subpicture with 4-byte offsets */ +@@ -243,15 +248,22 @@ + cmd_pos = 2; + } + ++ if (big_offsets && buf_size < 6) ++ return AVERROR(EAGAIN); ++ + size = READ_OFFSET(buf + (big_offsets ? 2 : 0)); +- cmd_pos = READ_OFFSET(buf + cmd_pos); + +- if (cmd_pos < 0 || cmd_pos > buf_size - 2 - offset_size) { +- if (cmd_pos > size) { +- av_log(ctx, AV_LOG_ERROR, "Discarding invalid packet\n"); +- return 0; +- } ++ if (size == 0) ++ return -1; ++ ++ if (buf_size < size) + return AVERROR(EAGAIN); ++ ++ cmd_pos = READ_OFFSET(buf + cmd_pos); ++ ++ if (cmd_pos < 0 || cmd_pos > size) { ++ av_log(ctx, AV_LOG_ERROR, "Discarding invalid packet\n"); ++ return AVERROR_INVALIDDATA; + } + + while (cmd_pos > 0 && cmd_pos < buf_size - 2 - offset_size) { +@@ -524,10 +536,13 @@ + int appended = 0; + int is_menu; + ++ if (ctx->pts == AV_NOPTS_VALUE && sub->pts != AV_NOPTS_VALUE) ++ ctx->pts = sub->pts; + if (ctx->buf_size) { + int ret = append_to_cached_buf(avctx, buf, buf_size); + if (ret < 0) { + *data_size = 0; ++ ctx->pts = AV_NOPTS_VALUE; + return ret; + } + buf = ctx->buf; +@@ -538,7 +553,12 @@ + is_menu = decode_dvd_subtitles(ctx, sub, buf, buf_size); + if (is_menu == AVERROR(EAGAIN)) { + *data_size = 0; +- return appended ? 0 : append_to_cached_buf(avctx, buf, buf_size); ++ int ret = appended ? 0 : append_to_cached_buf(avctx, buf, buf_size); ++ if (ret < 0) { ++ ctx->pts = AV_NOPTS_VALUE; ++ return ret; ++ } ++ return buf_size; + } + + if (is_menu < 0) { +@@ -547,9 +567,10 @@ + reset_rects(sub); + *data_size = 0; + ++ ctx->pts = AV_NOPTS_VALUE; + return buf_size; + } +- if (!is_menu && find_smallest_bounding_rectangle(ctx, sub) == 0) ++ if (!is_menu && !ctx->output_empty_rects && find_smallest_bounding_rectangle(ctx, sub) == 0) + goto no_subtitle; + + if (ctx->forced_subs_only && !(sub->rects[0]->flags & AV_SUBTITLE_FLAG_FORCED)) +@@ -557,6 +578,8 @@ + + ctx->buf_size = 0; + *data_size = 1; ++ sub->pts = ctx->pts; ++ ctx->pts = AV_NOPTS_VALUE; + return buf_size; + } + +@@ -682,6 +705,7 @@ + av_log(avctx, AV_LOG_DEBUG, " 0x%06"PRIx32, ctx->palette[i]); + av_log(avctx, AV_LOG_DEBUG, "\n"); + } ++ ctx->pts = AV_NOPTS_VALUE; + + return 1; + } +@@ -698,6 +722,7 @@ + { "palette", "set the global palette", OFFSET(palette_str), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, SD }, + { "ifo_palette", "obtain the global palette from .IFO file", OFFSET(ifo_str), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, SD }, + { "forced_subs_only", "Only show forced subtitles", OFFSET(forced_subs_only), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, SD}, ++ { "output_empty_rects", "Output subtitles with empty or fully transparent rects", OFFSET(output_empty_rects), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, SD}, + { NULL } + }; + static const AVClass dvdsub_class = { +diff -Naur ffmpeg-7.1.1.old/libavcodec/libdav1d.c ffmpeg-7.1.1/libavcodec/libdav1d.c +--- ffmpeg-7.1.1.old/libavcodec/libdav1d.c 2025-03-24 10:54:38.090755863 +0100 ++++ ffmpeg-7.1.1/libavcodec/libdav1d.c 2025-03-24 10:54:39.274085311 +0100 +@@ -563,6 +563,8 @@ + break; + } + case ITU_T_T35_PROVIDER_CODE_DOLBY: { ++ AVBufferRef *rpu_buf; ++ AVFrameSideData *rpu; + int provider_oriented_code = bytestream2_get_be32(&gb); + if (itut_t35->country_code != ITU_T_T35_COUNTRY_CODE_US || + provider_oriented_code != 0x800) +@@ -575,6 +577,18 @@ + break; // ignore + } + ++ rpu_buf = av_buffer_alloc(itut_t35->payload_size); ++ if (rpu_buf) { ++ memcpy(rpu_buf->data, itut_t35->payload, itut_t35->payload_size); ++ rpu = av_frame_new_side_data_from_buf(frame, AV_FRAME_DATA_DOVI_RPU_BUFFER_T35, rpu_buf); ++ if (!rpu) { ++ av_buffer_unref(&rpu_buf); ++ goto fail; ++ } ++ } else { ++ goto fail; ++ } ++ + res = ff_dovi_attach_side_data(&dav1d->dovi, frame); + if (res < 0) + goto fail; +diff -Naur ffmpeg-7.1.1.old/libavcodec/mfenc.c ffmpeg-7.1.1/libavcodec/mfenc.c +--- ffmpeg-7.1.1.old/libavcodec/mfenc.c 2025-03-24 10:54:38.125756284 +0100 ++++ ffmpeg-7.1.1/libavcodec/mfenc.c 2025-03-24 10:54:39.282547759 +0100 +@@ -1315,3 +1315,4 @@ + + MF_ENCODER(VIDEO, h264, H264, venc_opts, VFMTS, VCAPS, defaults); + MF_ENCODER(VIDEO, hevc, HEVC, venc_opts, VFMTS, VCAPS, defaults); ++MF_ENCODER(VIDEO, av1, AV1, venc_opts, VFMTS, VCAPS, defaults); +diff -Naur ffmpeg-7.1.1.old/libavcodec/mf_utils.c ffmpeg-7.1.1/libavcodec/mf_utils.c +--- ffmpeg-7.1.1.old/libavcodec/mf_utils.c 2025-03-24 10:54:38.086755815 +0100 ++++ ffmpeg-7.1.1/libavcodec/mf_utils.c 2025-03-24 10:54:39.282392106 +0100 +@@ -240,6 +240,7 @@ + GUID_ENTRY(MFMediaType_Video), + GUID_ENTRY(MFAudioFormat_PCM), + GUID_ENTRY(MFAudioFormat_Float), ++ GUID_ENTRY(ff_MFVideoFormat_AV1), + GUID_ENTRY(MFVideoFormat_H264), + GUID_ENTRY(MFVideoFormat_H264_ES), + GUID_ENTRY(ff_MFVideoFormat_HEVC), +@@ -507,6 +508,7 @@ + const CLSID *ff_codec_to_mf_subtype(enum AVCodecID codec) + { + switch (codec) { ++ case AV_CODEC_ID_AV1: return &ff_MFVideoFormat_AV1; + case AV_CODEC_ID_H264: return &MFVideoFormat_H264; + case AV_CODEC_ID_HEVC: return &ff_MFVideoFormat_HEVC; + case AV_CODEC_ID_AC3: return &MFAudioFormat_Dolby_AC3; +diff -Naur ffmpeg-7.1.1.old/libavcodec/mf_utils.h ffmpeg-7.1.1/libavcodec/mf_utils.h +--- ffmpeg-7.1.1.old/libavcodec/mf_utils.h 2025-03-24 10:54:38.061755515 +0100 ++++ ffmpeg-7.1.1/libavcodec/mf_utils.h 2025-03-24 10:54:39.282464482 +0100 +@@ -113,6 +113,7 @@ + + DEFINE_MEDIATYPE_GUID(ff_MFVideoFormat_HEVC, 0x43564548); // FCC('HEVC') + DEFINE_MEDIATYPE_GUID(ff_MFVideoFormat_HEVC_ES, 0x53564548); // FCC('HEVS') ++DEFINE_MEDIATYPE_GUID(ff_MFVideoFormat_AV1, 0x31305641); // FCC('AV01') + + + // This enum is missing from mingw-w64's codecapi.h by v7.0.0. +diff -Naur ffmpeg-7.1.1.old/libavcodec/pgssubdec.c ffmpeg-7.1.1/libavcodec/pgssubdec.c +--- ffmpeg-7.1.1.old/libavcodec/pgssubdec.c 2025-03-24 10:54:37.986754612 +0100 ++++ ffmpeg-7.1.1/libavcodec/pgssubdec.c 2025-03-24 10:54:39.280528236 +0100 +@@ -35,9 +35,11 @@ + #include "libavutil/opt.h" + + #define RGBA(r,g,b,a) (((unsigned)(a) << 24) | ((r) << 16) | ((g) << 8) | (b)) +-#define MAX_EPOCH_PALETTES 8 // Max 8 allowed per PGS epoch +-#define MAX_EPOCH_OBJECTS 64 // Max 64 allowed per PGS epoch +-#define MAX_OBJECT_REFS 2 // Max objects per display set ++#define MAX_EPOCH_PALETTES 8 // Max 8 allowed per PGS epoch ++#define MAX_EPOCH_OBJECTS 64 // Max 64 allowed per PGS epoch ++#define MAX_OBJECT_REFS 2 // Max objects per display set ++#define MAX_OBJECT_WH 4096 // Max object width/height ++ + + enum SegmentType { + PALETTE_SEGMENT = 0x14, +@@ -48,57 +50,80 @@ + }; + + typedef struct PGSSubObjectRef { +- int id; +- int window_id; +- uint8_t composition_flag; +- int x; +- int y; +- int crop_x; +- int crop_y; +- int crop_w; +- int crop_h; ++ uint16_t id; ++ uint8_t window_id; ++ uint8_t composition_flag; ++ uint16_t x; ++ uint16_t y; ++ uint16_t crop_x; ++ uint16_t crop_y; ++ uint16_t crop_w; ++ uint16_t crop_h; + } PGSSubObjectRef; + + typedef struct PGSSubPresentation { +- int id_number; +- int palette_id; +- int object_count; ++ uint8_t palette_flag; ++ uint8_t palette_id; ++ uint8_t object_count; + PGSSubObjectRef objects[MAX_OBJECT_REFS]; +- int64_t pts; ++ int64_t pts; + } PGSSubPresentation; + + typedef struct PGSSubObject { +- int id; +- int w; +- int h; +- uint8_t *rle; +- unsigned int rle_buffer_size, rle_data_len; +- unsigned int rle_remaining_len; ++ uint16_t id; ++ uint16_t w; ++ uint16_t h; ++ uint8_t *rle; ++ uint8_t *bitmap; ++ uint32_t rle_buffer_size; ++ uint32_t rle_data_len; ++ uint32_t rle_remaining_len; ++ uint32_t bitmap_buffer_size; ++ uint32_t bitmap_size; + } PGSSubObject; + + typedef struct PGSSubObjects { +- int count; ++ uint8_t count; + PGSSubObject object[MAX_EPOCH_OBJECTS]; + } PGSSubObjects; + + typedef struct PGSSubPalette { +- int id; +- uint32_t clut[256]; ++ uint8_t id; ++ uint32_t clut[AVPALETTE_COUNT]; + } PGSSubPalette; + + typedef struct PGSSubPalettes { +- int count; ++ uint8_t count; + PGSSubPalette palette[MAX_EPOCH_PALETTES]; + } PGSSubPalettes; + ++typedef struct PGSGraphicPlane { ++ uint8_t count; ++ uint8_t writable; ++ AVSubtitleRect visible_rect[MAX_OBJECT_REFS]; ++} PGSGraphicPlane; ++ + typedef struct PGSSubContext { + AVClass *class; + PGSSubPresentation presentation; + PGSSubPalettes palettes; + PGSSubObjects objects; ++ PGSGraphicPlane plane; + int forced_subs_only; + } PGSSubContext; + ++static void clear_graphic_plane(PGSSubContext *ctx) ++{ ++ int i; ++ ++ for (i = 0; i < ctx->plane.count; i++) { ++ av_freep(&ctx->plane.visible_rect[i].data[0]); ++ memset(&ctx->plane.visible_rect[i], 0, sizeof(ctx->plane.visible_rect[i])); ++ } ++ ctx->plane.writable = 0; ++ ctx->plane.count = 0; ++} ++ + static void flush_cache(AVCodecContext *avctx) + { + PGSSubContext *ctx = avctx->priv_data; +@@ -106,8 +131,11 @@ + + for (i = 0; i < ctx->objects.count; i++) { + av_freep(&ctx->objects.object[i].rle); +- ctx->objects.object[i].rle_buffer_size = 0; ++ ctx->objects.object[i].rle_buffer_size = 0; + ctx->objects.object[i].rle_remaining_len = 0; ++ av_freep(&ctx->objects.object[i].bitmap); ++ ctx->objects.object[i].bitmap_buffer_size = 0; ++ ctx->objects.object[i].bitmap_size = 0; + } + ctx->objects.count = 0; + ctx->palettes.count = 0; +@@ -144,6 +172,7 @@ + + static av_cold int close_decoder(AVCodecContext *avctx) + { ++ clear_graphic_plane((PGSSubContext *)avctx->priv_data); + flush_cache(avctx); + + return 0; +@@ -159,48 +188,51 @@ + * @param buf pointer to the RLE data to process + * @param buf_size size of the RLE data to process + */ +-static int decode_rle(AVCodecContext *avctx, AVSubtitleRect *rect, +- const uint8_t *buf, unsigned int buf_size) ++static int decode_object_rle(AVCodecContext *avctx, PGSSubObject *object) + { +- const uint8_t *rle_bitmap_end; ++ const uint8_t *rle_buf; ++ const uint8_t *rle_end; + int pixel_count, line_count; ++ rle_buf = object->rle; ++ rle_end = object->rle + object->rle_data_len; + +- rle_bitmap_end = buf + buf_size; ++ object->bitmap_size = object->w * object->h; ++ av_fast_padded_malloc(&object->bitmap, &object->bitmap_buffer_size, ++ object->bitmap_size); + +- rect->data[0] = av_malloc_array(rect->w, rect->h); +- +- if (!rect->data[0]) ++ if (!object->bitmap) + return AVERROR(ENOMEM); + + pixel_count = 0; + line_count = 0; + +- while (buf < rle_bitmap_end && line_count < rect->h) { ++ while (rle_buf < rle_end && line_count < object->h) { + uint8_t flags, color; + int run; + +- color = bytestream_get_byte(&buf); ++ color = bytestream_get_byte(&rle_buf); + run = 1; + + if (color == 0x00) { +- flags = bytestream_get_byte(&buf); ++ flags = bytestream_get_byte(&rle_buf); + run = flags & 0x3f; + if (flags & 0x40) +- run = (run << 8) + bytestream_get_byte(&buf); +- color = flags & 0x80 ? bytestream_get_byte(&buf) : 0; ++ run = (run << 8) + bytestream_get_byte(&rle_buf); ++ color = flags & 0x80 ? bytestream_get_byte(&rle_buf) : 0; + } + +- if (run > 0 && pixel_count + run <= rect->w * rect->h) { +- memset(rect->data[0] + pixel_count, color, run); ++ if (run > 0 && pixel_count + run <= object->w * object->h) { ++ memset(object->bitmap + pixel_count, color, run); + pixel_count += run; + } else if (!run) { + /* + * New Line. Check if correct pixels decoded, if not display warning + * and adjust bitmap pointer to correct new line position. + */ +- if (pixel_count % rect->w > 0) { +- av_log(avctx, AV_LOG_ERROR, "Decoded %d pixels, when line should be %d pixels\n", +- pixel_count % rect->w, rect->w); ++ if (pixel_count % object->w > 0) { ++ av_log(avctx, AV_LOG_ERROR, ++ "Decoded %d pixels, when object line should be %d pixels\n", ++ pixel_count % object->w, object->w); + if (avctx->err_recognition & AV_EF_EXPLODE) { + return AVERROR_INVALIDDATA; + } +@@ -209,13 +241,11 @@ + } + } + +- if (pixel_count < rect->w * rect->h) { +- av_log(avctx, AV_LOG_ERROR, "Insufficient RLE data for subtitle\n"); ++ if (pixel_count < object->w * object->h) { ++ av_log(avctx, AV_LOG_ERROR, "Insufficient RLE data for object\n"); + return AVERROR_INVALIDDATA; + } +- +- ff_dlog(avctx, "Pixel Count = %d, Area = %d\n", pixel_count, rect->w * rect->h); +- ++ ff_dlog(avctx, "Pixel Count = %d, Area = %d\n", pixel_count, object->w * object->h); + return 0; + } + +@@ -237,7 +267,7 @@ + + uint8_t sequence_desc; + unsigned int rle_bitmap_len, width, height; +- int id; ++ int id, ret; + + if (buf_size <= 4) + return AVERROR_INVALIDDATA; +@@ -260,57 +290,71 @@ + /* Read the Sequence Description to determine if start of RLE data or appended to previous RLE */ + sequence_desc = bytestream_get_byte(&buf); + +- if (!(sequence_desc & 0x80)) { +- /* Additional RLE data */ +- if (buf_size > object->rle_remaining_len) ++ /* First in sequence object definition segment */ ++ if (sequence_desc & 0x80) { ++ if (buf_size <= 7) + return AVERROR_INVALIDDATA; ++ buf_size -= 7; + +- memcpy(object->rle + object->rle_data_len, buf, buf_size); +- object->rle_data_len += buf_size; +- object->rle_remaining_len -= buf_size; +- +- return 0; +- } +- +- if (buf_size <= 7) +- return AVERROR_INVALIDDATA; +- buf_size -= 7; ++ /* Decode rle bitmap length, stored size includes width/height data */ ++ rle_bitmap_len = bytestream_get_be24(&buf) - 2*2; + +- /* Decode rle bitmap length, stored size includes width/height data */ +- rle_bitmap_len = bytestream_get_be24(&buf) - 2*2; ++ if (buf_size > rle_bitmap_len) { ++ av_log(avctx, AV_LOG_ERROR, ++ "Buffer dimension %d larger than the expected RLE data %d\n", ++ buf_size, rle_bitmap_len); ++ return AVERROR_INVALIDDATA; ++ } + +- if (buf_size > rle_bitmap_len) { +- av_log(avctx, AV_LOG_ERROR, +- "Buffer dimension %d larger than the expected RLE data %d\n", +- buf_size, rle_bitmap_len); +- return AVERROR_INVALIDDATA; +- } ++ /* Get bitmap dimensions from data */ ++ width = bytestream_get_be16(&buf); ++ height = bytestream_get_be16(&buf); ++ ++ /* Make sure the bitmap is not too large */ ++ if (MAX_OBJECT_WH < width || MAX_OBJECT_WH < height || !width || !height) { ++ av_log(avctx, AV_LOG_ERROR, "Bitmap dimensions (%dx%d) invalid.\n", width, height); ++ return AVERROR_INVALIDDATA; ++ } + +- /* Get bitmap dimensions from data */ +- width = bytestream_get_be16(&buf); +- height = bytestream_get_be16(&buf); +- +- /* Make sure the bitmap is not too large */ +- if (avctx->width < width || avctx->height < height || !width || !height) { +- av_log(avctx, AV_LOG_ERROR, "Bitmap dimensions (%dx%d) invalid.\n", width, height); +- return AVERROR_INVALIDDATA; +- } ++ object->rle_data_len = 0; ++ object->w = width; ++ object->h = height; ++ /* Dimensions against video are checked at decode after cropping. */ ++ av_fast_padded_malloc(&object->rle, &object->rle_buffer_size, rle_bitmap_len); + +- object->w = width; +- object->h = height; ++ if (!object->rle) { ++ object->rle_remaining_len = 0; ++ return AVERROR(ENOMEM); ++ } + +- av_fast_padded_malloc(&object->rle, &object->rle_buffer_size, rle_bitmap_len); ++ memcpy(object->rle, buf, buf_size); ++ object->rle_remaining_len = rle_bitmap_len; ++ } else { ++ /* Additional RLE data */ ++ if (buf_size > object->rle_remaining_len) ++ return AVERROR_INVALIDDATA; + +- if (!object->rle) { +- object->rle_data_len = 0; +- object->rle_remaining_len = 0; +- return AVERROR(ENOMEM); ++ memcpy(object->rle + object->rle_data_len, buf, buf_size); + } ++ object->rle_data_len += buf_size; ++ object->rle_remaining_len -= buf_size; + +- memcpy(object->rle, buf, buf_size); +- object->rle_data_len = buf_size; +- object->rle_remaining_len = rle_bitmap_len - buf_size; +- ++ /* Last in sequence object definition (can be both first and last) */ ++ if (sequence_desc & 0x40) { ++ /* Attempt decoding if data is valid */ ++ if (0 == object->rle_remaining_len) { ++ ret = decode_object_rle(avctx, object); ++ if (ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE || ret == AVERROR(ENOMEM))) { ++ return ret; ++ } ++ } else { ++ av_log(avctx, AV_LOG_ERROR, ++ "RLE data length %u is %u bytes shorter than expected\n", ++ object->rle_data_len, object->rle_remaining_len); ++ if (avctx->err_recognition & AV_EF_EXPLODE) ++ return AVERROR_INVALIDDATA; ++ } ++ } + return 0; + } + +@@ -318,7 +362,7 @@ + * Parse the palette segment packet. + * + * The palette segment contains details of the palette, +- * a maximum of 256 colors can be defined. ++ * a maximum of 256 colors (AVPALETTE_COUNT) can be defined. + * + * @param avctx contains the current codec context + * @param buf pointer to the packet to process +@@ -391,13 +435,17 @@ + int64_t pts) + { + PGSSubContext *ctx = avctx->priv_data; +- int i, state, ret; ++ int ret; ++ uint8_t i, state; + const uint8_t *buf_end = buf + buf_size; + + // Video descriptor + int w = bytestream_get_be16(&buf); + int h = bytestream_get_be16(&buf); + ++ // On a new display set, reset writability of the graphic plane ++ ctx->plane.writable = 0; ++ + ctx->presentation.pts = pts; + + ff_dlog(avctx, "Video Dimensions %dx%d\n", +@@ -406,88 +454,121 @@ + if (ret < 0) + return ret; + +- /* Skip 1 bytes of unknown, frame rate */ +- buf++; ++ /* Skip 3 bytes: framerate (1), presentation id number (2) */ ++ buf+=3; + +- // Composition descriptor +- ctx->presentation.id_number = bytestream_get_be16(&buf); + /* +- * state is a 2 bit field that defines pgs epoch boundaries ++ * State is a 2 bit field that defines pgs epoch boundaries + * 00 - Normal, previously defined objects and palettes are still valid + * 01 - Acquisition point, previous objects and palettes can be released + * 10 - Epoch start, previous objects and palettes can be released + * 11 - Epoch continue, previous objects and palettes can be released + * +- * reserved 6 bits discarded ++ * Reserved 6 bits discarded + */ + state = bytestream_get_byte(&buf) >> 6; + if (state != 0) { ++ /* Epoch start always wipes the graphic plane. Epoch continue does only if ++ * playback is not seamless, which should not happen with a proper stream. ++ */ ++ if (0b10 == state) ++ clear_graphic_plane((PGSSubContext *)avctx->priv_data); + flush_cache(avctx); + } + ++ /* Reserved 7 bits discarded. */ ++ ctx->presentation.palette_flag = bytestream_get_byte(&buf) & 0x80; ++ ctx->presentation.palette_id = bytestream_get_byte(&buf); ++ + /* +- * skip palette_update_flag (0x80), ++ * On palette update, don't parse the compositions references, ++ * just evaluate the existing graphic plane with the new palette. + */ +- buf += 1; +- ctx->presentation.palette_id = bytestream_get_byte(&buf); +- ctx->presentation.object_count = bytestream_get_byte(&buf); +- if (ctx->presentation.object_count > MAX_OBJECT_REFS) { +- av_log(avctx, AV_LOG_ERROR, +- "Invalid number of presentation objects %d\n", +- ctx->presentation.object_count); +- ctx->presentation.object_count = 2; +- if (avctx->err_recognition & AV_EF_EXPLODE) { +- return AVERROR_INVALIDDATA; ++ if (!ctx->presentation.palette_flag) { ++ ctx->presentation.object_count = bytestream_get_byte(&buf); ++ if (ctx->presentation.object_count > MAX_OBJECT_REFS) { ++ av_log(avctx, AV_LOG_ERROR, ++ "Invalid number of presentation objects %d\n", ++ ctx->presentation.object_count); ++ ctx->presentation.object_count = 2; ++ if (avctx->err_recognition & AV_EF_EXPLODE) { ++ return AVERROR_INVALIDDATA; ++ } + } +- } + ++ for (i = 0; i < ctx->presentation.object_count; i++) { ++ PGSSubObjectRef *const object = &ctx->presentation.objects[i]; + +- for (i = 0; i < ctx->presentation.object_count; i++) +- { +- PGSSubObjectRef *const object = &ctx->presentation.objects[i]; +- +- if (buf_end - buf < 8) { +- av_log(avctx, AV_LOG_ERROR, "Insufficent space for object\n"); +- ctx->presentation.object_count = i; +- return AVERROR_INVALIDDATA; +- } +- +- object->id = bytestream_get_be16(&buf); +- object->window_id = bytestream_get_byte(&buf); +- object->composition_flag = bytestream_get_byte(&buf); +- +- object->x = bytestream_get_be16(&buf); +- object->y = bytestream_get_be16(&buf); +- +- // If cropping +- if (object->composition_flag & 0x80) { +- object->crop_x = bytestream_get_be16(&buf); +- object->crop_y = bytestream_get_be16(&buf); +- object->crop_w = bytestream_get_be16(&buf); +- object->crop_h = bytestream_get_be16(&buf); +- } +- +- ff_dlog(avctx, "Subtitle Placement x=%d, y=%d\n", +- object->x, object->y); +- +- if (object->x > avctx->width || object->y > avctx->height) { +- av_log(avctx, AV_LOG_ERROR, "Subtitle out of video bounds. x = %d, y = %d, video width = %d, video height = %d.\n", +- object->x, object->y, +- avctx->width, avctx->height); +- object->y = object->x = 0; +- if (avctx->err_recognition & AV_EF_EXPLODE) { ++ if (buf_end - buf < 8) { ++ av_log(avctx, AV_LOG_ERROR, "Insufficent space for object\n"); ++ ctx->presentation.object_count = i; + return AVERROR_INVALIDDATA; + } ++ ++ object->id = bytestream_get_be16(&buf); ++ object->window_id = bytestream_get_byte(&buf); ++ object->composition_flag = bytestream_get_byte(&buf); ++ ++ object->x = bytestream_get_be16(&buf); ++ object->y = bytestream_get_be16(&buf); ++ ++ // If cropping ++ if (object->composition_flag & 0x80) { ++ object->crop_x = bytestream_get_be16(&buf); ++ object->crop_y = bytestream_get_be16(&buf); ++ object->crop_w = bytestream_get_be16(&buf); ++ object->crop_h = bytestream_get_be16(&buf); ++ } ++ ++ /* Placement is checked at decode after cropping. */ ++ ff_dlog(avctx, "Subtitle Placement x=%d, y=%d\n", ++ object->x, object->y); + } + } ++ return 0; ++} ++ ++/** ++ * Parse the window segment packet. ++ * ++ * The window segment instructs the decoder to redraw the graphic plane ++ * with the composition references provided in the presentation segment ++ * ++ * @param avctx contains the current codec context ++ */ ++static int parse_window_segment(AVCodecContext *avctx, const uint8_t *buf, ++ int buf_size) ++{ ++ PGSSubContext *ctx = (PGSSubContext *)avctx->priv_data; ++ ++ // 1 byte: number of windows defined ++ if (bytestream_get_byte(&buf) > MAX_OBJECT_REFS) { ++ av_log(avctx, AV_LOG_ERROR, "Too many windows defined.\n"); ++ return AVERROR_INVALIDDATA; ++ } + ++ /* TODO: mask objects with windows when transfering to the graphic plane ++ * Window Segment Structure ++ * { ++ * 1 byte : window id, ++ * 2 bytes: X position of window, ++ * 2 bytes: Y position of window, ++ * 2 bytes: Width of window, ++ * 2 bytes: Height of window. ++ * } ++ */ ++ // Flush the graphic plane, it will be redrawn. ++ clear_graphic_plane(ctx); ++ ctx->plane.writable = 1; ++ ctx->plane.count = ctx->presentation.object_count; + return 0; + } + + /** + * Parse the display segment packet. + * +- * The display segment controls the updating of the display. ++ * The display segment closes the display set. The inferred data is used ++ * to decide if the display should be updated. + * + * @param avctx contains the current codec context + * @param data pointer to the data pertaining the subtitle to display +@@ -500,26 +581,33 @@ + PGSSubContext *ctx = avctx->priv_data; + int64_t pts; + PGSSubPalette *palette; +- int i, ret; ++ int i; + + pts = ctx->presentation.pts != AV_NOPTS_VALUE ? ctx->presentation.pts : sub->pts; + memset(sub, 0, sizeof(*sub)); + sub->pts = pts; + ctx->presentation.pts = AV_NOPTS_VALUE; +- sub->start_display_time = 0; + // There is no explicit end time for PGS subtitles. The end time + // is defined by the start of the next sub which may contain no + // objects (i.e. clears the previous sub) + sub->end_display_time = UINT32_MAX; +- sub->format = 0; + +- // Blank if last object_count was 0. +- if (!ctx->presentation.object_count) ++ // Object count is zero only on an epoch start with no WDS ++ // or the last DS with a WDS had no presentation object. ++ if (!ctx->plane.count) { + return 1; +- sub->rects = av_calloc(ctx->presentation.object_count, sizeof(*sub->rects)); +- if (!sub->rects) { +- return AVERROR(ENOMEM); + } ++ ++ if (!ctx->presentation.palette_flag && !ctx->plane.writable) { ++ // This display set does not perform a display update ++ // E.g. it only defines new objects or palettes for future usage. ++ return 0; ++ } ++ ++ sub->rects = av_calloc(ctx->plane.count, sizeof(*sub->rects)); ++ if (!sub->rects) ++ return AVERROR(ENOMEM); ++ + palette = find_palette(ctx->presentation.palette_id, &ctx->palettes); + if (!palette) { + // Missing palette. Should only happen with damaged streams. +@@ -528,57 +616,128 @@ + avsubtitle_free(sub); + return AVERROR_INVALIDDATA; + } +- for (i = 0; i < ctx->presentation.object_count; i++) { +- AVSubtitleRect *const rect = av_mallocz(sizeof(*rect)); +- PGSSubObject *object; + +- if (!rect) +- return AVERROR(ENOMEM); +- sub->rects[sub->num_rects++] = rect; +- rect->type = SUBTITLE_BITMAP; ++ for (i = 0; i < ctx->plane.count; i++) { ++ const PGSSubObjectRef *sub_object = &ctx->presentation.objects[i]; ++ AVSubtitleRect *const gp_rect = &ctx->plane.visible_rect[i]; ++ AVSubtitleRect *rect; ++ gp_rect->type = SUBTITLE_BITMAP; ++ ++ // Compose the graphic plane if a window segment has been provided ++ if (ctx->plane.writable) { ++ PGSSubObject *object; ++ ++ // Process bitmap ++ object = find_object(sub_object->id, &ctx->objects); ++ if (!object) { ++ // Missing object. Should only happen with damaged streams. ++ av_log(avctx, AV_LOG_ERROR, "Invalid object id %d\n", sub_object->id); ++ if (avctx->err_recognition & AV_EF_EXPLODE) ++ return AVERROR_INVALIDDATA; ++ // Leaves rect empty with 0 width and height. ++ continue; ++ } ++ if (sub_object->composition_flag & 0x40) ++ gp_rect->flags |= AV_SUBTITLE_FLAG_FORCED; + +- /* Process bitmap */ +- object = find_object(ctx->presentation.objects[i].id, &ctx->objects); +- if (!object) { +- // Missing object. Should only happen with damaged streams. +- av_log(avctx, AV_LOG_ERROR, "Invalid object id %d\n", +- ctx->presentation.objects[i].id); +- if (avctx->err_recognition & AV_EF_EXPLODE) +- return AVERROR_INVALIDDATA; +- // Leaves rect empty with 0 width and height. +- continue; +- } +- if (ctx->presentation.objects[i].composition_flag & 0x40) +- rect->flags |= AV_SUBTITLE_FLAG_FORCED; ++ gp_rect->x = sub_object->x; ++ gp_rect->y = sub_object->y; + +- rect->x = ctx->presentation.objects[i].x; +- rect->y = ctx->presentation.objects[i].y; ++ if (object->rle) { ++ int out_of_picture = 0; ++ gp_rect->w = object->w; ++ gp_rect->h = object->h; ++ ++ gp_rect->linesize[0] = object->w; ++ ++ // Check for cropping. ++ if (sub_object->composition_flag & 0x80) { ++ int out_of_object = 0; ++ ++ if (object->w < sub_object->crop_x + sub_object->crop_w) ++ out_of_object = 1; ++ if (object->h < sub_object->crop_y + sub_object->crop_h) ++ out_of_object = 1; ++ ++ if (out_of_object) { ++ av_log(avctx, AV_LOG_ERROR, ++ "Subtitle cropping values are out of object. " ++ "obj_w = %d, obj_h = %d, crop_x = %d, crop_y = %d, " ++ "crop_w = %d, crop_h = %d.\n", ++ object->w, ++ object->h, ++ sub_object->crop_x, ++ sub_object->crop_y, ++ sub_object->crop_w, ++ sub_object->crop_h); ++ if (avctx->err_recognition & AV_EF_EXPLODE) ++ return AVERROR_INVALIDDATA; ++ } else { ++ // Replace subtitle dimensions with cropping ones. ++ gp_rect->w = sub_object->crop_w; ++ gp_rect->h = sub_object->crop_h; ++ gp_rect->linesize[0] = sub_object->crop_w; ++ } ++ } + +- if (object->rle) { +- rect->w = object->w; +- rect->h = object->h; ++ /* Make sure the subtitle is not out of picture. */ ++ if (avctx->width < gp_rect->x + gp_rect->w || !gp_rect->w) ++ out_of_picture = 1; ++ if (avctx->height < gp_rect->y + gp_rect->h || !gp_rect->h) ++ out_of_picture = 1; ++ if (out_of_picture) { ++ av_log(avctx, AV_LOG_ERROR, ++ "Subtitle out of video bounds. " ++ "x = %d, y = %d, width = %d, height = %d.\n", ++ gp_rect->x, gp_rect->y, gp_rect->w, gp_rect->h); ++ if (avctx->err_recognition & AV_EF_EXPLODE) ++ return AVERROR_INVALIDDATA; ++ gp_rect->w = 0; ++ gp_rect->h = 0; ++ continue; ++ } + +- rect->linesize[0] = object->w; ++ if (!object->bitmap_size || object->rle_remaining_len) { ++ gp_rect->w = 0; ++ gp_rect->h = 0; ++ continue; ++ } + +- if (object->rle_remaining_len) { +- av_log(avctx, AV_LOG_ERROR, "RLE data length %u is %u bytes shorter than expected\n", +- object->rle_data_len, object->rle_remaining_len); +- if (avctx->err_recognition & AV_EF_EXPLODE) +- return AVERROR_INVALIDDATA; +- } +- ret = decode_rle(avctx, rect, object->rle, object->rle_data_len); +- if (ret < 0) { +- if ((avctx->err_recognition & AV_EF_EXPLODE) || +- ret == AVERROR(ENOMEM)) { +- return ret; ++ gp_rect->data[0] = av_malloc_array(gp_rect->w, gp_rect->h); ++ if (!gp_rect->data[0]) ++ return AVERROR(ENOMEM); ++ ++ if (sub_object->composition_flag & 0x80) { ++ /* Copy cropped bitmap. */ ++ int y; ++ ++ for (y = 0; y < sub_object->crop_h; y++) { ++ memcpy(&gp_rect->data[0][y * sub_object->crop_w], ++ &object->bitmap[(sub_object->crop_y + y) * ++ object->w + sub_object->crop_x], ++ sub_object->crop_w); ++ } ++ } ++ else { ++ /* copy full object */ ++ memcpy(gp_rect->data[0], object->bitmap, object->bitmap_size); + } +- rect->w = 0; +- rect->h = 0; +- continue; + } + } +- /* Allocate memory for colors */ +- rect->nb_colors = 256; ++ // Export graphic plane content with latest palette ++ rect = av_memdup(gp_rect, sizeof(*gp_rect)); ++ if (!rect) ++ return AVERROR(ENOMEM); ++ ++ sub->rects[sub->num_rects++] = rect; ++ if (gp_rect->data[0]) { ++ rect->data[0] = av_memdup(gp_rect->data[0], rect->w*rect->h); ++ if (!rect->data[0]) ++ return AVERROR(ENOMEM); ++ } ++ ++ // Allocate memory for colors ++ rect->nb_colors = AVPALETTE_COUNT; + rect->data[1] = av_mallocz(AVPALETTE_SIZE); + if (!rect->data[1]) + return AVERROR(ENOMEM); +@@ -641,14 +800,7 @@ + ret = parse_presentation_segment(avctx, buf, segment_length, sub->pts); + break; + case WINDOW_SEGMENT: +- /* +- * Window Segment Structure (No new information provided): +- * 2 bytes: Unknown, +- * 2 bytes: X position of subtitle, +- * 2 bytes: Y position of subtitle, +- * 2 bytes: Width of subtitle, +- * 2 bytes: Height of subtitle. +- */ ++ ret = parse_window_segment(avctx, buf, segment_length); + break; + case DISPLAY_SEGMENT: + if (*got_sub_ptr) { +diff -Naur ffmpeg-7.1.1.old/libavcodec/videotoolbox.c ffmpeg-7.1.1/libavcodec/videotoolbox.c +--- ffmpeg-7.1.1.old/libavcodec/videotoolbox.c 2025-03-24 10:54:38.027755105 +0100 ++++ ffmpeg-7.1.1/libavcodec/videotoolbox.c 2025-03-24 10:54:39.271196851 +0100 +@@ -916,6 +916,23 @@ + break; + } + ++#if ARCH_X86_64 ++ if (avctx->codec_id == AV_CODEC_ID_H264 && ++ avctx->sw_pix_fmt == AV_PIX_FMT_YUV420P10) ++ { ++ // 10-bit H.264 is not supported on x86_64 ++ return AVERROR(ENOSYS); ++ } ++#endif ++ ++ if (avctx->codec_id == AV_CODEC_ID_H264 && ++ (avctx->level == 61 || avctx->level == 62)) ++ { ++ // H.264 Level 6.1 and 6.2 can't be ++ // decoded properly ++ return AVERROR(ENOSYS); ++ } ++ + #if defined(MAC_OS_X_VERSION_10_9) && !TARGET_OS_IPHONE && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9) && AV_HAS_BUILTIN(__builtin_available) + if (avctx->codec_id == AV_CODEC_ID_PRORES) { + if (__builtin_available(macOS 10.9, *)) { +diff -Naur ffmpeg-7.1.1.old/libavformat/isom.h ffmpeg-7.1.1/libavformat/isom.h +--- ffmpeg-7.1.1.old/libavformat/isom.h 2025-03-24 10:54:38.366759184 +0100 ++++ ffmpeg-7.1.1/libavformat/isom.h 2025-03-24 10:54:39.261252302 +0100 +@@ -272,6 +272,9 @@ + MOVEncryptionIndex *encryption_index; + } cenc; + ++ int has_fallback; // Audio fallback track ++ int fallback; ++ + struct IAMFDemuxContext *iamf; + } MOVStreamContext; + +diff -Naur ffmpeg-7.1.1.old/libavformat/matroskaenc.c ffmpeg-7.1.1/libavformat/matroskaenc.c +--- ffmpeg-7.1.1.old/libavformat/matroskaenc.c 2025-03-24 10:54:38.396759545 +0100 ++++ ffmpeg-7.1.1/libavformat/matroskaenc.c 2025-03-24 10:54:39.269651231 +0100 +@@ -2933,6 +2933,16 @@ + case AV_CODEC_ID_AAC: + if (side_data_size && mkv->track.bc) { + int output_sample_rate = 0; ++ if (par->extradata && par->extradata_size) { ++ if (par->extradata_size != side_data_size || ++ memcmp(par->extradata, side_data, side_data_size)) { ++ av_log(s, AV_LOG_ERROR, "Error, AAC extradata changed mid-stream.\n"); ++ return AVERROR(EINVAL); ++ } else { ++ // Already written ++ break; ++ } ++ } + ret = get_aac_sample_rates(s, mkv, side_data, side_data_size, + &track->sample_rate, &output_sample_rate); + if (ret < 0) +diff -Naur ffmpeg-7.1.1.old/libavformat/mov.c ffmpeg-7.1.1/libavformat/mov.c +--- ffmpeg-7.1.1.old/libavformat/mov.c 2025-03-24 10:54:38.353759028 +0100 ++++ ffmpeg-7.1.1/libavformat/mov.c 2025-03-24 10:54:39.261629363 +0100 +@@ -56,6 +56,7 @@ + #include "libavcodec/mpegaudiodecheader.h" + #include "libavcodec/mlp_parse.h" + #include "avformat.h" ++#include "avlanguage.h" + #include "internal.h" + #include "avio_internal.h" + #include "demux.h" +@@ -342,6 +343,73 @@ + return 0; + } + ++static int mov_read_3gp_udta_tag(MOVContext *c, AVIOContext *pb, MOVAtom atom) ++{ ++ const char *key; ++ AVDictionary *metadata; ++ uint16_t langcode = 0; ++ char key2[32], language[4] = {0}; ++ uint32_t str_size, version; ++ char *str; ++ if (atom.size < 6) ++ return AVERROR_INVALIDDATA; ++ switch (atom.type) { ++ case MKTAG( 'a','l','b','m'): key = "album"; break; ++ case MKTAG( 'a','u','t','h'): key = "author"; break; ++ case MKTAG( 'c','p','r','t'): key = "copyright"; break; ++ case MKTAG( 'd','s','c','p'): key = "comment"; break; ++ case MKTAG( 'g','n','r','e'): key = "genre"; break; ++ case MKTAG( 'p','e','r','f'): key = "artist"; break; ++ case MKTAG( 't','i','t','l'): key = "title"; break; ++ case MKTAG( 'y','r','r','c'): key = "date"; break; ++ default: return 0; ++ } ++ version = avio_rb32(pb); // version + flags ++ if (version != 0) ++ av_log(c->fc, AV_LOG_WARNING, "udta %s unknown version number: %u\n", str, version); ++ if (MKTAG( 'y','r','r','c') == atom.type) { ++ int year; ++ year = avio_rb16(pb); ++ str = av_asprintf("%d", year); ++ if (!str) ++ return AVERROR(ENOMEM); ++ } else { ++ int ret; ++ const char *tmp; ++ langcode = avio_rb16(pb); ++ ff_mov_lang_to_iso639(langcode, language); ++ tmp = ff_convert_lang_to(language, AV_LANG_ISO639_2_BIBL); ++ if (!tmp) ++ av_log(c->fc, AV_LOG_WARNING, "udta %s unknown language code: %u\n", str, langcode); ++ str_size = atom.size - 6; ++ if (str_size <= 0 || str_size >= INT_MAX/2) ++ return AVERROR_INVALIDDATA; ++ str = av_mallocz(str_size + 1); ++ if (!str) ++ return AVERROR(ENOMEM); ++ ret = ffio_read_size(pb, str, str_size); ++ if (ret < 0) { ++ av_free(str); ++ return ret; ++ } ++ str[str_size] = 0; ++ } ++ if (c->trak_index < 0) { ++ metadata = c->fc->metadata; ++ c->fc->event_flags |= AVFMT_EVENT_FLAG_METADATA_UPDATED; ++ } ++ else { ++ metadata = c->fc->streams[c->trak_index]->metadata; ++ } ++ av_dict_set(&metadata, key, str, 0); ++ if (*language && strcmp(language, "und")) { ++ snprintf(key2, sizeof(key2), "%s-%s", key, language); ++ av_dict_set(&metadata, key2, str, 0); ++ } ++ av_freep(&str); ++ return 0; ++} ++ + static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom) + { + char tmp_key[AV_FOURCC_MAX_STRING_SIZE] = {0}; +@@ -354,6 +422,7 @@ + int (*parse)(MOVContext*, AVIOContext*, unsigned, const char*) = NULL; + int raw = 0; + int num = 0; ++ AVDictionary *metadata; + + switch (atom.type) { + case MKTAG( '@','P','R','M'): key = "premiere_version"; raw = 1; break; +@@ -367,15 +436,33 @@ + case MKTAG( 'c','a','t','g'): key = "category"; break; + case MKTAG( 'c','p','i','l'): key = "compilation"; + parse = mov_metadata_int8_no_padding; break; +- case MKTAG( 'c','p','r','t'): key = "copyright"; break; ++ case MKTAG( 'c','p','r','t'): ++ key = "copyright"; ++ if (!c->itunes_metadata) { ++ int64_t pos = avio_tell(pb); ++ int ret = mov_read_3gp_udta_tag(c, pb, atom); ++ if (ret != AVERROR_INVALIDDATA) ++ return ret; ++ avio_seek(pb, pos, SEEK_SET); ++ } ++ break; + case MKTAG( 'd','e','s','c'): key = "description"; break; + case MKTAG( 'd','i','s','k'): key = "disc"; + parse = mov_metadata_track_or_disc_number; break; + case MKTAG( 'e','g','i','d'): key = "episode_uid"; + parse = mov_metadata_int8_no_padding; break; + case MKTAG( 'F','I','R','M'): key = "firmware"; raw = 1; break; +- case MKTAG( 'g','n','r','e'): key = "genre"; +- parse = mov_metadata_gnre; break; ++ case MKTAG( 'g','n','r','e'): ++ key = "genre"; ++ parse = mov_metadata_gnre; ++ if (!c->itunes_metadata) { ++ int64_t pos = avio_tell(pb); ++ int ret = mov_read_3gp_udta_tag(c, pb, atom); ++ if (ret != AVERROR_INVALIDDATA) ++ return ret; ++ avio_seek(pb, pos, SEEK_SET); ++ } ++ break; + case MKTAG( 'h','d','v','d'): key = "hd_video"; + parse = mov_metadata_int8_no_padding; break; + case MKTAG( 'H','M','M','T'): +@@ -386,6 +473,7 @@ + return mov_metadata_loci(c, pb, atom.size); + case MKTAG( 'm','a','n','u'): key = "make"; break; + case MKTAG( 'm','o','d','l'): key = "model"; break; ++ case MKTAG( 'n','a','m','e'): key = "title"; raw = 1; break; + case MKTAG( 'p','c','s','t'): key = "podcast"; + parse = mov_metadata_int8_no_padding; break; + case MKTAG( 'p','g','a','p'): key = "gapless_playback"; +@@ -445,6 +533,15 @@ + case MKTAG(0xa9,'w','r','n'): key = "warning"; break; + case MKTAG(0xa9,'w','r','t'): key = "composer"; break; + case MKTAG(0xa9,'x','y','z'): key = "location"; break; ++ case MKTAG( 'a','l','b','m'): ++ case MKTAG( 'a','u','t','h'): ++ case MKTAG( 'd','s','c','p'): ++ case MKTAG( 'p','e','r','f'): ++ case MKTAG( 't','i','t','l'): ++ case MKTAG( 'y','r','r','c'): ++ if (!c->itunes_metadata) { ++ return mov_read_3gp_udta_tag(c, pb, atom); ++ } + } + retry: + if (c->itunes_metadata && atom.size > 8) { +@@ -571,17 +668,23 @@ + } + str[str_size] = 0; + } +- c->fc->event_flags |= AVFMT_EVENT_FLAG_METADATA_UPDATED; +- av_dict_set(&c->fc->metadata, key, str, 0); ++ if (c->trak_index < 0) { ++ metadata = c->fc->metadata; ++ c->fc->event_flags |= AVFMT_EVENT_FLAG_METADATA_UPDATED; ++ if (!strcmp(key, "encoder")) { ++ int major, minor, micro; ++ if (sscanf(str, "HandBrake %d.%d.%d", &major, &minor, µ) == 3) { ++ c->handbrake_version = 1000000*major + 1000*minor + micro; ++ } ++ } ++ } ++ else { ++ metadata = c->fc->streams[c->trak_index]->metadata; ++ } ++ av_dict_set(&metadata, key, str, 0); + if (*language && strcmp(language, "und")) { + snprintf(key2, sizeof(key2), "%s-%s", key, language); +- av_dict_set(&c->fc->metadata, key2, str, 0); +- } +- if (!strcmp(key, "encoder")) { +- int major, minor, micro; +- if (sscanf(str, "HandBrake %d.%d.%d", &major, &minor, µ) == 3) { +- c->handbrake_version = 1000000*major + 1000*minor + micro; +- } ++ av_dict_set(&metadata, key2, str, 0); + } + } + +@@ -9081,6 +9184,23 @@ + return ret; + } + ++static int mov_read_fall(MOVContext *c, AVIOContext *pb, MOVAtom atom) ++{ ++ AVStream *st; ++ MOVStreamContext *sc; ++ ++ if (c->fc->nb_streams < 1) ++ return 0; ++ st = c->fc->streams[c->fc->nb_streams-1]; ++ sc = st->priv_data; ++ ++ sc->fallback = avio_rb32(pb); ++ sc->has_fallback = 1; ++ ++ return 0; ++} ++ ++ + static const MOVParseTableEntry mov_default_parse_table[] = { + { MKTAG('A','C','L','R'), mov_read_aclr }, + { MKTAG('A','P','R','G'), mov_read_avid }, +@@ -9183,6 +9303,7 @@ + { MKTAG('v','p','c','C'), mov_read_vpcc }, + { MKTAG('m','d','c','v'), mov_read_mdcv }, + { MKTAG('c','l','l','i'), mov_read_clli }, ++{ MKTAG('f','a','l','l'), mov_read_fall }, + { MKTAG('d','v','c','C'), mov_read_dvcc_dvvc }, + { MKTAG('d','v','v','C'), mov_read_dvcc_dvvc }, + { MKTAG('d','v','w','C'), mov_read_dvcc_dvvc }, +@@ -10367,6 +10488,23 @@ + err = ff_replaygain_export(st, s->metadata); + if (err < 0) + return err; ++ if (sc->has_fallback) { ++ for (j = 0; j < s->nb_streams; j++) { ++ if (s->streams[j]->id == sc->fallback) { ++ AVPacketSideData *sd; ++ int *fallback; ++ sd = av_packet_side_data_new(&st->codecpar->coded_side_data, ++ &st->codecpar->nb_coded_side_data, ++ AV_PKT_DATA_FALLBACK_TRACK, ++ sizeof(int), 0); ++ if (!sd) ++ return AVERROR(ENOMEM); ++ fallback = (int*)sd->data; ++ *fallback = j; ++ break; ++ } ++ } ++ } + break; + case AVMEDIA_TYPE_VIDEO: + if (sc->display_matrix) { +diff -Naur ffmpeg-7.1.1.old/libavformat/movenc.c ffmpeg-7.1.1/libavformat/movenc.c +--- ffmpeg-7.1.1.old/libavformat/movenc.c 2025-03-24 10:54:38.381759365 +0100 ++++ ffmpeg-7.1.1/libavformat/movenc.c 2025-03-24 10:54:39.258769917 +0100 +@@ -28,6 +28,7 @@ + + #include "movenc.h" + #include "avformat.h" ++#include "avlanguage.h" + #include "avio_internal.h" + #include "dovi_isom.h" + #include "riff.h" +@@ -4055,6 +4056,41 @@ + return len + 24; + } + ++static uint16_t language_code(const char *str) ++{ ++ return (((str[0] - 0x60) & 0x1F) << 10) + ++ (((str[1] - 0x60) & 0x1F) << 5) + ++ (( str[2] - 0x60) & 0x1F); ++} ++static int mov_write_3gp_udta_tag(AVIOContext *pb, AVDictionary *metadata, ++ const char *tag, const char *str) ++{ ++ int64_t pos = avio_tell(pb); ++ AVDictionaryEntry *t = av_dict_get(metadata, str, NULL, 0); ++ if (!t || !utf8len(t->value)) ++ return 0; ++ avio_wb32(pb, 0); /* size */ ++ ffio_wfourcc(pb, tag); /* type */ ++ avio_wb32(pb, 0); /* version + flags */ ++ if (!strcmp(tag, "yrrc")) ++ avio_wb16(pb, atoi(t->value)); ++ else { ++ int lang = 0, len; ++ len = strlen(t->key); ++ if (t->key[len - 4] == '-') { ++ lang = ff_mov_iso639_to_lang(&t->key[len - 3], 1); ++ } ++ if (!lang) ++ lang = ff_mov_iso639_to_lang("und", 1); ++ avio_wb16(pb, lang); /* language */ ++ avio_write(pb, t->value, strlen(t->value) + 1); /* UTF8 string value */ ++ if (!strcmp(tag, "albm") && ++ (t = av_dict_get(metadata, "track", NULL, 0))) ++ avio_w8(pb, atoi(t->value)); ++ } ++ return update_size(pb, pos); ++} ++ + static int mov_write_track_metadata(AVIOContext *pb, AVStream *st, + const char *tag, const char *str) + { +@@ -4129,8 +4165,23 @@ + if (ret < 0) + return ret; + +- if (mov->mode & (MODE_MP4|MODE_MOV)) ++ if (mov->mode & (MODE_MP4|MODE_MOV)) { ++ AVDictionaryEntry *t = NULL; ++ int und = 0; ++ + mov_write_track_metadata(pb_buf, st, "name", "title"); ++ while ((t = av_dict_get(st->metadata, "title-", t, AV_DICT_IGNORE_SUFFIX))) { ++ int len = strlen(t->key); ++ if (len == 10 && ++ ff_convert_lang_to(&t->key[len - 3], AV_LANG_ISO639_2_BIBL)) { ++ mov_write_3gp_udta_tag(pb_buf, st->metadata, "titl", t->key); ++ if (!strcmp("und", &t->key[len - 3])) ++ und = 1; ++ } ++ } ++ if (!und) ++ mov_write_3gp_udta_tag(pb_buf, st->metadata, "titl", "title"); ++ } + + if (mov->mode & MODE_MP4) { + if ((ret = mov_write_track_kinds(pb_buf, st)) < 0) +@@ -4727,35 +4778,6 @@ + return 0; + } + +-static uint16_t language_code(const char *str) +-{ +- return (((str[0] - 0x60) & 0x1F) << 10) + +- (((str[1] - 0x60) & 0x1F) << 5) + +- (( str[2] - 0x60) & 0x1F); +-} +- +-static int mov_write_3gp_udta_tag(AVIOContext *pb, AVFormatContext *s, +- const char *tag, const char *str) +-{ +- int64_t pos = avio_tell(pb); +- AVDictionaryEntry *t = av_dict_get(s->metadata, str, NULL, 0); +- if (!t || !utf8len(t->value)) +- return 0; +- avio_wb32(pb, 0); /* size */ +- ffio_wfourcc(pb, tag); /* type */ +- avio_wb32(pb, 0); /* version + flags */ +- if (!strcmp(tag, "yrrc")) +- avio_wb16(pb, atoi(t->value)); +- else { +- avio_wb16(pb, language_code("eng")); /* language */ +- avio_write(pb, t->value, strlen(t->value) + 1); /* UTF8 string value */ +- if (!strcmp(tag, "albm") && +- (t = av_dict_get(s->metadata, "track", NULL, 0))) +- avio_w8(pb, atoi(t->value)); +- } +- return update_size(pb, pos); +-} +- + static int mov_write_chpl_tag(AVIOContext *pb, AVFormatContext *s) + { + int64_t pos = avio_tell(pb); +@@ -4794,14 +4816,14 @@ + return ret; + + if (mov->mode & MODE_3GP) { +- mov_write_3gp_udta_tag(pb_buf, s, "perf", "artist"); +- mov_write_3gp_udta_tag(pb_buf, s, "titl", "title"); +- mov_write_3gp_udta_tag(pb_buf, s, "auth", "author"); +- mov_write_3gp_udta_tag(pb_buf, s, "gnre", "genre"); +- mov_write_3gp_udta_tag(pb_buf, s, "dscp", "comment"); +- mov_write_3gp_udta_tag(pb_buf, s, "albm", "album"); +- mov_write_3gp_udta_tag(pb_buf, s, "cprt", "copyright"); +- mov_write_3gp_udta_tag(pb_buf, s, "yrrc", "date"); ++ mov_write_3gp_udta_tag(pb_buf, s->metadata, "perf", "artist"); ++ mov_write_3gp_udta_tag(pb_buf, s->metadata, "titl", "title"); ++ mov_write_3gp_udta_tag(pb_buf, s->metadata, "auth", "author"); ++ mov_write_3gp_udta_tag(pb_buf, s->metadata, "gnre", "genre"); ++ mov_write_3gp_udta_tag(pb_buf, s->metadata, "dscp", "comment"); ++ mov_write_3gp_udta_tag(pb_buf, s->metadata, "albm", "album"); ++ mov_write_3gp_udta_tag(pb_buf, s->metadata, "cprt", "copyright"); ++ mov_write_3gp_udta_tag(pb_buf, s->metadata, "yrrc", "date"); + mov_write_loci_tag(s, pb_buf); + } else if (mov->mode == MODE_MOV && !(mov->flags & FF_MOV_FLAG_USE_MDTA)) { // the title field breaks gtkpod with mp4 and my suspicion is that stuff is not valid in mp4 + mov_write_string_metadata(s, pb_buf, "\251ART", "artist", 0); +diff -Naur ffmpeg-7.1.1.old/libavutil/frame.c ffmpeg-7.1.1/libavutil/frame.c +--- ffmpeg-7.1.1.old/libavutil/frame.c 2025-03-24 10:54:38.298758366 +0100 ++++ ffmpeg-7.1.1/libavutil/frame.c 2025-03-24 10:54:39.274197994 +0100 +@@ -45,6 +45,7 @@ + [AV_FRAME_DATA_FILM_GRAIN_PARAMS] = { "Film grain parameters" }, + [AV_FRAME_DATA_DETECTION_BBOXES] = { "Bounding boxes for object detection and classification" }, + [AV_FRAME_DATA_DOVI_RPU_BUFFER] = { "Dolby Vision RPU Data" }, ++ [AV_FRAME_DATA_DOVI_RPU_BUFFER_T35] = { "Dolby Vision RPU ITU T35 Data" }, + [AV_FRAME_DATA_DOVI_METADATA] = { "Dolby Vision Metadata" }, + [AV_FRAME_DATA_LCEVC] = { "LCEVC NAL data" }, + [AV_FRAME_DATA_VIEW_ID] = { "View ID" }, +diff -Naur ffmpeg-7.1.1.old/libavutil/frame.h ffmpeg-7.1.1/libavutil/frame.h +--- ffmpeg-7.1.1.old/libavutil/frame.h 2025-03-24 10:54:38.287758234 +0100 ++++ ffmpeg-7.1.1/libavutil/frame.h 2025-03-24 10:54:39.274296419 +0100 +@@ -201,6 +201,12 @@ + AV_FRAME_DATA_DOVI_RPU_BUFFER, + + /** ++ * Dolby Vision RPU ITU T35 raw data, suitable for passing to SVT-AV1 ++ * or other libraries. Array of uint8_t. ++ */ ++ AV_FRAME_DATA_DOVI_RPU_BUFFER_T35, ++ ++ /** + * Parsed Dolby Vision metadata, suitable for passing to a software + * implementation. The payload is the AVDOVIMetadata struct defined in + * libavutil/dovi_meta.h. +diff -Naur ffmpeg-7.1.1.old/libswscale/swscale_unscaled.c ffmpeg-7.1.1/libswscale/swscale_unscaled.c +--- ffmpeg-7.1.1.old/libswscale/swscale_unscaled.c 2025-03-24 10:54:38.201757199 +0100 ++++ ffmpeg-7.1.1/libswscale/swscale_unscaled.c 2025-03-24 10:54:39.272233834 +0100 +@@ -341,7 +341,7 @@ + const uint8_t *tsrc0 = src[0]; + for (x = c->srcW; x > 0; x--) { + t = *tsrc0++; +- output_pixel(tdstY++, t | (t << 8)); ++ output_pixel(tdstY++, (t << 8)); + } + src[0] += srcStride[0]; + dstY += dstStride[0] / 2; +@@ -352,9 +352,9 @@ + const uint8_t *tsrc2 = src[2]; + for (x = c->srcW / 2; x > 0; x--) { + t = *tsrc1++; +- output_pixel(tdstUV++, t | (t << 8)); ++ output_pixel(tdstUV++, (t << 8)); + t = *tsrc2++; +- output_pixel(tdstUV++, t | (t << 8)); ++ output_pixel(tdstUV++, (t << 8)); + } + src[1] += srcStride[1]; + src[2] += srcStride[2]; diff --git a/anda/multimedia/ffmpeg/ffmpeg-chromium.patch b/anda/multimedia/ffmpeg/ffmpeg-chromium.patch new file mode 100644 index 0000000000..cf9b9c8d6f --- /dev/null +++ b/anda/multimedia/ffmpeg/ffmpeg-chromium.patch @@ -0,0 +1,30 @@ +diff -Naur ffmpeg-7.1.1.old/libavformat/avformat.h ffmpeg-7.1.1/libavformat/avformat.h +--- ffmpeg-7.1.1.old/libavformat/avformat.h 2025-03-24 10:54:38.357759076 +0100 ++++ ffmpeg-7.1.1/libavformat/avformat.h 2025-03-24 10:54:39.096586841 +0100 +@@ -1202,6 +1202,10 @@ + + struct AVCodecParserContext *av_stream_get_parser(const AVStream *s); + ++// Chromium: We use the internal field first_dts vvv ++int64_t av_stream_get_first_dts(const AVStream *st); ++// Chromium: We use the internal field first_dts ^^^ ++ + #define AV_PROGRAM_RUNNING 1 + + /** +diff -Naur ffmpeg-7.1.1.old/libavformat/utils.c ffmpeg-7.1.1/libavformat/utils.c +--- ffmpeg-7.1.1.old/libavformat/utils.c 2025-03-24 10:54:38.360759112 +0100 ++++ ffmpeg-7.1.1/libavformat/utils.c 2025-03-24 10:54:39.097179227 +0100 +@@ -44,6 +44,13 @@ + * various utility functions for use within FFmpeg + */ + ++// Chromium: We use the internal field first_dts vvv ++int64_t av_stream_get_first_dts(const AVStream *st) ++{ ++ return cffstream(st)->first_dts; ++} ++// Chromium: We use the internal field first_dts ^^^ ++ + /* an arbitrarily chosen "sane" max packet size -- 50M */ + #define SANE_CHUNK_SIZE (50000000) diff --git a/anda/multimedia/ffmpeg/ffmpeg-nvcc.patch b/anda/multimedia/ffmpeg/ffmpeg-nvcc.patch new file mode 100644 index 0000000000..88ae668455 --- /dev/null +++ b/anda/multimedia/ffmpeg/ffmpeg-nvcc.patch @@ -0,0 +1,12 @@ +diff -Naur ffmpeg-7.1.1.old/configure ffmpeg-7.1.1/configure +--- ffmpeg-7.1.1.old/configure 2025-03-24 11:04:46.377074634 +0100 ++++ ffmpeg-7.1.1/configure 2025-03-24 11:04:54.615698726 +0100 +@@ -6742,7 +6742,7 @@ + nvccflags=$nvccflags_default + fi + +-nvccflags="$nvccflags -std=c++11" ++nvccflags="$nvccflags -std=c++14" + + if enabled x86_64 || enabled ppc64 || enabled aarch64; then + nvccflags="$nvccflags -m64" diff --git a/anda/multimedia/ffmpeg/ffmpeg-svt-vp9.patch b/anda/multimedia/ffmpeg/ffmpeg-svt-vp9.patch new file mode 100644 index 0000000000..351c801512 --- /dev/null +++ b/anda/multimedia/ffmpeg/ffmpeg-svt-vp9.patch @@ -0,0 +1,762 @@ +diff -Naur ffmpeg-7.1.1.old/configure ffmpeg-7.1.1/configure +--- ffmpeg-7.1.1.old/configure 2025-03-24 10:54:38.202757211 +0100 ++++ ffmpeg-7.1.1/configure 2025-03-24 10:54:38.618546808 +0100 +@@ -278,6 +278,7 @@ + --enable-libsrt enable Haivision SRT protocol via libsrt [no] + --enable-libssh enable SFTP protocol via libssh [no] + --enable-libsvtav1 enable AV1 encoding via SVT [no] ++ --enable-libsvtvp9 enable VP9 encoding via svt [no] + --enable-libtensorflow enable TensorFlow as a DNN module backend + for DNN based filters like sr [no] + --enable-libtesseract enable Tesseract, needed for ocr filter [no] +@@ -1953,6 +1954,7 @@ + libshaderc + libshine + libsmbclient ++ libsvtvp9 + libsnappy + libsoxr + libspeex +@@ -3575,6 +3577,7 @@ + libvpx_vp8_encoder_deps="libvpx" + libvpx_vp9_decoder_deps="libvpx" + libvpx_vp9_encoder_deps="libvpx" ++libsvt_vp9_encoder_deps="libsvtvp9" + libvvenc_encoder_deps="libvvenc" + libwebp_encoder_deps="libwebp" + libwebp_anim_encoder_deps="libwebp" +@@ -6997,6 +7000,7 @@ + enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init + enabled libsrt && require_pkg_config libsrt "srt >= 1.3.0" srt/srt.h srt_socket + enabled libsvtav1 && require_pkg_config libsvtav1 "SvtAv1Enc >= 0.9.0" EbSvtAv1Enc.h svt_av1_enc_init_handle ++enabled libsvtvp9 && require_pkg_config libsvtvp9 SvtVp9Enc EbSvtVp9Enc.h eb_vp9_svt_init_handle + enabled libtensorflow && require libtensorflow tensorflow/c/c_api.h TF_Version -ltensorflow + enabled libtesseract && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate + enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg +diff -Naur ffmpeg-7.1.1.old/libavcodec/allcodecs.c ffmpeg-7.1.1/libavcodec/allcodecs.c +--- ffmpeg-7.1.1.old/libavcodec/allcodecs.c 2025-03-24 10:54:38.119756212 +0100 ++++ ffmpeg-7.1.1/libavcodec/allcodecs.c 2025-03-24 10:54:38.619934060 +0100 +@@ -796,6 +796,7 @@ + extern const FFCodec ff_libvo_amrwbenc_encoder; + extern const FFCodec ff_libvorbis_encoder; + extern const FFCodec ff_libvorbis_decoder; ++extern const FFCodec ff_libsvt_vp9_encoder; + extern const FFCodec ff_libvpx_vp8_encoder; + extern const FFCodec ff_libvpx_vp8_decoder; + extern FFCodec ff_libvpx_vp9_encoder; +diff -Naur ffmpeg-7.1.1.old/libavcodec/libsvt_vp9.c ffmpeg-7.1.1/libavcodec/libsvt_vp9.c +--- ffmpeg-7.1.1.old/libavcodec/libsvt_vp9.c 1970-01-01 01:00:00.000000000 +0100 ++++ ffmpeg-7.1.1/libavcodec/libsvt_vp9.c 2025-03-24 10:54:38.620176868 +0100 +@@ -0,0 +1,701 @@ ++/* ++* Scalable Video Technology for VP9 encoder library plugin ++* ++* Copyright (c) 2018 Intel Corporation ++* ++* This file is part of FFmpeg. ++* ++* FFmpeg is free software; you can redistribute it and/or ++* modify it under the terms of the GNU Lesser General Public ++* License as published by the Free Software Foundation; either ++* version 2.1 of the License, or (at your option) any later version. ++* ++* FFmpeg is distributed in the hope that it will be useful, ++* but WITHOUT ANY WARRANTY; without even the implied warranty of ++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++* Lesser General Public License for more details. ++* ++* You should have received a copy of the GNU Lesser General Public ++* License along with this program; if not, write to the Free Software ++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++*/ ++ ++#include ++#include "EbSvtVp9ErrorCodes.h" ++#include "EbSvtVp9Enc.h" ++ ++#include "libavutil/common.h" ++#include "libavutil/frame.h" ++#include "libavutil/mem.h" ++#include "libavutil/opt.h" ++#include "libavcodec/get_bits.h" ++ ++#include "codec_internal.h" ++#include "internal.h" ++#include "encode.h" ++#include "avcodec.h" ++ ++#define SUPERFRAME_INDEX_MAX_SIZE 128 ++ ++#define RECIVED_FRAMES_MAX_SIZE 32 ++#define MAX_VP9_SUPERFRAME_SIZE 8 ++ ++typedef enum eos_status { ++ EOS_NOT_REACHED = 0, ++ EOS_REACHED, ++ EOS_TOTRIGGER ++}EOS_STATUS; ++ ++typedef struct SvtReceivedFrameStruct { ++ // fields for AVPacket ++ AVBufferRef *buf; ++ int64_t pts; ++ int64_t dts; ++ int size; ++ int flags; ++ ++ // svt fields: ++ int ready_flag; // frame or superframe in data is visible ++ int frames_count; ++ int frames_sizes[MAX_VP9_SUPERFRAME_SIZE]; ++} SvtReceivedFrameStruct; ++ ++typedef struct SvtContext { ++ AVClass *class; ++ ++ EbSvtVp9EncConfiguration enc_params; ++ EbComponentType *svt_handle; ++ ++ EbBufferHeaderType *in_buf; ++ int raw_size; ++ ++ AVFrame *frame; ++ ++ AVBufferPool* pool; ++ ++ EOS_STATUS eos_flag; ++ ++ // User options. ++ int enc_mode; ++ int rc_mode; ++ int tune; ++ int qp; ++ ++ int target_socket; ++ ++ int forced_idr; ++ ++ int level; ++ ++ int base_layer_switch_mode; ++ ++ ++ int64_t last_ready_dts; ++ SvtReceivedFrameStruct received_frames[RECIVED_FRAMES_MAX_SIZE]; ++ int received_frames_size; ++} SvtContext; ++ ++static int error_mapping(EbErrorType svt_ret) ++{ ++ int err; ++ ++ switch (svt_ret) { ++ case EB_ErrorInsufficientResources: ++ err = AVERROR(ENOMEM); ++ break; ++ ++ case EB_ErrorUndefined: ++ case EB_ErrorInvalidComponent: ++ case EB_ErrorBadParameter: ++ err = AVERROR(EINVAL); ++ break; ++ ++ case EB_ErrorDestroyThreadFailed: ++ case EB_ErrorSemaphoreUnresponsive: ++ case EB_ErrorDestroySemaphoreFailed: ++ case EB_ErrorCreateMutexFailed: ++ case EB_ErrorMutexUnresponsive: ++ case EB_ErrorDestroyMutexFailed: ++ err = AVERROR_EXTERNAL; ++ break; ++ ++ case EB_NoErrorEmptyQueue: ++ err = AVERROR(EAGAIN); ++ ++ case EB_ErrorNone: ++ err = 0; ++ break; ++ ++ default: ++ err = AVERROR_UNKNOWN; ++ } ++ ++ return err; ++} ++ ++static void free_buffer(SvtContext *svt_enc) ++{ ++ if (svt_enc->in_buf) { ++ EbSvtEncInput *in_data = (EbSvtEncInput *)svt_enc->in_buf->p_buffer; ++ av_freep(&in_data); ++ av_freep(&svt_enc->in_buf); ++ } ++ av_buffer_pool_uninit(&svt_enc->pool); ++} ++ ++static int alloc_buffer(EbSvtVp9EncConfiguration *config, SvtContext *svt_enc) ++{ ++ const size_t luma_size_8bit = ++ config->source_width * config->source_height; ++ const size_t luma_size_10bit = ++ (config->encoder_bit_depth > 8) ? luma_size_8bit : 0; ++ ++ EbSvtEncInput *in_data; ++ ++ svt_enc->raw_size = ((luma_size_8bit + luma_size_10bit) * 3 / 2) * MAX_VP9_SUPERFRAME_SIZE + SUPERFRAME_INDEX_MAX_SIZE; ++ ++ // allocate buffer for in and out ++ svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf)); ++ if (!svt_enc->in_buf) ++ goto failed; ++ ++ ++ svt_enc->in_buf->p_buffer = (unsigned char *)av_mallocz(sizeof(*in_data)); ++ if (!svt_enc->in_buf->p_buffer) ++ goto failed; ++ ++ svt_enc->in_buf->size = sizeof(*svt_enc->in_buf); ++ svt_enc->in_buf->p_app_private = NULL; ++ ++ svt_enc->pool = av_buffer_pool_init(svt_enc->raw_size, NULL); ++ if (!svt_enc->pool) ++ goto failed; ++ ++ svt_enc->received_frames_size = 0; ++ svt_enc->last_ready_dts = -1e9; ++ ++ return 0; ++ ++failed: ++ free_buffer(svt_enc); ++ return AVERROR(ENOMEM); ++} ++ ++static int config_enc_params(EbSvtVp9EncConfiguration *param, ++ AVCodecContext *avctx) ++{ ++ SvtContext *svt_enc = avctx->priv_data; ++ int ret; ++ int ten_bits = 0; ++ ++ param->source_width = avctx->width; ++ param->source_height = avctx->height; ++ ++ if (avctx->pix_fmt == AV_PIX_FMT_YUV420P10LE) { ++ av_log(avctx, AV_LOG_DEBUG , "Encoder 10 bits depth input\n"); ++ // Disable Compressed 10-bit format default ++ ten_bits = 1; ++ } ++ ++ // Update param from options ++ param->enc_mode = svt_enc->enc_mode; ++ param->level = svt_enc->level; ++ param->rate_control_mode = svt_enc->rc_mode; ++ param->tune = svt_enc->tune; ++ param->base_layer_switch_mode = svt_enc->base_layer_switch_mode; ++ param->qp = svt_enc->qp; ++ param->target_socket = svt_enc->target_socket; ++ param->target_bit_rate = avctx->bit_rate; ++ if (avctx->gop_size > 0) ++ param->intra_period = avctx->gop_size - 1; ++ ++ if (avctx->framerate.num > 0 && avctx->framerate.den > 0) { ++ param->frame_rate_numerator = avctx->framerate.num; ++ param->frame_rate_denominator = avctx->framerate.den * avctx->ticks_per_frame; ++ } else { ++ param->frame_rate_numerator = avctx->time_base.den; ++ param->frame_rate_denominator = avctx->time_base.num * avctx->ticks_per_frame; ++ } ++ ++ if (param->rate_control_mode) { ++ param->max_qp_allowed = avctx->qmax; ++ param->min_qp_allowed = avctx->qmin; ++ } ++ ++ if (ten_bits) { ++ param->encoder_bit_depth = 10; ++ } ++ ++ ret = alloc_buffer(param, svt_enc); ++ ++ return ret; ++} ++ ++static void read_in_data(EbSvtVp9EncConfiguration *config, ++ const AVFrame *frame, ++ EbBufferHeaderType *headerPtr) ++{ ++ uint8_t is16bit = config->encoder_bit_depth > 8; ++ uint64_t luma_size = ++ (uint64_t)config->source_width * config->source_height<< is16bit; ++ EbSvtEncInput *in_data = (EbSvtEncInput *)headerPtr->p_buffer; ++ ++ // support yuv420p and yuv420p010 ++ in_data->luma = frame->data[0]; ++ in_data->cb = frame->data[1]; ++ in_data->cr = frame->data[2]; ++ ++ // stride info ++ in_data->y_stride = frame->linesize[0] >> is16bit; ++ in_data->cb_stride = frame->linesize[1] >> is16bit; ++ in_data->cr_stride = frame->linesize[2] >> is16bit; ++ ++ headerPtr->n_filled_len += luma_size * 3/2u; ++} ++ ++static av_cold int eb_enc_init(AVCodecContext *avctx) ++{ ++ SvtContext *svt_enc = avctx->priv_data; ++ EbErrorType svt_ret; ++ ++ svt_enc->eos_flag = EOS_NOT_REACHED; ++ ++ svt_ret = eb_vp9_svt_init_handle(&svt_enc->svt_handle, svt_enc, &svt_enc->enc_params); ++ if (svt_ret != EB_ErrorNone) { ++ av_log(avctx, AV_LOG_ERROR, "Error init encoder handle\n"); ++ goto failed; ++ } ++ ++ svt_ret = config_enc_params(&svt_enc->enc_params, avctx); ++ if (svt_ret != EB_ErrorNone) { ++ av_log(avctx, AV_LOG_ERROR, "Error configure encoder parameters\n"); ++ goto failed_init_handle; ++ } ++ ++ svt_ret = eb_vp9_svt_enc_set_parameter(svt_enc->svt_handle, &svt_enc->enc_params); ++ if (svt_ret != EB_ErrorNone) { ++ av_log(avctx, AV_LOG_ERROR, "Error setting encoder parameters\n"); ++ goto failed_init_handle; ++ } ++ ++ svt_ret = eb_vp9_init_encoder(svt_enc->svt_handle); ++ if (svt_ret != EB_ErrorNone) { ++ av_log(avctx, AV_LOG_ERROR, "Error init encoder\n"); ++ goto failed_init_handle; ++ } ++ ++ svt_enc->frame = av_frame_alloc(); ++ if (!svt_enc->frame) ++ return AVERROR(ENOMEM); ++ ++ // if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) { ++ // EbBufferHeaderType* headerPtr; ++ // headerPtr->size = sizeof(headerPtr); ++ // headerPtr->n_filled_len = 0; /* in/out */ ++ // headerPtr->p_buffer = av_malloc(10 * 1024 * 1024); ++ // headerPtr->n_alloc_len = (10 * 1024 * 1024); ++ // ++ // if (!headerPtr->p_buffer) { ++ // av_log(avctx, AV_LOG_ERROR, ++ // "Cannot allocate buffer size %d.\n", headerPtr->n_alloc_len); ++ // svt_ret = EB_ErrorInsufficientResources; ++ // goto failed_init_enc; ++ // } ++ // ++ // svt_ret = eb_svt_enc_stream_header(svt_enc->svt_handle, &headerPtr); ++ // if (svt_ret != EB_ErrorNone) { ++ // av_log(avctx, AV_LOG_ERROR, "Error when build stream header.\n"); ++ // av_freep(&headerPtr->p_buffer); ++ // goto failed_init_enc; ++ // } ++ // ++ // avctx->extradata_size = headerPtr->n_filled_len; ++ // avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); ++ // if (!avctx->extradata) { ++ // av_log(avctx, AV_LOG_ERROR, ++ // "Cannot allocate VP9 header of size %d.\n", avctx->extradata_size); ++ // av_freep(&headerPtr->p_buffer); ++ // svt_ret = EB_ErrorInsufficientResources; ++ // goto failed_init_enc; ++ // } ++ // memcpy(avctx->extradata, headerPtr->p_buffer, avctx->extradata_size); ++ // ++ // av_freep(&headerPtr->p_buffer); ++ // } ++ return 0; ++ ++//failed_init_enc: ++// eb_deinit_encoder(svt_enc->svt_handle); ++failed_init_handle: ++ eb_vp9_deinit_handle(svt_enc->svt_handle); ++failed: ++ free_buffer(svt_enc); ++ return error_mapping(svt_ret); ++} ++ ++static int eb_send_frame(AVCodecContext *avctx, const AVFrame *frame) ++{ ++ SvtContext *svt_enc = avctx->priv_data; ++ EbBufferHeaderType *headerPtr = svt_enc->in_buf; ++ ++ if (!frame) { ++ if (svt_enc->eos_flag == EOS_REACHED) ++ return 0; ++ ++ EbBufferHeaderType headerPtrLast; ++ headerPtrLast.n_alloc_len = 0; ++ headerPtrLast.n_filled_len = 0; ++ headerPtrLast.n_tick_count = 0; ++ headerPtrLast.p_app_private = NULL; ++ headerPtrLast.p_buffer = NULL; ++ headerPtrLast.flags = EB_BUFFERFLAG_EOS; ++ ++ eb_vp9_svt_enc_send_picture(svt_enc->svt_handle, &headerPtrLast); ++ svt_enc->eos_flag = EOS_REACHED; ++ av_log(avctx, AV_LOG_DEBUG, "Finish sending frames!!!\n"); ++ return 0; ++ } ++ ++ read_in_data(&svt_enc->enc_params, frame, headerPtr); ++ ++ headerPtr->flags = 0; ++ headerPtr->p_app_private = NULL; ++ headerPtr->pts = frame->pts; ++ switch (frame->pict_type) { ++ case AV_PICTURE_TYPE_I: ++ headerPtr->pic_type = svt_enc->forced_idr > 0 ? EB_IDR_PICTURE : EB_I_PICTURE; ++ break; ++ case AV_PICTURE_TYPE_P: ++ headerPtr->pic_type = EB_P_PICTURE; ++ break; ++ case AV_PICTURE_TYPE_B: ++ headerPtr->pic_type = EB_B_PICTURE; ++ break; ++ default: ++ headerPtr->pic_type = EB_INVALID_PICTURE; ++ break; ++ } ++ eb_vp9_svt_enc_send_picture(svt_enc->svt_handle, headerPtr); ++ ++ return 0; ++} ++ ++static int is_frame_visible(uint8_t const* ptr, int size) { ++ GetBitContext gb; ++ int ret, visible, profile; ++ if ((ret = init_get_bits8(&gb, ptr, size)) < 0) { ++ return ret; ++ } ++ ++ // frame marker ++ get_bits(&gb, 2); ++ profile = get_bits1(&gb); ++ profile |= get_bits1(&gb) << 1; ++ ++ // reserved_zero ++ if (profile == 3) profile += get_bits1(&gb); // reserved_zero ++ ++ // read show_existing_frame ++ if (get_bits1(&gb)) { ++ // show_existing_frame == 1 ++ visible = 1; ++ } else { ++ // show_existing_frame == 0 ++ // keyframe (frame_type actually) ++ get_bits1(&gb); ++ // read show_frame ++ visible = get_bits1(&gb) ? 2 : 0; ++ } ++ ++ return visible; ++} ++ ++static int get_received_frame(SvtContext *svt_enc, AVPacket *pkt) { ++ SvtReceivedFrameStruct* rfs = &svt_enc->received_frames[0]; ++ ++ if (svt_enc->received_frames_size == 0 || !rfs->ready_flag) { ++ return AVERROR(EAGAIN); ++ } ++ ++ pkt->buf = rfs->buf; ++ pkt->data = rfs->buf->data; ++ pkt->dts = rfs->dts; ++ pkt->pts = rfs->pts; ++ pkt->flags = rfs->flags; ++ pkt->size = rfs->size; ++ ++ --svt_enc->received_frames_size; ++ for (int i = 0; i < svt_enc->received_frames_size; ++i) { ++ svt_enc->received_frames[i] = svt_enc->received_frames[i + 1]; ++ } ++ ++ return 0; ++} ++ ++static int put_received_frame(AVCodecContext *avctx, uint8_t* data, int size, int keyframe, int64_t dts, int64_t pts) { ++ SvtContext *svt_enc = avctx->priv_data; ++ SvtReceivedFrameStruct* rfs; ++ ++ if (svt_enc->received_frames_size == 0 || svt_enc->received_frames[svt_enc->received_frames_size - 1].ready_flag) { ++ ++svt_enc->received_frames_size; ++ if (svt_enc->received_frames_size > RECIVED_FRAMES_MAX_SIZE) { ++ av_log(avctx, AV_LOG_ERROR, "Fail: svt_enc->received_frames_size > RECIVED_FRAMES_MAX_SIZE \n"); ++ return AVERROR_BUG; ++ } ++ ++ rfs = &svt_enc->received_frames[svt_enc->received_frames_size - 1]; ++ ++ rfs->buf = av_buffer_pool_get(svt_enc->pool); ++ if (!rfs->buf) { ++ av_log(avctx, AV_LOG_ERROR, "Failed to allocate output packet.\n"); ++ return AVERROR(ENOMEM); ++ } ++ ++ rfs->size = 0; ++ rfs->flags = 0; ++ rfs->ready_flag = 0; ++ rfs->frames_count = 0; ++ } else { ++ rfs = &svt_enc->received_frames[svt_enc->received_frames_size - 1]; ++ } ++ ++ rfs->pts = pts; ++ rfs->dts = dts; ++ rfs->flags = (keyframe ? AV_PKT_FLAG_KEY : 0); ++ ++ ++rfs->frames_count; ++ if (rfs->frames_count > MAX_VP9_SUPERFRAME_SIZE) { ++ av_log(avctx, AV_LOG_ERROR, "Fail: rfs->frames_count > MAX_VP9_SUPERFRAME_SIZE \n"); ++ return AVERROR_BUG; ++ } ++ ++ rfs->frames_sizes[rfs->frames_count - 1] = size; ++ ++ memcpy(rfs->buf->data + rfs->size, data, size); ++ rfs->size += size; ++ ++ int visible = is_frame_visible(data, size); ++ if (visible < 0) { ++ av_log(avctx, AV_LOG_ERROR, "Fail: is_frame_visible \n"); ++ return visible; ++ } ++ ++ ++ rfs->ready_flag = visible; ++ ++ if (rfs->ready_flag) { ++ if (rfs->dts <= svt_enc->last_ready_dts) { ++ rfs->dts = svt_enc->last_ready_dts + 1; ++ } ++ svt_enc->last_ready_dts = rfs->dts; ++ ++ } ++ ++ // add superframe_index if needed ++ if (rfs->ready_flag && rfs->frames_count > 1) { ++ // superframe_header: ++ // 110 - superframe_marker ++ // 11 = 3 = bytes_per_framesize_minus_1 - use 4-bytes size ++ // xxx = frames_in_superframe_minus_1 ++ uint8_t header = 0b11011000; ++ header |= (rfs->frames_count - 1) & 0b111; ++ ++ uint8_t* ptr = rfs->buf->data + rfs->size; ++ ++ ptr[0] = header; ++ ++ptr; ++ ++ for (int i = 0; i < rfs->frames_count; ++i) { ++ ptr[0] = (rfs->frames_sizes[i] >> 0) & 0xff; ++ ptr[1] = (rfs->frames_sizes[i] >> 8) & 0xff; ++ ptr[2] = (rfs->frames_sizes[i] >> 16) & 0xff; ++ ptr[3] = (rfs->frames_sizes[i] >> 24) & 0xff; ++ ++ ptr += 4; ++ } ++ ++ ptr[0] = header; ++ ++ptr; ++ ++ rfs->size = ptr - rfs->buf->data; ++ } ++ ++ return 0; ++} ++ ++static int eb_receive_packet(AVCodecContext *avctx, AVPacket *pkt) ++{ ++ SvtContext *svt_enc = avctx->priv_data; ++ EbBufferHeaderType *headerPtr; ++ EbErrorType svt_ret; ++ AVBufferRef *ref; ++ int ret = 0; ++ ++ if (get_received_frame(svt_enc, pkt) == 0) { ++ return 0; ++ } ++ ++ if (EOS_TOTRIGGER == svt_enc->eos_flag) { ++ pkt = NULL; ++ return AVERROR_EOF; ++ } ++ ++ AVFrame *frame = svt_enc->frame; ++ ret = ff_encode_get_frame(avctx, frame); ++ if (ret < 0 && ret != AVERROR_EOF) { ++ return ret; ++ } ++ if (ret == AVERROR_EOF) ++ frame = NULL; ++ ++ ret = eb_send_frame(avctx, frame); ++ if (ret < 0) ++ return ret; ++ av_frame_unref(svt_enc->frame); ++ ++ for (;;) { ++ svt_ret = eb_vp9_svt_get_packet(svt_enc->svt_handle, &headerPtr, svt_enc->eos_flag); ++ if (svt_ret == EB_NoErrorEmptyQueue) { ++ return AVERROR(EAGAIN); ++ } ++ ++ if (EB_BUFFERFLAG_EOS & headerPtr->flags) ++ svt_enc->eos_flag = EOS_TOTRIGGER; ++ ++ ret = 0; ++ ++ // ignore headerPtr->dts on purpose ++ ++ if (headerPtr->flags & EB_BUFFERFLAG_SHOW_EXT) { ++ ret = put_received_frame(avctx, headerPtr->p_buffer, headerPtr->n_filled_len - 4, 0, headerPtr->pts - 3, headerPtr->pts - 3); ++ if (ret != 0) goto end; ++ ret = put_received_frame(avctx, headerPtr->p_buffer + headerPtr->n_filled_len - 4, 1, 0, headerPtr->pts - 2, headerPtr->pts - 2); ++ if (ret != 0) goto end; ++ ret = put_received_frame(avctx, headerPtr->p_buffer + headerPtr->n_filled_len - 3, 1, 0, headerPtr->pts - 1, headerPtr->pts - 1); ++ if (ret != 0) goto end; ++ ret = put_received_frame(avctx, headerPtr->p_buffer + headerPtr->n_filled_len - 2, 1, 0, headerPtr->pts + 0, headerPtr->pts + 0); ++ if (ret != 0) goto end; ++ ret = put_received_frame(avctx, headerPtr->p_buffer + headerPtr->n_filled_len - 1, 1, 0, headerPtr->pts + 1, headerPtr->pts + 1); ++ if (ret != 0) goto end; ++ } else { ++ ret = put_received_frame(avctx, headerPtr->p_buffer, headerPtr->n_filled_len, headerPtr->pic_type == EB_IDR_PICTURE, headerPtr->pts, headerPtr->pts); ++ if (ret != 0) goto end; ++ } ++ ++ ret = get_received_frame(svt_enc, pkt); ++ ++ end: ++ eb_vp9_svt_release_out_buffer(&headerPtr); ++ ++ if (ret == AVERROR(EAGAIN)) { ++ continue; ++ } ++ ++ break; ++ } ++ ++ ++ ++ return ret; ++} ++ ++static av_cold int eb_enc_close(AVCodecContext *avctx) ++{ ++ SvtContext *svt_enc = avctx->priv_data; ++ ++ eb_vp9_deinit_encoder(svt_enc->svt_handle); ++ eb_vp9_deinit_handle(svt_enc->svt_handle); ++ ++ av_frame_free(&svt_enc->frame); ++ ++ free_buffer(svt_enc); ++ ++ return 0; ++} ++ ++#define OFFSET(x) offsetof(SvtContext, x) ++#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM ++static const AVOption options[] = { ++ { "preset", "Encoding preset [1, 1]", ++ OFFSET(enc_mode), AV_OPT_TYPE_INT, { .i64 = 9 }, 0, 9, VE }, ++ ++ { "level", "Set level (level_idc)", OFFSET(level), ++ AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 0xff, VE, "level" }, ++ ++#define LEVEL(name, value) name, NULL, 0, AV_OPT_TYPE_CONST, \ ++ { .i64 = value }, 0, 0, VE, "level" ++ { LEVEL("1", 10) }, ++ { LEVEL("2", 20) }, ++ { LEVEL("2.1", 21) }, ++ { LEVEL("3", 30) }, ++ { LEVEL("3.1", 31) }, ++ { LEVEL("4", 40) }, ++ { LEVEL("4.1", 41) }, ++ { LEVEL("5", 50) }, ++ { LEVEL("5.1", 51) }, ++ { LEVEL("5.2", 52) }, ++ { LEVEL("6", 60) }, ++ { LEVEL("6.1", 61) }, ++ { LEVEL("6.2", 62) }, ++#undef LEVEL ++ ++ { "tune", "Tune mode", OFFSET(tune), ++ AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 2, VE , "tune"}, ++ { "vq", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "tune" }, ++ { "ssim", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, VE, "tune" }, ++ { "vmaf", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, INT_MIN, INT_MAX, VE, "tune" }, ++ ++ { "rc", "Bit rate control mode", OFFSET(rc_mode), ++ AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 2, VE , "rc"}, ++ { "cqp", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "rc" }, ++ { "vbr", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, VE, "rc" }, ++ { "cbr", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, INT_MIN, INT_MAX, VE, "rc" }, ++ ++ { "qp", "QP value for intra frames", OFFSET(qp), ++ AV_OPT_TYPE_INT, { .i64 = 32 }, 0, 51, VE }, ++ ++ { "socket", "Target CPU socket to use. -1 use all available", OFFSET(target_socket), ++ AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, ++ ++ { "bl_mode", "Random Access Prediction Structure type setting", OFFSET(base_layer_switch_mode), ++ AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, ++ ++ { "forced-idr", "If forcing keyframes, force them as IDR frames.", OFFSET(forced_idr), ++ AV_OPT_TYPE_BOOL, { .i64 = 0 }, -1, 1, VE }, ++ ++ {NULL}, ++}; ++ ++static const AVClass class = { ++ .class_name = "libsvt_vp9", ++ .item_name = av_default_item_name, ++ .option = options, ++ .version = LIBAVUTIL_VERSION_INT, ++}; ++ ++static const FFCodecDefault eb_enc_defaults[] = { ++ { "b", "7M" }, ++ { "flags", "-cgop" }, ++ { "qmin", "10" }, ++ { "qmax", "48" }, ++ { NULL }, ++}; ++ ++const FFCodec ff_libsvt_vp9_encoder = { ++ .p.name = "libsvt_vp9", ++ .p.long_name = NULL_IF_CONFIG_SMALL("SVT-VP9(Scalable Video Technology for VP9) encoder"), ++ .priv_data_size = sizeof(SvtContext), ++ .p.type = AVMEDIA_TYPE_VIDEO, ++ .p.id = AV_CODEC_ID_VP9, ++ .init = eb_enc_init, ++ FF_CODEC_RECEIVE_PACKET_CB(eb_receive_packet), ++ .close = eb_enc_close, ++ .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS, ++ .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | ++ FF_CODEC_CAP_AUTO_THREADS | FF_CODEC_CAP_INIT_CLEANUP, ++ .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, ++ AV_PIX_FMT_NONE }, ++ .p.priv_class = &class, ++ .defaults = eb_enc_defaults, ++ .p.wrapper_name = "libsvt_vp9", ++}; +diff -Naur ffmpeg-7.1.1.old/libavcodec/Makefile ffmpeg-7.1.1/libavcodec/Makefile +--- ffmpeg-7.1.1.old/libavcodec/Makefile 2025-03-24 10:54:37.935753999 +0100 ++++ ffmpeg-7.1.1/libavcodec/Makefile 2025-03-24 10:54:38.620394147 +0100 +@@ -1157,6 +1157,7 @@ + OBJS-$(CONFIG_LIBVORBIS_DECODER) += libvorbisdec.o + OBJS-$(CONFIG_LIBVORBIS_ENCODER) += libvorbisenc.o \ + vorbis_data.o ++OBJS-$(CONFIG_LIBSVT_VP9_ENCODER) += libsvt_vp9.o + OBJS-$(CONFIG_LIBVPX_VP8_DECODER) += libvpxdec.o + OBJS-$(CONFIG_LIBVPX_VP8_ENCODER) += libvpxenc.o + OBJS-$(CONFIG_LIBVPX_VP9_DECODER) += libvpxdec.o diff --git a/anda/multimedia/ffmpeg/ffmpeg.spec b/anda/multimedia/ffmpeg/ffmpeg.spec index b3ecb029fe..ab21a3db50 100644 --- a/anda/multimedia/ffmpeg/ffmpeg.spec +++ b/anda/multimedia/ffmpeg/ffmpeg.spec @@ -1,243 +1,174 @@ -# TODO: add make test to %%check section - -#global branch oldabi- -#global date 20230221 -#global commit 691d01989936d4b0681aa226aea8a19f06c04cea -#global rel %(c=%{commit}; echo ${c:0:7}) - -%global terrasrc_commit 60a820cdf3d0048cbffc8a83483cec768e70f909 - -%if 0%{?fedora} >= 37 || 0%{?rhel} >= 9 -%bcond_without libavcodec_freeworld -%else -%bcond_with libavcodec_freeworld -%endif - -%undefine _package_note_file - -%ifarch %{ix86} %{arm} -# Fails due to asm issue %global _lto_cflags %{nil} -%endif -# Cuda and others are only available on some arches -%global cuda_arches x86_64 +%global avcodec_soversion 61 +%global avdevice_soversion 61 +%global avfilter_soversion 10 +%global avformat_soversion 61 +%global avutil_soversion 59 +%global postproc_soversion 58 +%global swresample_soversion 5 +%global swscale_soversion 8 -# Disable because of gcc issue -%global _without_lensfun 1 -# Disable due to undefined symbols in libavformat -#global _with_dvddemuxer 1 -%ifnarch i686 -%global _with_bs2b 1 -%global _with_codec2 1 -%global _with_chromaprint 1 -%global _with_ilbc 1 -%global _with_openh264 1 -%if 0%{?fedora} -%global _with_placebo 1 -%endif -%global _with_rav1e 1 -%global _with_smb 1 -%global _with_snappy 1 -%global _with_svtav1 1 -%global _with_tesseract 1 -%global _with_twolame 1 -%global _with_wavpack 1 -%global _with_webp 1 -%global _with_zmq 1 -%else -%global _without_libklvanc 1 -%global _without_libaribb24 1 -%global _without_libaribcaption 1 -%global _without_rubberband 1 -%global _without_vulkan 1 -%endif -%ifarch x86_64 -%global _with_vpl 1 -%global _with_vapoursynth 1 -%global _with_vmaf 1 -%endif - -# flavor nonfree -%if 0%{?_with_cuda:1} -%global _with_cuvid 1 -%global _with_libnpp 1 -%endif - -# Disable nvenc when not relevant -%ifnarch %{cuda_arches} aarch64 -%global _without_nvenc 1 -%endif - -# extras flags -%if 0%{!?_cuda_version:1} -%global _cuda_version 12.6 -%endif -%global _cuda_version_rpm %(echo %{_cuda_version} | sed -e 's/\\./-/') -%global _cuda_bindir %{_cuda_prefix}/bin -%if 0%{?_with_cuda:1} -%global cuda_cflags $(pkg-config --cflags cuda-%{_cuda_version}) -%global cuda_ldflags $(pkg-config --libs cuda-%{_cuda_version}) -%endif - -%if 0%{?_with_libnpp:1} -%global libnpp_cflags $(pkg-config --cflags nppi-%{_cuda_version} nppc-%{_cuda_version}) -%global libnpp_ldlags $(pkg-config --libs-only-L nppi-%{_cuda_version} nppc-%{_cuda_version}) -%endif - -%if 0%{?_with_rpi:1} -%global _with_omx 1 -%global _with_omx_rpi 1 -%global _with_mmal 1 -ExclusiveArch: armv7hnl -%endif - -%if 0%{?_without_gpl} -%global lesser L -%endif - -%if 0%{!?_without_amr} || 0%{?_with_gmp} || 0%{?_with_smb} || 0%{?_with_vmaf} -%global ffmpeg_license %{?lesser}GPLv3+ -%else -%global ffmpeg_license %{?lesser}GPLv2+ -%endif - -Summary: Digital VCR and streaming server -Name: ffmpeg%{?flavor} +Summary: A complete solution to record, convert and stream audio and video +Name: ffmpeg Version: 7.1.1 -Release: 1%?dist -License: %{ffmpeg_license} -URL: https://ffmpeg.org/ -%if 0%{?date} -Source0: ffmpeg-%{?branch}%{date}.tar.bz2 -%else -Source0: https://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz -Source1: https://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz.asc -Source2: https://ffmpeg.org/ffmpeg-devel.asc -%endif -# We don't endorse adding this patch but fedora insists on breaking the ffmpeg ABI -#Patch0: https://raw.githubusercontent.com/terrapkg/pkg-ffmpeg/%terrasrc_commit/ffmpeg-chromium.patch -Patch1: https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/099f88b8641dfc299f3896d17d9addc5b9ae7799 -Conflicts: %{name}-free -Provides: %{name}-bin = %{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -%{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel} -%{?_with_cuda:%{?!_with_cuda_nvcc:BuildRequires: clang}} -%{?_with_libnpp:BuildRequires: pkgconfig(nppc-%{_cuda_version})} -BuildRequires: alsa-lib-devel -BuildRequires: AMF-devel +Release: 1%{?dist} +License: LGPL-3.0-or-later +URL: http://%{name}.org/ +Epoch: 1 + +Source0: http://%{name}.org/releases/%{name}-%{version}.tar.xz + +# https://github.com/OpenVisualCloud/SVT-VP9/tree/master/ffmpeg_plugin +Patch0: %{name}-svt-vp9.patch +# https://github.com/HandBrake/HandBrake/tree/e117cfe7fca37abeec59ea4201e5d93ed7477746 +Patch2: %{name}-HandBrake.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=2240127 +# Reference: https://crbug.com/1306560 +Patch3: %{name}-chromium.patch +# Fix build with recent NVCC: +Patch4: %{name}-nvcc.patch + +BuildRequires: AMF-devel >= 1.4.28 BuildRequires: bzip2-devel -%{?_with_codec2:BuildRequires: codec2-devel} -%{?_with_faac:BuildRequires: faac-devel} -%{?_with_fdk_aac:BuildRequires: fdk-aac-devel} -%{?_with_flite:BuildRequires: flite-devel} -BuildRequires: fontconfig-devel -BuildRequires: freetype-devel -BuildRequires: fribidi-devel -%{!?_without_frei0r:BuildRequires: frei0r-devel} -%{?_with_gme:BuildRequires: game-music-emu-devel} -BuildRequires: gnupg2 -BuildRequires: gnutls-devel +BuildRequires: codec2-devel +BuildRequires: doxygen +BuildRequires: frei0r-devel +BuildRequires: gmp-devel BuildRequires: gsm-devel -BuildRequires: harfbuzz-devel -%{?_with_ilbc:BuildRequires: ilbc-devel} +BuildRequires: ilbc-devel BuildRequires: lame-devel >= 3.98.3 -%{!?_without_jack:BuildRequires: jack-audio-connection-kit-devel} -%{!?_without_jxl:BuildRequires: libjxl-devel} -%{!?_without_ladspa:BuildRequires: ladspa-devel} -BuildRequires: lcms2-devel -%{!?_without_aom:BuildRequires: libaom-devel} -%{!?_without_aribb24:BuildRequires: pkgconfig(aribb24) >= 1.0.3} -%{!?_without_dav1d:BuildRequires: libdav1d-devel} -%{?_with_dvddemuxer:BuildRequires: libdvdnav-devel libdvdread-devel} -%{!?_without_ass:BuildRequires: libass-devel} -%{!?_without_bluray:BuildRequires: libbluray-devel} -%{?_with_bs2b:BuildRequires: libbs2b-devel} -%{?_with_caca:BuildRequires: libcaca-devel} -%{!?_without_cdio:BuildRequires: libcdio-paranoia-devel} -%{?_with_chromaprint:BuildRequires: libchromaprint-devel} -%{!?_without_lensfun:BuildRequires: lensfun-devel} -%if 0%{?_with_ieee1394} +BuildRequires: ladspa-devel BuildRequires: libavc1394-devel -BuildRequires: libdc1394-devel -BuildRequires: libiec61883-devel -%endif -%{!?_without_libaribcaption:BuildRequires: pkgconfig(libaribcaption) >= 1.1.1} -BuildRequires: libdrm-devel +BuildRequires: libchromaprint-devel BuildRequires: libgcrypt-devel -%{!?_without_libklvanc:BuildRequires: libklvanc-devel} -BuildRequires: libGL-devel -BuildRequires: libmodplug-devel -BuildRequires: libmysofa-devel -%if 0%{?fedora} && 0%{?fedora} > 39 -%{?_with_openh264:BuildRequires: noopenh264-devel} -%else -%{?_with_openh264:BuildRequires: openh264-devel} -%endif -BuildRequires: libopenmpt-devel -%{?_with_placebo:BuildRequires: libplacebo-devel >= 4.192.0} -BuildRequires: librsvg2-devel -# Disable rtmp because of rfbz: 6441 & 2399 -%{?_with_rtmp:BuildRequires: librtmp-devel} -%{?_with_smb:BuildRequires: libsmbclient-devel} -BuildRequires: libssh-devel +BuildRequires: libiec61883-devel +BuildRequires: libklvanc-devel BuildRequires: libtheora-devel -BuildRequires: libv4l-devel -%{?!_without_vaapi:BuildRequires: libva-devel >= 0.31.0} BuildRequires: libvdpau-devel -BuildRequires: libvorbis-devel -%{?_with_vapoursynth:BuildRequires: vapoursynth-devel} -%{?!_without_vpx:BuildRequires: libvpx-devel >= 1.4.0} -%{?_with_mfx:BuildRequires: pkgconfig(libmfx) >= 1.23-1} -%ifarch %{ix86} x86_64 +BuildRequires: libxavs-devel +BuildRequires: mesa-libGL-devel BuildRequires: nasm -%endif -%{?_with_webp:BuildRequires: libwebp-devel} -%{?_with_netcdf:BuildRequires: netcdf-devel} -%{?_with_rpi:BuildRequires: raspberrypi-vc-devel} -%{!?_without_nvenc:BuildRequires: nv-codec-headers} -%{!?_without_amr:BuildRequires: opencore-amr-devel vo-amrwbenc-devel} -%{?_with_omx:BuildRequires: libomxil-bellagio-devel} -BuildRequires: libxcb-devel -BuildRequires: libxml2-devel -%{!?_without_lv2:BuildRequires: lilv-devel lv2-devel} -%{!?_without_openal:BuildRequires: openal-soft-devel} -%if 0%{!?_without_opencl:1} -BuildRequires: opencl-headers ocl-icd-devel -%{?fedora:Recommends: opencl-icd} -%endif -%{?_with_opencv:BuildRequires: opencv-devel} -BuildRequires: openjpeg2-devel -%{!?_without_opus:BuildRequires: opus-devel >= 1.1.3} -%{!?_without_pulse:BuildRequires: pulseaudio-libs-devel} -BuildRequires: perl(GD::Text) +BuildRequires: ocl-icd-devel +BuildRequires: openal-soft-devel +BuildRequires: opencore-amr-devel BuildRequires: perl(Pod::Man) -BuildRequires: perl(Texinfo::Convert::HTML) -BuildRequires: qrencode-devel -%{?_with_rav1e:BuildRequires: pkgconfig(rav1e)} -%{!?_without_rubberband:BuildRequires: rubberband-devel} -%{!?_without_tools:BuildRequires: SDL2-devel} -%{?_with_snappy:BuildRequires: snappy-devel} +BuildRequires: snappy-devel BuildRequires: soxr-devel -BuildRequires: speex-devel -BuildRequires: pkgconfig(srt) -%{?_with_svtav1:BuildRequires: svt-av1-devel >= 0.9.0} -%{?_with_tesseract:BuildRequires: tesseract-devel} -#BuildRequires: texi2html +BuildRequires: subversion BuildRequires: texinfo -%{?_with_twolame:BuildRequires: twolame-devel} -%{?_with_vmaf:BuildRequires: libvmaf-devel >= 1.5.2} -%{?_with_vpl:BuildRequires: pkgconfig(vpl) >= 2.6} -%{?_with_wavpack:BuildRequires: wavpack-devel} -%{!?_without_vidstab:BuildRequires: vid.stab-devel} -%{!?_without_vulkan:BuildRequires: pkgconfig(shaderc) pkgconfig(vulkan) >= 1.3.277} -%{!?_without_x264:BuildRequires: x264-devel >= 0.0.0-0.31} -%{!?_without_x265:BuildRequires: x265-devel} -%{!?_without_xvid:BuildRequires: xvidcore-devel} -%{!?_without_zimg:BuildRequires: zimg-devel >= 2.7.0} -BuildRequires: zlib-devel -%{?_with_zmq:BuildRequires: zeromq-devel} -%{!?_without_zvbi:BuildRequires: zvbi-devel} +BuildRequires: twolame-devel >= 0.3.10 +BuildRequires: vo-amrwbenc-devel +BuildRequires: xvidcore-devel +BuildRequires: xz-devel + +BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(aom) >= 1.0.0 +BuildRequires: pkgconfig(aribb24) >= 1.0.3 +BuildRequires: pkgconfig(caca) +BuildRequires: pkgconfig(dav1d) >= 0.5.0 +BuildRequires: pkgconfig(davs2) >= 1.6.0 +BuildRequires: pkgconfig(dvdnav) >= 6.1.1 +BuildRequires: pkgconfig(fdk-aac) +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(fribidi) +BuildRequires: pkgconfig(harfbuzz) +BuildRequires: pkgconfig(jack) +BuildRequires: pkgconfig(kvazaar) >= 0.8.1 +BuildRequires: pkgconfig(lc3) >= 1.1.0 +BuildRequires: pkgconfig(lcms2) >= 2.13 +BuildRequires: pkgconfig(lcevc_dec) >= 2.0.0 +BuildRequires: pkgconfig(libaribcaption) >= 1.1.1 +BuildRequires: pkgconfig(libass) >= 0.11.0 +BuildRequires: pkgconfig(libbluray) +BuildRequires: pkgconfig(libbs2b) +BuildRequires: pkgconfig(libcdio_paranoia) +BuildRequires: pkgconfig(libdc1394-2) +BuildRequires: pkgconfig(libdrm) +BuildRequires: pkgconfig(libgme) +BuildRequires: pkgconfig(libjxl) >= 0.7.0 +#BuildRequires: pkgconfig(lensfun) > 0.3.95 +BuildRequires: pkgconfig(libmodplug) +BuildRequires: pkgconfig(libmysofa) +BuildRequires: pkgconfig(libopenjp2) >= 2.1.0 +BuildRequires: pkgconfig(libopenmpt) >= 0.2.6557 +BuildRequires: pkgconfig(libplacebo) >= 4.192.0 +BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(libqrencode) +#BuildRequires: pkgconfig(libquirc) +BuildRequires: pkgconfig(librabbitmq) >= 0.7.1 +BuildRequires: pkgconfig(librist) >= 0.2.7 +BuildRequires: pkgconfig(librtmp) +BuildRequires: pkgconfig(librsvg-2.0) +BuildRequires: pkgconfig(libssh) +BuildRequires: pkgconfig(libtcmalloc) +BuildRequires: pkgconfig(libva) >= 0.35.0 +BuildRequires: pkgconfig(libva-drm) +BuildRequires: pkgconfig(libva-x11) +BuildRequires: pkgconfig(libv4l2) +BuildRequires: pkgconfig(libvvenc) >= 1.11.0 +BuildRequires: pkgconfig(libwebp) +BuildRequires: pkgconfig(libwebpmux) >= 0.4.0 +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(libzmq) >= 4.2.1 +BuildRequires: pkgconfig(lilv-0) +BuildRequires: pkgconfig(lv2) +#BuildRequires: pkgconfig(OpenCL) +#BuildRequires: pkgconfig(opencv) +BuildRequires: pkgconfig(openh264) +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(opus) +BuildRequires: pkgconfig(rav1e) >= 0.4.0 +BuildRequires: pkgconfig(rubberband) >= 1.8.1 +BuildRequires: pkgconfig(sdl2) +BuildRequires: pkgconfig(shaderc) >= 2019.1 +#BuildRequires: pkgconfig(shine) +BuildRequires: pkgconfig(smbclient) +BuildRequires: pkgconfig(speex) +BuildRequires: pkgconfig(srt) >= 1.3.0 +BuildRequires: pkgconfig(tesseract) +BuildRequires: pkgconfig(uavs3d) >= 1.1.41 +BuildRequires: pkgconfig(vapoursynth-script) >= 42 +BuildRequires: pkgconfig(vidstab) >= 0.98 +BuildRequires: pkgconfig(vorbis) +BuildRequires: pkgconfig(vorbisenc) +BuildRequires: pkgconfig(vpx) >= 1.4.0 +BuildRequires: pkgconfig(vulkan) >= 1.3.277 +BuildRequires: pkgconfig(xavs2) >= 1.3.0 +BuildRequires: pkgconfig(xcb) >= 1.4 +BuildRequires: pkgconfig(xcb-shape) +BuildRequires: pkgconfig(xcb-shm) +BuildRequires: pkgconfig(xcb-xfixes) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(x264) +BuildRequires: pkgconfig(x265) +BuildRequires: pkgconfig(xv) +BuildRequires: pkgconfig(zimg) >= 2.7.0 +BuildRequires: pkgconfig(zlib) +BuildRequires: pkgconfig(zvbi-0.2) >= 0.2.28 + +%ifarch x86_64 aarch64 +# Nvidia CUVID support and Performance Primitives based code +BuildRequires: cuda-cudart-devel +BuildRequires: cuda-nvcc +BuildRequires: libnpp-devel +BuildRequires: pkgconfig(ffnvcodec) >= 12.0.16.0 +%endif + +%ifarch x86_64 +BuildRequires: pkgconfig(libmfx) +BuildRequires: pkgconfig(libvmaf) >= 2.0.0 +BuildRequires: pkgconfig(SvtAv1Enc) >= 0.9.0 +BuildRequires: pkgconfig(SvtVp9Enc) +BuildRequires: pkgconfig(vpl) >= 2.6 +#BuildRequires: pkgconfig(xevd) >= 0.4.1 +#BuildRequires: pkgconfig(xeve) >= 0.4.3 +%endif + +Obsoletes: %{name}-free < %{epoch}:%{version}-%{release} +Provides: %{name}-free = %{epoch}:%{version}-%{release} %description FFmpeg is a complete and free Internet live audio and video @@ -246,1687 +177,489 @@ VCR. It can encode in real time in many formats including MPEG1 audio and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash. %package libs -Summary: Libraries for %{name} -Conflicts: libavcodec-free -Conflicts: libavfilter-free -Conflicts: libavformat-free -Conflicts: libavutil-free -Conflicts: libpostproc-free -Conflicts: libswresample-free -Conflicts: libswscale-free -%{?_with_vmaf:Recommends: vmaf-models} -Provides: libavcodec-freeworld = %{version}-%{release} +Summary: Metapackage for %{name} libraries +Requires: libavcodec%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libavdevice%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libavfilter%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libavformat%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libavutil%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libpostproc%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libswresample%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libswscale%{?_isa} = %{epoch}:%{version}-%{release} %description libs FFmpeg is a complete and free Internet live audio and video broadcasting solution for Linux/Unix. It also includes a digital VCR. It can encode in real time in many formats including MPEG1 audio and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash. -This package contains the libraries for %{name} +This metapackage pulls in all the %{name} libraries. -%package -n libavdevice%{?flavor} -Summary: Special devices muxing/demuxing library -Conflicts: libavdevice-free -Requires: %{name}-libs%{_isa} = %{version}-%{release} +%package devel +Summary: Metapackage for %{name} development files +Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +Requires: pkgconfig -%description -n libavdevice%{?flavor} +%description devel +FFmpeg is a complete and free Internet live audio and video broadcasting +solution for Linux/Unix. It also includes a digital VCR. It can encode in real +time in many formats. This package contains development files for %{name}. + +%package -n libavcodec +Summary: FFmpeg codec library +Obsoletes: libavcodec-free < %{epoch}:%{version}-%{release} +Provides: libavcodec-free = %{epoch}:%{version}-%{release} + +%description -n libavcodec +The libavcodec library provides a generic encoding/decoding framework and +contains multiple decoders and encoders for audio, video and subtitle streams, +and several bitstream filters. + +%package -n libavcodec-devel +Summary: Development files for FFmpeg's codec library +Requires: libavcodec%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libavutil-devel%{?_isa} = %{epoch}:%{version}-%{release} +Requires: pkgconfig +Obsoletes: libavcodec-free-devel < %{epoch}:%{version}-%{release} +Provides: libavcodec-free-devel = %{epoch}:%{version}-%{release} + +%description -n libavcodec-devel +The libavcodec library provides a generic encoding/decoding framework and +contains multiple decoders and encoders for audio, video and subtitle streams, +and several bitstream filters. + +This subpackage contains the headers for FFmpeg libavcodec. + +%package -n libavdevice +Summary: FFMpeg devices muxing/demuxing library +Obsoletes: libavdevice-free < %{epoch}:%{version}-%{release} +Provides: libavdevice-free = %{epoch}:%{version}-%{release} + +%description -n libavdevice Libavdevice is a complementary library to libavf "libavformat". It provides various "special" platform-specific muxers and demuxers, e.g. for grabbing devices, audio capture and playback etc. -%package devel -Summary: Development package for %{name} -Conflicts: %{name}-free-devel -Requires: %{name}-libs%{_isa} = %{version}-%{release} -Requires: libavdevice%{?flavor}%{_isa} = %{version}-%{release} +%package -n libavdevice-devel +Summary: Development files for FFMpeg devices muxing/demuxing library +Requires: libavcodec-devel%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libavdevice%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libavfilter-devel%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libavformat-devel%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libavutil-devel%{?_isa} = %{epoch}:%{version}-%{release} Requires: pkgconfig +Obsoletes: libavdevice-free-devel < %{epoch}:%{version}-%{release} +Provides: libavdevice-free-devel = %{epoch}:%{version}-%{release} -%description devel -FFmpeg is a complete and free Internet live audio and video -broadcasting solution for Linux/Unix. It also includes a digital -VCR. It can encode in real time in many formats including MPEG1 audio -and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash. -This package contains development files for %{name} +%description -n libavdevice-devel +This subpackage contains the headers for FFmpeg libavdevice. -%if %{with libavcodec_freeworld} -%package -n libavcodec-freeworld -Summary: Freeworld libavcodec to complement the distro counterparts -# Supplements doesn't work well yet - we can rely on comps for now -#Supplements: libavcodec-free >= %%{version} -Conflicts: libavcodec-free < %{version} +%package -n libavfilter +Summary: FFmpeg audio and video filtering library +Requires: libavcodec%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libavformat%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libavutil%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libpostproc%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libswresample%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libswscale%{?_isa} = %{epoch}:%{version}-%{release} +Obsoletes: libavfilter-free < %{epoch}:%{version}-%{release} +Provides: libavfilter-free = %{epoch}:%{version}-%{release} -%description -n libavcodec-freeworld -Freeworld libavcodec to complement the distro counterparts -%endif +%description -n libavfilter +The libavfilter library provides a generic audio/video filtering framework +containing several filters, sources and sinks. +%package -n libavfilter-devel +Summary: Development files for FFmpeg's audio/video filter library +Requires: libavcodec-devel%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libavfilter%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libavformat-devel%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libavutil-devel%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libpostproc-devel%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libswresample-devel%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libswscale-devel%{?_isa} = %{epoch}:%{version}-%{release} +Requires: pkgconfig +Obsoletes: libavfilter-free-devel < %{epoch}:%{version}-%{release} +Provides: libavfilter-free-devel = %{epoch}:%{version}-%{release} -# Don't use the %%configure macro as this is not an autotool script -%global ff_configure \ -./configure \\\ - --prefix=%{_prefix} \\\ - --bindir=%{_bindir} \\\ - --datadir=%{_datadir}/%{name} \\\ - --docdir=%{_docdir}/%{name} \\\ - --incdir=%{_includedir}/%{name} \\\ - --libdir=%{_libdir} \\\ - --mandir=%{_mandir} \\\ - --arch=%{_target_cpu} \\\ - --optflags="%{optflags}" \\\ - --extra-ldflags="%{?__global_ldflags} %{?cuda_ldflags} %{?libnpp_ldlags}" \\\ - --extra-cflags="%{?cuda_cflags} %{?libnpp_cflags} -I%{_includedir}/rav1e" \\\ - %{?flavor:--disable-manpages} \\\ - %{?progs_suffix:--progs-suffix=%{progs_suffix}} \\\ - %{?build_suffix:--build-suffix=%{build_suffix}} \\\ - %{!?_without_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-version3} \\\ - --enable-bzlib \\\ - %{?_with_chromaprint:--enable-chromaprint} \\\ - --enable-fontconfig \\\ - %{!?_without_frei0r:--enable-frei0r} \\\ - --enable-gcrypt \\\ - %{?_with_gmp:--enable-gmp --enable-version3} \\\ - --enable-gnutls \\\ - %{!?_without_ladspa:--enable-ladspa} \\\ - --enable-lcms2 \\\ - %{!?_without_aom:--enable-libaom} \\\ - %{!?_without_libaribb24:--enable-libaribb24} \\\ - %{!?_without_libaribcaption:--enable-libaribcaption} \\\ - %{!?_without_dav1d:--enable-libdav1d} \\\ - %{!?_without_ass:--enable-libass} \\\ - %{!?_without_bluray:--enable-libbluray} \\\ - %{?_with_bs2b:--enable-libbs2b} \\\ - %{?_with_caca:--enable-libcaca} \\\ - %{?_with_codec2:--enable-libcodec2} \\\ - %{?_with_cuda_nvcc:--enable-cuda-nvcc --enable-nonfree} \\\ - %{?_with_cuvid:--enable-cuvid --enable-nonfree} \\\ - %{!?_without_cdio:--enable-libcdio} \\\ - %{?_with_ieee1394:--enable-libdc1394 --enable-libiec61883} \\\ - --enable-libdrm \\\ - %{?_with_dvddemuxer:--enable-libdvdnav --enable-libdvdread} \\\ - %{?_with_faac:--enable-libfaac --enable-nonfree} \\\ - %{?_with_fdk_aac:--enable-libfdk-aac --enable-nonfree} \\\ - %{?_with_flite:--enable-libflite} \\\ - %{!?_without_jack:--enable-libjack} \\\ - %{!?_without_jxl:--enable-libjxl} \\\ - --enable-libfreetype \\\ - %{!?_without_fribidi:--enable-libfribidi} \\\ - %{?_with_gme:--enable-libgme} \\\ - --enable-libgsm \\\ - --enable-libharfbuzz \\\ - %{?_with_ilbc:--enable-libilbc} \\\ - %{!?_without_lensfun:--enable-liblensfun} \\\ - %{?_with_libnpp:--enable-libnpp --enable-nonfree} \\\ - --enable-libmp3lame \\\ - --enable-libmysofa \\\ - %{?_with_netcdf:--enable-netcdf} \\\ - %{?_with_mmal:--enable-mmal} \\\ - %{!?_without_nvenc:--enable-nvenc} \\\ - %{?_with_omx:--enable-omx} \\\ - %{?_with_omx_rpi:--enable-omx-rpi} \\\ - %{!?_without_openal:--enable-openal} \\\ - %{!?_without_opencl:--enable-opencl} \\\ - %{?_with_opencv:--enable-libopencv} \\\ - %{!?_without_opengl:--enable-opengl} \\\ - %{?_with_openh264:--enable-libopenh264} \\\ - --enable-libopenjpeg \\\ - --enable-libopenmpt \\\ - %{!?_without_opus:--enable-libopus} \\\ - %{!?_without_pulse:--enable-libpulse} \\\ - %{?_with_placebo:--enable-libplacebo} \\\ - --enable-librsvg \\\ - %{?_with_rav1e:--enable-librav1e} \\\ - %{?_with_rtmp:--enable-librtmp} \\\ - %{!?_without_rubberband:--enable-librubberband} \\\ - --enable-libqrencode \\\ - %{?_with_smb:--enable-libsmbclient --enable-version3} \\\ - %{?_with_snappy:--enable-libsnappy} \\\ - --enable-libsoxr \\\ - --enable-libspeex \\\ - --enable-libsrt \\\ - --enable-libssh \\\ - %{?_with_svtav1:--enable-libsvtav1} \\\ - %{?_with_tesseract:--enable-libtesseract} \\\ - --enable-libtheora \\\ - %{?_with_twolame:--enable-libtwolame} \\\ - --enable-libvorbis \\\ - --enable-libv4l2 \\\ - %{!?_without_vidstab:--enable-libvidstab} \\\ - %{?_with_vmaf:--enable-libvmaf --enable-version3} \\\ - %{?_with_vapoursynth:--enable-vapoursynth} \\\ - %{!?_without_vpx:--enable-libvpx} \\\ - %{!?_without_vulkan:--enable-vulkan --enable-libshaderc} \\\ - %{?_with_webp:--enable-libwebp} \\\ - %{!?_without_x264:--enable-libx264} \\\ - %{!?_without_x265:--enable-libx265} \\\ - %{!?_without_xvid:--enable-libxvid} \\\ - --enable-libxml2 \\\ - %{!?_without_zimg:--enable-libzimg} \\\ - %{?_with_zmq:--enable-libzmq} \\\ - %{!?_without_zvbi:--enable-libzvbi} \\\ - %{!?_without_lv2:--enable-lv2} \\\ - --enable-avfilter \\\ - --enable-libmodplug \\\ - --enable-postproc \\\ - --enable-pthreads \\\ - --disable-static \\\ - --enable-shared \\\ - %{!?_without_gpl:--enable-gpl} \\\ - --disable-debug \\\ - --disable-stripping +%description -n libavfilter-devel +This subpackage contains the headers for FFmpeg libavfilter. +%package -n libavformat +Summary: FFmpeg's stream format library +Obsoletes: libavformat-free < %{epoch}:%{version}-%{release} +Provides: libavformat-free = %{epoch}:%{version}-%{release} + +%description -n libavformat +The libavformat library provides a generic framework for multiplexing and +demultiplexing (muxing and demuxing) audio, video and subtitle streams. +It encompasses multiple muxers and demuxers for multimedia container formats. + +%package -n libavformat-devel +Summary: Development files for FFmpeg's stream format library +Requires: libavcodec-devel%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libavformat%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libavutil-devel%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libswresample-devel%{?_isa} = %{epoch}:%{version}-%{release} +Requires: pkgconfig +Obsoletes: libavformat-free-devel < %{epoch}:%{version}-%{release} +Provides: libavformat-free-devel = %{epoch}:%{version}-%{release} + +%description -n libavformat-devel +This subpackage contains the headers for FFmpeg libavformat. + +%package -n libavutil +Summary: FFmpeg's utility library +Obsoletes: libavutil-free < %{epoch}:%{version}-%{release} +Provides: libavutil-free = %{epoch}:%{version}-%{release} + +%description -n libavutil +The libavutil library is a utility library to aid portable multimedia +programming. It contains safe portable string functions, random +number generators, data structures, additional mathematics functions, +cryptography and multimedia related functionality (like enumerations +for pixel and sample formats). + +%package -n libavutil-devel +Summary: Development files for FFmpeg's utility library +Requires: libavutil%{?_isa} = %{epoch}:%{version}-%{release} +Requires: pkgconfig +Obsoletes: libavutil-free-devel < %{epoch}:%{version}-%{release} +Provides: libavutil-free-devel = %{epoch}:%{version}-%{release} + +%description -n libavutil-devel +This subpackage contains the headers for FFmpeg libavutil. + +%package -n libpostproc +Summary: FFmpeg post-processing library +Obsoletes: libpostproc-free < %{epoch}:%{version}-%{release} +Provides: libpostproc-free = %{epoch}:%{version}-%{release} + +%description -n libpostproc +A library with video postprocessing filters, such as deblocking and +deringing filters, noise reduction, automatic contrast and brightness +correction, linear/cubic interpolating deinterlacing. + +%package -n libpostproc-devel +Summary: Development files for the FFmpeg post-processing library +Requires: libavutil-devel%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libpostproc%{?_isa} = %{epoch}:%{version}-%{release} +Requires: pkgconfig +Obsoletes: libpostproc-free-devel < %{epoch}:%{version}-%{release} +Provides: libpostproc-free-devel = %{epoch}:%{version}-%{release} + +%description -n libpostproc-devel +This subpackage contains the headers for FFmpeg libpostproc. + +%package -n libswresample +Summary: FFmpeg software resampling library +Requires: libavutil%{?_isa} = %{epoch}:%{version}-%{release} +Obsoletes: libavresemple < %{epoch}:%{version}-%{release} +Provides: libavresemple = %{epoch}:%{version}-%{release} +Obsoletes: libswresample-free < %{epoch}:%{version}-%{release} +Provides: libswresample-free = %{epoch}:%{version}-%{release} + +%description -n libswresample +The libswresample library performs audio conversion between different +sample rates, channel layout and channel formats. + +%package -n libswresample-devel +Summary: Development files for the FFmpeg software resampling library +Requires: libavutil-devel%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libswresample%{?_isa} = %{epoch}:%{version}-%{release} +Obsoletes: libavresemple-devel < %{epoch}:%{version}-%{release} +Provides: libavresemple-devel = %{epoch}:%{version}-%{release} +Obsoletes: libswresample-free-devel < %{epoch}:%{version}-%{release} +Provides: libswresample-free-devel = %{epoch}:%{version}-%{release} + +%description -n libswresample-devel +This subpackage contains the headers for FFmpeg libswresample. + +%package -n libswscale +Summary: FFmpeg image scaling and colorspace/pixel conversion library +Obsoletes: libswscale-free < %{epoch}:%{version}-%{release} +Provides: libswscale-free = %{epoch}:%{version}-%{release} + +%description -n libswscale +The libswscale library performs image scaling and colorspace and +pixel format conversion operations. + +%package -n libswscale-devel +Summary: Development files for FFmpeg's image scaling and colorspace library +Requires: libavutil-devel%{?_isa} = %{epoch}:%{version}-%{release} +Requires: libswscale%{?_isa} = %{epoch}:%{version}-%{release} +Obsoletes: libswscale-free-devel < %{epoch}:%{version}-%{release} +Provides: libswscale-free-devel = %{epoch}:%{version}-%{release} + +%description -n libswscale-devel +This subpackage contains the headers for FFmpeg libswscale. %prep -%if 0%{?date} -%autosetup -p1 -n ffmpeg-%{?branch}%{date} -echo "git-snapshot-%{?branch}%{date}-rpmfusion" > VERSION -%else -%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' -%autosetup -p1 -n ffmpeg-%{version} -%endif -# fix -O3 -g in host_cflags -sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure -mkdir -p _doc/examples -cp -pr doc/examples/{*.c,Makefile,README} _doc/examples/ +%autosetup -p1 + +# Uncomment to enable debugging while configuring +#sed -i -e 's|#!/bin/sh|#!/bin/sh -x|g' configure %build -%{?_with_cuda:export PATH=${PATH}:%{_cuda_bindir}} -%{ff_configure}\ +%set_build_flags + +./configure \ + --arch=%{_target_cpu} \ + --bindir=%{_bindir} \ + --datadir=%{_datadir}/%{name} \ + --disable-static \ + --disable-stripping \ + --enable-amf \ + --enable-avcodec \ + --enable-avdevice \ + --enable-avfilter \ + --enable-avformat \ + --enable-alsa \ + --enable-bzlib \ + --enable-chromaprint \ + --enable-frei0r \ + --enable-gcrypt \ + --enable-gmp \ + --enable-gpl \ + --enable-gray \ + --enable-iconv \ + --enable-ladspa \ + --enable-lcms2 \ + --enable-libass \ + --enable-libaom \ + --enable-libaribb24 \ + --enable-libaribcaption \ + --enable-libass \ + --enable-libbluray \ + --enable-libbs2b \ + --enable-libcaca \ + --enable-libcdio \ + --enable-libcodec2 \ + --enable-libdav1d \ + --enable-libdavs2 \ + --enable-libdc1394 \ + --enable-libdrm \ + --enable-libdvdnav \ + --enable-libdvdread \ + --enable-libfdk-aac \ + --enable-libfontconfig \ + --enable-libfreetype \ + --enable-libfribidi \ + --enable-libgme \ + --enable-libgsm \ + --enable-libharfbuzz \ + --enable-libiec61883 \ + --enable-libilbc \ + --enable-libjack \ + --enable-libjxl \ + --enable-libklvanc \ + --enable-libkvazaar \ + --enable-liblc3 \ + --disable-liblensfun \ + --enable-liblcevc-dec \ + --enable-libmodplug \ + --enable-libmp3lame \ + --enable-libmysofa \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --disable-libopencv \ + --enable-libopenh264 \ + --enable-libopenjpeg \ + --enable-libopenmpt \ + --enable-libopus \ + --enable-libplacebo \ + --enable-libpulse \ + --enable-libqrencode \ + --disable-libquirc \ + --enable-librabbitmq \ + --enable-librav1e \ + --enable-librist \ + --enable-librsvg \ + --enable-librtmp \ + --enable-librubberband \ + --enable-libshaderc \ + --disable-libshine \ + --enable-libsmbclient \ + --enable-libsnappy \ + --enable-libsoxr \ + --enable-libspeex \ + --enable-libsrt \ + --enable-libssh \ + --disable-libtensorflow \ + --enable-libtesseract \ + --enable-libtheora \ + --disable-libtorch \ + --enable-libtwolame \ + --enable-libuavs3d \ + --enable-libv4l2 \ + --enable-libvidstab \ + --enable-libvo-amrwbenc \ + --enable-libvorbis \ + --enable-libvpx \ + --enable-libvvenc \ + --enable-libwebp \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libxavs2 \ + --enable-libxavs \ + --enable-libxcb \ + --enable-libxcb-shape \ + --enable-libxcb-shm \ + --enable-libxcb-xfixes \ + --enable-libxml2 \ + --enable-libxvid \ + --enable-libzimg \ + --enable-libzmq \ + --enable-libzvbi \ + --enable-lv2 \ + --enable-lzma \ + --enable-nonfree \ + --enable-manpages \ + --enable-openal \ + --enable-opencl \ + --enable-opengl \ + --enable-openssl \ + --enable-postproc \ + --enable-sdl2 \ + --enable-shared \ + --enable-swresample \ + --enable-swscale \ + --enable-v4l2-m2m \ + --enable-vaapi \ + --enable-vapoursynth \ + --enable-version3 \ + --enable-vdpau \ + --enable-vulkan \ + --enable-xlib \ + --enable-zlib \ + --extra-ldflags="%{build_ldflags}" \ + --incdir=%{_includedir} \ + --libdir=%{_libdir} \ + --mandir=%{_mandir} \ + --optflags="%{build_cflags}" \ + --prefix=%{_prefix} \ --shlibdir=%{_libdir} \ -%if 0%{?_without_tools:1} - --disable-doc \ - --disable-ffmpeg --disable-ffplay --disable-ffprobe \ +%ifarch x86_64 aarch64 + --enable-cuda-nvcc \ + --enable-cuvid \ + --enable-ffnvcodec \ + --enable-libnpp \ + --enable-nvdec \ + --enable-nvenc \ + --extra-cflags="-I%{_includedir}/cuda" \ %endif -%ifnarch %{ix86} - --enable-lto \ +%ifarch x86_64 + --enable-libsvtav1 \ + --enable-libsvtvp9 \ + --enable-libvmaf \ + --enable-libvpl \ +# --enable-libxevd \ +# --enable-libxeve \ %endif -%ifarch %{ix86} - --cpu=%{_target_cpu} \ -%endif - %{?_with_mfx:--enable-libmfx} \ - %{?_with_vpl:--enable-libvpl} \ -%ifarch %{ix86} x86_64 %{power64} - --enable-runtime-cpudetect \ -%endif -%ifarch %{power64} -%ifarch ppc64 - --cpu=g5 \ -%endif -%ifarch ppc64p7 - --cpu=power7 \ -%endif -%ifarch ppc64le - --cpu=power8 \ -%endif - --enable-pic \ -%endif -%ifarch %{arm} - --disable-runtime-cpudetect --arch=arm \ -%ifarch armv6hl - --cpu=armv6 \ -%endif -%ifarch armv7hl armv7hnl - --cpu=armv7-a \ - --enable-vfpv3 \ - --enable-thumb \ -%endif -%ifarch armv7hl - --disable-neon \ -%endif -%ifarch armv7hnl - --enable-neon \ -%endif -%endif - || cat ffbuild/config.log %make_build V=1 make documentation V=1 make alltools V=1 %install -%make_install V=1 -%if 0%{!?flavor:1} -rm -r %{buildroot}%{_datadir}/%{name}/examples -%endif -%if 0%{!?progs_suffix:1} -install -pm755 tools/qt-faststart %{buildroot}%{_bindir} -%endif +%make_install +# Let rpmbuild pick up the docs +rm -fr %{buildroot}%{_docdir}/* +rm -fr %{buildroot}%{_datadir}/examples +mkdir doc/html +mv doc/*.html doc/html -%if %{with libavcodec_freeworld} -# Install the libavcodec freeworld counterpart -mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/ -mkdir -p %{buildroot}%{_libdir}/%{name} -echo -e "%{_libdir}/%{name}\n" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_lib}.conf -cp -pa %{buildroot}%{_libdir}/libavcodec.so.* \ - %{buildroot}%{_libdir}/%{name} -%endif - -%ldconfig_scriptlets libs -%ldconfig_scriptlets -n libavdevice%{?flavor} - -%if 0%{!?_without_tools:1} %files -%{_bindir}/ffmpeg%{?progs_suffix} -%{_bindir}/ffplay%{?progs_suffix} -%{_bindir}/ffprobe%{?progs_suffix} -%{!?progs_suffix:%{_bindir}/qt-faststart} -%{!?flavor: -%{_mandir}/man1/ffmpeg*.1* +%{_bindir}/%{name} +%{_bindir}/ffplay +%{_bindir}/ffprobe +%{_mandir}/man1/%{name}*.1* %{_mandir}/man1/ffplay*.1* %{_mandir}/man1/ffprobe*.1* -} %{_datadir}/%{name} -%endif %files libs -%doc CREDITS README.md -%license COPYING.* -%{_libdir}/lib*.so.* -%exclude %{_libdir}/libavdevice%{?build_suffix}.so.* -%{!?flavor:%{_mandir}/man3/lib*.3.* -%exclude %{_mandir}/man3/libavdevice.3* -} - -%files -n libavdevice%{?flavor} -%{_libdir}/libavdevice%{?build_suffix}.so.* -%{!?flavor:%{_mandir}/man3/libavdevice.3*} +%license COPYING.* LICENSE.md +%doc MAINTAINERS README.md CREDITS Changelog RELEASE_NOTES %files devel -%doc MAINTAINERS doc/APIchanges doc/*.txt -%doc _doc/examples -%doc %{_docdir}/%{name}/*.{css,html} -%{_includedir}/%{name} -%{_libdir}/pkgconfig/lib*.pc -%{_libdir}/lib*.so - -%if %{with libavcodec_freeworld} -%files -n libavcodec-freeworld -%{_sysconfdir}/ld.so.conf.d/%{name}-%{_lib}.conf -%{_libdir}/%{name}/libavcodec.so.* -%endif - - -%changelog -* Wed Oct 09 2024 Leigh Scott - 7.0.2-4 -- Disable DVD demuxer due to undefined symbols in libavformat - -* Mon Oct 07 2024 Nicolas Chauvet - 7.0.2-3 -- Sync with fedora deps: - Enable Kernel Labs VANC processing and ARIB text/caption decoding - -* Fri Sep 20 2024 Leigh Scott - 7.0.2-2 -- Rebuild - -* Sun Aug 04 2024 Leigh Scott - 7.0.2-1 -- Update to 7.0.2 - -* Thu Aug 01 2024 RPM Fusion Release Engineering - 7.0.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri May 31 2024 Robert-André Mauchin - 7.0.1-2 -- Rebuild for svt-av1 2.1.0 - -* Sun May 26 2024 Leigh Scott - 7.0.1-1 -- Update to 7.0.1 - -* Fri Apr 19 2024 Leigh Scott - 7.0-1 -- Update to 7.0 - -* Sat Apr 06 2024 Leigh Scott - 6.1.1-8 -- Rebuild for new x265 version - -* Fri Mar 22 2024 Sérgio Basto - 6.1.1-7 -- Rebuild for jpegxl (libjxl) 0.10.2 - -* Tue Mar 12 2024 Dominik Mierzejewski - 6.1.1-6 -- Enable drawtext filter (requires libharfbuzz, rfbz#6889) - -* Thu Feb 01 2024 Leigh Scott - 6.1.1-5 -- rebuilt - -* Thu Feb 01 2024 Leigh Scott - 6.1.1-4 -- Switch to noopenh264-devel for f39+ - -* Tue Jan 16 2024 Nicolas Chauvet - 6.1.1-3 -- Rebuilt for libavcodec-freeworld - -* Sun Jan 14 2024 Leigh Scott - 6.1.1-2 -- rebuilt - -* Mon Jan 01 2024 Leigh Scott - 6.1.1-1 -- Update to 6.1.1 release - -* Wed Nov 15 2023 Nicolas Chauvet - 6.1-3 -- Bump - -* Wed Nov 15 2023 Leigh Scott - 6.1-2 -- Add patch to fix fedora ffmpeg brokenABI change - -* Sat Nov 11 2023 Leigh Scott - 6.1-1 -- Update to 6.1 release - -* Fri Nov 10 2023 Leigh Scott - 6.0.1-1 -- Update to 6.0.1 release - -* Sun Oct 08 2023 Dominik Mierzejewski - 6.0-18 -- Backport upstream patch to fix segfault when passing non-existent filter - option (rfbz#6773) - -* Fri Sep 29 2023 Nicolas Chauvet - 6.0-17 -- Rebuild for libplacebo -- Backport upstream patch to fix assembly with binutils 2.41 - rathann - -* Fri Jul 28 2023 Nicolas Chauvet - 6.0-16 -- rebuilt - -* Sun Jul 16 2023 Leigh Scott - 6.0-15 -- rebuilt - -* Fri Jun 23 2023 Leigh Scott - 6.0-14 -- rebuilt - -* Fri Jun 23 2023 Leigh Scott - 6.0-13 -- rebuilt - -* Wed Jun 14 2023 Leigh Scott - 6.0-12 -- rebuilt - -* Sun May 14 2023 Leigh Scott - 6.0-11 -- fedora cisco repo isn't multiarch - -* Fri May 12 2023 Leigh Scott - 6.0-10 -- Enable openh264 for fedora - -* Mon Apr 24 2023 Nicolas Chauvet - 6.0-9 -- Add ffmpeg-bin for deps - -* Fri Apr 07 2023 Leigh Scott - 6.0-8 -- rebuilt - -* Fri Mar 24 2023 Leigh Scott - 6.0-7 -- rebuilt - -* Wed Mar 22 2023 Nicolas Chauvet - 6.0-6 -- Rebuilt - -* Sat Mar 18 2023 Todd Zullinger - 6.0-5 -- verify upstream source signature - -* Sun Mar 12 2023 Leigh Scott - 6.0-4 -- Rebuild against new nvcodec-headers - -* Sun Mar 12 2023 Leigh Scott - 6.0-3 -- Enable chromaprint -- Enable svt-av1 on all arches - -* Tue Feb 28 2023 Leigh Scott - 6.0-2 -- Disable chromaprint - -* Tue Feb 21 2023 Leigh Scott - 6.0-1 -- Update to 6.0 release - -* Sun Jan 08 2023 Leigh Scott - 5.1.2-9 -- Enable libplacebo (rfbz#6549) - -* Fri Dec 23 2022 Nicolas Chauvet - 5.1.2-8 -- rebuild - -* Mon Nov 21 2022 Nicolas Chauvet - 5.1.2-6 -- Enable libjxl -- Enable svt-av1 on el9 x86_64 - -* Thu Nov 17 2022 Nicolas Chauvet - 5.1.2-5 -- Rework el9 cases - -* Mon Oct 17 2022 Leigh Scott - 5.1.2-3 -- Disable rtmp because of rfbz: 6441 & 2399 - -* Wed Sep 28 2022 Nicolas Chauvet - 5.1.2-2 -- Implement libavcodec-freeworld - -* Sun Sep 25 2022 Leigh Scott - 5.1.2-1 -- Update to 5.1.2 release - -* Mon Sep 05 2022 Leigh Scott - 5.1.1-3 -- Switch from glslang to shaderc - -* Sun Sep 04 2022 Leigh Scott - 5.1.1-2 -- move libs to a subdirectory to allow parallel installation with ffmpeg-free - -* Thu Sep 01 2022 Leigh Scott - 5.1.1-1 -- Update to 5.1.1 release - -* Sun Aug 07 2022 RPM Fusion Release Engineering - 5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg - 5.1 - -* Fri Jul 22 2022 Leigh Scott - 5.1-1 -- Update to 5.1 release - -* Mon Jul 11 2022 Leigh Scott - 5.0.1-10 -- rebuilt - -* Thu Jun 23 2022 Robert-André Mauchin - 5.0.1-9 -- Rebuilt for new AOM, dav1d, rav1e and svt-av1 - -* Fri Jun 17 2022 Nicolas Chauvet - 5.0.1-8 -- Rebuilt - -* Sun Jun 12 2022 Sérgio Basto - 5.0.1-7 -- unbootstrap - -* Sun Jun 12 2022 Sérgio Basto - 5.0.1-6 -- Mass rebuild for x264-0.164 -- Bootstrap build without chromaprint - -* Fri May 27 2022 Leigh Scott - 5.0.1-5 -- rebuilt - -* Fri May 27 2022 Leigh Scott - 5.0.1-4 -- rebuilt - -* Fri Apr 29 2022 Leigh Scott - 5.0.1-3 -- Fix zimg - -* Tue Apr 05 2022 Leigh Scott - 5.0.1-2 -- Add conflicts - -* Tue Apr 05 2022 Leigh Scott - 5.0.1-1 -- Update to 5.0.1 release - -* Sun Mar 13 2022 Leigh Scott - 5.0-7 -- Rebuilt - -* Fri Mar 11 2022 Leigh Scott - 5.0-6 -- Enable AMF support - -* Thu Mar 03 2022 Leigh Scott - 5.0-5 -- Rebuild - -* Sat Feb 26 2022 Leigh Scott - 5.0-4 -- Drop patch for chrome - -* Fri Feb 11 2022 Leigh Scott - 5.0-3 -- Add patch for chrome - -* Fri Feb 04 2022 Leigh Scott - 5.0-2 -- rebuilt - -* Sat Jan 15 2022 Leigh Scott - 5.0-1 -- Update to 5.0 release - -* Tue Jan 04 2022 Leigh Scott - 5.0-0.1.20220104git311ea9c -- Update to 5.0-0.1.20220104git311ea9c - -* Sun Dec 19 2021 Leigh Scott - 4.5-0.3.20211108git45dc668 -- rebuilt - -* Thu Dec 16 2021 Nicolas Chauvet - 4.5-0.2.20211108git45dc668 -- Rebuilt - -* Mon Nov 08 2021 Leigh Scott - 4.5-0.1.20211108git45dc668 -- Update to 4.5-0.1.20211108git45dc668 - -* Mon Oct 25 2021 Leigh Scott - 4.4.1-1 -- Update to 4.4.1 release - -* Mon Aug 02 2021 RPM Fusion Release Engineering - 4.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jul 28 2021 Leigh Scott - 4.4-6 -- Enable libwebp support - -* Sat Jul 10 2021 Sérgio Basto - 4.4-5 -- Mass rebuild for x264-0.163 - -* Sun Jun 13 2021 Leigh Scott - 4.4-4 -- Rebuild for aom bump - -* Mon May 10 2021 Leigh Scott - 4.4-3 -- rebuilt - -* Wed Apr 14 2021 Leigh Scott - 4.4-2 -- Rebuild for new x265 - -* Fri Apr 09 2021 Leigh Scott - 4.4-1 -- Update to 4.4 release - -* Thu Apr 08 2021 Leigh Scott - 4.4-0.8.20210408git25e794a -- Update to 4.4-0.8.20210408git25e794a - -* Wed Mar 24 2021 Leigh Scott - 4.4-0.7.20210323git0be265e -- rebuilt - -* Tue Mar 23 2021 Leigh Scott - 4.4-0.6.20210323git0be265e -- Update to 4.4-0.6.20210323git0be265e -- Switch to release/4.4 branch - -* Fri Mar 12 2021 Leigh Scott - 4.4-0.5.20210312git5136726 -- Update to 20210312git5136726 - -* Thu Feb 18 2021 Leigh Scott - 4.4-0.4.20210218gitc2bf1dc -- Update to 20210218gitc2bf1dc - -* Wed Feb 03 2021 RPM Fusion Release Engineering - 4.4-0.3.20210125gitc7016e3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jan 25 2021 Leigh Scott - 4.4-0.2.20210125gitc7016e3 -- Update to 20210125gitc7016e3 - -* Thu Dec 31 2020 Leigh Scott - 4.4-0.1.20201231git477dd2d -- Update to 20201231git477dd2d - -* Thu Dec 24 2020 Leigh Scott - 4.3.1-15 -- Enable dash demuxer (rfbz#5876) -- Enable lv2 support (rfbz#5863) - -* Mon Dec 14 2020 Leigh Scott - 4.3.1-14 -- Actually do the dav1d rebuild - -* Mon Dec 14 2020 Robert-André Mauchin - 4.3.1-13 -- Rebuild for dav1d SONAME bump - -* Fri Nov 27 2020 Sérgio Basto - 4.3.1-12 -- Mass rebuild for x264-0.161 - -* Sat Oct 10 2020 Leigh Scott - 4.3.1-11 -- Revert last commit - -* Sat Oct 10 2020 Leigh Scott - 4.3.1-10 -- Add VP9 10/12 Bit support for VDPAU - -* Tue Aug 18 2020 Leigh Scott - 4.3.1-9 -- Disable vulkan on i686 - -* Mon Aug 17 2020 RPM Fusion Release Engineering - 4.3.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sun Aug 16 2020 Leigh Scott - 4.3.1-7 -- Disable rav1e support as rust packaging is rawhide only - -* Sun Aug 09 2020 Leigh Scott - 4.3.1-6 -- Enable LTO for x86 -- Add glslang patches and bump version for build requires -- Add upstream patches to suppress asm warnings - -* Mon Aug 03 2020 Leigh Scott - 4.3.1-5 -- Disable LTO for x86 - -* Mon Aug 03 2020 Leigh Scott - 4.3.1-4 -- Add patch to fix x86_64 LTO build issue - -* Wed Jul 15 2020 Leigh Scott - 4.3.1-3 -- Enabled libopenmpt - -* Tue Jul 14 2020 Leigh Scott - 4.3.1-2 -- Enable libmysofa - -* Sat Jul 11 2020 Leigh Scott - 4.3.1-1 -- Update to 4.3.1 release - -* Wed Jul 08 2020 Leigh Scott - 4.3-5 -- Rebuilt - -* Tue Jul 07 2020 Sérgio Basto - 4.3-4 -- Mass rebuild for x264 - -* Wed Jul 01 2020 Leigh Scott - 4.3-3 -- Rebuilt - -* Wed Jun 24 2020 Leigh Scott - 4.3-2 -- Enable vapoursynth - -* Mon Jun 15 2020 Leigh Scott - 4.3-1 -- Update to 4.3 release - -* Sat Jun 06 2020 Leigh Scott - 4.3-0.23.20200606git -- Update to 20200606git - -* Sun May 31 2020 Leigh Scott - 4.3-0.22.20200531git -- Update to 20200531git - -* Mon May 25 2020 Leigh Scott - 4.3-0.21.20200524git -- Enable lensfun - -* Sun May 24 2020 Leigh Scott - 4.3-0.20.20200524git -- Rebuild for dav1d SONAME bump - -* Sat May 23 2020 Leigh Scott - 4.3-0.19.20200523git -- Update to 20200523git - -* Sat May 16 2020 Leigh Scott - 4.3-0.18.20200516git -- Update to 20200516git - -* Fri May 08 2020 Leigh Scott - 4.3-0.17.20200508git -- Update to 20200508git - -* Fri May 01 2020 Leigh Scott - 4.3-0.16.20200501git -- Update to 20200501git - -* Thu Apr 23 2020 Leigh Scott - 4.3-0.15.20200423git -- Update to 20200423git -- Enable nvdec for aarch64 - -* Sun Apr 19 2020 Leigh Scott - 4.3-0.14.20200419git -- Update to 20200419git - -* Sun Apr 12 2020 Leigh Scott - 4.3-0.13.20200412git -- Update to 20200412git - -* Wed Apr 08 2020 Nicolas Chauvet - 4.3-0.12.20200401git -- Enable srt - -* Wed Apr 01 2020 Leigh Scott - 4.3-0.11.20200401git -- Update snapshot, fixes rfbz#5537 - -* Wed Apr 01 2020 leigh123linux - 4.3-0.10.20200401git -- Update to 20200401git - -* Sat Mar 21 2020 Leigh Scott - 4.3-0.9.20200321git -- Update to 20200321git - -* Fri Mar 13 2020 leigh123linux - 4.3-0.8.20200313git -- Update to 20200313git - -* Wed Mar 11 2020 Leigh Scott - 4.3-0.7.20200305git -- Rebuilt for i686 - -* Mon Mar 09 2020 leigh123linux - 4.3-0.6.20200305git -- Enable rav1e support - -* Thu Mar 05 2020 Leigh Scott - 4.3-0.5.20200305git -- Update to 20200305git - -* Tue Feb 25 2020 Leigh Scott - 4.3-0.4.20200225git -- Update to 20200225git - -* Sun Feb 23 2020 Leigh Scott - 4.3-0.3.20200222git -- Rebuild for x265 - -* Sun Feb 23 2020 Leigh Scott - 4.3-0.2.20200222git -- Enable vulkan support - -* Sat Feb 22 2020 Leigh Scott - 4.3-0.1.20200222git -- Update to 20200222git - -* Tue Feb 04 2020 RPM Fusion Release Engineering - 4.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jan 01 2020 Leigh Scott - 4.2.2-1 -- Update to 4.2.2 release - -* Tue Dec 17 2019 Sérgio Monteiro Basto - 4.2.1-5 -- Mass rebuild for x264 - -* Thu Nov 28 2019 Leigh Scott - 4.2.1-4 -- Rebuilt for x265 - -* Thu Oct 24 2019 Leigh Scott - 4.2.1-3 -- Rebuild for dav1d SONAME bump - -* Sat Sep 07 2019 Leigh Scott - 4.2.1-2 -- Enable libjack (rfbz #5346) - -* Sat Sep 07 2019 Leigh Scott - 4.2.1-1 -- Update to 4.2.1 release - -* Mon Aug 26 2019 Leigh Scott - 4.2-4 -- Rebuild for el8 - -* Tue Aug 20 2019 Leigh Scott - 4.2-3 -- Rebuild for dav1d and aom SONAME bump -- Drop XvMC support (rfbz #5328) - -* Fri Aug 09 2019 RPM Fusion Release Engineering - 4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Aug 05 2019 Leigh Scott - 4.2-1 -- Update to 4.2 release -- Enable dav1d support - -* Sat Jul 27 2019 Nicolas Chauvet - 4.1.4-2 -- Add patch for set_default_priority - -* Tue Jul 09 2019 Leigh Scott - 4.1.4-1 -- Update to 4.1.4 release - -* Fri Jun 28 2019 Nicolas Chauvet - 4.1.3-3 -- Rebuilt for x265 - -* Sat Apr 06 2019 Nicolas Chauvet - 4.1.3-2 -- Backport avutil/mem: Fix invalid use of av_alloc_size - rfbz#5149 - -* Mon Apr 01 2019 Leigh Scott - 4.1.3-1 -- Update to 4.1.3 release - -* Sat Mar 23 2019 Leigh Scott - 4.1.2-1 -- Update to 4.1.2 release - -* Tue Mar 12 2019 Sérgio Basto - 4.1.1-4 -- Mass rebuild for x264 - -* Mon Mar 04 2019 RPM Fusion Release Engineering - 4.1.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Feb 28 2019 Leigh Scott - 4.1.1-2 -- Rebuild for new x265 - -* Sun Feb 10 2019 Leigh Scott - 4.1.1-1 -- Update to 4.1.1 release - -* Fri Jan 25 2019 Dominik Mierzejewski - 4.1-7 -- Enable libssh support by default (rfbz#5135) - -* Thu Jan 24 2019 Nicolas Chauvet - 4.1-6 -- Drop opencv by default - OpenCV 3.X has an overlinking issue - unsuitable for core libraries - Reported as https://github.com/opencv/opencv/issues/7001 - -* Fri Dec 21 2018 Nicolas Chauvet - 4.1-5 -- Add omx/omx_rpi - -* Sun Nov 18 2018 Leigh Scott - 4.1-4 -- Rebuild for new x265 - -* Fri Nov 09 2018 Nicolas Chauvet - 4.1-3 -- Fix for cuda enabled repo - -* Thu Nov 08 2018 Nicolas Chauvet - 4.1-2 -- Add support for rpi -- Enable libvmaf for x86_64 - -* Tue Nov 06 2018 Leigh Scott - 4.1-1 -- Update to 4.1 release - -* Sat Nov 03 2018 Leigh Scott - 4.0.3-1 -- Update to 4.0.3 release - -* Thu Oct 04 2018 Leigh Scott - 4.0.2-8 -- Add upstream commit to fix aom build failure - -* Thu Oct 04 2018 Sérgio Basto - 4.0.2-7 -- Mass rebuild for x264 and/or x265 - -* Fri Sep 14 2018 Leigh Scott - 4.0.2-6 -- Change BuildRequires: aom-devel to libaom-devel - -* Tue Sep 11 2018 Robert-André Mauchin - 4.0.2-5 -- Add support for libaom (rfbz#5016) - -* Wed Sep 05 2018 Nicolas Chauvet - 4.0.2-4 -- Add without_opus -- Add disable opus and mfx for rhel -- Enable nvenc for rhel - -* Sun Jul 29 2018 Julian Sikorski - 4.0.2-3 -- Add spec fixes from rfbz #4964 - -* Thu Jul 26 2018 RPM Fusion Release Engineering - 4.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Jul 18 2018 Leigh Scott - 4.0.2-1 -- Update to 4.0.2 release - -* Fri Jul 06 2018 Leigh Scott - 4.0.1-2 -- enable libzvbi by default (rfbz#4956) - -* Sat Jun 16 2018 Leigh Scott - 4.0.1-1 -- Update to 4.0.1 release - -* Sat Jun 16 2018 Leigh Scott - 4.0-2 -- Rebuild for new libass version - -* Fri Apr 20 2018 Leigh Scott - 4.0-1 -- Update to 4.0 release - -* Thu Apr 19 2018 Leigh Scott - 4.0-0.1.20180419git -- Update to 20180419 (release/4.0 branch) - -* Mon Mar 05 2018 Leigh Scott - 3.5-0.6.20180305git -- Update to 20180305 -- Change build requires for nvenc - -* Wed Feb 28 2018 Leigh Scott - 3.5-0.5.20180211git -- Rebuilt for x265 - -* Tue Feb 27 2018 Nicolas Chauvet - 3.5-0.4.20180211git -- Rebuilt for x265 - -* Sun Feb 11 2018 Leigh Scott - 3.5-0.3.20180211git -- Update to 20180211git - -* Fri Jan 26 2018 Leigh Scott - 3.5-0.2.20180116git -- Rebuild for new libcdio and libvpx versions - -* Tue Jan 16 2018 Leigh Scott - 3.5-0.1.20180116git -- Update to 20180116git -- Remove ffserver parts from spec -- Add requires ffmpeg-libs to libavdevice (rfbz#4768) - -* Mon Jan 15 2018 Nicolas Chauvet - 3.4.1-5 -- Update to libva 2.0.0 - -* Sat Dec 30 2017 Sérgio Basto - 3.4.1-4 -- Mass rebuild for x264 and x265 - -* Sun Dec 17 2017 Nicolas Chauvet - 3.4.1-3 -- Add _cuda_version rpm macro - -* Mon Dec 11 2017 Nicolas Chauvet - 3.4.1-2 -- Backport patch for arm neon rfbz#4727 - -* Mon Dec 11 2017 Leigh Scott - 3.4.1-1 -- Updated to 3.4.1 - -* Tue Nov 28 2017 Dominik Mierzejewski - 3.4-6 -- enable support for vid.stab (rfbz#4713) -- rebuild against new libmfx (rhbz#1471768) - -* Wed Oct 25 2017 Dominik Mierzejewski - 3.4-5 -- drop support for building on ppc (32bit) -- explicitly support ppc64p7 and ppc64le -- set correct CPU options on armv7hl -- show config.log in case of configure failure -- enable VAAPI support on all arches, it's not x86-specific anymore - -* Wed Oct 25 2017 Leigh Scott - 3.4-4 -- Switch from yasm to nasm - -* Wed Oct 25 2017 Leigh Scott - 3.4-3 -- Add SVG rasterization and KMS screengrabber support - -* Mon Oct 16 2017 Leigh Scott - 3.4-2 -- rebuild for x265 - -* Sun Oct 15 2017 Leigh Scott - 3.4-1 -- Updated to 3.4 -- Remove build requires schroedinger-devel (wrapper was removed) - -* Thu Oct 12 2017 Dominik Mierzejewski - 3.3.4-2 -- add support for OpenJPEG v2.3 - -* Tue Sep 12 2017 Leigh Scott - 3.3.4-1 -- Updated to 3.3.4 - -* Thu Aug 31 2017 Leigh Scott - 3.3.3-4 -- Add support for LibOpenJPEG v2.2 - -* Thu Aug 31 2017 RPM Fusion Release Engineering - 3.3.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Aug 31 2017 RPM Fusion Release Engineering - 3.3.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Jul 29 2017 Leigh Scott - 3.3.3-1 -- Updated to 3.3.3 - -* Wed Jun 07 2017 Leigh Scott - 3.3.2-1 -- Updated to 3.3.2 - -* Mon May 15 2017 Leigh Scott - 3.3.1-1 -- Updated to 3.3.1 - -* Wed Apr 19 2017 Leigh Scott - 3.3-1 -- Updated to 3.3 -- Make nvenc x86 only -- Remove obsolete x11grab configure option - -* Sun Mar 19 2017 RPM Fusion Release Engineering - 3.2.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Feb 11 2017 Leigh Scott - 3.2.4-1 -- Updated to 3.2.4 - -* Mon Feb 06 2017 Leigh Scott - 3.2.3-1 -- Updated to 3.2.3 - -* Tue Jan 03 2017 Dominik Mierzejewski - 3.2.2-3 -- rebuild for x265 - -* Mon Jan 02 2017 Dominik Mierzejewski - 3.2.2-2 -- enable optional nonfree build with cuda, cuvid, npp and fdk-aac - (most credit for this goes to Nicolas Chauvet) -- allow disabling x11grab (conflicts with nonfree builds) -- use Recommends only on Fedora (patch by Nicolas Chauvet) -- enable AMR codecs by default (rfbz#4367, patch by Nicolas Chauvet) - -* Tue Dec 06 2016 Julian Sikorski - 3.2.2-1 -- Updated to 3.2.2 - -* Sat Nov 26 2016 Julian Sikorski - 3.2.1-1 -- Updated to 3.2.1 - -* Wed Nov 16 2016 Adrian Reber - 3.2-3 -- Rebuild for libcdio-0.94 - -* Tue Nov 08 2016 Sérgio Basto - 3.2-2 -- Rebuild for x265-2.1 - -* Sat Oct 29 2016 Julian Sikorski - 3.2-1 -- Updated to 3.2 -- Dropped openjpeg2 patch -- Updated BuildRequires to SDL2-devel -- Incorporated some cleanups from RF #4243 - -* Tue Oct 25 2016 Julian Sikorski - 3.1.5-1 -- Updated to 3.1.5 - -* Sat Oct 01 2016 Leigh Scott - 3.1.4-2 -- Fix missing libxvid (rfbz#4274) - -* Sat Oct 01 2016 Julian Sikorski - 3.1.4-1 -- Updated to 3.1.4 - -* Thu Sep 08 2016 Nicolas Chauvet - 3.1.3-3 -- Disable OpenCV for Fedora >= 25 - -* Sat Sep 03 2016 Dominik Mierzejewski - 3.1.3-2 -- enable QSV support by default, since libmfx is in Fedora now -- QSV is x86 only -- put x86-specific BRs in one place - -* Sat Aug 27 2016 Julian Sikorski - 3.1.3-1 -- Updated to 3.1.3 - -* Thu Aug 25 2016 Leigh Scott - 3.1.2-2 -- enable support for nvenc - -* Wed Aug 10 2016 Julian Sikorski - 3.1.2-1 -- Updated to 3.1.2 - -* Wed Jul 27 2016 Julian Sikorski - 3.1.1-1 -- Updated to 3.1.1 -- Dropped included patch -- Added $RPM_LD_FLAGS to %%configure -- Switched to openjpeg2 -- Fixed build with openjpeg2-2.1.1 (patch by Sandro Mani) - -* Sat Jul 23 2016 Igor Gnatenko - 3.0.2-5 -- Rebuild for libvpx soname bump - -* Sun Jul 10 2016 Dominik Mierzejewski - 3.0.2-4 -- enable jack by default (rfbz#2156) -- re-enable opencl by default (rfbz#3640 was fixed) -- add conditional support for QSV via libmfx (rfbz#4043) -- drop libcelt support (celt 0.11 no longer available in Fedora) -- drop libdirac support (unsupported by FFmpeg) -- make xvidcore support optional -- add missing ldconfig calls for libavdevice package -- move libavdevice manpage to its subpackage -- move examples from main package to -devel as docs -- add support for libiec61883 and make DV (IEEE 1394) support optional -- enable optional support for many external libraries (rfbz#4109) - -* Thu Jul 07 2016 Julian Sikorski - 3.0.2-3 -- Fixed build failure on rawhide due to newer opencv using a patch from upstream - git - -* Sun Jun 12 2016 Leigh Scott - 3.0.2-2 -- rebuilt - -* Sat May 14 2016 Michael Kuhn - 3.0.2-1 -- Update to 3.0.2. - -* Mon May 02 2016 Julian Sikorski - 2.8.7-1 -- Updated to 2.8.7 - -* Mon Feb 01 2016 Julian Sikorski - 2.8.6-1 -- Updated to 2.8.6 - -* Sat Jan 16 2016 Julian Sikorski - 2.8.5-1 -- Updated to 2.8.5 - -* Wed Dec 23 2015 Julian Sikorski - 2.8.4-1 -- Updated to 2.8.4 -- Fixed Fraunhofer FDK AAC conditional build (RF # 3898) - -* Sun Nov 29 2015 Julian Sikorski - 2.8.3-1 -- Updated to 2.8.3 - -* Sat Nov 14 2015 Nicolas Chauvet - 2.8.2-1 -- Update to 2.8.2 - -* Sat Oct 24 2015 Nicolas Chauvet - 2.8.1-1 -- Update to 2.8.1 - -* Sat Jul 25 2015 Julian Sikorski - 2.6.4-1 -- Updated to 2.6.4 - -* Wed May 27 2015 Julian Sikorski - 2.6.3-1 -- Updated to 2.6.3 - -* Sat May 16 2015 Nicolas Chauvet - 2.6.2-3 -- Rebuilt for x265 - -* Mon May 11 2015 Nicolas Chauvet - 2.6.2-2 -- Disable opencl by default - rfbz#3640 -- Add with condition for nvenc,fdk_aac - -* Tue May 05 2015 Julian Sikorski - 2.6.2-1 -- Updated to 2.6.2 - -* Tue Apr 28 2015 Julian Sikorski - 2.4.9-1 -- Updated to 2.4.9 - -* Wed Apr 15 2015 Dominik Mierzejewski - 2.4.8-3 -- rebuilt for new x265 - -* Mon Apr 13 2015 Nicolas Chauvet - 2.4.8-2 -- Fix sed for f22 where cflags contains a directory path - -* Mon Mar 30 2015 Julian Sikorski - 2.4.8-1 -- Updated to 2.4.8 - -* Sun Feb 15 2015 Julian Sikorski - 2.4.7-1 -- Updated to 2.4.7 - -* Sun Feb 01 2015 Dominik Mierzejewski - 2.4.6-3 -- enable LADSPA support (rfbz#3134) - -* Sun Feb 01 2015 Dominik Mierzejewski - 2.4.6-2 -- enable OpenCL support -- BR texinfo instead of texi2html to reduce BRs by half -- drop support for building on SPARC (no longer a Fedora Secondary Arch) -- move libavdevice to a subpackage (rfbz#3075) - -* Wed Jan 14 2015 Julian Sikorski - 2.4.6-1 -- Updated to 2.4.6 - -* Sun Dec 21 2014 Julian Sikorski - 2.4.5-1 -- Updated to 2.4.5 - -* Thu Dec 18 2014 Dominik Mierzejewski - 2.4.4-2 -- enable support for libx265 by default (rfbz#3421, patch by Nerijus Baliūnas) - -* Mon Dec 01 2014 Julian Sikorski - 2.4.4-1 -- Updated to 2.4.4 - -* Tue Nov 04 2014 Nicolas Chauvet - 2.4.3-2 -- Rebuilt for vaapi 0.36 - -* Sun Nov 02 2014 Julian Sikorski - 2.4.3-1 -- Updated to 2.4.3 - -* Sun Oct 19 2014 Sérgio Basto - 2.4.2-1 -- Update to ffmpeg-2.4.2 - -* Fri Oct 03 2014 Julian Sikorski - 2.3.4-1 -- Updated to 2.3.4 - -* Sat Sep 27 2014 kwizart - 2.3.3-3 -- Rebuild back to ffmpeg 2.3x - -* Sat Sep 13 2014 Nicolas Chauvet - 2.3.3-2 -- Disable libcelt by default - rfbz#3359 - -* Tue Sep 02 2014 Julian Sikorski - 2.3.3-1 -- Updated to 2.3.3 - -* Tue Aug 12 2014 Julian Sikorski - 2.3.2-1 -- Updated to 2.3.2 - -* Sun Aug 03 2014 Julian Sikorski - 2.3.1-1 -- Updated to 2.3.1 -- README → README.md - -* Tue Jul 15 2014 Julian Sikorski - 2.2.5-1 -- Updated to 2.2.5 - -* Tue Jul 08 2014 Julian Sikorski - 2.2.4-1 -- Updated to 2.2.4 - -* Wed Jun 04 2014 Julian Sikorski - 2.2.3-1 -- Updated to 2.2.3 - -* Mon May 05 2014 Julian Sikorski - 2.2.2-1 -- Updated to 2.2.2 - -* Fri Apr 18 2014 Nicolas Chauvet - 2.2.1-1 -- Update to 2.2.1 - -* Mon Mar 24 2014 Julian Sikorski - 2.2-1 -- Updated to 2.2 - -* Fri Mar 21 2014 Julian Sikorski - 2.1.4-4 -- Rebuilt for libass-0.10.2 - -* Tue Mar 18 2014 Julian Sikorski - 2.1.4-3 -- Rebuilt for x264 - -* Thu Mar 06 2014 Nicolas Chauvet - 2.1.4-2 -- Rebuilt for x264 - -* Tue Feb 25 2014 Julian Sikorski - 2.1.4-1 -- Updated to 2.1.4 - -* Thu Jan 16 2014 Julian Sikorski - 2.1.3-1 -- Updated to 2.1.3 - -* Wed Nov 20 2013 Nicolas Chauvet - 2.1.1-1 -- Update to 2.1.1 - -* Tue Oct 29 2013 Julian Sikorski - 2.1-1 -- Updated to 2.1 - -* Tue Oct 22 2013 Nicolas Chauvet - 2.0.2-2 -- Rebuilt for x264 - -* Wed Oct 09 2013 Julian Sikorski - 2.0.2-1 -- Updated to 2.0.2 - -* Mon Sep 30 2013 Nicolas Chauvet - 2.0.1-3 -- Rebuilt - -* Tue Aug 27 2013 Nicolas Chauvet - 2.0.1-2 -- Enable avresample as noticed by Xavier Bachelot - -* Tue Aug 13 2013 Nicolas Chauvet - 2.0.1-1 -- Update to 2.0.1 - -* Thu Aug 01 2013 Julian Sikorski - 2.0-1 -- Updated to 2.0 -- Dropped the no longer needed bogus man dir work-around - -* Thu Aug 01 2013 Julian Sikorski - 1.2.2-1 -- Updated to 1.2.2 - -* Sat Jul 20 2013 Nicolas Chauvet - 1.2.1-7 -- Rebuilt for x264 - -* Tue Jul 02 2013 Dominik Mierzejewski - 1.2.1-6 -- fix building with libcdio - -* Mon Jul 01 2013 Dominik Mierzejewski - 1.2.1-5 -- build with soxr support enabled (rfbz#2853) - -* Thu Jun 27 2013 Nicolas Chauvet - 1.2.1-4 -- Reverse the logic for neon on arm - -* Wed Jun 19 2013 Nicolas Chauvet - 1.2.1-3 -- Enable neon on armv7hnl -- Enable thumb on all arm but armv6hl - -* Tue May 14 2013 Julian Sikorski - 1.2.1-1 -- Updated to 1.2.1 - -* Sun May 05 2013 Julian Sikorski - 1.2-2 -- Rebuilt for x264-0.130 - -* Mon Mar 18 2013 Julian Sikorski - 1.2-1 -- Updated to 1.2 - -* Mon Mar 18 2013 Julian Sikorski - 1.1.4-1 -- Updated to 1.1.4 - -* Sun Mar 10 2013 Nicolas Chauvet - 1.1.3-1 -- Update to 1.1.3 - -* Sun Jan 20 2013 Nicolas Chauvet - 1.1.1-1 -- Update to 1.1.1 -- Disable libcdio with fedora 19 - -* Mon Jan 07 2013 Julian Sikorski - 1.1-1 -- Updated to 1.1 -- Added new man pages - -* Tue Dec 04 2012 Julian Sikorski - 1.0.1-1 -- Updated to 1.0.1 - -* Fri Nov 23 2012 Julian Sikorski - 1.0-5 -- Rebuilt for x264-0.128 - -* Sat Nov 03 2012 Julian Sikorski - 1.0-4 -- Fixed -O3 -g in host_cflags -- Made the installation verbose too - -* Sat Nov 03 2012 Julian Sikorski - 1.0-3 -- Use Fedora %%{optflags} -- Made the build process verbose - -* Thu Nov 01 2012 Nicolas Chauvet - 1.0-2 -- Add opus -- Enable opencv frei0r by default -- Disable librmtp - use builtin implementation rfbz#2399 - -* Thu Oct 04 2012 Julian Sikorski - 1.0-1 -- Updated to 1.0 -- Dropped obsolete Group, Buildroot, %%clean and %%defattr -- Dropped the included patch - -* Wed Sep 05 2012 Nicolas Chauvet - 0.11.1-3 -- Rebuilt for x264 ABI 125 - -* Sat Jul 21 2012 Nicolas Chauvet - 0.11.1-2 -- Backport fix rfbz#2423 - -* Thu Jun 14 2012 Julian Sikorski - 0.11.1-1 -- Updated to 0.11.1 - -* Wed Jun 13 2012 Julian Sikorski - 0.10.4-1 -- Updated to 0.10.4 - -* Mon May 07 2012 Julian Sikorski - 0.10.3-1 -- Updated to 0.10.3 - -* Tue May 01 2012 Nicolas Chauvet - 0.10.2-3 -- Sync with ffmpeg-compat and EL -- Add BR libmodplug-devel -- Enable libass openal-soft - -* Tue Apr 10 2012 Nicolas Chauvet - 0.10.2-2 -- Explicitely disable neon unless armv7hnl - -* Sun Mar 18 2012 Julian Sikorski - 0.10.2-1 -- Updated to 0.10.2 - -* Mon Mar 12 2012 root - 0.10-2 -- Rebuilt for x264 ABI 0.120 - -* Sun Feb 19 2012 Nicolas Chauvet - 0.10-1 -- Update to 0.10 -- Disable dirac by default - rfbz#1946 -- Enabled by default: libv4l2 gnutls -- New RPM Conditionals: - --with crystalhd dirac jack frei0r openal opencv - --without celt cdio pulse - -* Wed Feb 01 2012 Nicolas Chauvet - 0.8.9-1 -- Update to 0.8.9 -- Add BR libass-devel -- Rebuilt for libvpx - -* Mon Jan 09 2012 Nicolas Chauvet - 0.8.8-1 -- Update to 0.8.8 - -* Wed Dec 21 2011 Nicolas Chauvet - 0.8.7-1 -- Update to 0.8.7 - -* Fri Oct 28 2011 Nicolas Chauvet - 0.8.5-2 -- Fix for glibc bug rhbz#747377 - -* Sun Oct 23 2011 Dominik Mierzejewski - 0.8.5-1 -- update to 0.8.5 - -* Fri Sep 23 2011 Dominik Mierzejewski - 0.8.4-1 -- update to 0.8.4 -- fix FFmpeg name spelling - -* Mon Aug 22 2011 Dominik Mierzejewski - 0.8.2-1 -- update to 0.8.2 -- enable CELT decoding via libcelt -- support AMR WB encoding via libvo-amrwbenc (optional) -- enable FreeType support - -* Thu Jul 14 2011 Nicolas Chauvet - 0.7.1-1 -- Update to 0.7.1 - -* Fri Jul 01 2011 Nicolas Chauvet - 0.7-0.3.20110612git -- Add XvMC in ffmpeg - -* Sun Jun 12 2011 Nicolas Chauvet - 0.7-0.2.20110612git -- Update to 20110612git from oldabi branch - -* Sun Jun 12 2011 Nicolas Chauvet - 0.7-0.1.rc1 -- Update to 7.0-rc1 -- Remove upstreamed patch -- Fix flv - rfbz#1743 -- New RPM build conditional --without x264. - -* Tue Apr 12 2011 Dominik Mierzejewski - 0.6.90-0.2.rc0 -- fixed missing av_parser_parse symbol (upstream patch) - -* Mon Apr 04 2011 Dominik Mierzejewski - 0.6.90-0.1.rc0 -- updated to 0.6.90-rc0 release -- ensure main package is version-locked to the -libs subpackage - -* Sun Feb 27 2011 Dominik Mierzejewski - 0.6.1-1.20110227git -- 20110227 snapshot -- bump version to post-0.6.1 to allow stable 0.6.1 update in older branches -- drop --with amr->opencore_amr indirection -- add qt-faststart tool (bug #1259) -- build PIC objects on PPC (bug #1457) -- provide custom version string -- require latest x264 build - -* Fri Jan 21 2011 Hans de Goede - 0.6-5.20100704svn -- Rebuild for new openjpeg - -* Wed Jul 21 2010 Nicolas Chauvet - 0.6-4.20100704svn -- Enable libva -- Restore compatibility --with amr - -* Mon Jul 05 2010 Nicolas Chauvet - 0.6-3.20100704svn -- Fix build using --define ffmpegsuffix 'foo' -- Disable FFmpeg binaries when built with suffix. - -* Sun Jul 04 2010 Dominik Mierzejewski - 0.6-2.20100704svn -- 20100703 snapshot -- enable libvpx (WebM/VP8) support (rfbz#1250) -- drop faad2 support (dropped upstream) -- drop old Obsoletes: -- enable librtmp support - -* Sat Jun 19 2010 Dominik Mierzejewski - 0.6-1.20100619svn -- 20100619 snapshot - -* Thu Apr 29 2010 Dominik Mierzejewski - 0.6-0.3.20100429svn -- 20100429 snapshot -- dropped unnecessary imlib2-devel BR - -* Sat Mar 20 2010 Dominik Mierzejewski - 0.6-0.2.20100320svn -- bump for rebuild - -* Sat Mar 20 2010 Dominik Mierzejewski - 0.6-0.1.20100320svn -- 20100320 snapshot -- drop upstream'd patch -- bumped version to pre-0.6 -- added ffprobe to file list - -* Sat Jan 16 2010 Dominik Mierzejewski - 0.5-6.20100116svn -- 20100116 snapshot, requires recent x264 -- fix textrels on x86_64 in a different way (patch by Reimar Döffinger) -- use -mlongcall instead of -fPIC to fix rfbz#804, it's faster - -* Sat Nov 7 2009 Hans de Goede - 0.5-5.20091026svn -- Add -fPIC -dPIC when compiling on ppc (rf804) - -* Thu Oct 22 2009 Dominik Mierzejewski - 0.5-4.20091026svn -- 20091026 snapshot, requires recent x264 -- dropped support for old amr libs (not supported upstream since July) -- don't disable yasm for generic builds -- fixed opencore amr support -- dropped workaround for non-standard openjpeg headers location -- dropped separate SIMDified libs for x86 and ppc(64), - runtime CPU detection should be enough - -* Thu Oct 15 2009 kwizart - 0.5-3.svn20091007 -- Update to svn snapshot 20091007 -- Add BR dirac vdpau. -- Use --with nonfree as a separate conditional for amr and faac. -- Use --with gplv3 as a separate conditional for opencore-amr. -- Don't build faac by default because it's nonfree. -- Allow to --define 'ffmpegsuffix custom' for special SONAME. - -* Fri Mar 27 2009 Dominik Mierzejewski - 0.5-2 -- rebuild for new faad2 and x264 - -* Tue Mar 10 2009 Dominik Mierzejewski - 0.5-1 -- 0.5 release -- enable yasm on x86_64, fix resulting textrels -- add missing obsoletes for ffmpeg-compat-devel (really fix bug #173) -- disable yasm and certain asm optimizations for generic ix86 builds -- %%{_bindir} is now usable -- include more docs -- specfile cleanups -- add JPEG2000 decoding support via openjpeg - -* Sat Jan 31 2009 Dominik Mierzejewski - 0.4.9-0.58.20090131 -- 20090131 snapshot - -* Wed Dec 17 2008 Dominik Mierzejewski - 0.4.9-0.57.20081217 -- 20081217 snapshot -- fix pkgconfig files again (broken in 0.4.9-0.55.20081214) - -* Mon Dec 15 2008 Dominik Mierzejewski - 0.4.9-0.56.20081214 -- drop libdirac support for now - -* Sun Dec 14 2008 Dominik Mierzejewski - 0.4.9-0.55.20081214 -- 20081214 snapshot -- change the lib split on x86, it doesn't work right for P3/AthlonXP -- specfile cleanups -- enable bzlib, dirac and speex support via external libs -- sort BR list alphabetically -- drop upstream'd patch - -* Thu Dec 11 2008 Dominik Mierzejewski - 0.4.9-0.54.20081202 -- fix pkgconfig file generation - -* Thu Dec 04 2008 Dominik Mierzejewski - 0.4.9-0.53.20081202 -- 20081202 snapshot -- drop upstreamed/obsolete patches - -* Thu Nov 20 2008 Dominik Mierzejewski - 0.4.9-0.52.20080908 -- add obsoletes for -compat package (RPMFusion bug #173) - -* Sat Nov 01 2008 Dominik Mierzejewski - 0.4.9-0.51.20080908 -- reworked build system -- build optimized versions where it makes sense -- specfile cleanups -- enable yasm for optimized asm routines on x86_32 -- add obsoletes for Freshrpms' libpostproc subpackage - -* Thu Sep 18 2008 Dominik Mierzejewski - 0.4.9-0.50.20080908 -- 20080908 snapshot (r25261), last before ABI change - -* Fri Sep 05 2008 Dominik Mierzejewski - 0.4.9-0.49.20080905 -- 20080905 snapshot -- fix build --with amr -- update snapshot.sh -- drop liba52 support, native ac3 decoder is better in every way - -* Mon Aug 25 2008 Dominik Mierzejewski - 0.4.9-0.48.20080825 -- 20080825 snapshot -- use CFLAGS more similar to upstream -- enable X11 grabbing input -- enable libavfilter - -* Sun Aug 03 2008 Thorsten Leemhuis - 0.4.9-0.46.20080614 -- 20080614 snapshot -- no need to conditionalize swscaler anymore -- dropped obsolete pkgconfig patch -- BR latest x264 - -* Mon Mar 03 2008 Dominik Mierzejewski - 0.4.9-0.45.20080113 -- rebuild for new x264 - -* Sun Jan 13 2008 Dominik Mierzejewski - 0.4.9-0.44.20080113 -- 20080113 snapshot -- drop unnecessary patch -- enable libdc1394 support -- enable swscaler - -* Mon Nov 12 2007 Dominik Mierzejewski - 0.4.9-0.43.20071111 -- ensure that we use the correct faad2 version - -* Sun Nov 11 2007 Dominik Mierzejewski - 0.4.9-0.42.20071111 -- 20071111 snapshot -- current faad2 is good again - -* Thu Oct 18 2007 Dominik Mierzejewski - 0.4.9-0.41.20071011 -- fix BRs and Requires for faad2 - -* Thu Oct 11 2007 Dominik Mierzejewski - 0.4.9-0.40.20071011 -- 20071011 snapshot -- don't link against faad2-2.5, it makes GPL'd binary non-distributable -- go back to normal linking instead of dlopen() of liba52 - -* Sun Sep 23 2007 Dominik Mierzejewski - 0.4.9-0.39.20070923 -- 20070923 snapshot -- use faad2 2.5 -- optional AMR support -- dropped obsolete patch - -* Thu Jun 07 2007 Dominik Mierzejewski - 0.4.9-0.38.20070607 -- 20070607 snapshot -- libdca BR dropped (no longer supported) -- drop gsm.h path hack, gsm in Fedora now provides a compatibility symlink -- remove arch hacks, ffmpeg's configure is smart enough -- enable cmov on x86_64 - -* Thu May 03 2007 Dominik Mierzejewski - 0.4.9-0.37.20070503 -- require older faad2 to prevent bugreports like #1388 -- prepare for libdc1394 support -- enable pthreads -- 20070503 snapshot - -* Thu Feb 08 2007 Dominik Mierzejewski - 0.4.9-0.35.20070204 -- libswscale.pc is necessary regardless of --enable-swscaler - -* Sun Feb 4 2007 Ville Skyttä - 0.4.9-0.34.20070204 -- 2007-02-04 snapshot, enable libtheora. -- Make swscaler optional, disabled again by default (#1379). - -* Fri Jan 05 2007 Dominik Mierzejewski - 0.4.9-0.34.20061214 -- move vhooks to -libs - -* Wed Jan 03 2007 Dominik Mierzejewski - 0.4.9-0.33.20061214 -- split -libs subpackage for multilib installs - -* Tue Dec 26 2006 Dominik Mierzejewski - 0.4.9-0.32.20061214 -- new kino works with swscaler, re-enabled - -* Tue Dec 19 2006 Dominik Mierzejewski - 0.4.9-0.31.20061214 -- disable swscaler, it breaks kino - -* Sun Dec 17 2006 Ville Skyttä - 0.4.9-0.30.20061214 -- fix pkgconfig patch - -* Sat Dec 16 2006 Dominik Mierzejewski - 0.4.9-0.29.20061214 -- liba52 change broke build on 64bit -- resurrect lost URL changes - -* Fri Dec 15 2006 Dominik Mierzejewski - 0.4.9-0.28.20061214 -- fixed build on x86 -- change liba52 file-based dependency to provides-based -- resurrect and update pkgconfig patch - -* Thu Dec 14 2006 Dominik Mierzejewski - 0.4.9-0.27.20061214 -- new snapshot URL -- new URL - -* Thu Dec 14 2006 Dominik Mierzejewski - 0.4.9-0.26.20061214 -- 2006-12-14 snapshot -- added libdca support -- enabled swscaler -- dropped obsolete patches - -* Mon Oct 30 2006 Ville Skyttä - 0.4.9-0.25.20061030 -- 2006-10-30 snapshot, fixes x86_64 build. -- Apply a less intrusive workaround for LAME detection issues. - -* Sat Oct 28 2006 Ville Skyttä - 0.4.9-0.25.20061028 -- 2006-10-28 snapshot, build with x264. -- Clean up some pre-FC4 compat build dependency cruft. -- Quick and dirty workarounds for ./configure's libmp3lame test and asm - register issues on ix86. - -* Fri Oct 06 2006 Thorsten Leemhuis 0.4.9-25 -- rebuilt for unwind info generation, broken in gcc-4.1.1-21 - -* Tue Sep 26 2006 Ville Skyttä - 0.4.9-0.24.20060817 -- Drop SELinux fcontext settings, they're supposedly fixed upstream again. - -* Thu Aug 17 2006 Ville Skyttä - 0.4.9-0.23.20060817 -- 2006-08-17 snapshot. -- Fix svn rev in "ffmpeg -version" etc. - -* Wed Aug 9 2006 Ville Skyttä - 0.4.9-0.23.20060804 -- Reintroduce SELinux fcontext settings on ix86 (not needed on x86_64, ppc), - they're not completely taken care of upstream (#1120). -- Split svn snapshot creator into a separate script. - -* Fri Aug 4 2006 Ville Skyttä - 0.4.9-0.22.20060804 -- 2006-08-04 snapshot. -- Drop bogus version from SDL-devel build dependency. -- Drop no longer relevant libpostproc obsoletion. -- Prune pre-2005 changelog entries. -- Specfile cleanup. - -* Sat Jun 17 2006 Ville Skyttä - 0.4.9-0.22.20060617 -- 2006-06-17 snapshot. - -* Mon Jun 12 2006 Ville Skyttä - 0.4.9-0.22.20060612 -- 2006-06-12 snapshot, rgb.txt patch applied upstream. -- Patch to force linking vhook modules with their dependencies, --as-needed - seems to drop needed things for some reason for drawtext and imlib2. -- Revert to dlopen()'ing liba52 and add file based dependency on it, it's - easier this way again due to --as-needed linkage. - -* Wed May 17 2006 Ville Skyttä - 0.4.9-0.22.20060517 -- 2006-05-17 snapshot. -- Link with faad2, don't dlopen() it. - -* Sat May 13 2006 Ville Skyttä - 0.4.9-0.22.20060513 -- 2006-05-13 snapshot. -- Drop SELinux fixups, they're part of upstream policy now. - -* Sat Apr 15 2006 Ville Skyttä - 0.4.9-0.22.20060407 -- SELinux file context fixups (mplayer, vdr-dxr3 etc) while waiting for #188358 - -* Sat Apr 8 2006 Ville Skyttä - 0.4.9-0.21.20060407 -- 2006-04-07 CVS snapshot. -- Move *.so to -devel, hopefully nothing needs them any more. - -* Fri Mar 31 2006 Ville Skyttä - 0.4.9-0.21.20051228 -- Remove superfluous dependencies from pkgconfig files (#747). -- Re-enable MMX on x86_64. - -* Thu Mar 09 2006 Andreas Bierfert -- switch to new release field - -* Tue Feb 28 2006 Andreas Bierfert -- add dist - -* Wed Dec 28 2005 Ville Skyttä - 0.4.9-0.lvn.0.20.20051228 -- 2005-12-28 CVS snapshot. -- Let upstream configure take care of PIC settings (patched for ppc). -- Own shared lib symlinks. - -* Fri Dec 23 2005 Ville Skyttä - 0.4.9-0.lvn.0.20.20050801 -- Apply upstream fix for CVE-2005-4048. -- Patch to find rgb.txt in FC5 too. - -* Thu Sep 29 2005 Ville Skyttä - 0:0.4.9-0.lvn.0.19.20050801 -- Clean up obsolete pre-FC3 stuff (FAAC is now unconditionally enabled). -- Drop zero Epochs. - -* Tue Aug 16 2005 Ville Skyttä - 0:0.4.9-0.lvn.0.18.20050801 -- Apply some upstream and some mine (libdir) fixes to pkgconfig files. -- Add pkgconfig dependency to -devel. -- Include gsm support. - -* Thu Aug 4 2005 David Woodhouse - 0:0.4.9-0.lvn.0.17.20050801 -- Update to 20050801 snapshot to make xine-lib happy -- Enable Altivec support by using --cpu=powerpc (not 'ppc') -- Enable theora -- Add pkgconfig files -- Undefine various things which might be macros before redefining them - -* Sat Jul 23 2005 Dams - 0:0.4.9-0.lvn.0.17.20050427 -- Added patch from Marc Deslauriers to fix wmv2 distorsion - -* Sun Jul 10 2005 Ville Skyttä - 0:0.4.9-0.lvn.0.16.20050427 -- Enable faac by default, rebuild with "--without faac" to disable. -- Clean up obsolete pre-FC2 and other stuff. - -* Sun May 22 2005 Ville Skyttä - 0:0.4.9-0.lvn.0.15.20050427 -- PPC needs -fPIC too. - -* Sat May 21 2005 Thorsten Leemhuis - 0:0.4.9-0.lvn.0.14.20050427 -- disable mmx for now on x86_64 to fix build - -* Sat Apr 30 2005 Dams - 0:0.4.9-0.lvn.0.13.20050427 -- Removed bogus devel requires -- Re-added conditionnal a52dec buildreq - -* Fri Apr 29 2005 Ville Skyttä - 0:0.4.9-0.lvn.0.12.20050427 -- Link avcodec with a52 when building with a52bin, remove unnecessary - hardcoded liba52.so.0 dependency. - -* Fri Apr 29 2005 Dams - 0:0.4.9-0.lvn.0.11.20050427 -- Fixed devel package deps - -* Fri Apr 29 2005 Dams - 0:0.4.9-0.lvn.0.10.20050427 -- texi2html replaces tetex as build dependency (FC4 compliance) -- re-added man pages - -* Thu Apr 28 2005 Dams - 0:0.4.9-0.lvn.0.9.20050427 -- Patch from Enrico to fix build on gcc4 -- Missing BuildReq a52dec-devel when a52bin is defined -- Patch to fix a52 build - -* Wed Apr 27 2005 Dams - 0:0.4.9-0.lvn.0.8.20050427 -- Updated tarball to cvs 20050427 snapshot -- Enabled libogg, xvid, a52bin -- Dropped Patch[0-3] +%doc doc/APIchanges doc/*.txt +%doc doc/html doc/examples + +%files -n libavcodec +%license COPYING.GPLv2 LICENSE.md +%{_libdir}/libavcodec.so.%{avcodec_soversion}* + +%files -n libavcodec-devel +%{_includedir}/libavcodec +%{_libdir}/pkgconfig/libavcodec.pc +%{_libdir}/libavcodec.so +%{_mandir}/man3/libavcodec.3* + +%files -n libavdevice +%license COPYING.GPLv2 LICENSE.md +%{_libdir}/libavdevice.so.%{avdevice_soversion}* + +%files -n libavdevice-devel +%{_includedir}/libavdevice +%{_libdir}/pkgconfig/libavdevice.pc +%{_libdir}/libavdevice.so +%{_mandir}/man3/libavdevice.3* + +%files -n libavfilter +%license COPYING.GPLv2 LICENSE.md +%{_libdir}/libavfilter.so.%{avfilter_soversion}* + +%files -n libavfilter-devel +%{_includedir}/libavfilter +%{_libdir}/pkgconfig/libavfilter.pc +%{_libdir}/libavfilter.so +%{_mandir}/man3/libavfilter.3* + +%files -n libavformat +%license COPYING.GPLv2 LICENSE.md +%{_libdir}/libavformat.so.%{avformat_soversion}* + +%files -n libavformat-devel +%{_includedir}/libavformat +%{_libdir}/pkgconfig/libavformat.pc +%{_libdir}/libavformat.so +%{_mandir}/man3/libavformat.3* + +%files -n libavutil +%license COPYING.GPLv2 LICENSE.md +%{_libdir}/libavutil.so.%{avutil_soversion}* + +%files -n libavutil-devel +%{_includedir}/libavutil +%{_libdir}/pkgconfig/libavutil.pc +%{_libdir}/libavutil.so +%{_mandir}/man3/libavutil.3* + +%files -n libpostproc +%license COPYING.GPLv2 LICENSE.md +%{_libdir}/libpostproc.so.%{postproc_soversion}* + +%files -n libpostproc-devel +%{_includedir}/libpostproc +%{_libdir}/pkgconfig/libpostproc.pc +%{_libdir}/libpostproc.so + +%files -n libswresample +%license COPYING.GPLv2 LICENSE.md +%{_libdir}/libswresample.so.%{swresample_soversion}* + +%files -n libswresample-devel +%{_includedir}/libswresample +%{_libdir}/pkgconfig/libswresample.pc +%{_libdir}/libswresample.so +%{_mandir}/man3/libswresample.3* + +%files -n libswscale +%license COPYING.GPLv2 LICENSE.md +%{_libdir}/libswscale.so.%{swscale_soversion}* + +%files -n libswscale-devel +%{_includedir}/libswscale +%{_libdir}/pkgconfig/libswscale.pc +%{_libdir}/libswscale.so +%{_mandir}/man3/libswscale.3* From 438d83f22c72bf66f30382002fb239b6c4117076 Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 29 Apr 2025 05:38:23 -0500 Subject: [PATCH 0963/2977] feat(andax/nvidia.rhai): Automatically fetch new CUDA versions (#4514) Signed-off-by: Gilver --- andax/nvidia.rhai | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/andax/nvidia.rhai b/andax/nvidia.rhai index 780de31ef0..03d82bea6a 100644 --- a/andax/nvidia.rhai +++ b/andax/nvidia.rhai @@ -2,9 +2,10 @@ // This module is used to parse the NVIDIA website for the latest driver version fn nvidia_component_list() { - let series = "12.8.1"; - let url = `https://developer.download.nvidia.com/compute/cuda/redist/redistrib_${series}.json`; - return get(url).json(); + let url = "https://developer.download.nvidia.com/compute/cuda/redist/"; + let matches = find_all("redistrib_[\\d.]+.json", get(url)); + let series = `${url}${matches[matches.len - 1][0]}`; + return get(series).json(); } fn nvidia_component_version(component) { let components = nvidia_component_list(); From b3b0074eb1b09285b4b0ba8791e62d06be204c40 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 29 Apr 2025 13:23:14 +0000 Subject: [PATCH 0964/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 1ad80203c3..190f0b10b7 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.184.5-pre +%global ver 0.184.6-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ From 363c4de838bd814ba8e0b22d546272f8dd4b2f1e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 29 Apr 2025 13:59:58 +0000 Subject: [PATCH 0965/2977] bump: nightly --- anda/system/readymade/nightly/readymade-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/readymade/nightly/readymade-nightly.spec b/anda/system/readymade/nightly/readymade-nightly.spec index 3b90510666..1973d7c465 100644 --- a/anda/system/readymade/nightly/readymade-nightly.spec +++ b/anda/system/readymade/nightly/readymade-nightly.spec @@ -1,4 +1,4 @@ -%global commit dc6b76d5ffeb552c2b8234b053b5a439628b661e +%global commit 6519859b9adebd01f6e9cf5546248e5e45ff137c %global commit_date 20250429 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From be93c0e93dbcf9ebdcbecca3936be9c333984553 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 29 Apr 2025 14:46:22 +0000 Subject: [PATCH 0966/2977] bump: stable --- anda/devs/zed/stable/zed.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 273019982f..be799d201e 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,8 +9,8 @@ %global rustflags_debuginfo 0 Name: zed -Version: 0.183.11 -Release: 2%?dist +Version: 0.183.12 +Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 AND ISC) AND AGPL.3.0-only AND AGPL-3.0-or-later AND (Apache-2.0 OR BSL-1.0 OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception) AND Apache-2.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR MIT OR Apache-2.0) AND BSD-2-Clause AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR Apache-2.0) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND CC0-1.0 AND GPL-3.0-or-later AND (ISC AND (Apache-2.0 OR ISC) AND OpenSSL) AND (ISC AND (Apache-2.0 OR ISC)) AND ISC AND (MIT AND (MIT OR Apache-2.0)) AND (MIT AND BSD-3-Clause) AND (MIT OR Apache-2.0 OR CC0-1.0) AND (MIT OR Apache-2.0 OR NCSA) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND MPL-2.0 AND Unicode-3.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND Zlib From fee1956d11cfebb201aab46019064f416f3e49af Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 29 Apr 2025 15:42:00 +0000 Subject: [PATCH 0967/2977] bump: inputplumber crystal --- anda/games/inputplumber/inputplumber.spec | 2 +- anda/langs/crystal/crystal/crystal.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index f405be2603..7d70a78005 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.55.1 +Version: 0.55.2 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later diff --git a/anda/langs/crystal/crystal/crystal.spec b/anda/langs/crystal/crystal/crystal.spec index 08c7941c76..e655ccd370 100644 --- a/anda/langs/crystal/crystal/crystal.spec +++ b/anda/langs/crystal/crystal/crystal.spec @@ -1,7 +1,7 @@ %define debug_package %nil Name: crystal -Version: 1.16.1 +Version: 1.16.2 Release: 1%?dist Summary: The Crystal Programming Language License: Apache-2.0 From 86c05f15df7930bdf4ef46cd66151dce43b8984b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 29 Apr 2025 16:24:01 +0000 Subject: [PATCH 0968/2977] bump: discord-openasar discord --- anda/apps/discord-openasar/discord-openasar.spec | 2 +- anda/apps/discord/discord.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-openasar/discord-openasar.spec b/anda/apps/discord-openasar/discord-openasar.spec index e6bc6006a1..a6fd8eafc7 100644 --- a/anda/apps/discord-openasar/discord-openasar.spec +++ b/anda/apps/discord-openasar/discord-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-openasar -Version: 0.0.92 +Version: 0.0.93 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord/discord.spec b/anda/apps/discord/discord.spec index 2dc9815dbe..b4edc3f065 100644 --- a/anda/apps/discord/discord.spec +++ b/anda/apps/discord/discord.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord -Version: 0.0.92 +Version: 0.0.93 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: https://discord.com From e485ca94ca08c7adfc231b577b0d74ce95ed1305 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 29 Apr 2025 16:46:57 +0000 Subject: [PATCH 0969/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 262fd1202f..8c58d0076a 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.662 +Version: 0.0.663 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 1f41a0c8a3..ff07585571 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.662 +Version: 0.0.663 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 93110ed66bf1c954ecb77ef8c677b88c9a2e9f68 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 29 Apr 2025 16:57:24 +0000 Subject: [PATCH 0970/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 5e28c857a6..d97ec54875 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.28.224217 +Version: 2025.04.29.164609 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 0eb9a2bcd78059ef2b008bb27ba33d0dac6bf6ae Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 29 Apr 2025 12:00:13 -0500 Subject: [PATCH 0971/2977] feat(cuda-cudnn, libcusparelt): Make update.rhai automatically track new series (#4520) --- anda/lib/nvidia/cuda-cudnn/update.rhai | 8 ++++---- anda/lib/nvidia/libcusparselt/update.rhai | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/anda/lib/nvidia/cuda-cudnn/update.rhai b/anda/lib/nvidia/cuda-cudnn/update.rhai index 0df4df487d..34f26eec9e 100644 --- a/anda/lib/nvidia/cuda-cudnn/update.rhai +++ b/anda/lib/nvidia/cuda-cudnn/update.rhai @@ -1,5 +1,5 @@ -import "andax/nvidia.rhai" as nvidia; -let series = "9.6.0"; -let url = `https://developer.download.nvidia.com/compute/cudnn/redist/redistrib_${series}.json`; -let json = get(url).json(); +let url = "https://developer.download.nvidia.com/compute/cudnn/redist/"; +let matches = find_all("redistrib_[\\d.]+.json", get(url)); +let series = `${url}${matches[matches.len - 1][0]}`; +let json = get(series).json(); rpm.version(json["cudnn"]["version"]); diff --git a/anda/lib/nvidia/libcusparselt/update.rhai b/anda/lib/nvidia/libcusparselt/update.rhai index 9dc271021e..18f94061bc 100644 --- a/anda/lib/nvidia/libcusparselt/update.rhai +++ b/anda/lib/nvidia/libcusparselt/update.rhai @@ -1,5 +1,5 @@ -let series = "0.6.3"; -let url = `https://developer.download.nvidia.com/compute/cusparselt/redist/redistrib_${series}.json`; -let json = get(url).json(); - +let url = "https://developer.download.nvidia.com/compute/cusparselt/redist/"; +let matches = find_all("redistrib_[\\d.]+.json", get(url)); +let series = `${url}${matches[matches.len - 1][0]}`; +let json = get(series).json(); rpm.version(json["libcusparse_lt"]["version"]); From f907735d06a4186812e945c46cf10564ffe610c7 Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 29 Apr 2025 19:06:28 +0200 Subject: [PATCH 0972/2977] feat(switcheroo-control): bump release number, update discrete patch (#4521) - for F42 the release was bumped to 8, needed to bump it again for the terra package to be updated to - the discrete patch was updated to support the Intel Xe Driver Signed-off-by: Jan200101 --- ...pdate-GPUs-comment-for-dbus-property.patch | 27 - .../0002-main-add-Discrete-key.patch | 379 ----- ...x-integration-tests-without-UMockdev.patch | 27 - ...for-discrete-detection-with-mock-lib.patch | 278 ---- ...05-main-remove-leftover-and-fix-typo.patch | 39 - ...screte-dependencies-out-of-main-deps.patch | 48 - ...-for-discrete-command-line-arguments.patch | 137 -- .../0008-main-add-udev-rule-for-i915.patch | 25 - ...in-use-Discrete-key-in-switcherooctl.patch | 34 - ...0010-main-use-new-GPU-list-on-uevent.patch | 45 - anda/apps/switcheroo-control/discrete.patch | 1335 +++++++++++++++++ .../switcheroo-control.spec | 31 +- 12 files changed, 1350 insertions(+), 1055 deletions(-) delete mode 100644 anda/apps/switcheroo-control/0001-main-update-GPUs-comment-for-dbus-property.patch delete mode 100644 anda/apps/switcheroo-control/0002-main-add-Discrete-key.patch delete mode 100644 anda/apps/switcheroo-control/0003-tests-fix-integration-tests-without-UMockdev.patch delete mode 100644 anda/apps/switcheroo-control/0004-tests-add-tests-for-discrete-detection-with-mock-lib.patch delete mode 100644 anda/apps/switcheroo-control/0005-main-remove-leftover-and-fix-typo.patch delete mode 100644 anda/apps/switcheroo-control/0006-main-move-discrete-dependencies-out-of-main-deps.patch delete mode 100644 anda/apps/switcheroo-control/0007-main-use-glib-for-discrete-command-line-arguments.patch delete mode 100644 anda/apps/switcheroo-control/0008-main-add-udev-rule-for-i915.patch delete mode 100644 anda/apps/switcheroo-control/0009-main-use-Discrete-key-in-switcherooctl.patch delete mode 100644 anda/apps/switcheroo-control/0010-main-use-new-GPU-list-on-uevent.patch create mode 100644 anda/apps/switcheroo-control/discrete.patch diff --git a/anda/apps/switcheroo-control/0001-main-update-GPUs-comment-for-dbus-property.patch b/anda/apps/switcheroo-control/0001-main-update-GPUs-comment-for-dbus-property.patch deleted file mode 100644 index 825ca07b19..0000000000 --- a/anda/apps/switcheroo-control/0001-main-update-GPUs-comment-for-dbus-property.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 44046bfbcb30a19c45416113a2a82a4d17a1a998 Mon Sep 17 00:00:00 2001 -From: Jan200101 -Date: Mon, 14 Aug 2023 14:06:45 +0200 -Subject: [PATCH 01/10] main: update GPUs comment for dbus property - -Signed-off-by: Jan200101 ---- - src/net.hadess.SwitcherooControl.xml | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/net.hadess.SwitcherooControl.xml b/src/net.hadess.SwitcherooControl.xml -index e52bc1a..59a8896 100644 ---- a/src/net.hadess.SwitcherooControl.xml -+++ b/src/net.hadess.SwitcherooControl.xml -@@ -38,7 +38,8 @@ - will contain a user-facing name for the GPU, the "Environment" (as) key will - contain an array of even number of strings, each being an environment - variable to set to use the GPU, followed by its value, the "Default" (b) key -- will tag the default (usually integrated) GPU. -+ will tag the default GPU, the "Discrete" (b) key tags if the GPU is a -+ dedicated component. - --> - - --- -2.46.0 - diff --git a/anda/apps/switcheroo-control/0002-main-add-Discrete-key.patch b/anda/apps/switcheroo-control/0002-main-add-Discrete-key.patch deleted file mode 100644 index b67ca67fae..0000000000 --- a/anda/apps/switcheroo-control/0002-main-add-Discrete-key.patch +++ /dev/null @@ -1,379 +0,0 @@ -From 4f31415cb61a50c2bcba1510a7511518417d0970 Mon Sep 17 00:00:00 2001 -From: Jan200101 -Date: Mon, 11 Sep 2023 15:21:46 +0200 -Subject: [PATCH 02/10] main: add Discrete key - -Signed-off-by: Jan200101 ---- - .gitlab-ci.yml | 1 + - data/30-discrete-gpu.rules.in | 3 + - data/meson.build | 7 ++ - meson.build | 9 +++ - meson_options.txt | 24 +++++++ - src/discrete-detection/amdgpu.c | 46 +++++++++++++ - src/discrete-detection/meson.build | 18 +++++ - src/discrete-detection/nouveau.c | 105 +++++++++++++++++++++++++++++ - src/meson.build | 4 +- - src/switcheroo-control.c | 16 +++++ - 10 files changed, 232 insertions(+), 1 deletion(-) - create mode 100644 data/30-discrete-gpu.rules.in - create mode 100644 src/discrete-detection/amdgpu.c - create mode 100644 src/discrete-detection/meson.build - create mode 100644 src/discrete-detection/nouveau.c - -diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml -index a6aa3c7..a09fe20 100644 ---- a/.gitlab-ci.yml -+++ b/.gitlab-ci.yml -@@ -3,6 +3,7 @@ image: fedora:rawhide - variables: - DEPENDENCIES: glib2-devel - libgudev-devel -+ libdrm-devel - gtk-doc - gcc - gcc-c++ -diff --git a/data/30-discrete-gpu.rules.in b/data/30-discrete-gpu.rules.in -new file mode 100644 -index 0000000..a803ed4 ---- /dev/null -+++ b/data/30-discrete-gpu.rules.in -@@ -0,0 +1,3 @@ -+DRIVERS=="amdgpu", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-amdgpu $env{DEVNAME}", TAG+="switcheroo-discrete-gpu" -+DRIVERS=="nouveau", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-nouveau $env{DEVNAME}", TAG+="switcheroo-discrete-gpu" -+DRIVERS=="nvidia", TAG+="switcheroo-discrete-gpu" -diff --git a/data/meson.build b/data/meson.build -index 85e5c93..38cf96c 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -17,3 +17,10 @@ install_data( - '30-pci-intel-gpu.hwdb', - install_dir: hwdb_dir, - ) -+ -+configure_file( -+ input: '30-discrete-gpu.rules.in', -+ output: '30-discrete-gpu.rules', -+ configuration: data_conf, -+ install_dir: rules_dir, -+) -diff --git a/meson.build b/meson.build -index b8f4bff..b3aaf0c 100644 ---- a/meson.build -+++ b/meson.build -@@ -20,6 +20,9 @@ gnome = import('gnome') - glib = dependency('glib-2.0', version: '>= 2.56.0') - gio = dependency('gio-2.0', version: '>= 2.56.0') - gudev = dependency('gudev-1.0', version: '>= 232') -+libdrm = dependency('libdrm', version: '>= 2.4.97', required: get_option('libdrm')) -+libdrm_nouveau = dependency('libdrm_nouveau', version: '>= 2.4.97', required: get_option('libdrm_nouveau')) -+libdrm_amdgpu = dependency('libdrm_amdgpu', version: '>= 2.4.97', required: get_option('libdrm_amdgpu')) - - systemd_systemunitdir = get_option('systemdsystemunitdir') - if systemd_systemunitdir == '' -@@ -32,6 +35,12 @@ if hwdb_dir == '' - hwdb_dir = udevdir / 'hwdb.d' - endif - -+rules_dir = get_option('rulesdir') -+if rules_dir == '' -+ udevdir = dependency('udev').get_pkgconfig_variable('udevdir') -+ rules_dir = udevdir / 'rules.d' -+endif -+ - # Make like license available in the build root for docs - configure_file( - input: 'COPYING', -diff --git a/meson_options.txt b/meson_options.txt -index c8d9619..b8d671a 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -10,6 +10,12 @@ option('hwdbdir', - description: 'Directory for hwdb files', - ) - -+option('rulesdir', -+ type: 'string', -+ value: '', -+ description: 'Directory for ruke files', -+) -+ - option('gtk_doc', - type: 'boolean', - value: false, -@@ -21,3 +27,21 @@ option('tests', - type: 'boolean', - value: false - ) -+ -+option('libdrm', -+ description: 'Whether libdrm should be used to probe GPUs', -+ type: 'feature', -+ value: 'auto' -+) -+ -+option('libdrm_nouveau', -+ description: 'Whether libdrm_nouveau should be used to probe Nvidia GPUs', -+ type: 'feature', -+ value: 'auto' -+) -+ -+option('libdrm_amdgpu', -+ description: 'Whether libdrm_amdgpu should be used to probe AMD GPUs', -+ type: 'feature', -+ value: 'auto' -+) -diff --git a/src/discrete-detection/amdgpu.c b/src/discrete-detection/amdgpu.c -new file mode 100644 -index 0000000..2d9804f ---- /dev/null -+++ b/src/discrete-detection/amdgpu.c -@@ -0,0 +1,46 @@ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+ -+typedef int handle; -+G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1) -+G_DEFINE_AUTOPTR_CLEANUP_FUNC(amdgpu_device_handle, free); -+ -+int main(int argc, char** argv) -+{ -+ if (argc < 2) -+ { -+ puts ("check-discrete-amdgpu [DEVNAME]"); -+ return EXIT_FAILURE; -+ } -+ -+ const char *devname; -+ g_auto(handle) fd = -1; -+ g_autoptr(GUdevDevice) parent = NULL; -+ struct drm_amdgpu_info_device device_info = {0}; -+ amdgpu_device_handle device = NULL; -+ uint32_t drm_major, drm_minor; -+ -+ devname = argv[1]; -+ fd = open (devname, O_RDWR); -+ if (fd < 0) -+ return EXIT_FAILURE; -+ -+ if (amdgpu_device_initialize (fd, &drm_major, &drm_minor, &device)) -+ return EXIT_FAILURE; -+ -+ if (amdgpu_query_info (device, AMDGPU_INFO_DEV_INFO, sizeof(device_info), &device_info)) -+ return EXIT_FAILURE; -+ -+ /* AMDGPU_IDS_FLAGS_FUSION is set for all APUs */ -+ if (device_info.ids_flags & AMDGPU_IDS_FLAGS_FUSION) -+ return EXIT_FAILURE; -+ -+ return EXIT_SUCCESS; -+} -diff --git a/src/discrete-detection/meson.build b/src/discrete-detection/meson.build -new file mode 100644 -index 0000000..3a6c03f ---- /dev/null -+++ b/src/discrete-detection/meson.build -@@ -0,0 +1,18 @@ -+ -+if libdrm_amdgpu.found() -+ executable('check-discrete-amdgpu', -+ files('amdgpu.c'), -+ dependencies: deps, -+ install: true, -+ install_dir: libexecdir, -+ ) -+endif -+ -+if libdrm.found() and libdrm_nouveau.found() -+ executable('check-discrete-nouveau', -+ files('nouveau.c'), -+ dependencies: deps, -+ install: true, -+ install_dir: libexecdir, -+ ) -+endif -diff --git a/src/discrete-detection/nouveau.c b/src/discrete-detection/nouveau.c -new file mode 100644 -index 0000000..0a1f220 ---- /dev/null -+++ b/src/discrete-detection/nouveau.c -@@ -0,0 +1,105 @@ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+ -+typedef int handle; -+G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1) -+ -+int main(int argc, char** argv) -+{ -+ if (argc < 2) -+ { -+ puts ("check-discrete-nouveau [DEVNAME]"); -+ return EXIT_FAILURE; -+ } -+ -+ const char *devname; -+ g_auto(handle) fd = -1; -+ -+ devname = argv[1]; -+ fd = open (devname, O_RDWR); -+ if (fd < 0) -+ return EXIT_FAILURE; -+ -+ g_autofree void *device = malloc(352); -+ -+ /* Init device */ -+ { -+ struct { -+ struct nvif_ioctl_v0 ioctl; -+ struct nvif_ioctl_new_v0 new; -+ struct nv_device_v0 dev; -+ } init_args = { -+ .ioctl = { -+ .object = 0, -+ .owner = NVIF_IOCTL_V0_OWNER_ANY, -+ .route = 0x00, -+ .type = NVIF_IOCTL_V0_NEW, -+ .version = 0, -+ }, -+ .new = { -+ .handle = 0, -+ .object = (uintptr_t)device, -+ .oclass = NV_DEVICE, -+ .route = NVIF_IOCTL_V0_ROUTE_NVIF, -+ .token = (uintptr_t)device, -+ .version = 0, -+ }, -+ .dev = { -+ .device = ~0ULL, -+ }, -+ }; -+ -+ if (drmCommandWrite (fd, DRM_NOUVEAU_NVIF, &init_args, sizeof(init_args))) -+ return EXIT_FAILURE; -+ } -+ -+ /* Query device info */ -+ struct { -+ struct nvif_ioctl_v0 ioctl; -+ struct nvif_ioctl_mthd_v0 mthd; -+ struct nv_device_info_v0 info; -+ } args = { -+ .ioctl = { -+ .object = (uintptr_t)device, -+ .owner = NVIF_IOCTL_V0_OWNER_ANY, -+ .route = 0x00, -+ .type = NVIF_IOCTL_V0_MTHD, -+ .version = 0, -+ }, -+ .mthd = { -+ .method = NV_DEVICE_V0_INFO, -+ .version = 0, -+ }, -+ .info = { -+ .version = 0, -+ }, -+ }; -+ -+ if (drmCommandWriteRead (fd, DRM_NOUVEAU_NVIF, &args, sizeof(args))) -+ return EXIT_FAILURE; -+ -+ -+ switch (args.info.platform) -+ { -+ case NV_DEVICE_INFO_V0_IGP: -+ case NV_DEVICE_INFO_V0_SOC: -+ return EXIT_FAILURE; -+ -+ case NV_DEVICE_INFO_V0_PCI: -+ case NV_DEVICE_INFO_V0_AGP: -+ case NV_DEVICE_INFO_V0_PCIE: -+ default: -+ return EXIT_SUCCESS; -+ } -+ return EXIT_FAILURE; -+} -diff --git a/src/meson.build b/src/meson.build -index ab3a77d..da4267f 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -1,4 +1,4 @@ --deps = [glib, gio, gudev] -+deps = [glib, gio, gudev, libdrm, libdrm_nouveau, libdrm_amdgpu] - - sources = [ - 'info-cleanup.c', -@@ -34,3 +34,5 @@ configure_file( - configuration: switcherooctl_conf, - install_dir: get_option('bindir') - ) -+ -+subdir('discrete-detection') -diff --git a/src/switcheroo-control.c b/src/switcheroo-control.c -index abd8154..e407bfb 100644 ---- a/src/switcheroo-control.c -+++ b/src/switcheroo-control.c -@@ -31,6 +31,7 @@ typedef struct { - char *name; - GPtrArray *env; - gboolean is_default; -+ gboolean is_discrete; - } CardData; - - typedef struct { -@@ -94,6 +95,8 @@ build_gpus_variant (ControlData *data) - g_variant_new_strv ((const gchar * const *) card->env->pdata, card->env->len)); - g_variant_builder_add (&asv_builder, "{sv}", "Default", - g_variant_new_boolean (card->is_default)); -+ g_variant_builder_add (&asv_builder, "{sv}", "Discrete", -+ g_variant_new_boolean (card->is_discrete)); - - g_variant_builder_add (&builder, "a{sv}", &asv_builder); - } -@@ -312,6 +315,18 @@ get_card_is_default (GUdevDevice *d) - return g_udev_device_get_sysfs_attr_as_boolean (parent, "boot_vga"); - } - -+static gboolean -+get_card_is_discrete (GUdevDevice *d) -+{ -+ const char * const * tags; -+ g_autoptr (GUdevDevice) platform_device = NULL; -+ -+ tags = g_udev_device_get_tags (d); -+ if (tags && g_strv_contains (tags, "switcheroo-discrete-gpu")) -+ return TRUE; -+ return FALSE; -+} -+ - static CardData * - get_card_data (GUdevClient *client, - GUdevDevice *d) -@@ -328,6 +343,7 @@ get_card_data (GUdevClient *client, - data->name = get_card_name (d); - data->env = env; - data->is_default = get_card_is_default (d); -+ data->is_discrete = get_card_is_discrete (d); - - return data; - } --- -2.46.0 - diff --git a/anda/apps/switcheroo-control/0003-tests-fix-integration-tests-without-UMockdev.patch b/anda/apps/switcheroo-control/0003-tests-fix-integration-tests-without-UMockdev.patch deleted file mode 100644 index e8ee844d53..0000000000 --- a/anda/apps/switcheroo-control/0003-tests-fix-integration-tests-without-UMockdev.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 1b115ed72e03ff1169cbfddd79ef10890baca133 Mon Sep 17 00:00:00 2001 -From: Jan200101 -Date: Tue, 12 Sep 2023 15:53:40 +0200 -Subject: [PATCH 03/10] tests: fix integration tests without UMockdev - `gi.require_version` throws ValueError if the dependency cannot be found - -Signed-off-by: Jan200101 ---- - tests/integration-test.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/integration-test.py b/tests/integration-test.py -index d8dea16..e3dd996 100755 ---- a/tests/integration-test.py -+++ b/tests/integration-test.py -@@ -37,7 +37,7 @@ except ImportError as e: - try: - gi.require_version('UMockdev', '1.0') - from gi.repository import UMockdev --except ImportError: -+except (ImportError, ValueError): - sys.stderr.write('Skipping tests, umockdev not available (https://github.com/martinpitt/umockdev)\n') - sys.exit(0) - --- -2.46.0 - diff --git a/anda/apps/switcheroo-control/0004-tests-add-tests-for-discrete-detection-with-mock-lib.patch b/anda/apps/switcheroo-control/0004-tests-add-tests-for-discrete-detection-with-mock-lib.patch deleted file mode 100644 index 24915eba46..0000000000 --- a/anda/apps/switcheroo-control/0004-tests-add-tests-for-discrete-detection-with-mock-lib.patch +++ /dev/null @@ -1,278 +0,0 @@ -From d933e96bdb15679ae7653f929461982aa66973ba Mon Sep 17 00:00:00 2001 -From: Jan200101 -Date: Tue, 12 Sep 2023 15:58:16 +0200 -Subject: [PATCH 04/10] tests: add tests for discrete detection with mock libs - Both tests have 4 different ways of testing: - Invalid Device - Unexpected - Device - Non Discrete GPU (iGPU/APU) - Discrete GPU - -Signed-off-by: Jan200101 ---- - src/discrete-detection/meson.build | 4 +- - tests/discrete-detection/libdrm_amdgpu_mock.c | 57 +++++++++++++ - .../discrete-detection/libdrm_nouveau_mock.c | 68 ++++++++++++++++ - tests/discrete-detection/meson.build | 80 +++++++++++++++++++ - tests/meson.build | 2 + - 5 files changed, 209 insertions(+), 2 deletions(-) - create mode 100644 tests/discrete-detection/libdrm_amdgpu_mock.c - create mode 100644 tests/discrete-detection/libdrm_nouveau_mock.c - create mode 100644 tests/discrete-detection/meson.build - -diff --git a/src/discrete-detection/meson.build b/src/discrete-detection/meson.build -index 3a6c03f..8eb8437 100644 ---- a/src/discrete-detection/meson.build -+++ b/src/discrete-detection/meson.build -@@ -1,6 +1,6 @@ - - if libdrm_amdgpu.found() -- executable('check-discrete-amdgpu', -+ amdgpu_discrete = executable('check-discrete-amdgpu', - files('amdgpu.c'), - dependencies: deps, - install: true, -@@ -9,7 +9,7 @@ if libdrm_amdgpu.found() - endif - - if libdrm.found() and libdrm_nouveau.found() -- executable('check-discrete-nouveau', -+ nouveau_discrete = executable('check-discrete-nouveau', - files('nouveau.c'), - dependencies: deps, - install: true, -diff --git a/tests/discrete-detection/libdrm_amdgpu_mock.c b/tests/discrete-detection/libdrm_amdgpu_mock.c -new file mode 100644 -index 0000000..20fa4aa ---- /dev/null -+++ b/tests/discrete-detection/libdrm_amdgpu_mock.c -@@ -0,0 +1,57 @@ -+#include -+#include -+#include -+ -+#include -+ -+enum { -+ OTHER_GPU, -+ AMD_APU, -+ AMD_GPU, -+}; -+ -+/* Mock open(2) so we can test multiple devices configurations */ -+int open(const char *pathname, int flags) -+{ -+ if (!strcmp(pathname, "OTHER_GPU")) -+ return OTHER_GPU; -+ if (!strcmp (pathname, "AMD_APU")) -+ return AMD_APU; -+ if (!strcmp (pathname, "AMD_GPU")) -+ return AMD_GPU; -+ -+ return -1; -+} -+ -+/* open64 may be used for large file support */ -+int open64(const char *pathname, int flags) -+{ -+ return open (pathname, flags); -+} -+ -+int amdgpu_device_initialize(int fd, uint32_t *major_version, uint32_t *minor_version, int *device_handle) -+{ -+ // Store the fd in the device handle for access in query_info -+ *device_handle = fd; -+ -+ if (fd != AMD_GPU && fd != AMD_APU) -+ return 1; -+ -+ return 0; -+} -+ -+int amdgpu_query_info(int device_handle, unsigned info_id, unsigned size, void *value) -+{ -+ struct drm_amdgpu_info_device* device_info = value; -+ -+ if (device_handle == AMD_GPU) { -+ device_info->ids_flags = 0; -+ return 0; -+ } -+ if (device_handle == AMD_APU) { -+ device_info->ids_flags = AMDGPU_IDS_FLAGS_FUSION; -+ return 0; -+ } -+ -+ return 1; -+} -diff --git a/tests/discrete-detection/libdrm_nouveau_mock.c b/tests/discrete-detection/libdrm_nouveau_mock.c -new file mode 100644 -index 0000000..cdbfda8 ---- /dev/null -+++ b/tests/discrete-detection/libdrm_nouveau_mock.c -@@ -0,0 +1,68 @@ -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+ -+enum { -+ OTHER_GPU, -+ NVIDIA_IGPU, -+ NVIDIA_GPU, -+}; -+ -+/* Mock open(2) so we can test multiple devices configurations */ -+int open(const char *pathname, int flags) -+{ -+ if (!strcmp(pathname, "OTHER_GPU")) -+ return OTHER_GPU; -+ if (!strcmp (pathname, "NVIDIA_IGPU")) -+ return NVIDIA_IGPU; -+ if (!strcmp (pathname, "NVIDIA_GPU")) -+ return NVIDIA_GPU; -+ -+ return -1; -+} -+ -+/* open64 may be used for large file support */ -+int open64(const char *pathname, int flags) -+{ -+ return open (pathname, flags); -+} -+ -+int drmCommandWrite(int fd, unsigned long drmCommandIndex, void *data, unsigned long size) -+{ -+ if (drmCommandIndex != DRM_NOUVEAU_NVIF) -+ return 1; -+ -+ if (fd != NVIDIA_GPU && fd != NVIDIA_IGPU) -+ return 1; -+ -+ return 0; -+} -+ -+int drmCommandWriteRead(int fd, unsigned long drmCommandIndex, void *data, unsigned long size) -+{ -+ if (drmCommandIndex != DRM_NOUVEAU_NVIF) -+ return 1; -+ -+ struct { -+ struct nvif_ioctl_v0 ioctl; -+ struct nvif_ioctl_mthd_v0 mthd; -+ struct nv_device_info_v0 info; -+ } *args = data; -+ -+ if (fd == NVIDIA_GPU) { -+ args->info.platform = NV_DEVICE_INFO_V0_PCIE; -+ return 0; -+ } -+ if (fd == NVIDIA_IGPU) { -+ args->info.platform = NV_DEVICE_INFO_V0_IGP; -+ return 0; -+ } -+ -+ return 1; -+} -\ No newline at end of file -diff --git a/tests/discrete-detection/meson.build b/tests/discrete-detection/meson.build -new file mode 100644 -index 0000000..f01a014 ---- /dev/null -+++ b/tests/discrete-detection/meson.build -@@ -0,0 +1,80 @@ -+ -+if libdrm_amdgpu.found() -+ amdgpu_mock_lib = shared_library( -+ 'drm_amdgpu_mock', -+ files('libdrm_amdgpu_mock.c'), -+ dependencies: libdrm_amdgpu -+ ) -+ -+ test( -+ 'test amdgpu detection with invalid device', -+ amdgpu_discrete, -+ args: ['NO_GPU'], -+ env: environment({'LD_PRELOAD': amdgpu_mock_lib.full_path()}), -+ should_fail: true -+ ) -+ -+ test( -+ 'test amdgpu detection with non-AMD GPU', -+ amdgpu_discrete, -+ args: ['OTHER_GPU'], -+ env: environment({'LD_PRELOAD': amdgpu_mock_lib.full_path()}), -+ should_fail: true -+ ) -+ -+ test( -+ 'test amdgpu detection with AMD APU', -+ amdgpu_discrete, -+ args: ['AMD_APU'], -+ env: environment({'LD_PRELOAD': amdgpu_mock_lib.full_path()}), -+ should_fail: true -+ ) -+ -+ test( -+ 'test amdgpu detection with AMD GPU', -+ amdgpu_discrete, -+ args: ['AMD_GPU'], -+ env: environment({'LD_PRELOAD': amdgpu_mock_lib.full_path()}), -+ should_fail: false -+ ) -+endif -+ -+if libdrm.found() and libdrm_nouveau.found() -+ nouveau_mock_lib = shared_library( -+ 'drm_nouveau_mock', -+ files('libdrm_nouveau_mock.c'), -+ dependencies: [libdrm, libdrm_nouveau] -+ ) -+ -+ test( -+ 'test nouveau detection with invalid device', -+ nouveau_discrete, -+ args: ['NO_GPU'], -+ env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}), -+ should_fail: true -+ ) -+ -+ test( -+ 'test nouveau detection with non-Nvidia GPU', -+ nouveau_discrete, -+ args: ['OTHER_GPU'], -+ env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}), -+ should_fail: true -+ ) -+ -+ test( -+ 'test nouveau detection with Nvidia iGPU', -+ nouveau_discrete, -+ args: ['NVIDIA_IGPU'], -+ env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}), -+ should_fail: true -+ ) -+ -+ test( -+ 'test nouveau detection with Nvidia GPU', -+ nouveau_discrete, -+ args: ['NVIDIA_GPU'], -+ env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}), -+ should_fail: false -+ ) -+endif -\ No newline at end of file -diff --git a/tests/meson.build b/tests/meson.build -index b0b7476..61ef00c 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -15,3 +15,5 @@ foreach ut: unit_tests - env: envs, - ) - endforeach -+ -+subdir('discrete-detection') --- -2.46.0 - diff --git a/anda/apps/switcheroo-control/0005-main-remove-leftover-and-fix-typo.patch b/anda/apps/switcheroo-control/0005-main-remove-leftover-and-fix-typo.patch deleted file mode 100644 index b10984fc67..0000000000 --- a/anda/apps/switcheroo-control/0005-main-remove-leftover-and-fix-typo.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c102b643945dc076d881497dd2ca5865938f7053 Mon Sep 17 00:00:00 2001 -From: Jan200101 -Date: Tue, 12 Sep 2023 15:57:47 +0200 -Subject: [PATCH 05/10] main: remove leftover and fix typo - -Signed-off-by: Jan200101 ---- - meson_options.txt | 2 +- - src/switcheroo-control.c | 1 - - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/meson_options.txt b/meson_options.txt -index b8d671a..c77fea8 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -13,7 +13,7 @@ option('hwdbdir', - option('rulesdir', - type: 'string', - value: '', -- description: 'Directory for ruke files', -+ description: 'Directory for rule files', - ) - - option('gtk_doc', -diff --git a/src/switcheroo-control.c b/src/switcheroo-control.c -index e407bfb..0f6a548 100644 ---- a/src/switcheroo-control.c -+++ b/src/switcheroo-control.c -@@ -319,7 +319,6 @@ static gboolean - get_card_is_discrete (GUdevDevice *d) - { - const char * const * tags; -- g_autoptr (GUdevDevice) platform_device = NULL; - - tags = g_udev_device_get_tags (d); - if (tags && g_strv_contains (tags, "switcheroo-discrete-gpu")) --- -2.46.0 - diff --git a/anda/apps/switcheroo-control/0006-main-move-discrete-dependencies-out-of-main-deps.patch b/anda/apps/switcheroo-control/0006-main-move-discrete-dependencies-out-of-main-deps.patch deleted file mode 100644 index 18a0e42158..0000000000 --- a/anda/apps/switcheroo-control/0006-main-move-discrete-dependencies-out-of-main-deps.patch +++ /dev/null @@ -1,48 +0,0 @@ -From f764db4eb565c19ba14155791fbfced3fb5d34c8 Mon Sep 17 00:00:00 2001 -From: Jan200101 -Date: Tue, 12 Sep 2023 15:58:27 +0200 -Subject: [PATCH 06/10] main: move discrete dependencies out of main deps - -Signed-off-by: Jan200101 ---- - src/discrete-detection/meson.build | 5 +++-- - src/meson.build | 2 +- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/discrete-detection/meson.build b/src/discrete-detection/meson.build -index 8eb8437..353316f 100644 ---- a/src/discrete-detection/meson.build -+++ b/src/discrete-detection/meson.build -@@ -1,8 +1,9 @@ -+discrete_deps = deps + [libdrm, libdrm_nouveau, libdrm_amdgpu] - - if libdrm_amdgpu.found() - amdgpu_discrete = executable('check-discrete-amdgpu', - files('amdgpu.c'), -- dependencies: deps, -+ dependencies: discrete_deps, - install: true, - install_dir: libexecdir, - ) -@@ -11,7 +12,7 @@ endif - if libdrm.found() and libdrm_nouveau.found() - nouveau_discrete = executable('check-discrete-nouveau', - files('nouveau.c'), -- dependencies: deps, -+ dependencies: discrete_deps, - install: true, - install_dir: libexecdir, - ) -diff --git a/src/meson.build b/src/meson.build -index da4267f..22d69e7 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -1,4 +1,4 @@ --deps = [glib, gio, gudev, libdrm, libdrm_nouveau, libdrm_amdgpu] -+deps = [glib, gio, gudev] - - sources = [ - 'info-cleanup.c', --- -2.46.0 - diff --git a/anda/apps/switcheroo-control/0007-main-use-glib-for-discrete-command-line-arguments.patch b/anda/apps/switcheroo-control/0007-main-use-glib-for-discrete-command-line-arguments.patch deleted file mode 100644 index 524930709f..0000000000 --- a/anda/apps/switcheroo-control/0007-main-use-glib-for-discrete-command-line-arguments.patch +++ /dev/null @@ -1,137 +0,0 @@ -From d2ecc29469d5572fd171926c9d1dbb1b851c7b09 Mon Sep 17 00:00:00 2001 -From: Jan200101 -Date: Tue, 12 Sep 2023 17:12:00 +0200 -Subject: [PATCH 07/10] main: use glib for discrete command-line arguments - -Signed-off-by: Jan200101 ---- - src/discrete-detection/amdgpu.c | 29 ++++++++++++++++++++--------- - src/discrete-detection/nouveau.c | 29 ++++++++++++++++++++--------- - 2 files changed, 40 insertions(+), 18 deletions(-) - -diff --git a/src/discrete-detection/amdgpu.c b/src/discrete-detection/amdgpu.c -index 2d9804f..5a9a4ab 100644 ---- a/src/discrete-detection/amdgpu.c -+++ b/src/discrete-detection/amdgpu.c -@@ -1,9 +1,10 @@ -- - #include - #include - #include -+#include - #include - #include -+#include - - #include - #include -@@ -12,22 +13,32 @@ typedef int handle; - G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1) - G_DEFINE_AUTOPTR_CLEANUP_FUNC(amdgpu_device_handle, free); - --int main(int argc, char** argv) -+int main (int argc, char** argv) - { -- if (argc < 2) -- { -- puts ("check-discrete-amdgpu [DEVNAME]"); -- return EXIT_FAILURE; -- } -- - const char *devname; - g_auto(handle) fd = -1; -- g_autoptr(GUdevDevice) parent = NULL; - struct drm_amdgpu_info_device device_info = {0}; - amdgpu_device_handle device = NULL; - uint32_t drm_major, drm_minor; -+ g_autoptr(GOptionContext) option_context = NULL; -+ g_autoptr(GError) error = NULL; - -+ setlocale (LC_ALL, ""); -+ option_context = g_option_context_new (""); -+ -+ if (!g_option_context_parse (option_context, &argc, &argv, &error)) { -+ g_print ("Failed to parse arguments: %s\n", error->message); -+ return EXIT_FAILURE; -+ } -+ -+ if (argc < 2) -+ { -+ g_print ("%s\n", g_option_context_get_help (option_context, TRUE, NULL)); -+ return EXIT_FAILURE; -+ } - devname = argv[1]; -+; -+ - fd = open (devname, O_RDWR); - if (fd < 0) - return EXIT_FAILURE; -diff --git a/src/discrete-detection/nouveau.c b/src/discrete-detection/nouveau.c -index 0a1f220..1d61cbb 100644 ---- a/src/discrete-detection/nouveau.c -+++ b/src/discrete-detection/nouveau.c -@@ -1,9 +1,10 @@ -- - #include - #include - #include -+#include - #include - #include -+#include - - #include - #include -@@ -14,23 +15,34 @@ - typedef int handle; - G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1) - --int main(int argc, char** argv) -+int main (int argc, char** argv) - { -+ const gchar *devname = NULL; -+ g_auto(handle) fd = -1; -+ g_autofree void *device = NULL; -+ g_autoptr(GOptionContext) option_context = NULL; -+ g_autoptr(GError) error = NULL; -+ -+ setlocale (LC_ALL, ""); -+ option_context = g_option_context_new (""); -+ -+ if (!g_option_context_parse (option_context, &argc, &argv, &error)) { -+ g_print ("Failed to parse arguments: %s\n", error->message); -+ return EXIT_FAILURE; -+ } -+ - if (argc < 2) - { -- puts ("check-discrete-nouveau [DEVNAME]"); -+ g_print ("%s\n", g_option_context_get_help (option_context, TRUE, NULL)); - return EXIT_FAILURE; - } -- -- const char *devname; -- g_auto(handle) fd = -1; -- - devname = argv[1]; -+ - fd = open (devname, O_RDWR); - if (fd < 0) - return EXIT_FAILURE; - -- g_autofree void *device = malloc(352); -+ device = malloc(352); - - /* Init device */ - { -@@ -88,7 +100,6 @@ int main(int argc, char** argv) - if (drmCommandWriteRead (fd, DRM_NOUVEAU_NVIF, &args, sizeof(args))) - return EXIT_FAILURE; - -- - switch (args.info.platform) - { - case NV_DEVICE_INFO_V0_IGP: --- -2.46.0 - diff --git a/anda/apps/switcheroo-control/0008-main-add-udev-rule-for-i915.patch b/anda/apps/switcheroo-control/0008-main-add-udev-rule-for-i915.patch deleted file mode 100644 index b7a684a1c6..0000000000 --- a/anda/apps/switcheroo-control/0008-main-add-udev-rule-for-i915.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 462b09f02de37dfd2965d23cc7c4137bcf45a4ae Mon Sep 17 00:00:00 2001 -From: Jan200101 -Date: Wed, 14 Feb 2024 20:25:42 +0100 -Subject: [PATCH 08/10] main: add udev rule for i915 checking a lot of systems - has shown that the intel iGPU will always be available at `0000:00:02.0`. - Using ID_PATH would have been cleaner, but I couldn't get it to work. - -Signed-off-by: Jan200101 ---- - data/30-discrete-gpu.rules.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/data/30-discrete-gpu.rules.in b/data/30-discrete-gpu.rules.in -index a803ed4..f30f315 100644 ---- a/data/30-discrete-gpu.rules.in -+++ b/data/30-discrete-gpu.rules.in -@@ -1,3 +1,4 @@ - DRIVERS=="amdgpu", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-amdgpu $env{DEVNAME}", TAG+="switcheroo-discrete-gpu" - DRIVERS=="nouveau", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-nouveau $env{DEVNAME}", TAG+="switcheroo-discrete-gpu" --DRIVERS=="nvidia", TAG+="switcheroo-discrete-gpu" -+DRIVERS=="nvidia", SUBSYSTEM=="drm", TAG+="switcheroo-discrete-gpu" -+DRIVERS=="i915", SUBSYSTEM=="drm", DEVPATH!="/devices/pci0000:00/0000:00:02.0/drm/*", TAG+="switcheroo-discrete-gpu" --- -2.46.0 - diff --git a/anda/apps/switcheroo-control/0009-main-use-Discrete-key-in-switcherooctl.patch b/anda/apps/switcheroo-control/0009-main-use-Discrete-key-in-switcherooctl.patch deleted file mode 100644 index abb8fdf525..0000000000 --- a/anda/apps/switcheroo-control/0009-main-use-Discrete-key-in-switcherooctl.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 55db3aeaeb962952881f73e94432f750cfb64fc8 Mon Sep 17 00:00:00 2001 -From: Jan200101 -Date: Thu, 15 Feb 2024 16:24:00 +0100 -Subject: [PATCH 09/10] main: use Discrete key in switcherooctl - -Signed-off-by: Jan200101 ---- - src/switcherooctl.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/switcherooctl.in b/src/switcherooctl.in -index 96c21cc..c0e3f07 100755 ---- a/src/switcherooctl.in -+++ b/src/switcherooctl.in -@@ -77,6 +77,7 @@ def print_gpu(gpu, index): - print('Device:', index) - print(' Name: ', gpu['Name']) - print(' Default: ', "yes" if gpu['Default'] else "no") -+ print(' Discrete: ', "yes" if gpu['Discrete'] else "no") - print(' Environment:', env_to_str(gpu['Environment'])) - - def _list(): -@@ -126,7 +127,7 @@ def get_discrete_gpu(): - return None - - try: -- gpu = next(gpu for gpu in gpus if not gpu['Default']) -+ gpu = next(gpu for gpu in gpus if gpu['Discrete']) - except StopIteration: - return None - else: --- -2.46.0 - diff --git a/anda/apps/switcheroo-control/0010-main-use-new-GPU-list-on-uevent.patch b/anda/apps/switcheroo-control/0010-main-use-new-GPU-list-on-uevent.patch deleted file mode 100644 index 9f55d398e7..0000000000 --- a/anda/apps/switcheroo-control/0010-main-use-new-GPU-list-on-uevent.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4232c75fe41158bb5063d630d36b3ffd6a8a57ec Mon Sep 17 00:00:00 2001 -From: Jan200101 -Date: Fri, 6 Sep 2024 22:31:56 +0200 -Subject: [PATCH 10/10] main: use new GPU list on uevent the amount of GPUs may - still be the same but underlying attributes may have changed On the ASUS TUF - Dash F15 running Fedora 40 6.10.7-200.fc40.x86_64 the udev tags are not - applied at the time switcheroo-control starts but at a later uevent they are - correct. Memory gets allocated anyways to check if the GPU count has changed, - so this shouldn't affect memory usage. - -Signed-off-by: Jan200101 ---- - src/switcheroo-control.c | 16 ++++++---------- - 1 file changed, 6 insertions(+), 10 deletions(-) - -diff --git a/src/switcheroo-control.c b/src/switcheroo-control.c -index 0f6a548..01954c7 100644 ---- a/src/switcheroo-control.c -+++ b/src/switcheroo-control.c -@@ -438,16 +438,12 @@ uevent_cb (GUdevClient *client, - - cards = get_drm_cards (data); - num_gpus = cards->len; -- if (num_gpus != data->num_gpus) { -- g_debug ("GPUs added or removed (old: %d new: %d)", -- data->num_gpus, num_gpus); -- g_ptr_array_free (data->cards, TRUE); -- data->cards = cards; -- data->num_gpus = cards->len; -- send_dbus_event (data); -- } else { -- g_ptr_array_free (cards, TRUE); -- } -+ g_debug ("GPUs updated (old: %d new: %d)", -+ data->num_gpus, num_gpus); -+ g_ptr_array_free (data->cards, TRUE); -+ data->cards = cards; -+ data->num_gpus = cards->len; -+ send_dbus_event (data); - } - - static void --- -2.46.0 - diff --git a/anda/apps/switcheroo-control/discrete.patch b/anda/apps/switcheroo-control/discrete.patch new file mode 100644 index 0000000000..bc3e696e90 --- /dev/null +++ b/anda/apps/switcheroo-control/discrete.patch @@ -0,0 +1,1335 @@ +From 44046bfbcb30a19c45416113a2a82a4d17a1a998 Mon Sep 17 00:00:00 2001 +From: Jan200101 +Date: Mon, 14 Aug 2023 14:06:45 +0200 +Subject: [PATCH 01/13] main: update GPUs comment for dbus property + +Signed-off-by: Jan200101 +--- + src/net.hadess.SwitcherooControl.xml | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/net.hadess.SwitcherooControl.xml b/src/net.hadess.SwitcherooControl.xml +index e52bc1a..59a8896 100644 +--- a/src/net.hadess.SwitcherooControl.xml ++++ b/src/net.hadess.SwitcherooControl.xml +@@ -38,7 +38,8 @@ + will contain a user-facing name for the GPU, the "Environment" (as) key will + contain an array of even number of strings, each being an environment + variable to set to use the GPU, followed by its value, the "Default" (b) key +- will tag the default (usually integrated) GPU. ++ will tag the default GPU, the "Discrete" (b) key tags if the GPU is a ++ dedicated component. + --> + + +-- +2.49.0 + + +From 4f31415cb61a50c2bcba1510a7511518417d0970 Mon Sep 17 00:00:00 2001 +From: Jan200101 +Date: Mon, 11 Sep 2023 15:21:46 +0200 +Subject: [PATCH 02/13] main: add Discrete key + +Signed-off-by: Jan200101 +--- + .gitlab-ci.yml | 1 + + data/30-discrete-gpu.rules.in | 3 + + data/meson.build | 7 ++ + meson.build | 9 +++ + meson_options.txt | 24 +++++++ + src/discrete-detection/amdgpu.c | 46 +++++++++++++ + src/discrete-detection/meson.build | 18 +++++ + src/discrete-detection/nouveau.c | 105 +++++++++++++++++++++++++++++ + src/meson.build | 4 +- + src/switcheroo-control.c | 16 +++++ + 10 files changed, 232 insertions(+), 1 deletion(-) + create mode 100644 data/30-discrete-gpu.rules.in + create mode 100644 src/discrete-detection/amdgpu.c + create mode 100644 src/discrete-detection/meson.build + create mode 100644 src/discrete-detection/nouveau.c + +diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml +index a6aa3c7..a09fe20 100644 +--- a/.gitlab-ci.yml ++++ b/.gitlab-ci.yml +@@ -3,6 +3,7 @@ image: fedora:rawhide + variables: + DEPENDENCIES: glib2-devel + libgudev-devel ++ libdrm-devel + gtk-doc + gcc + gcc-c++ +diff --git a/data/30-discrete-gpu.rules.in b/data/30-discrete-gpu.rules.in +new file mode 100644 +index 0000000..a803ed4 +--- /dev/null ++++ b/data/30-discrete-gpu.rules.in +@@ -0,0 +1,3 @@ ++DRIVERS=="amdgpu", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-amdgpu $env{DEVNAME}", TAG+="switcheroo-discrete-gpu" ++DRIVERS=="nouveau", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-nouveau $env{DEVNAME}", TAG+="switcheroo-discrete-gpu" ++DRIVERS=="nvidia", TAG+="switcheroo-discrete-gpu" +diff --git a/data/meson.build b/data/meson.build +index 85e5c93..38cf96c 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -17,3 +17,10 @@ install_data( + '30-pci-intel-gpu.hwdb', + install_dir: hwdb_dir, + ) ++ ++configure_file( ++ input: '30-discrete-gpu.rules.in', ++ output: '30-discrete-gpu.rules', ++ configuration: data_conf, ++ install_dir: rules_dir, ++) +diff --git a/meson.build b/meson.build +index b8f4bff..b3aaf0c 100644 +--- a/meson.build ++++ b/meson.build +@@ -20,6 +20,9 @@ gnome = import('gnome') + glib = dependency('glib-2.0', version: '>= 2.56.0') + gio = dependency('gio-2.0', version: '>= 2.56.0') + gudev = dependency('gudev-1.0', version: '>= 232') ++libdrm = dependency('libdrm', version: '>= 2.4.97', required: get_option('libdrm')) ++libdrm_nouveau = dependency('libdrm_nouveau', version: '>= 2.4.97', required: get_option('libdrm_nouveau')) ++libdrm_amdgpu = dependency('libdrm_amdgpu', version: '>= 2.4.97', required: get_option('libdrm_amdgpu')) + + systemd_systemunitdir = get_option('systemdsystemunitdir') + if systemd_systemunitdir == '' +@@ -32,6 +35,12 @@ if hwdb_dir == '' + hwdb_dir = udevdir / 'hwdb.d' + endif + ++rules_dir = get_option('rulesdir') ++if rules_dir == '' ++ udevdir = dependency('udev').get_pkgconfig_variable('udevdir') ++ rules_dir = udevdir / 'rules.d' ++endif ++ + # Make like license available in the build root for docs + configure_file( + input: 'COPYING', +diff --git a/meson_options.txt b/meson_options.txt +index c8d9619..b8d671a 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -10,6 +10,12 @@ option('hwdbdir', + description: 'Directory for hwdb files', + ) + ++option('rulesdir', ++ type: 'string', ++ value: '', ++ description: 'Directory for ruke files', ++) ++ + option('gtk_doc', + type: 'boolean', + value: false, +@@ -21,3 +27,21 @@ option('tests', + type: 'boolean', + value: false + ) ++ ++option('libdrm', ++ description: 'Whether libdrm should be used to probe GPUs', ++ type: 'feature', ++ value: 'auto' ++) ++ ++option('libdrm_nouveau', ++ description: 'Whether libdrm_nouveau should be used to probe Nvidia GPUs', ++ type: 'feature', ++ value: 'auto' ++) ++ ++option('libdrm_amdgpu', ++ description: 'Whether libdrm_amdgpu should be used to probe AMD GPUs', ++ type: 'feature', ++ value: 'auto' ++) +diff --git a/src/discrete-detection/amdgpu.c b/src/discrete-detection/amdgpu.c +new file mode 100644 +index 0000000..2d9804f +--- /dev/null ++++ b/src/discrete-detection/amdgpu.c +@@ -0,0 +1,46 @@ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++ ++typedef int handle; ++G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1) ++G_DEFINE_AUTOPTR_CLEANUP_FUNC(amdgpu_device_handle, free); ++ ++int main(int argc, char** argv) ++{ ++ if (argc < 2) ++ { ++ puts ("check-discrete-amdgpu [DEVNAME]"); ++ return EXIT_FAILURE; ++ } ++ ++ const char *devname; ++ g_auto(handle) fd = -1; ++ g_autoptr(GUdevDevice) parent = NULL; ++ struct drm_amdgpu_info_device device_info = {0}; ++ amdgpu_device_handle device = NULL; ++ uint32_t drm_major, drm_minor; ++ ++ devname = argv[1]; ++ fd = open (devname, O_RDWR); ++ if (fd < 0) ++ return EXIT_FAILURE; ++ ++ if (amdgpu_device_initialize (fd, &drm_major, &drm_minor, &device)) ++ return EXIT_FAILURE; ++ ++ if (amdgpu_query_info (device, AMDGPU_INFO_DEV_INFO, sizeof(device_info), &device_info)) ++ return EXIT_FAILURE; ++ ++ /* AMDGPU_IDS_FLAGS_FUSION is set for all APUs */ ++ if (device_info.ids_flags & AMDGPU_IDS_FLAGS_FUSION) ++ return EXIT_FAILURE; ++ ++ return EXIT_SUCCESS; ++} +diff --git a/src/discrete-detection/meson.build b/src/discrete-detection/meson.build +new file mode 100644 +index 0000000..3a6c03f +--- /dev/null ++++ b/src/discrete-detection/meson.build +@@ -0,0 +1,18 @@ ++ ++if libdrm_amdgpu.found() ++ executable('check-discrete-amdgpu', ++ files('amdgpu.c'), ++ dependencies: deps, ++ install: true, ++ install_dir: libexecdir, ++ ) ++endif ++ ++if libdrm.found() and libdrm_nouveau.found() ++ executable('check-discrete-nouveau', ++ files('nouveau.c'), ++ dependencies: deps, ++ install: true, ++ install_dir: libexecdir, ++ ) ++endif +diff --git a/src/discrete-detection/nouveau.c b/src/discrete-detection/nouveau.c +new file mode 100644 +index 0000000..0a1f220 +--- /dev/null ++++ b/src/discrete-detection/nouveau.c +@@ -0,0 +1,105 @@ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++typedef int handle; ++G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1) ++ ++int main(int argc, char** argv) ++{ ++ if (argc < 2) ++ { ++ puts ("check-discrete-nouveau [DEVNAME]"); ++ return EXIT_FAILURE; ++ } ++ ++ const char *devname; ++ g_auto(handle) fd = -1; ++ ++ devname = argv[1]; ++ fd = open (devname, O_RDWR); ++ if (fd < 0) ++ return EXIT_FAILURE; ++ ++ g_autofree void *device = malloc(352); ++ ++ /* Init device */ ++ { ++ struct { ++ struct nvif_ioctl_v0 ioctl; ++ struct nvif_ioctl_new_v0 new; ++ struct nv_device_v0 dev; ++ } init_args = { ++ .ioctl = { ++ .object = 0, ++ .owner = NVIF_IOCTL_V0_OWNER_ANY, ++ .route = 0x00, ++ .type = NVIF_IOCTL_V0_NEW, ++ .version = 0, ++ }, ++ .new = { ++ .handle = 0, ++ .object = (uintptr_t)device, ++ .oclass = NV_DEVICE, ++ .route = NVIF_IOCTL_V0_ROUTE_NVIF, ++ .token = (uintptr_t)device, ++ .version = 0, ++ }, ++ .dev = { ++ .device = ~0ULL, ++ }, ++ }; ++ ++ if (drmCommandWrite (fd, DRM_NOUVEAU_NVIF, &init_args, sizeof(init_args))) ++ return EXIT_FAILURE; ++ } ++ ++ /* Query device info */ ++ struct { ++ struct nvif_ioctl_v0 ioctl; ++ struct nvif_ioctl_mthd_v0 mthd; ++ struct nv_device_info_v0 info; ++ } args = { ++ .ioctl = { ++ .object = (uintptr_t)device, ++ .owner = NVIF_IOCTL_V0_OWNER_ANY, ++ .route = 0x00, ++ .type = NVIF_IOCTL_V0_MTHD, ++ .version = 0, ++ }, ++ .mthd = { ++ .method = NV_DEVICE_V0_INFO, ++ .version = 0, ++ }, ++ .info = { ++ .version = 0, ++ }, ++ }; ++ ++ if (drmCommandWriteRead (fd, DRM_NOUVEAU_NVIF, &args, sizeof(args))) ++ return EXIT_FAILURE; ++ ++ ++ switch (args.info.platform) ++ { ++ case NV_DEVICE_INFO_V0_IGP: ++ case NV_DEVICE_INFO_V0_SOC: ++ return EXIT_FAILURE; ++ ++ case NV_DEVICE_INFO_V0_PCI: ++ case NV_DEVICE_INFO_V0_AGP: ++ case NV_DEVICE_INFO_V0_PCIE: ++ default: ++ return EXIT_SUCCESS; ++ } ++ return EXIT_FAILURE; ++} +diff --git a/src/meson.build b/src/meson.build +index ab3a77d..da4267f 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -1,4 +1,4 @@ +-deps = [glib, gio, gudev] ++deps = [glib, gio, gudev, libdrm, libdrm_nouveau, libdrm_amdgpu] + + sources = [ + 'info-cleanup.c', +@@ -34,3 +34,5 @@ configure_file( + configuration: switcherooctl_conf, + install_dir: get_option('bindir') + ) ++ ++subdir('discrete-detection') +diff --git a/src/switcheroo-control.c b/src/switcheroo-control.c +index abd8154..e407bfb 100644 +--- a/src/switcheroo-control.c ++++ b/src/switcheroo-control.c +@@ -31,6 +31,7 @@ typedef struct { + char *name; + GPtrArray *env; + gboolean is_default; ++ gboolean is_discrete; + } CardData; + + typedef struct { +@@ -94,6 +95,8 @@ build_gpus_variant (ControlData *data) + g_variant_new_strv ((const gchar * const *) card->env->pdata, card->env->len)); + g_variant_builder_add (&asv_builder, "{sv}", "Default", + g_variant_new_boolean (card->is_default)); ++ g_variant_builder_add (&asv_builder, "{sv}", "Discrete", ++ g_variant_new_boolean (card->is_discrete)); + + g_variant_builder_add (&builder, "a{sv}", &asv_builder); + } +@@ -312,6 +315,18 @@ get_card_is_default (GUdevDevice *d) + return g_udev_device_get_sysfs_attr_as_boolean (parent, "boot_vga"); + } + ++static gboolean ++get_card_is_discrete (GUdevDevice *d) ++{ ++ const char * const * tags; ++ g_autoptr (GUdevDevice) platform_device = NULL; ++ ++ tags = g_udev_device_get_tags (d); ++ if (tags && g_strv_contains (tags, "switcheroo-discrete-gpu")) ++ return TRUE; ++ return FALSE; ++} ++ + static CardData * + get_card_data (GUdevClient *client, + GUdevDevice *d) +@@ -328,6 +343,7 @@ get_card_data (GUdevClient *client, + data->name = get_card_name (d); + data->env = env; + data->is_default = get_card_is_default (d); ++ data->is_discrete = get_card_is_discrete (d); + + return data; + } +-- +2.49.0 + + +From 1b115ed72e03ff1169cbfddd79ef10890baca133 Mon Sep 17 00:00:00 2001 +From: Jan200101 +Date: Tue, 12 Sep 2023 15:53:40 +0200 +Subject: [PATCH 03/13] tests: fix integration tests without UMockdev + `gi.require_version` throws ValueError if the dependency cannot be found + +Signed-off-by: Jan200101 +--- + tests/integration-test.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/integration-test.py b/tests/integration-test.py +index d8dea16..e3dd996 100755 +--- a/tests/integration-test.py ++++ b/tests/integration-test.py +@@ -37,7 +37,7 @@ except ImportError as e: + try: + gi.require_version('UMockdev', '1.0') + from gi.repository import UMockdev +-except ImportError: ++except (ImportError, ValueError): + sys.stderr.write('Skipping tests, umockdev not available (https://github.com/martinpitt/umockdev)\n') + sys.exit(0) + +-- +2.49.0 + + +From d933e96bdb15679ae7653f929461982aa66973ba Mon Sep 17 00:00:00 2001 +From: Jan200101 +Date: Tue, 12 Sep 2023 15:58:16 +0200 +Subject: [PATCH 04/13] tests: add tests for discrete detection with mock libs + Both tests have 4 different ways of testing: - Invalid Device - Unexpected + Device - Non Discrete GPU (iGPU/APU) - Discrete GPU + +Signed-off-by: Jan200101 +--- + src/discrete-detection/meson.build | 4 +- + tests/discrete-detection/libdrm_amdgpu_mock.c | 57 +++++++++++++ + .../discrete-detection/libdrm_nouveau_mock.c | 68 ++++++++++++++++ + tests/discrete-detection/meson.build | 80 +++++++++++++++++++ + tests/meson.build | 2 + + 5 files changed, 209 insertions(+), 2 deletions(-) + create mode 100644 tests/discrete-detection/libdrm_amdgpu_mock.c + create mode 100644 tests/discrete-detection/libdrm_nouveau_mock.c + create mode 100644 tests/discrete-detection/meson.build + +diff --git a/src/discrete-detection/meson.build b/src/discrete-detection/meson.build +index 3a6c03f..8eb8437 100644 +--- a/src/discrete-detection/meson.build ++++ b/src/discrete-detection/meson.build +@@ -1,6 +1,6 @@ + + if libdrm_amdgpu.found() +- executable('check-discrete-amdgpu', ++ amdgpu_discrete = executable('check-discrete-amdgpu', + files('amdgpu.c'), + dependencies: deps, + install: true, +@@ -9,7 +9,7 @@ if libdrm_amdgpu.found() + endif + + if libdrm.found() and libdrm_nouveau.found() +- executable('check-discrete-nouveau', ++ nouveau_discrete = executable('check-discrete-nouveau', + files('nouveau.c'), + dependencies: deps, + install: true, +diff --git a/tests/discrete-detection/libdrm_amdgpu_mock.c b/tests/discrete-detection/libdrm_amdgpu_mock.c +new file mode 100644 +index 0000000..20fa4aa +--- /dev/null ++++ b/tests/discrete-detection/libdrm_amdgpu_mock.c +@@ -0,0 +1,57 @@ ++#include ++#include ++#include ++ ++#include ++ ++enum { ++ OTHER_GPU, ++ AMD_APU, ++ AMD_GPU, ++}; ++ ++/* Mock open(2) so we can test multiple devices configurations */ ++int open(const char *pathname, int flags) ++{ ++ if (!strcmp(pathname, "OTHER_GPU")) ++ return OTHER_GPU; ++ if (!strcmp (pathname, "AMD_APU")) ++ return AMD_APU; ++ if (!strcmp (pathname, "AMD_GPU")) ++ return AMD_GPU; ++ ++ return -1; ++} ++ ++/* open64 may be used for large file support */ ++int open64(const char *pathname, int flags) ++{ ++ return open (pathname, flags); ++} ++ ++int amdgpu_device_initialize(int fd, uint32_t *major_version, uint32_t *minor_version, int *device_handle) ++{ ++ // Store the fd in the device handle for access in query_info ++ *device_handle = fd; ++ ++ if (fd != AMD_GPU && fd != AMD_APU) ++ return 1; ++ ++ return 0; ++} ++ ++int amdgpu_query_info(int device_handle, unsigned info_id, unsigned size, void *value) ++{ ++ struct drm_amdgpu_info_device* device_info = value; ++ ++ if (device_handle == AMD_GPU) { ++ device_info->ids_flags = 0; ++ return 0; ++ } ++ if (device_handle == AMD_APU) { ++ device_info->ids_flags = AMDGPU_IDS_FLAGS_FUSION; ++ return 0; ++ } ++ ++ return 1; ++} +diff --git a/tests/discrete-detection/libdrm_nouveau_mock.c b/tests/discrete-detection/libdrm_nouveau_mock.c +new file mode 100644 +index 0000000..cdbfda8 +--- /dev/null ++++ b/tests/discrete-detection/libdrm_nouveau_mock.c +@@ -0,0 +1,68 @@ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++enum { ++ OTHER_GPU, ++ NVIDIA_IGPU, ++ NVIDIA_GPU, ++}; ++ ++/* Mock open(2) so we can test multiple devices configurations */ ++int open(const char *pathname, int flags) ++{ ++ if (!strcmp(pathname, "OTHER_GPU")) ++ return OTHER_GPU; ++ if (!strcmp (pathname, "NVIDIA_IGPU")) ++ return NVIDIA_IGPU; ++ if (!strcmp (pathname, "NVIDIA_GPU")) ++ return NVIDIA_GPU; ++ ++ return -1; ++} ++ ++/* open64 may be used for large file support */ ++int open64(const char *pathname, int flags) ++{ ++ return open (pathname, flags); ++} ++ ++int drmCommandWrite(int fd, unsigned long drmCommandIndex, void *data, unsigned long size) ++{ ++ if (drmCommandIndex != DRM_NOUVEAU_NVIF) ++ return 1; ++ ++ if (fd != NVIDIA_GPU && fd != NVIDIA_IGPU) ++ return 1; ++ ++ return 0; ++} ++ ++int drmCommandWriteRead(int fd, unsigned long drmCommandIndex, void *data, unsigned long size) ++{ ++ if (drmCommandIndex != DRM_NOUVEAU_NVIF) ++ return 1; ++ ++ struct { ++ struct nvif_ioctl_v0 ioctl; ++ struct nvif_ioctl_mthd_v0 mthd; ++ struct nv_device_info_v0 info; ++ } *args = data; ++ ++ if (fd == NVIDIA_GPU) { ++ args->info.platform = NV_DEVICE_INFO_V0_PCIE; ++ return 0; ++ } ++ if (fd == NVIDIA_IGPU) { ++ args->info.platform = NV_DEVICE_INFO_V0_IGP; ++ return 0; ++ } ++ ++ return 1; ++} +\ No newline at end of file +diff --git a/tests/discrete-detection/meson.build b/tests/discrete-detection/meson.build +new file mode 100644 +index 0000000..f01a014 +--- /dev/null ++++ b/tests/discrete-detection/meson.build +@@ -0,0 +1,80 @@ ++ ++if libdrm_amdgpu.found() ++ amdgpu_mock_lib = shared_library( ++ 'drm_amdgpu_mock', ++ files('libdrm_amdgpu_mock.c'), ++ dependencies: libdrm_amdgpu ++ ) ++ ++ test( ++ 'test amdgpu detection with invalid device', ++ amdgpu_discrete, ++ args: ['NO_GPU'], ++ env: environment({'LD_PRELOAD': amdgpu_mock_lib.full_path()}), ++ should_fail: true ++ ) ++ ++ test( ++ 'test amdgpu detection with non-AMD GPU', ++ amdgpu_discrete, ++ args: ['OTHER_GPU'], ++ env: environment({'LD_PRELOAD': amdgpu_mock_lib.full_path()}), ++ should_fail: true ++ ) ++ ++ test( ++ 'test amdgpu detection with AMD APU', ++ amdgpu_discrete, ++ args: ['AMD_APU'], ++ env: environment({'LD_PRELOAD': amdgpu_mock_lib.full_path()}), ++ should_fail: true ++ ) ++ ++ test( ++ 'test amdgpu detection with AMD GPU', ++ amdgpu_discrete, ++ args: ['AMD_GPU'], ++ env: environment({'LD_PRELOAD': amdgpu_mock_lib.full_path()}), ++ should_fail: false ++ ) ++endif ++ ++if libdrm.found() and libdrm_nouveau.found() ++ nouveau_mock_lib = shared_library( ++ 'drm_nouveau_mock', ++ files('libdrm_nouveau_mock.c'), ++ dependencies: [libdrm, libdrm_nouveau] ++ ) ++ ++ test( ++ 'test nouveau detection with invalid device', ++ nouveau_discrete, ++ args: ['NO_GPU'], ++ env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}), ++ should_fail: true ++ ) ++ ++ test( ++ 'test nouveau detection with non-Nvidia GPU', ++ nouveau_discrete, ++ args: ['OTHER_GPU'], ++ env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}), ++ should_fail: true ++ ) ++ ++ test( ++ 'test nouveau detection with Nvidia iGPU', ++ nouveau_discrete, ++ args: ['NVIDIA_IGPU'], ++ env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}), ++ should_fail: true ++ ) ++ ++ test( ++ 'test nouveau detection with Nvidia GPU', ++ nouveau_discrete, ++ args: ['NVIDIA_GPU'], ++ env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}), ++ should_fail: false ++ ) ++endif +\ No newline at end of file +diff --git a/tests/meson.build b/tests/meson.build +index b0b7476..61ef00c 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -15,3 +15,5 @@ foreach ut: unit_tests + env: envs, + ) + endforeach ++ ++subdir('discrete-detection') +-- +2.49.0 + + +From c102b643945dc076d881497dd2ca5865938f7053 Mon Sep 17 00:00:00 2001 +From: Jan200101 +Date: Tue, 12 Sep 2023 15:57:47 +0200 +Subject: [PATCH 05/13] main: remove leftover and fix typo + +Signed-off-by: Jan200101 +--- + meson_options.txt | 2 +- + src/switcheroo-control.c | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/meson_options.txt b/meson_options.txt +index b8d671a..c77fea8 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -13,7 +13,7 @@ option('hwdbdir', + option('rulesdir', + type: 'string', + value: '', +- description: 'Directory for ruke files', ++ description: 'Directory for rule files', + ) + + option('gtk_doc', +diff --git a/src/switcheroo-control.c b/src/switcheroo-control.c +index e407bfb..0f6a548 100644 +--- a/src/switcheroo-control.c ++++ b/src/switcheroo-control.c +@@ -319,7 +319,6 @@ static gboolean + get_card_is_discrete (GUdevDevice *d) + { + const char * const * tags; +- g_autoptr (GUdevDevice) platform_device = NULL; + + tags = g_udev_device_get_tags (d); + if (tags && g_strv_contains (tags, "switcheroo-discrete-gpu")) +-- +2.49.0 + + +From f764db4eb565c19ba14155791fbfced3fb5d34c8 Mon Sep 17 00:00:00 2001 +From: Jan200101 +Date: Tue, 12 Sep 2023 15:58:27 +0200 +Subject: [PATCH 06/13] main: move discrete dependencies out of main deps + +Signed-off-by: Jan200101 +--- + src/discrete-detection/meson.build | 5 +++-- + src/meson.build | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/discrete-detection/meson.build b/src/discrete-detection/meson.build +index 8eb8437..353316f 100644 +--- a/src/discrete-detection/meson.build ++++ b/src/discrete-detection/meson.build +@@ -1,8 +1,9 @@ ++discrete_deps = deps + [libdrm, libdrm_nouveau, libdrm_amdgpu] + + if libdrm_amdgpu.found() + amdgpu_discrete = executable('check-discrete-amdgpu', + files('amdgpu.c'), +- dependencies: deps, ++ dependencies: discrete_deps, + install: true, + install_dir: libexecdir, + ) +@@ -11,7 +12,7 @@ endif + if libdrm.found() and libdrm_nouveau.found() + nouveau_discrete = executable('check-discrete-nouveau', + files('nouveau.c'), +- dependencies: deps, ++ dependencies: discrete_deps, + install: true, + install_dir: libexecdir, + ) +diff --git a/src/meson.build b/src/meson.build +index da4267f..22d69e7 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -1,4 +1,4 @@ +-deps = [glib, gio, gudev, libdrm, libdrm_nouveau, libdrm_amdgpu] ++deps = [glib, gio, gudev] + + sources = [ + 'info-cleanup.c', +-- +2.49.0 + + +From d2ecc29469d5572fd171926c9d1dbb1b851c7b09 Mon Sep 17 00:00:00 2001 +From: Jan200101 +Date: Tue, 12 Sep 2023 17:12:00 +0200 +Subject: [PATCH 07/13] main: use glib for discrete command-line arguments + +Signed-off-by: Jan200101 +--- + src/discrete-detection/amdgpu.c | 29 ++++++++++++++++++++--------- + src/discrete-detection/nouveau.c | 29 ++++++++++++++++++++--------- + 2 files changed, 40 insertions(+), 18 deletions(-) + +diff --git a/src/discrete-detection/amdgpu.c b/src/discrete-detection/amdgpu.c +index 2d9804f..5a9a4ab 100644 +--- a/src/discrete-detection/amdgpu.c ++++ b/src/discrete-detection/amdgpu.c +@@ -1,9 +1,10 @@ +- + #include + #include + #include ++#include + #include + #include ++#include + + #include + #include +@@ -12,22 +13,32 @@ typedef int handle; + G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1) + G_DEFINE_AUTOPTR_CLEANUP_FUNC(amdgpu_device_handle, free); + +-int main(int argc, char** argv) ++int main (int argc, char** argv) + { +- if (argc < 2) +- { +- puts ("check-discrete-amdgpu [DEVNAME]"); +- return EXIT_FAILURE; +- } +- + const char *devname; + g_auto(handle) fd = -1; +- g_autoptr(GUdevDevice) parent = NULL; + struct drm_amdgpu_info_device device_info = {0}; + amdgpu_device_handle device = NULL; + uint32_t drm_major, drm_minor; ++ g_autoptr(GOptionContext) option_context = NULL; ++ g_autoptr(GError) error = NULL; + ++ setlocale (LC_ALL, ""); ++ option_context = g_option_context_new (""); ++ ++ if (!g_option_context_parse (option_context, &argc, &argv, &error)) { ++ g_print ("Failed to parse arguments: %s\n", error->message); ++ return EXIT_FAILURE; ++ } ++ ++ if (argc < 2) ++ { ++ g_print ("%s\n", g_option_context_get_help (option_context, TRUE, NULL)); ++ return EXIT_FAILURE; ++ } + devname = argv[1]; ++; ++ + fd = open (devname, O_RDWR); + if (fd < 0) + return EXIT_FAILURE; +diff --git a/src/discrete-detection/nouveau.c b/src/discrete-detection/nouveau.c +index 0a1f220..1d61cbb 100644 +--- a/src/discrete-detection/nouveau.c ++++ b/src/discrete-detection/nouveau.c +@@ -1,9 +1,10 @@ +- + #include + #include + #include ++#include + #include + #include ++#include + + #include + #include +@@ -14,23 +15,34 @@ + typedef int handle; + G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1) + +-int main(int argc, char** argv) ++int main (int argc, char** argv) + { ++ const gchar *devname = NULL; ++ g_auto(handle) fd = -1; ++ g_autofree void *device = NULL; ++ g_autoptr(GOptionContext) option_context = NULL; ++ g_autoptr(GError) error = NULL; ++ ++ setlocale (LC_ALL, ""); ++ option_context = g_option_context_new (""); ++ ++ if (!g_option_context_parse (option_context, &argc, &argv, &error)) { ++ g_print ("Failed to parse arguments: %s\n", error->message); ++ return EXIT_FAILURE; ++ } ++ + if (argc < 2) + { +- puts ("check-discrete-nouveau [DEVNAME]"); ++ g_print ("%s\n", g_option_context_get_help (option_context, TRUE, NULL)); + return EXIT_FAILURE; + } +- +- const char *devname; +- g_auto(handle) fd = -1; +- + devname = argv[1]; ++ + fd = open (devname, O_RDWR); + if (fd < 0) + return EXIT_FAILURE; + +- g_autofree void *device = malloc(352); ++ device = malloc(352); + + /* Init device */ + { +@@ -88,7 +100,6 @@ int main(int argc, char** argv) + if (drmCommandWriteRead (fd, DRM_NOUVEAU_NVIF, &args, sizeof(args))) + return EXIT_FAILURE; + +- + switch (args.info.platform) + { + case NV_DEVICE_INFO_V0_IGP: +-- +2.49.0 + + +From 462b09f02de37dfd2965d23cc7c4137bcf45a4ae Mon Sep 17 00:00:00 2001 +From: Jan200101 +Date: Wed, 14 Feb 2024 20:25:42 +0100 +Subject: [PATCH 08/13] main: add udev rule for i915 checking a lot of systems + has shown that the intel iGPU will always be available at `0000:00:02.0`. + Using ID_PATH would have been cleaner, but I couldn't get it to work. + +Signed-off-by: Jan200101 +--- + data/30-discrete-gpu.rules.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/data/30-discrete-gpu.rules.in b/data/30-discrete-gpu.rules.in +index a803ed4..f30f315 100644 +--- a/data/30-discrete-gpu.rules.in ++++ b/data/30-discrete-gpu.rules.in +@@ -1,3 +1,4 @@ + DRIVERS=="amdgpu", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-amdgpu $env{DEVNAME}", TAG+="switcheroo-discrete-gpu" + DRIVERS=="nouveau", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-nouveau $env{DEVNAME}", TAG+="switcheroo-discrete-gpu" +-DRIVERS=="nvidia", TAG+="switcheroo-discrete-gpu" ++DRIVERS=="nvidia", SUBSYSTEM=="drm", TAG+="switcheroo-discrete-gpu" ++DRIVERS=="i915", SUBSYSTEM=="drm", DEVPATH!="/devices/pci0000:00/0000:00:02.0/drm/*", TAG+="switcheroo-discrete-gpu" +-- +2.49.0 + + +From 55db3aeaeb962952881f73e94432f750cfb64fc8 Mon Sep 17 00:00:00 2001 +From: Jan200101 +Date: Thu, 15 Feb 2024 16:24:00 +0100 +Subject: [PATCH 09/13] main: use Discrete key in switcherooctl + +Signed-off-by: Jan200101 +--- + src/switcherooctl.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/switcherooctl.in b/src/switcherooctl.in +index 96c21cc..c0e3f07 100755 +--- a/src/switcherooctl.in ++++ b/src/switcherooctl.in +@@ -77,6 +77,7 @@ def print_gpu(gpu, index): + print('Device:', index) + print(' Name: ', gpu['Name']) + print(' Default: ', "yes" if gpu['Default'] else "no") ++ print(' Discrete: ', "yes" if gpu['Discrete'] else "no") + print(' Environment:', env_to_str(gpu['Environment'])) + + def _list(): +@@ -126,7 +127,7 @@ def get_discrete_gpu(): + return None + + try: +- gpu = next(gpu for gpu in gpus if not gpu['Default']) ++ gpu = next(gpu for gpu in gpus if gpu['Discrete']) + except StopIteration: + return None + else: +-- +2.49.0 + + +From 4232c75fe41158bb5063d630d36b3ffd6a8a57ec Mon Sep 17 00:00:00 2001 +From: Jan200101 +Date: Fri, 6 Sep 2024 22:31:56 +0200 +Subject: [PATCH 10/13] main: use new GPU list on uevent the amount of GPUs may + still be the same but underlying attributes may have changed On the ASUS TUF + Dash F15 running Fedora 40 6.10.7-200.fc40.x86_64 the udev tags are not + applied at the time switcheroo-control starts but at a later uevent they are + correct. Memory gets allocated anyways to check if the GPU count has changed, + so this shouldn't affect memory usage. + +Signed-off-by: Jan200101 +--- + src/switcheroo-control.c | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) + +diff --git a/src/switcheroo-control.c b/src/switcheroo-control.c +index 0f6a548..01954c7 100644 +--- a/src/switcheroo-control.c ++++ b/src/switcheroo-control.c +@@ -438,16 +438,12 @@ uevent_cb (GUdevClient *client, + + cards = get_drm_cards (data); + num_gpus = cards->len; +- if (num_gpus != data->num_gpus) { +- g_debug ("GPUs added or removed (old: %d new: %d)", +- data->num_gpus, num_gpus); +- g_ptr_array_free (data->cards, TRUE); +- data->cards = cards; +- data->num_gpus = cards->len; +- send_dbus_event (data); +- } else { +- g_ptr_array_free (cards, TRUE); +- } ++ g_debug ("GPUs updated (old: %d new: %d)", ++ data->num_gpus, num_gpus); ++ g_ptr_array_free (data->cards, TRUE); ++ data->cards = cards; ++ data->num_gpus = cards->len; ++ send_dbus_event (data); + } + + static void +-- +2.49.0 + + +From ad09f908cc9e56cccfc946b285f2e7ddd014c587 Mon Sep 17 00:00:00 2001 +From: Jan200101 +Date: Mon, 28 Apr 2025 21:41:47 +0200 +Subject: [PATCH 11/13] main: add xe discrete detection + +Signed-off-by: Jan200101 +--- + data/30-discrete-gpu.rules.in | 1 + + meson.build | 1 + + meson_options.txt | 6 +++ + src/discrete-detection/meson.build | 9 +++++ + src/discrete-detection/xe.c | 63 ++++++++++++++++++++++++++++++ + 5 files changed, 80 insertions(+) + create mode 100644 src/discrete-detection/xe.c + +diff --git a/data/30-discrete-gpu.rules.in b/data/30-discrete-gpu.rules.in +index f30f315..ab60bf2 100644 +--- a/data/30-discrete-gpu.rules.in ++++ b/data/30-discrete-gpu.rules.in +@@ -2,3 +2,4 @@ DRIVERS=="amdgpu", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-amdgpu + DRIVERS=="nouveau", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-nouveau $env{DEVNAME}", TAG+="switcheroo-discrete-gpu" + DRIVERS=="nvidia", SUBSYSTEM=="drm", TAG+="switcheroo-discrete-gpu" + DRIVERS=="i915", SUBSYSTEM=="drm", DEVPATH!="/devices/pci0000:00/0000:00:02.0/drm/*", TAG+="switcheroo-discrete-gpu" ++DRIVERS=="xe", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-xe $env{DEVNAME}", TAG+="switcheroo-discrete-gpu" +diff --git a/meson.build b/meson.build +index b3aaf0c..31dfa95 100644 +--- a/meson.build ++++ b/meson.build +@@ -23,6 +23,7 @@ gudev = dependency('gudev-1.0', version: '>= 232') + libdrm = dependency('libdrm', version: '>= 2.4.97', required: get_option('libdrm')) + libdrm_nouveau = dependency('libdrm_nouveau', version: '>= 2.4.97', required: get_option('libdrm_nouveau')) + libdrm_amdgpu = dependency('libdrm_amdgpu', version: '>= 2.4.97', required: get_option('libdrm_amdgpu')) ++drm_xe = cc.has_header('drm/xe_drm.h', required: get_option('drm_xe')) + + systemd_systemunitdir = get_option('systemdsystemunitdir') + if systemd_systemunitdir == '' +diff --git a/meson_options.txt b/meson_options.txt +index c77fea8..058dbdd 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -45,3 +45,9 @@ option('libdrm_amdgpu', + type: 'feature', + value: 'auto' + ) ++ ++option('drm_xe', ++ description: 'Whether the kernel provided xe drm header should be used to probe Intel GPUs', ++ type: 'feature', ++ value: 'auto' ++) +diff --git a/src/discrete-detection/meson.build b/src/discrete-detection/meson.build +index 353316f..7e0b324 100644 +--- a/src/discrete-detection/meson.build ++++ b/src/discrete-detection/meson.build +@@ -17,3 +17,12 @@ if libdrm.found() and libdrm_nouveau.found() + install_dir: libexecdir, + ) + endif ++ ++if drm_xe ++ xe_discrete = executable('check-discrete-xe', ++ files('xe.c'), ++ dependencies: deps, ++ install: true, ++ install_dir: libexecdir, ++ ) ++endif +diff --git a/src/discrete-detection/xe.c b/src/discrete-detection/xe.c +new file mode 100644 +index 0000000..5ee6ede +--- /dev/null ++++ b/src/discrete-detection/xe.c +@@ -0,0 +1,63 @@ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++typedef int handle; ++G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1) ++ ++int main (int argc, char** argv) ++{ ++ const char *devname; ++ g_auto(handle) fd = -1; ++ g_autofree struct drm_xe_query_config *config = NULL; ++ g_autoptr(GOptionContext) option_context = NULL; ++ g_autoptr(GError) error = NULL; ++ ++ setlocale (LC_ALL, ""); ++ option_context = g_option_context_new (""); ++ ++ if (!g_option_context_parse (option_context, &argc, &argv, &error)) { ++ g_print ("Failed to parse arguments: %s\n", error->message); ++ return EXIT_FAILURE; ++ } ++ ++ if (argc < 2) ++ { ++ g_print ("%s\n", g_option_context_get_help (option_context, TRUE, NULL)); ++ return EXIT_FAILURE; ++ } ++ devname = argv[1]; ++ ++ fd = open (devname, O_RDWR); ++ if (fd < 0) ++ return EXIT_FAILURE; ++ ++ struct drm_xe_device_query query = { ++ .extensions = 0, ++ .query = DRM_XE_DEVICE_QUERY_CONFIG, ++ .size = 0, ++ .data = 0, ++ }; ++ ++ if (ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query)) ++ return EXIT_FAILURE; ++ ++ config = malloc(query.size); ++ if (!config) ++ return EXIT_FAILURE; ++ ++ query.data = (uintptr_t)config; ++ if (ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query)) ++ return EXIT_FAILURE; ++ ++ // if the GPU has dedicated vram then its discrrete ++ if (config->info[DRM_XE_QUERY_CONFIG_FLAGS] & DRM_XE_QUERY_CONFIG_FLAG_HAS_VRAM) ++ return EXIT_SUCCESS; ++ ++ return EXIT_FAILURE; ++ ++} +-- +2.49.0 + + +From cefec04bfc28a32bbec1e5a25999a768a6a7bf9c Mon Sep 17 00:00:00 2001 +From: Jan200101 +Date: Mon, 28 Apr 2025 21:39:48 +0200 +Subject: [PATCH 12/13] tests: fix switcherooctl output test + +Signed-off-by: Jan200101 +--- + tests/integration-test.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/integration-test.py b/tests/integration-test.py +index e3dd996..5b4b4bb 100755 +--- a/tests/integration-test.py ++++ b/tests/integration-test.py +@@ -512,7 +512,7 @@ class Tests(dbusmock.DBusTestCase): + + out = subprocess.run([tool_path], capture_output=True) + self.assertEqual(out.returncode, 0, "'switcherooctl' call failed") +- self.assertEqual(out.stdout, b'Device: 0\n Name: Intel\xc2\xae UHD Graphics 620 (Kabylake GT2)\n Default: yes\n Environment: DRI_PRIME=pci-0000_00_02_0\n\nDevice: 1\n Name: GM108M [GeForce 930MX]\n Default: no\n Environment: DRI_PRIME=pci-0000_01_00_0\n') ++ self.assertEqual(out.stdout, b'Device: 0\n Name: Intel\xc2\xae UHD Graphics 620 (Kabylake GT2)\n Default: yes\n Discrete: no\n Environment: DRI_PRIME=pci-0000_00_02_0\n\nDevice: 1\n Name: GM108M [GeForce 930MX]\n Default: no\n Discrete: no\n Environment: DRI_PRIME=pci-0000_01_00_0\n') + + out = subprocess.run([tool_path, 'launch', '--gpu', '0', 'env'], capture_output=True) + self.assertEqual(out.returncode, 0, "'switcherooctl launch --gpu 0' failed") +-- +2.49.0 + + +From a446971f7aef77218625eb8627ec34e86e403737 Mon Sep 17 00:00:00 2001 +From: Jan200101 +Date: Mon, 28 Apr 2025 21:53:21 +0200 +Subject: [PATCH 13/13] tests: add tests for xe discrete detection + +Signed-off-by: Jan200101 +--- + tests/discrete-detection/drm_xe_mock.c | 47 ++++++++++++++++++++++++++ + tests/discrete-detection/meson.build | 42 ++++++++++++++++++++++- + 2 files changed, 88 insertions(+), 1 deletion(-) + create mode 100644 tests/discrete-detection/drm_xe_mock.c + +diff --git a/tests/discrete-detection/drm_xe_mock.c b/tests/discrete-detection/drm_xe_mock.c +new file mode 100644 +index 0000000..a9da460 +--- /dev/null ++++ b/tests/discrete-detection/drm_xe_mock.c +@@ -0,0 +1,47 @@ ++#include ++#include ++#include ++#include ++ ++#include ++enum { ++ OTHER_GPU, ++ INTEL_IGPU, ++ INTEL_GPU, ++}; ++ ++/* Mock open(2) so we can test multiple devices configurations */ ++int open(const char *pathname, int flags) ++{ ++ if (!strcmp(pathname, "OTHER_GPU")) ++ return OTHER_GPU; ++ if (!strcmp (pathname, "INTEL_IGPU")) ++ return INTEL_IGPU; ++ if (!strcmp (pathname, "INTEL_GPU")) ++ return INTEL_GPU; ++ ++ return -1; ++} ++ ++/* open64 may be used for large file support */ ++int open64(const char *pathname, int flags) ++{ ++ return open (pathname, flags); ++} ++ ++int ioctl(int fd, unsigned long op, struct drm_xe_device_query* query) ++{ ++ if (op != DRM_IOCTL_XE_DEVICE_QUERY) ++ return EINVAL; ++ if (fd == OTHER_GPU) ++ return ENODEV; ++ ++ if (query->size == 0) { ++ query->size = sizeof(struct drm_xe_query_config); ++ } else { ++ struct drm_xe_query_config *config = (struct drm_xe_query_config*)query->data; ++ config->info[DRM_XE_QUERY_CONFIG_FLAGS] = fd == INTEL_GPU ? DRM_XE_QUERY_CONFIG_FLAG_HAS_VRAM : 0; ++ } ++ ++ return 0; ++} +diff --git a/tests/discrete-detection/meson.build b/tests/discrete-detection/meson.build +index f01a014..998229f 100644 +--- a/tests/discrete-detection/meson.build ++++ b/tests/discrete-detection/meson.build +@@ -77,4 +77,44 @@ if libdrm.found() and libdrm_nouveau.found() + env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}), + should_fail: false + ) +-endif +\ No newline at end of file ++endif ++ ++if drm_xe ++ xe_mock_lib = shared_library( ++ 'drm_xe_mock', ++ files('drm_xe_mock.c') ++ ) ++ ++ test( ++ 'test xe detection with invalid device', ++ xe_discrete, ++ args: ['NO_GPU'], ++ env: environment({'LD_PRELOAD': xe_mock_lib.full_path()}), ++ should_fail: true ++ ) ++ ++ test( ++ 'test xe detection with non-Intel GPU', ++ xe_discrete, ++ args: ['OTHER_GPU'], ++ env: environment({'LD_PRELOAD': xe_mock_lib.full_path()}), ++ should_fail: true ++ ) ++ ++ test( ++ 'test xe detection with Intel Integrated GPU', ++ xe_discrete, ++ args: ['INTEL_IGPU'], ++ env: environment({'LD_PRELOAD': xe_mock_lib.full_path()}), ++ should_fail: true ++ ) ++ ++ test( ++ 'test xe detection with Intel Discrete GPU', ++ xe_discrete, ++ args: ['INTEL_GPU'], ++ env: environment({'LD_PRELOAD': xe_mock_lib.full_path()}), ++ should_fail: false ++ ) ++ ++endif +-- +2.49.0 + diff --git a/anda/apps/switcheroo-control/switcheroo-control.spec b/anda/apps/switcheroo-control/switcheroo-control.spec index dde67c0bb2..11f83f1462 100644 --- a/anda/apps/switcheroo-control/switcheroo-control.spec +++ b/anda/apps/switcheroo-control/switcheroo-control.spec @@ -1,22 +1,16 @@ Name: switcheroo-control Version: 2.6 -Release: 8%{?dist} +Release: 9%{?dist} Summary: D-Bus service to check the availability of dual-GPU License: GPLv3 URL: https://gitlab.freedesktop.org/hadess/switcheroo-control/ # URL from https://gitlab.freedesktop.org/hadess/switcheroo-control/-/releases Source0: https://gitlab.freedesktop.org/hadess/switcheroo-control/uploads/86ea54ac7ddb901b6bf6e915209151f8/switcheroo-control-2.6.tar.xz -Patch: 0001-main-update-GPUs-comment-for-dbus-property.patch -Patch: 0002-main-add-Discrete-key.patch -Patch: 0003-tests-fix-integration-tests-without-UMockdev.patch -Patch: 0004-tests-add-tests-for-discrete-detection-with-mock-lib.patch -Patch: 0005-main-remove-leftover-and-fix-typo.patch -Patch: 0006-main-move-discrete-dependencies-out-of-main-deps.patch -Patch: 0007-main-use-glib-for-discrete-command-line-arguments.patch -Patch: 0008-main-add-udev-rule-for-i915.patch -Patch: 0009-main-use-Discrete-key-in-switcherooctl.patch -Patch: 0010-main-use-new-GPU-list-on-uevent.patch +# Adds proper discrete GPU detection to switcheroo-control +# https://gitlab.freedesktop.org/hadess/switcheroo-control/-/merge_requests/69 +Patch: discrete.patch + BuildRequires: gcc BuildRequires: pkgconfig(gudev-1.0) @@ -25,6 +19,7 @@ BuildRequires: gtk-doc BuildRequires: meson BuildRequires: systemd BuildRequires: libdrm-devel +BuildRequires: kernel-headers BuildRequires: python3-dbusmock BuildRequires: umockdev @@ -78,6 +73,7 @@ fi %{_mandir}/man1/switcherooctl.1* %{_libexecdir}/check-discrete-amdgpu %{_libexecdir}/check-discrete-nouveau +%{_libexecdir}/check-discrete-xe %{_udevrulesdir}/30-discrete-gpu.rules %files docs @@ -86,14 +82,17 @@ fi %{_datadir}/gtk-doc/html/%{name}/ %changelog -* Fri Sep 06 2024 Jan200101 - 2.6-8 +* Tue Apr 29 2025 Jan200101 - 2.6-9 - Update discrete patch -* Thu Feb 15 2024 Jan Drögehoff - 2.6-7 -- Update discrete patch +* Sun Jan 19 2025 Fedora Release Engineering - 2.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild -* Wed Feb 14 2024 Jan Drögehoff - 2.6-6 -- Add discrete patch +* Mon Jul 29 2024 Miroslav Suchý - 2.6-7 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 2.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild * Sat Jan 27 2024 Fedora Release Engineering - 2.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 254f81e05f6f9cb5a8780d12a1c055f7d5a10957 Mon Sep 17 00:00:00 2001 From: madomado Date: Wed, 30 Apr 2025 01:14:06 +0800 Subject: [PATCH 0973/2977] fix(nekoray): update.rhai (#4529) Signed-off-by: madomado --- anda/apps/nekoray/update.rhai | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/nekoray/update.rhai b/anda/apps/nekoray/update.rhai index a34cc96916..4f1929a65f 100644 --- a/anda/apps/nekoray/update.rhai +++ b/anda/apps/nekoray/update.rhai @@ -1,3 +1,3 @@ rpm.version(find(`([\d.]+)-\d+-\d+-\d+`, gh_rawfile("Mahdi-zarei/nekoray", "dev", "nekoray_version.txt"), 1)); -open_file("anda/apps/nekoray/Sagernet.SingBox.Version.txt", "w").write(gh('sagernet/sing-box')); +open_file("anda/apps/nekoray/Sagernet.SingBox.Version.txt", "w").write(gh("sagernet/sing-box")); From ca5e550ddf72e5e89d29f31fc70d761c0e402426 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 29 Apr 2025 17:20:25 +0000 Subject: [PATCH 0974/2977] bump: nekoray nekoray inputplumber cuda-cudnn libcusparselt --- anda/apps/nekoray/Sagernet.SingBox.Version.txt | 2 +- anda/apps/nekoray/nekoray.spec | 4 ++-- anda/games/inputplumber/inputplumber.spec | 2 +- anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec | 4 ++-- anda/lib/nvidia/libcusparselt/libcusparselt.spec | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/anda/apps/nekoray/Sagernet.SingBox.Version.txt b/anda/apps/nekoray/Sagernet.SingBox.Version.txt index 40faed9aa4..b2271b264a 100644 --- a/anda/apps/nekoray/Sagernet.SingBox.Version.txt +++ b/anda/apps/nekoray/Sagernet.SingBox.Version.txt @@ -1 +1 @@ -1.11.8 +v1.11.9 \ No newline at end of file diff --git a/anda/apps/nekoray/nekoray.spec b/anda/apps/nekoray/nekoray.spec index cd92bb2e8a..4def6ec6dd 100644 --- a/anda/apps/nekoray/nekoray.spec +++ b/anda/apps/nekoray/nekoray.spec @@ -1,7 +1,7 @@ %global gomodulesmode GO111MODULE=on Name: nekoray -Version: 4.3.3 -Release: 0%{?autorelease} +Version: 4.3.4 +Release: 1%?dist Summary: Qt based cross-platform GUI proxy configuration manager (backend: sing-box) URL: https://github.com/Mahdi-zarei/nekoray License: GPLv3 diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index 7d70a78005..84bfc4bc7d 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.55.2 +Version: 0.55.3 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later diff --git a/anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec b/anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec index d712263ea5..692042aba8 100644 --- a/anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec +++ b/anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec @@ -5,8 +5,8 @@ %global cuda_version 12 Name: cuda-cudnn -Version: 9.6.0.74 -Release: 1%{?dist} +Version: 9.8.0.87 +Release: 1%?dist Epoch: 1 Summary: NVIDIA CUDA Deep Neural Network library (cuDNN) License: NVIDIA Software Development Kit diff --git a/anda/lib/nvidia/libcusparselt/libcusparselt.spec b/anda/lib/nvidia/libcusparselt/libcusparselt.spec index 20cd3afb58..bcde150dfe 100644 --- a/anda/lib/nvidia/libcusparselt/libcusparselt.spec +++ b/anda/lib/nvidia/libcusparselt/libcusparselt.spec @@ -4,7 +4,7 @@ %global _build_id_links none Name: libcusparselt -Version: 0.6.3.2 +Version: 0.7.1.0 Release: 1%?dist Summary: CUDA Library for Sparse Matrix-Matrix Multiplication License: NVIDIA License From 1876927c992330e714c731964e56bff1486772f4 Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 29 Apr 2025 12:30:06 -0500 Subject: [PATCH 0975/2977] fix(lightly-qt5): Import andax/bump_extras.rhai for update.rhai (#4535) Signed-off-by: Gilver --- anda/themes/lightly-qt5/update.rhai | 2 ++ 1 file changed, 2 insertions(+) diff --git a/anda/themes/lightly-qt5/update.rhai b/anda/themes/lightly-qt5/update.rhai index 445e062962..cb64dfe576 100644 --- a/anda/themes/lightly-qt5/update.rhai +++ b/anda/themes/lightly-qt5/update.rhai @@ -1,3 +1,5 @@ +import "andax/bump_extras.rhai" as bump; + fn main(labels) { let branch = bump::as_bodhi_ver(labels.branch); let url = `https://bodhi.fedoraproject.org/updates/?search=qt5-5.&status=stable&releases=${branch}&rows_per_page=1&page=1`; From 85e353e60d56af1da3faad8cf921df28a2f34cb0 Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 29 Apr 2025 12:32:12 -0500 Subject: [PATCH 0976/2977] fix(gstreamer1-plugins-bad): add bump function to update script (#4537) Signed-off-by: Gilver --- anda/multimedia/gstreamer1/gstreamer1-plugins-bad/update.rhai | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/update.rhai b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/update.rhai index 01fd54bf73..5265f08cc8 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/update.rhai +++ b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/update.rhai @@ -5,7 +5,7 @@ let bodhi_branch = bump::as_bodhi_ver(labels.branch); let pkg = "gstreamer1-plugins-bad-free"; let branch = bump::as_bodhi_ver(labels.branch); -let vr = bodhi_vr("gstreamer1-plugins-bad-free", branch); +let vr = bump::bodhi_vr("gstreamer1-plugins-bad-free", branch); rpm.version(vr[1]); rpm.release(vr[2]); From d0c9f3ef6c0a968dc54f91b70deb985673037989 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 29 Apr 2025 17:38:36 +0000 Subject: [PATCH 0977/2977] bump(branch): gstreamer1-plugins-bad --- .../gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec index c1530c01a4..9476df8148 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec +++ b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec @@ -2,8 +2,8 @@ %global majorminor 1.0 Name: gstreamer1-plugins-bad -Version: 1.24.11 -Release: 3%{?dist} +Version: 1.26.1 +Release: 1%?dist Summary: GStreamer streaming media framework "bad" plugins License: LGPLv2+ and LGPLv2 URL: http://gstreamer.freedesktop.org/ From f9c22967bd1eba112505a4702c34d22d66dfa534 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 29 Apr 2025 18:51:12 +0000 Subject: [PATCH 0978/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 8c58d0076a..091befdd21 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.663 +Version: 0.0.664 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index ff07585571..ece102e7ad 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.663 +Version: 0.0.664 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From b1759112f725d49d65320bb637fccfc8453c74b9 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 29 Apr 2025 20:29:30 +0000 Subject: [PATCH 0979/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 190f0b10b7..f9fe450fe6 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.184.6-pre +%global ver 0.184.7-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ From de53c63e4038d9fc45bf37854d965e8262748cec Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 29 Apr 2025 21:45:52 +0000 Subject: [PATCH 0980/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 091befdd21..a8f06a67fc 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.664 +Version: 0.0.665 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index ece102e7ad..329c022445 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.664 +Version: 0.0.665 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 26f2e143166f8de5f140fcfe8048bb03b18b28be Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 29 Apr 2025 17:29:44 -0500 Subject: [PATCH 0981/2977] chore: Mass CUDA update (#4546) * chore: Mass CUDA update * fix(cuda-cudnn): Funny % missing Signed-off-by: Gilver * chore: Update all accidental bumo downs * chore: Bump releases * fix: How did that happen?? --------- Signed-off-by: Gilver --- anda/lib/nvidia/cuda-cccl/cuda-cccl.spec | 4 +- anda/lib/nvidia/cuda-cudart/cuda-cudart.spec | 5 +- anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec | 4 +- .../nvidia/cuda-cuobjdump/cuda-cuobjdump.spec | 4 +- anda/lib/nvidia/cuda-cupti/cuda-cupti.spec | 4 +- .../nvidia/cuda-cuxxfilt/cuda-cuxxfilt.spec | 6 +-- anda/lib/nvidia/cuda-gdb/cuda-gdb.spec | 6 +-- .../nvidia/cuda-nvdisasm/cuda-nvdisasm.spec | 6 +-- anda/lib/nvidia/cuda-nvml/cuda-nvml.spec | 7 +-- anda/lib/nvidia/cuda-nvprof/cuda-nvprof.spec | 7 +-- .../lib/nvidia/cuda-nvprune/cuda-nvprune.spec | 6 +-- anda/lib/nvidia/cuda-nvrtc/cuda-nvrtc.spec | 20 ++++--- anda/lib/nvidia/cuda-nvtx/cuda-nvtx.spec | 7 +-- .../nvidia/cuda-profiler/cuda-profiler.spec | 2 +- anda/lib/nvidia/cuda-sandbox/anda.hcl | 9 ++++ .../lib/nvidia/cuda-sandbox/cuda-sandbox.spec | 53 +++++++++++++++++++ anda/lib/nvidia/cuda-sandbox/update.rhai | 3 ++ .../nvidia/cuda-sanitizer/cuda-sanitizer.spec | 7 +-- anda/lib/nvidia/cuda/cuda.spec | 5 +- anda/lib/nvidia/libcublas/libcublas.spec | 7 +-- anda/lib/nvidia/libcudla/libcudla.spec | 12 +++-- anda/lib/nvidia/libcufft/libcufft.spec | 7 +-- anda/lib/nvidia/libcurand/libcurand.spec | 7 +-- anda/lib/nvidia/libcusparse/libcusparse.spec | 7 +-- .../nvidia/libcusparselt/libcusparselt.spec | 4 +- anda/lib/nvidia/libnpp/libnpp.spec | 10 ++-- anda/lib/nvidia/libnvfatbin/libnvfatbin.spec | 7 +-- anda/lib/nvidia/libnvjpeg/libnvjpeg.spec | 7 +-- 28 files changed, 134 insertions(+), 99 deletions(-) create mode 100644 anda/lib/nvidia/cuda-sandbox/anda.hcl create mode 100644 anda/lib/nvidia/cuda-sandbox/cuda-sandbox.spec create mode 100644 anda/lib/nvidia/cuda-sandbox/update.rhai diff --git a/anda/lib/nvidia/cuda-cccl/cuda-cccl.spec b/anda/lib/nvidia/cuda-cccl/cuda-cccl.spec index c72bbdcd6a..163589f96f 100644 --- a/anda/lib/nvidia/cuda-cccl/cuda-cccl.spec +++ b/anda/lib/nvidia/cuda-cccl/cuda-cccl.spec @@ -1,12 +1,12 @@ %global real_name cuda_cccl %global debug_package %{nil} -%global major_package_version 12-6 +%global major_package_version 12-8 Name: %(echo %real_name | tr '_' '-') Epoch: 1 Version: 12.8.90 -Release: 1%?dist +Release: 2%?dist Summary: CXX Core Compute Libraries License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-cudart/cuda-cudart.spec b/anda/lib/nvidia/cuda-cudart/cuda-cudart.spec index e6e4f17529..11130f94bf 100644 --- a/anda/lib/nvidia/cuda-cudart/cuda-cudart.spec +++ b/anda/lib/nvidia/cuda-cudart/cuda-cudart.spec @@ -9,7 +9,7 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 Version: 12.8.90 -Release: 1%?dist +Release: 2%?dist Summary: CUDA Runtime API library License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit @@ -19,7 +19,6 @@ Source0: https://developer.download.nvidia.com/compute/cuda/redist/%{real Source1: https://developer.download.nvidia.com/compute/cuda/redist/%{real_name}/linux-sbsa/%{real_name}-linux-sbsa-%{version}-archive.tar.xz Source3: cudart.pc -Requires(post): ldconfig Conflicts: %{name}-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release} %description @@ -67,8 +66,6 @@ sed -i \ -e 's|INCLUDE_DIR|%{_includedir}|g' \ %{buildroot}/%{_libdir}/pkgconfig/*.pc -%{?ldconfig_scriptlets} - %files %license LICENSE %{_libdir}/libcudart.so.* diff --git a/anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec b/anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec index 692042aba8..5213c6fc7f 100644 --- a/anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec +++ b/anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec @@ -6,7 +6,7 @@ Name: cuda-cudnn Version: 9.8.0.87 -Release: 1%?dist +Release: 2%?dist Epoch: 1 Summary: NVIDIA CUDA Deep Neural Network library (cuDNN) License: NVIDIA Software Development Kit @@ -59,8 +59,6 @@ mkdir -p %{buildroot}%{_includedir} cp -a include/* %{buildroot}%{_includedir}/ chmod 644 %{buildroot}%{_includedir}/* -%{?ldconfig_scriptlets} - %files %license LICENSE %{_libdir}/libcudnn*.so.* diff --git a/anda/lib/nvidia/cuda-cuobjdump/cuda-cuobjdump.spec b/anda/lib/nvidia/cuda-cuobjdump/cuda-cuobjdump.spec index 0b89893640..da413f6265 100644 --- a/anda/lib/nvidia/cuda-cuobjdump/cuda-cuobjdump.spec +++ b/anda/lib/nvidia/cuda-cuobjdump/cuda-cuobjdump.spec @@ -4,12 +4,12 @@ %global __strip /bin/true %global _missing_build_ids_terminate_build 0 %global _build_id_links none -%global major_package_version 12-6 +%global major_package_version 12-8 Name: %(echo %real_name | tr '_' '-') Epoch: 1 Version: 12.8.90 -Release: 1%?dist +Release: 2%?dist Summary: Utility to extract information from CUDA binary files License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-cupti/cuda-cupti.spec b/anda/lib/nvidia/cuda-cupti/cuda-cupti.spec index be039463d3..8ac6712534 100644 --- a/anda/lib/nvidia/cuda-cupti/cuda-cupti.spec +++ b/anda/lib/nvidia/cuda-cupti/cuda-cupti.spec @@ -9,7 +9,7 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 Version: 12.8.90 -Release: 1%?dist +Release: 2%?dist Summary: NVIDIA CUDA Profiling Tools Interface (CUPTI) library License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit @@ -51,8 +51,6 @@ This package contains static libraries for NVIDIA CUDA Profiling Tools Interface %setup -q -T -b 1 -n %{real_name}-linux-sbsa-%{version}-archive %endif -%{?ldconfig_scriptlets} - %install mkdir -p %{buildroot}%{_includedir} mkdir -p %{buildroot}%{_libdir} diff --git a/anda/lib/nvidia/cuda-cuxxfilt/cuda-cuxxfilt.spec b/anda/lib/nvidia/cuda-cuxxfilt/cuda-cuxxfilt.spec index f1797cdc4c..8320f05bce 100644 --- a/anda/lib/nvidia/cuda-cuxxfilt/cuda-cuxxfilt.spec +++ b/anda/lib/nvidia/cuda-cuxxfilt/cuda-cuxxfilt.spec @@ -4,12 +4,12 @@ %global __strip /bin/true %global _missing_build_ids_terminate_build 0 %global _build_id_links none -%global major_package_version 12-6 +%global major_package_version 12-8 Name: %(echo %real_name | tr '_' '-') Epoch: 1 Version: 12.8.90 -Release: 1%?dist +Release: 2%?dist Summary: CUDA cuxxfilt (demangler) License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit @@ -22,7 +22,7 @@ Source1: https://developer.download.nvidia.com/compute/cuda/redist/%{real CUDA cuxxfilt (demangler). %package devel -Summary: CUDA cuxxfilt (demangler) development files +Summary: CUDA cuxxfilt (demangler) Conflicts: %{name}-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release} %description devel diff --git a/anda/lib/nvidia/cuda-gdb/cuda-gdb.spec b/anda/lib/nvidia/cuda-gdb/cuda-gdb.spec index eab5b3647c..deabaee892 100644 --- a/anda/lib/nvidia/cuda-gdb/cuda-gdb.spec +++ b/anda/lib/nvidia/cuda-gdb/cuda-gdb.spec @@ -3,13 +3,13 @@ %global __strip /bin/true %global _missing_build_ids_terminate_build 0 %global _build_id_links none -%global major_package_version 12-6 +%global major_package_version 12-8 Name: %(echo %real_name | tr '_' '-') Epoch: 1 Version: 12.8.90 -Release: 1%?dist -Summary: CUDA GDB tool for debugging CUDA applications +Release: 2%?dist +Summary: CUDA GDB License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL URL: https://developer.nvidia.com/cuda-toolkit ExclusiveArch: x86_64 aarch64 diff --git a/anda/lib/nvidia/cuda-nvdisasm/cuda-nvdisasm.spec b/anda/lib/nvidia/cuda-nvdisasm/cuda-nvdisasm.spec index eab4639b29..4408566f91 100644 --- a/anda/lib/nvidia/cuda-nvdisasm/cuda-nvdisasm.spec +++ b/anda/lib/nvidia/cuda-nvdisasm/cuda-nvdisasm.spec @@ -4,12 +4,12 @@ %global __strip /bin/true %global _missing_build_ids_terminate_build 0 %global _build_id_links none -%global major_package_version 12-6 +%global major_package_version 12-8 Name: %(echo %real_name | tr '_' '-') Epoch: 1 Version: 12.8.90 -Release: 1%?dist +Release: 2%?dist Summary: Utility to extract information from CUDA binary files License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit @@ -19,7 +19,7 @@ Source0: https://developer.download.nvidia.com/compute/cuda/redist/%{real Source1: https://developer.download.nvidia.com/compute/cuda/redist/%{real_name}/linux-sbsa/%{real_name}-linux-sbsa-%{version}-archive.tar.xz Conflicts: %{name}-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release} - + %description nvdisasm extracts information from standalone cubin files and presents them in human readable format. The output of nvdisasm includes CUDA assembly code for diff --git a/anda/lib/nvidia/cuda-nvml/cuda-nvml.spec b/anda/lib/nvidia/cuda-nvml/cuda-nvml.spec index 7d0ab8a19e..e5d6ce5949 100644 --- a/anda/lib/nvidia/cuda-nvml/cuda-nvml.spec +++ b/anda/lib/nvidia/cuda-nvml/cuda-nvml.spec @@ -4,12 +4,12 @@ %global __strip /bin/true %global _missing_build_ids_terminate_build 0 %global _build_id_links none -%global major_package_version 12-6 +%global major_package_version 12-8 Name: cuda-nvml Epoch: 1 Version: 12.8.90 -Release: 1%?dist +Release: 2%?dist Summary: NVIDIA Management library (NVML) License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit @@ -19,7 +19,6 @@ Source0: https://developer.download.nvidia.com/compute/cuda/redist/%{real Source1: https://developer.download.nvidia.com/compute/cuda/redist/%{real_name}/linux-sbsa/%{real_name}-linux-sbsa-%{version}-archive.tar.xz Source3: nvidia-ml.pc -Requires(post): ldconfig Conflicts: %{name}-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release} %description @@ -66,8 +65,6 @@ sed -i \ -e 's|INCLUDE_DIR|%{_includedir}|g' \ %{buildroot}/%{_libdir}/pkgconfig/*.pc -%{?ldconfig_scriptlets} - %files devel %license LICENSE %doc nvml/example diff --git a/anda/lib/nvidia/cuda-nvprof/cuda-nvprof.spec b/anda/lib/nvidia/cuda-nvprof/cuda-nvprof.spec index 89caad40e6..69bd05acc5 100644 --- a/anda/lib/nvidia/cuda-nvprof/cuda-nvprof.spec +++ b/anda/lib/nvidia/cuda-nvprof/cuda-nvprof.spec @@ -4,12 +4,12 @@ %global __strip /bin/true %global _missing_build_ids_terminate_build 0 %global _build_id_links none -%global major_package_version 12-6 +%global major_package_version 12-8 Name: %(echo %real_name | tr '_' '-') Epoch: 1 Version: 12.8.90 -Release: 1%?dist +Release: 2%?dist Summary: CUDA command line profiling tool License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit @@ -19,7 +19,6 @@ Source0: https://developer.download.nvidia.com/compute/cuda/redist/%{real Source3: accinj%{__isa_bits}.pc Source4: cuinj%{__isa_bits}.pc -Requires(post): ldconfig Conflicts: %{name}-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release} %description @@ -62,8 +61,6 @@ sed -i \ -e 's|INCLUDE_DIR|%{_includedir}|g' \ %{buildroot}/%{_libdir}/pkgconfig/*.pc -%{?ldconfig_scriptlets} - %files %license LICENSE %{_bindir}/nvprof diff --git a/anda/lib/nvidia/cuda-nvprune/cuda-nvprune.spec b/anda/lib/nvidia/cuda-nvprune/cuda-nvprune.spec index a85429362c..29e6baed13 100644 --- a/anda/lib/nvidia/cuda-nvprune/cuda-nvprune.spec +++ b/anda/lib/nvidia/cuda-nvprune/cuda-nvprune.spec @@ -4,13 +4,13 @@ %global __strip /bin/true %global _missing_build_ids_terminate_build 0 %global _build_id_links none -%global major_package_version 12-6 +%global major_package_version 12-8 Name: %(echo %real_name | tr '_' '-') Epoch: 1 Version: 12.8.90 -Release: 1%?dist -Summary: CUDA tool to prune host object files and libraries +Release: 2%?dist +Summary: CUDA nvprune License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit ExclusiveArch: x86_64 aarch64 diff --git a/anda/lib/nvidia/cuda-nvrtc/cuda-nvrtc.spec b/anda/lib/nvidia/cuda-nvrtc/cuda-nvrtc.spec index 8f619747b1..ee7f8408f2 100644 --- a/anda/lib/nvidia/cuda-nvrtc/cuda-nvrtc.spec +++ b/anda/lib/nvidia/cuda-nvrtc/cuda-nvrtc.spec @@ -4,12 +4,12 @@ %global __strip /bin/true %global _missing_build_ids_terminate_build 0 %global _build_id_links none -%global major_package_version 12-6 +%global major_package_version 12-8 Name: %(echo %real_name | tr '_' '-') Epoch: 1 Version: 12.8.93 -Release: 1%?dist +Release: 2%?dist Summary: CUDA runtime compilation library (NVRTC) License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit @@ -19,7 +19,6 @@ Source0: https://developer.download.nvidia.com/compute/cuda/redist/%{real Source1: https://developer.download.nvidia.com/compute/cuda/redist/%{real_name}/linux-sbsa/%{real_name}-linux-sbsa-%{version}-archive.tar.xz Source3: nvrtc.pc -Requires(post): ldconfig Conflicts: %{name}-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release} %description @@ -72,22 +71,31 @@ sed -i \ -e 's|INCLUDE_DIR|%{_includedir}|g' \ %{buildroot}/%{_libdir}/pkgconfig/*.pc -%{?ldconfig_scriptlets} - %files %license LICENSE +%ifarch x86_64 +%{_libdir}/libnvrtc-builtins.alt.so.* +%{_libdir}/libnvrtc.alt.so.* +%endif %{_libdir}/libnvrtc-builtins.so.* %{_libdir}/libnvrtc.so.* %files devel %{_includedir}/nvrtc.h +%ifarch x86_64 +%{_libdir}/libnvrtc-builtins.alt.so +%{_libdir}/libnvrtc.alt.so +%endif %{_libdir}/libnvrtc-builtins.so %{_libdir}/libnvrtc.so %{_libdir}/pkgconfig/nvrtc.pc %files static +%ifarch x86_64 +%{_libdir}/libnvrtc-builtins_static.alt.a +%{_libdir}/libnvrtc_static.alt.a +%endif %{_libdir}/libnvrtc-builtins_static.a -%{_libdir}/libnvrtc.so %{_libdir}/libnvrtc_static.a %changelog diff --git a/anda/lib/nvidia/cuda-nvtx/cuda-nvtx.spec b/anda/lib/nvidia/cuda-nvtx/cuda-nvtx.spec index 7318de2d67..a96cd28c2b 100644 --- a/anda/lib/nvidia/cuda-nvtx/cuda-nvtx.spec +++ b/anda/lib/nvidia/cuda-nvtx/cuda-nvtx.spec @@ -4,12 +4,12 @@ %global __strip /bin/true %global _missing_build_ids_terminate_build 0 %global _build_id_links none -%global major_package_version 12-6 +%global major_package_version 12-8 Name: %(echo %real_name | tr '_' '-') Epoch: 1 Version: 12.8.90 -Release: 1%?dist +Release: 2%?dist Summary: NVIDIA Tools Extension (NVTX) library License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit @@ -19,7 +19,6 @@ Source0: https://developer.download.nvidia.com/compute/cuda/redist/%{real Source1: https://developer.download.nvidia.com/compute/cuda/redist/%{real_name}/linux-sbsa/%{real_name}-linux-sbsa-%{version}-archive.tar.xz Source3: nvToolsExt.pc -Requires(post): ldconfig Conflicts: %{name}-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release} %description @@ -61,8 +60,6 @@ sed -i \ -e 's|INCLUDE_DIR|%{_includedir}|g' \ %{buildroot}/%{_libdir}/pkgconfig/*.pc -%{?ldconfig_scriptlets} - %files %license LICENSE %{_libdir}/libnvToolsExt.so.* diff --git a/anda/lib/nvidia/cuda-profiler/cuda-profiler.spec b/anda/lib/nvidia/cuda-profiler/cuda-profiler.spec index f53976d4d6..3f22a1b85f 100644 --- a/anda/lib/nvidia/cuda-profiler/cuda-profiler.spec +++ b/anda/lib/nvidia/cuda-profiler/cuda-profiler.spec @@ -6,7 +6,7 @@ Name: cuda-profiler Epoch: 1 Version: 12.8.90 -Release: 1%?dist +Release: 2%?dist Summary: CUDA Profiler API License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-sandbox/anda.hcl b/anda/lib/nvidia/cuda-sandbox/anda.hcl new file mode 100644 index 0000000000..82924809e7 --- /dev/null +++ b/anda/lib/nvidia/cuda-sandbox/anda.hcl @@ -0,0 +1,9 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "cuda-sandbox.spec" + } + labels { + subrepo = "nvidia" + } +} diff --git a/anda/lib/nvidia/cuda-sandbox/cuda-sandbox.spec b/anda/lib/nvidia/cuda-sandbox/cuda-sandbox.spec new file mode 100644 index 0000000000..bdc48ec65b --- /dev/null +++ b/anda/lib/nvidia/cuda-sandbox/cuda-sandbox.spec @@ -0,0 +1,53 @@ +%global real_name cuda_sandbox_dev + +%global debug_package %{nil} +%global __strip /bin/true +%global _missing_build_ids_terminate_build 0 +%global _build_id_links none +%global major_package_version 12-8 + +Name: cuda-sandbox +Epoch: 1 +Version: 12.8.55 +Release: 1%{?dist} +Summary: CUDA nvsandboxutils +License: CUDA Toolkit +URL: https://developer.nvidia.com/cuda-toolkit +ExclusiveArch: x86_64 + +Source0: https://developer.download.nvidia.com/compute/cuda/redist/%{real_name}/linux-x86_64/%{real_name}-linux-x86_64-%{version}-archive.tar.xz + +Conflicts: %{name}-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release} + +%description +A C-based API for monitoring and managing various states of the NVIDIA GPU +devices. It provides a direct access to the queries and commands exposed via +nvidia-smi. The runtime version of NVML ships with the NVIDIA display driver. + +Each new version of NVML is backwards compatible and is intended to be a +platform for building 3rd party applications. + +%package devel +Summary: Development files for the CUDA nvsandboxutils library +Conflicts: %{name}-devel-%{major_package_version} < %{?epoch:%{epoch}:}%{version} + +%description devel +This package provides development files for the CUDA nvsandboxutils library. + +%prep +%setup -q -n %{real_name}-linux-x86_64-%{version}-archive + +%install +mkdir -p %{buildroot}%{_includedir} + +cp -fr include/* %{buildroot}%{_includedir}/ +install -p -m 0644 -D %{_lib}/stubs/libnvidia-sandboxutils_loader.a %{buildroot}%{_libdir}/libnvidia-sandboxutils_loader.a + +%files devel +%license LICENSE +%{_includedir}/nvsandboxutils_loader.h +%{_includedir}/nvsandboxutils.h +%{_libdir}/libnvidia-sandboxutils_loader.a + +%changelog +%autochangelog diff --git a/anda/lib/nvidia/cuda-sandbox/update.rhai b/anda/lib/nvidia/cuda-sandbox/update.rhai new file mode 100644 index 0000000000..6faed0fee7 --- /dev/null +++ b/anda/lib/nvidia/cuda-sandbox/update.rhai @@ -0,0 +1,3 @@ +import "andax/nvidia.rhai" as nvidia; + +rpm.version(nvidia::nvidia_component_version("cuda_sandbox_dev")); diff --git a/anda/lib/nvidia/cuda-sanitizer/cuda-sanitizer.spec b/anda/lib/nvidia/cuda-sanitizer/cuda-sanitizer.spec index a95929fcc6..b52871be49 100644 --- a/anda/lib/nvidia/cuda-sanitizer/cuda-sanitizer.spec +++ b/anda/lib/nvidia/cuda-sanitizer/cuda-sanitizer.spec @@ -4,12 +4,12 @@ %global __strip /bin/true %global _missing_build_ids_terminate_build 0 %global _build_id_links none -%global major_package_version 12-6 +%global major_package_version 12-8 Name: cuda-sanitizer Epoch: 1 Version: 12.8.93 -Release: 1%?dist +Release: 2%?dist Summary: CUDA Compute Sanitizer API License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit @@ -20,7 +20,6 @@ Source1: https://developer.download.nvidia.com/compute/cuda/redist/%{real BuildRequires: chrpath -Requires(post): ldconfig Conflicts: %{name}-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release} %description @@ -61,8 +60,6 @@ cp -fr compute-sanitizer/lib* %{buildroot}%{_libdir}/ cp -fr compute-sanitizer/Tree* compute-sanitizer/compute-sanitizer %{buildroot}%{_bindir}/ %endif -%{?ldconfig_scriptlets} - %files %license LICENSE %{_bindir}/TreeLauncherSubreaper diff --git a/anda/lib/nvidia/cuda/cuda.spec b/anda/lib/nvidia/cuda/cuda.spec index c78a30d686..1142390e76 100644 --- a/anda/lib/nvidia/cuda/cuda.spec +++ b/anda/lib/nvidia/cuda/cuda.spec @@ -1,9 +1,9 @@ %global debug_package %{nil} -%global major_package_version 12-6 +%global major_package_version 12-8 Name: cuda Version: 12.8.90 -Release: 1%?dist +Release: 2%?dist Summary: NVIDIA Compute Unified Device Architecture Toolkit Epoch: 1 License: CUDA Toolkit @@ -91,6 +91,7 @@ Requires: %{name}-nvrtc-devel%{?_isa} Requires: %{name}-nvtx-devel%{?_isa} Requires: %{name}-cuobjdump%{?_isa} Requires: %{name}-cuxxfilt-devel%{?_isa} +Requires: %{name}-sandbox-devel%{?_isa} Requires: libcublas-devel%{?_isa} Requires: libcufft-devel%{?_isa} Requires: libcufile-devel%{?_isa} diff --git a/anda/lib/nvidia/libcublas/libcublas.spec b/anda/lib/nvidia/libcublas/libcublas.spec index ed72b6f76f..a845854435 100644 --- a/anda/lib/nvidia/libcublas/libcublas.spec +++ b/anda/lib/nvidia/libcublas/libcublas.spec @@ -2,12 +2,12 @@ %global __strip /bin/true %global _missing_build_ids_terminate_build 0 %global _build_id_links none -%global major_package_version 12-6 +%global major_package_version 12-8 Name: libcublas Epoch: 1 Version: 12.8.4.1 -Release: 1%?dist +Release: 2%?dist Summary: NVIDIA CUDA Basic Linear Algebra Subroutines (cuBLAS) libraries License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit @@ -18,7 +18,6 @@ Source1: https://developer.download.nvidia.com/compute/cuda/redist/%{name Source3: cublas.pc Source4: cublasLt.pc -Requires(post): ldconfig Conflicts: %{name}-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release} %description @@ -68,8 +67,6 @@ sed -i \ -e 's|INCLUDE_DIR|%{_includedir}|g' \ %{buildroot}/%{_libdir}/pkgconfig/*.pc -%{?ldconfig_scriptlets} - %files %license LICENSE %{_libdir}/libcublas.so.* diff --git a/anda/lib/nvidia/libcudla/libcudla.spec b/anda/lib/nvidia/libcudla/libcudla.spec index 22f5e4509e..9335c494e4 100644 --- a/anda/lib/nvidia/libcudla/libcudla.spec +++ b/anda/lib/nvidia/libcudla/libcudla.spec @@ -2,13 +2,13 @@ %global __strip /bin/true %global _missing_build_ids_terminate_build 0 %global _build_id_links none -%global major_package_version 12-6 +%global major_package_version 12-8 Name: libcudla Epoch: 1 Version: 12.8.90 -Release: 1%?dist -Summary: NVIDIA CUDA Deep Learning Accelerator (DLA) engines (Jetson Xavier and Orin) +Release: 2%?dist +Summary: NVIDIA CUDA Deep Learning Accelerator (DLA) engines (Jetson Xavier + Orin) License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit ExclusiveArch: aarch64 @@ -17,7 +17,8 @@ Source0: https://developer.download.nvidia.com/compute/cuda/redist/%{name Source1: cudla.pc %description -Low-level driver for the Deep Learning Accelerator (DLA) engine for Jetson Xavier and Orin boards. +Low-level driver for the Deep Learning Accelerator (DLA) engine for Jetson +Xavier + Orin boards. %package devel Summary: Development files for CUDA Deep Learning Accelerator (DLA) engines @@ -25,7 +26,8 @@ Requires: %{name}%{_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Conflicts: %{name}-devel-%{major_package_version} < %{?epoch:%{epoch}:}%{version} %description devel -This package provides development files for the CUDA Deep Learning Accelerator (DLA) engines. +This package provides development files for the CUDA Deep Learning Accelerator +(DLA) engines. %prep %autosetup -n %{name}-linux-aarch64-%{version}-archive diff --git a/anda/lib/nvidia/libcufft/libcufft.spec b/anda/lib/nvidia/libcufft/libcufft.spec index 28aaee2383..2caf9ac4f1 100644 --- a/anda/lib/nvidia/libcufft/libcufft.spec +++ b/anda/lib/nvidia/libcufft/libcufft.spec @@ -2,12 +2,12 @@ %global __strip /bin/true %global _missing_build_ids_terminate_build 0 %global _build_id_links none -%global major_package_version 12-6 +%global major_package_version 12-8 Name: libcufft Epoch: 2 Version: 11.3.3.83 -Release: 1%?dist +Release: 2%?dist Summary: NVIDIA CUDA Fast Fourier Transform library (cuFFT) libraries License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit @@ -18,7 +18,6 @@ Source1: https://developer.download.nvidia.com/compute/cuda/redist/%{name Source3: cufft.pc Source4: cufftw.pc -Requires(post): ldconfig Conflicts: %{name}-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release} # Drop in 11.7: Provides: cuda-cufft = %{?epoch:%{epoch}:}%{version}-%{release} @@ -78,8 +77,6 @@ sed -i \ -e 's|INCLUDE_DIR|%{_includedir}|g' \ %{buildroot}/%{_libdir}/pkgconfig/*.pc -%{?ldconfig_scriptlets} - %files %license LICENSE %{_libdir}/libcufft.so.* diff --git a/anda/lib/nvidia/libcurand/libcurand.spec b/anda/lib/nvidia/libcurand/libcurand.spec index bec45dd06c..e9ec726065 100644 --- a/anda/lib/nvidia/libcurand/libcurand.spec +++ b/anda/lib/nvidia/libcurand/libcurand.spec @@ -2,12 +2,12 @@ %global __strip /bin/true %global _missing_build_ids_terminate_build 0 %global _build_id_links none -%global major_package_version 12-6 +%global major_package_version 12-8 Name: libcurand Epoch: 2 Version: 10.3.9.90 -Release: 1%?dist +Release: 2%?dist Summary: NVIDIA CUDA Random Number Generation library (cuRAND) License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit @@ -17,7 +17,6 @@ Source0: https://developer.download.nvidia.com/compute/cuda/redist/%{name Source1: https://developer.download.nvidia.com/compute/cuda/redist/%{name}/linux-sbsa/%{name}-linux-sbsa-%{version}-archive.tar.xz Source3: curand.pc -Requires(post): ldconfig Conflicts: %{name}-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release} %description @@ -68,8 +67,6 @@ sed -i \ -e 's|INCLUDE_DIR|%{_includedir}|g' \ %{buildroot}/%{_libdir}/pkgconfig/*.pc -%{?ldconfig_scriptlets} - %files %license LICENSE %{_libdir}/libcurand.so.* diff --git a/anda/lib/nvidia/libcusparse/libcusparse.spec b/anda/lib/nvidia/libcusparse/libcusparse.spec index d4592dd970..6c553d9040 100644 --- a/anda/lib/nvidia/libcusparse/libcusparse.spec +++ b/anda/lib/nvidia/libcusparse/libcusparse.spec @@ -2,12 +2,12 @@ %global __strip /bin/true %global _missing_build_ids_terminate_build 0 %global _build_id_links none -%global major_package_version 12-6 +%global major_package_version 12-8 Name: libcusparse Epoch: 1 Version: 12.5.8.93 -Release: 1%?dist +Release: 2%?dist Summary: NVIDIA CUDA Sparse Matrix library (cuSPARSE) library License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit @@ -17,7 +17,6 @@ Source0: https://developer.download.nvidia.com/compute/cuda/redist/%{name Source1: https://developer.download.nvidia.com/compute/cuda/redist/%{name}/linux-sbsa/%{name}-linux-sbsa-%{version}-archive.tar.xz Source3: cusparse.pc -Requires(post): ldconfig Conflicts: %{name}-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release} %description @@ -68,8 +67,6 @@ sed -i \ -e 's|INCLUDE_DIR|%{_includedir}|g' \ %{buildroot}/%{_libdir}/pkgconfig/*.pc -%{?ldconfig_scriptlets} - %files %license LICENSE %{_libdir}/libcusparse.so.* diff --git a/anda/lib/nvidia/libcusparselt/libcusparselt.spec b/anda/lib/nvidia/libcusparselt/libcusparselt.spec index bcde150dfe..0dabb25ce1 100644 --- a/anda/lib/nvidia/libcusparselt/libcusparselt.spec +++ b/anda/lib/nvidia/libcusparselt/libcusparselt.spec @@ -5,7 +5,7 @@ Name: libcusparselt Version: 0.7.1.0 -Release: 1%?dist +Release: 2%?dist Summary: CUDA Library for Sparse Matrix-Matrix Multiplication License: NVIDIA License URL: https://docs.nvidia.com/cuda/cusparselt/index.html @@ -62,8 +62,6 @@ install -p -m0644 lib/libcusparseLt_static.a %{buildroot}%{_libdir}/ mkdir -p %{buildroot}%{_includedir}/ install -p -m0644 include/cusparseLt.h %{buildroot}%{_includedir}/ -%{?ldconfig_scriptlets} - %files %license LICENSE %{_libdir}/libcusparseLt.so.* diff --git a/anda/lib/nvidia/libnpp/libnpp.spec b/anda/lib/nvidia/libnpp/libnpp.spec index 0fc28e60b5..8d6b0e8eb8 100644 --- a/anda/lib/nvidia/libnpp/libnpp.spec +++ b/anda/lib/nvidia/libnpp/libnpp.spec @@ -2,12 +2,12 @@ %global __strip /bin/true %global _missing_build_ids_terminate_build 0 %global _build_id_links none -%global major_package_version 12-6 +%global major_package_version 12-8 Name: libnpp Epoch: 1 Version: 12.3.3.100 -Release: 1%?dist +Release: 2%?dist Summary: NVIDIA Performance Primitives libraries License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit @@ -30,7 +30,6 @@ Source20: nppisu.pc Source21: nppitc.pc Source22: npps.pc -Requires(post): ldconfig Conflicts: %{name}-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release} %description @@ -85,8 +84,6 @@ sed -i \ -e 's|INCLUDE_DIR|%{_includedir}|g' \ %{buildroot}/%{_libdir}/pkgconfig/*.pc -%{?ldconfig_scriptlets} - %files %license LICENSE %{_libdir}/libnppc.so.* @@ -148,5 +145,6 @@ sed -i \ %{_libdir}/libnppisu_static.a %{_libdir}/libnppitc_static.a %{_libdir}/libnpps_static.a + %changelog -%autochangelog \ No newline at end of file +%autochangelog diff --git a/anda/lib/nvidia/libnvfatbin/libnvfatbin.spec b/anda/lib/nvidia/libnvfatbin/libnvfatbin.spec index 034ba6016a..2a3395e948 100644 --- a/anda/lib/nvidia/libnvfatbin/libnvfatbin.spec +++ b/anda/lib/nvidia/libnvfatbin/libnvfatbin.spec @@ -2,12 +2,12 @@ %global __strip /bin/true %global _missing_build_ids_terminate_build 0 %global _build_id_links none -%global major_package_version 12-6 +%global major_package_version 12-8 Name: libnvfatbin Epoch: 1 Version: 12.8.90 -Release: 1%?dist +Release: 2%?dist Summary: CUDA Fatbin Creator API License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit @@ -17,7 +17,6 @@ Source0: https://developer.download.nvidia.com/compute/cuda/redist/%{name Source1: https://developer.download.nvidia.com/compute/cuda/redist/%{name}/linux-sbsa/%{name}-linux-sbsa-%{version}-archive.tar.xz Source3: nvfatbin.pc -Requires(post): ldconfig Conflicts: %{name}-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release} %description @@ -73,8 +72,6 @@ sed -i \ -e 's|INCLUDE_DIR|%{_includedir}|g' \ %{buildroot}/%{_libdir}/pkgconfig/*.pc -%{?ldconfig_scriptlets} - %files %license LICENSE %{_libdir}/libnvfatbin.so.* diff --git a/anda/lib/nvidia/libnvjpeg/libnvjpeg.spec b/anda/lib/nvidia/libnvjpeg/libnvjpeg.spec index 6da7f9c6f6..03f922874f 100644 --- a/anda/lib/nvidia/libnvjpeg/libnvjpeg.spec +++ b/anda/lib/nvidia/libnvjpeg/libnvjpeg.spec @@ -2,12 +2,12 @@ %global __strip /bin/true %global _missing_build_ids_terminate_build 0 %global _build_id_links none -%global major_package_version 12-6 +%global major_package_version 12-8 Name: libnvjpeg Epoch: 1 Version: 12.3.5.92 -Release: 1%?dist +Release: 2%?dist Summary: CUDA NVIDIA JPEG decoder (nvJPEG) License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit @@ -17,7 +17,6 @@ Source0: https://developer.download.nvidia.com/compute/cuda/redist/%{name Source1: https://developer.download.nvidia.com/compute/cuda/redist/%{name}/linux-sbsa/%{name}-linux-sbsa-%{version}-archive.tar.xz Source3: nvjpeg.pc -Requires(post): ldconfig Conflicts: %{name}-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release} %description @@ -68,8 +67,6 @@ sed -i \ -e 's|INCLUDE_DIR|%{_includedir}|g' \ %{buildroot}/%{_libdir}/pkgconfig/*.pc -%{?ldconfig_scriptlets} - %files %license LICENSE %{_libdir}/libnvjpeg.so.* From 0a885f1eaa59597c8f4535efd79b7e66cc62a936 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 29 Apr 2025 22:38:02 +0000 Subject: [PATCH 0982/2977] bump: cuda-sandbox --- anda/lib/nvidia/cuda-sandbox/cuda-sandbox.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/nvidia/cuda-sandbox/cuda-sandbox.spec b/anda/lib/nvidia/cuda-sandbox/cuda-sandbox.spec index bdc48ec65b..fbfc7cfb86 100644 --- a/anda/lib/nvidia/cuda-sandbox/cuda-sandbox.spec +++ b/anda/lib/nvidia/cuda-sandbox/cuda-sandbox.spec @@ -8,8 +8,8 @@ Name: cuda-sandbox Epoch: 1 -Version: 12.8.55 -Release: 1%{?dist} +Version: 12.8.90 +Release: 1%?dist Summary: CUDA nvsandboxutils License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit From 5c2085375e8ce3bcbda245bf5078ca951c2b6ad8 Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 29 Apr 2025 18:00:46 -0500 Subject: [PATCH 0983/2977] fix?: Add updbranch label to all CUDA packages (#4547) --- anda/lib/nvidia/cuda-cccl/anda.hcl | 1 + anda/lib/nvidia/cuda-cudart/anda.hcl | 1 + anda/lib/nvidia/cuda-cudnn/anda.hcl | 1 + anda/lib/nvidia/cuda-cuobjdump/anda.hcl | 1 + anda/lib/nvidia/cuda-cupti/anda.hcl | 1 + anda/lib/nvidia/cuda-cuxxfilt/anda.hcl | 1 + anda/lib/nvidia/cuda-gdb/anda.hcl | 1 + anda/lib/nvidia/cuda-nvdisasm/anda.hcl | 1 + anda/lib/nvidia/cuda-nvml/anda.hcl | 1 + anda/lib/nvidia/cuda-nvprof/anda.hcl | 1 + anda/lib/nvidia/cuda-nvprune/anda.hcl | 1 + anda/lib/nvidia/cuda-nvrtc/anda.hcl | 1 + anda/lib/nvidia/cuda-nvtx/anda.hcl | 1 + anda/lib/nvidia/cuda-profiler/anda.hcl | 1 + anda/lib/nvidia/cuda-sandbox/anda.hcl | 1 + anda/lib/nvidia/cuda-sanitizer/anda.hcl | 1 + anda/lib/nvidia/cuda/anda.hcl | 1 + anda/lib/nvidia/libcublas/anda.hcl | 1 + anda/lib/nvidia/libcudla/anda.hcl | 1 + anda/lib/nvidia/libcufft/anda.hcl | 1 + anda/lib/nvidia/libcurand/anda.hcl | 1 + anda/lib/nvidia/libcusparse/anda.hcl | 1 + anda/lib/nvidia/libcusparselt/anda.hcl | 1 + anda/lib/nvidia/libnpp/anda.hcl | 1 + anda/lib/nvidia/libnvfatbin/anda.hcl | 1 + anda/lib/nvidia/libnvjpeg/anda.hcl | 1 + anda/tools/cuda-nvcc/anda.hcl | 3 +++ 27 files changed, 29 insertions(+) diff --git a/anda/lib/nvidia/cuda-cccl/anda.hcl b/anda/lib/nvidia/cuda-cccl/anda.hcl index 105fd9c168..ce1241131b 100644 --- a/anda/lib/nvidia/cuda-cccl/anda.hcl +++ b/anda/lib/nvidia/cuda-cccl/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/cuda-cudart/anda.hcl b/anda/lib/nvidia/cuda-cudart/anda.hcl index 221343b01c..ab2d612792 100644 --- a/anda/lib/nvidia/cuda-cudart/anda.hcl +++ b/anda/lib/nvidia/cuda-cudart/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/cuda-cudnn/anda.hcl b/anda/lib/nvidia/cuda-cudnn/anda.hcl index 476e1144e0..212968c66f 100644 --- a/anda/lib/nvidia/cuda-cudnn/anda.hcl +++ b/anda/lib/nvidia/cuda-cudnn/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/cuda-cuobjdump/anda.hcl b/anda/lib/nvidia/cuda-cuobjdump/anda.hcl index ce0c06c838..3743226408 100644 --- a/anda/lib/nvidia/cuda-cuobjdump/anda.hcl +++ b/anda/lib/nvidia/cuda-cuobjdump/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/cuda-cupti/anda.hcl b/anda/lib/nvidia/cuda-cupti/anda.hcl index 524b27fb9f..7ce7562e61 100644 --- a/anda/lib/nvidia/cuda-cupti/anda.hcl +++ b/anda/lib/nvidia/cuda-cupti/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/cuda-cuxxfilt/anda.hcl b/anda/lib/nvidia/cuda-cuxxfilt/anda.hcl index a152d49d81..5b083e7d90 100644 --- a/anda/lib/nvidia/cuda-cuxxfilt/anda.hcl +++ b/anda/lib/nvidia/cuda-cuxxfilt/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/cuda-gdb/anda.hcl b/anda/lib/nvidia/cuda-gdb/anda.hcl index 96834799fb..d5bcabdc0e 100644 --- a/anda/lib/nvidia/cuda-gdb/anda.hcl +++ b/anda/lib/nvidia/cuda-gdb/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/cuda-nvdisasm/anda.hcl b/anda/lib/nvidia/cuda-nvdisasm/anda.hcl index 0d1a673f66..43643856bc 100644 --- a/anda/lib/nvidia/cuda-nvdisasm/anda.hcl +++ b/anda/lib/nvidia/cuda-nvdisasm/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/cuda-nvml/anda.hcl b/anda/lib/nvidia/cuda-nvml/anda.hcl index 34840180f2..8288308f0c 100644 --- a/anda/lib/nvidia/cuda-nvml/anda.hcl +++ b/anda/lib/nvidia/cuda-nvml/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/cuda-nvprof/anda.hcl b/anda/lib/nvidia/cuda-nvprof/anda.hcl index 66df69c112..4628c1818a 100644 --- a/anda/lib/nvidia/cuda-nvprof/anda.hcl +++ b/anda/lib/nvidia/cuda-nvprof/anda.hcl @@ -5,5 +5,6 @@ project pkg { } labels { subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/cuda-nvprune/anda.hcl b/anda/lib/nvidia/cuda-nvprune/anda.hcl index 04a7d9e659..b06cfae87a 100644 --- a/anda/lib/nvidia/cuda-nvprune/anda.hcl +++ b/anda/lib/nvidia/cuda-nvprune/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/cuda-nvrtc/anda.hcl b/anda/lib/nvidia/cuda-nvrtc/anda.hcl index cfeecbc51e..e98d7b3dbb 100644 --- a/anda/lib/nvidia/cuda-nvrtc/anda.hcl +++ b/anda/lib/nvidia/cuda-nvrtc/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/cuda-nvtx/anda.hcl b/anda/lib/nvidia/cuda-nvtx/anda.hcl index 70c2c3b44e..ff8ca22216 100644 --- a/anda/lib/nvidia/cuda-nvtx/anda.hcl +++ b/anda/lib/nvidia/cuda-nvtx/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/cuda-profiler/anda.hcl b/anda/lib/nvidia/cuda-profiler/anda.hcl index bf19f1bca8..d50e653b01 100644 --- a/anda/lib/nvidia/cuda-profiler/anda.hcl +++ b/anda/lib/nvidia/cuda-profiler/anda.hcl @@ -6,5 +6,6 @@ project pkg { labels { mock = 1 subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/cuda-sandbox/anda.hcl b/anda/lib/nvidia/cuda-sandbox/anda.hcl index 82924809e7..43320c9288 100644 --- a/anda/lib/nvidia/cuda-sandbox/anda.hcl +++ b/anda/lib/nvidia/cuda-sandbox/anda.hcl @@ -5,5 +5,6 @@ project pkg { } labels { subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/cuda-sanitizer/anda.hcl b/anda/lib/nvidia/cuda-sanitizer/anda.hcl index e459b62748..3fde34bc00 100644 --- a/anda/lib/nvidia/cuda-sanitizer/anda.hcl +++ b/anda/lib/nvidia/cuda-sanitizer/anda.hcl @@ -6,5 +6,6 @@ project pkg { labels { mock = 1 subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/cuda/anda.hcl b/anda/lib/nvidia/cuda/anda.hcl index 4a81a369b2..57d27effa9 100644 --- a/anda/lib/nvidia/cuda/anda.hcl +++ b/anda/lib/nvidia/cuda/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/libcublas/anda.hcl b/anda/lib/nvidia/libcublas/anda.hcl index ea293241ed..ed6ff2bb1d 100644 --- a/anda/lib/nvidia/libcublas/anda.hcl +++ b/anda/lib/nvidia/libcublas/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/libcudla/anda.hcl b/anda/lib/nvidia/libcudla/anda.hcl index d88f879f40..cc3a088245 100644 --- a/anda/lib/nvidia/libcudla/anda.hcl +++ b/anda/lib/nvidia/libcudla/anda.hcl @@ -5,5 +5,6 @@ project pkg { } labels { subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/libcufft/anda.hcl b/anda/lib/nvidia/libcufft/anda.hcl index a46203edb7..1b13e9b0f0 100644 --- a/anda/lib/nvidia/libcufft/anda.hcl +++ b/anda/lib/nvidia/libcufft/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/libcurand/anda.hcl b/anda/lib/nvidia/libcurand/anda.hcl index 6ba63a679e..40dcfac1fd 100644 --- a/anda/lib/nvidia/libcurand/anda.hcl +++ b/anda/lib/nvidia/libcurand/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/libcusparse/anda.hcl b/anda/lib/nvidia/libcusparse/anda.hcl index fcf8d8b6b3..20403f3474 100644 --- a/anda/lib/nvidia/libcusparse/anda.hcl +++ b/anda/lib/nvidia/libcusparse/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/libcusparselt/anda.hcl b/anda/lib/nvidia/libcusparselt/anda.hcl index 6f738351fb..fd9ac2d6ef 100644 --- a/anda/lib/nvidia/libcusparselt/anda.hcl +++ b/anda/lib/nvidia/libcusparselt/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/libnpp/anda.hcl b/anda/lib/nvidia/libnpp/anda.hcl index bdb71604c8..61a3a614c2 100644 --- a/anda/lib/nvidia/libnpp/anda.hcl +++ b/anda/lib/nvidia/libnpp/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/libnvfatbin/anda.hcl b/anda/lib/nvidia/libnvfatbin/anda.hcl index 0f221d477d..f12629739c 100644 --- a/anda/lib/nvidia/libnvfatbin/anda.hcl +++ b/anda/lib/nvidia/libnvfatbin/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/lib/nvidia/libnvjpeg/anda.hcl b/anda/lib/nvidia/libnvjpeg/anda.hcl index 8881c1ea8e..14b654f7a3 100644 --- a/anda/lib/nvidia/libnvjpeg/anda.hcl +++ b/anda/lib/nvidia/libnvjpeg/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { subrepo = "nvidia" + updbranch = 1 } } diff --git a/anda/tools/cuda-nvcc/anda.hcl b/anda/tools/cuda-nvcc/anda.hcl index e82073db16..95c2969059 100644 --- a/anda/tools/cuda-nvcc/anda.hcl +++ b/anda/tools/cuda-nvcc/anda.hcl @@ -2,4 +2,7 @@ project "pkg" { rpm { spec = "cuda-nvcc.spec" } + labels { + upbranch = 1 + } } From 99d8a3d9a221183ec9388065f66b481d54590237 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 29 Apr 2025 23:38:49 +0000 Subject: [PATCH 0984/2977] bump: nightly --- anda/system/readymade/nightly/readymade-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/readymade/nightly/readymade-nightly.spec b/anda/system/readymade/nightly/readymade-nightly.spec index 1973d7c465..acd37ce681 100644 --- a/anda/system/readymade/nightly/readymade-nightly.spec +++ b/anda/system/readymade/nightly/readymade-nightly.spec @@ -1,4 +1,4 @@ -%global commit 6519859b9adebd01f6e9cf5546248e5e45ff137c +%global commit 73982b80058492404842524ebabe4cc1f2a99854 %global commit_date 20250429 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From 6ea2cd405b80aff3ebb6446807331adfd01e6d23 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 30 Apr 2025 01:48:11 +0000 Subject: [PATCH 0985/2977] bump(nightly): envision nightly micro nightly prismlauncher-nightly nim-nightly astal nvidia-patch --- anda/apps/envision/envision.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/micro/micro-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/lib/astal/astal/astal.spec | 4 ++-- anda/system/nvidia-patch/nvidia-patch.spec | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/anda/apps/envision/envision.spec b/anda/apps/envision/envision.spec index 1370365fa8..64bf00c5a1 100644 --- a/anda/apps/envision/envision.spec +++ b/anda/apps/envision/envision.spec @@ -1,5 +1,5 @@ -%global commit 9d85f1c24f5c6234e1672c96ea19b2dc990001e8 -%global commit_date 20250423 +%global commit c794037377bbddc014ce4a58b3662038fc6b056f +%global commit_date 20250430 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: envision-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index a3b219ea0c..4253f46f25 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 9a4419ce85b11b66af6b1c6974be6c848a4cc5e4 +%global commit b3edc88010e38946072a58fe336081ed104c9d44 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-04-28 +%global fulldate 2025-04-30 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 diff --git a/anda/devs/micro/micro-nightly.spec b/anda/devs/micro/micro-nightly.spec index 55851985fa..d4f4ab2fc8 100644 --- a/anda/devs/micro/micro-nightly.spec +++ b/anda/devs/micro/micro-nightly.spec @@ -12,8 +12,8 @@ # Naming variable as something other than "commit" is necessary # to stop %%gometa from putting commit hash in release -%global commit_hash b61c8a4e1ae6810f307b2fc4bc30c25f2fb04729 -%global commit_date 20250429 +%global commit_hash 06fe85c8c97de418f0f906edc4d84b877f744ca4 +%global commit_date 20250430 %global shortcommit %{sub %{commit_hash} 1 7} %global ver 2.0.14 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 5b0f048414..92c3278c2e 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 4dc8ce8cf7e27c6fc2ed3f532f47a1b4183998d5 +%global commit b4732235e31cbce6d38388b3ea32852159fa91d0 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250429 +%global commit_date 20250430 %global ver 0.185.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 5ef4a1cacc..6fb2a4c8bd 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit a6006c3a33ec5a7f8f297767add066290190170c +%global commit f086233186b769eff3273555cf20a0a3164a9054 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250429 +%global commit_date 20250430 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index cf7fdee9e6..e8663e571a 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit eea4ce0e2cf1dfdd2a90c2ab7f93888efc7ccf4e +%global commit 0506d5b973ee5bc2dfb1a1001e634c88aa15a2ad %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250429 +%global commit_date 20250430 %global debug_package %nil Name: nim-nightly diff --git a/anda/lib/astal/astal/astal.spec b/anda/lib/astal/astal/astal.spec index ccf3372eec..49f0bfc0e4 100644 --- a/anda/lib/astal/astal/astal.spec +++ b/anda/lib/astal/astal/astal.spec @@ -1,7 +1,7 @@ -%global commit c96126c7e261737270ad7ae35b27674c318648e6 +%global commit 07583deff8a486fad472718572c3248f0fbea1f3 %global shortcommit %{sub %commit 1 7} -%global commit_date 20250420 +%global commit_date 20250430 Name: astal Version: 0^%commit_date.%shortcommit diff --git a/anda/system/nvidia-patch/nvidia-patch.spec b/anda/system/nvidia-patch/nvidia-patch.spec index 178ccab02e..dcde587685 100644 --- a/anda/system/nvidia-patch/nvidia-patch.spec +++ b/anda/system/nvidia-patch/nvidia-patch.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} -%global commit a9d20a1e864004484f4920ffa6b11b8fd6ec27cc +%global commit 39f21ee316e6740be2fb1350086c8086906529a0 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250426 +%global commit_date 20250430 %global patches %{_datadir}/src/nvidia-patch From 43ab7e8fa36dfcbf8ec65f0f83da00e8fff00ed4 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 30 Apr 2025 02:02:59 +0000 Subject: [PATCH 0986/2977] bump: discord-canary-openasar discord-canary ruffle yt-dlp --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- anda/apps/ruffle/ruffle-nightly.spec | 2 +- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index a8f06a67fc..959d935eb3 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.665 +Version: 0.0.666 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 329c022445..0be4c21dfd 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.665 +Version: 0.0.666 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index c9637a0d78..d8c7746c94 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-29 +%global ver 2025-04-30 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index d97ec54875..266c3be1db 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.29.164609 +Version: 2025.04.30.011940 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From fa685d8335b9dddbb3e36cc7a57cd2c73b8c0806 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 30 Apr 2025 02:49:38 +0000 Subject: [PATCH 0987/2977] bump(branch): astal-gtk --- anda/lib/astal/astal-gtk/astal-gtk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/astal/astal-gtk/astal-gtk.spec b/anda/lib/astal/astal-gtk/astal-gtk.spec index 1df8f90573..9c81c07791 100644 --- a/anda/lib/astal/astal-gtk/astal-gtk.spec +++ b/anda/lib/astal/astal-gtk/astal-gtk.spec @@ -1,5 +1,5 @@ -%global commit c96126c -%global commit_date 20250420 +%global commit 07583de +%global commit_date 20250430 Name: astal Version: 0^%commit_date.%commit From e8cbf5e00d79a45a9c9e871a2c2aa9c30e1f0e21 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 30 Apr 2025 04:47:26 +0000 Subject: [PATCH 0988/2977] bump: inputplumber --- anda/games/inputplumber/inputplumber.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index 84bfc4bc7d..c605bb442c 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.55.3 +Version: 0.56.0 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later From 34d5253769774e38506bffef4a564e9bd37f1e9b Mon Sep 17 00:00:00 2001 From: Gilver Date: Wed, 30 Apr 2025 06:01:50 -0500 Subject: [PATCH 0989/2977] fix(lightly-qt6): Import andax/bump_extras.rhai for update.rhai (#4557) Signed-off-by: Gilver --- anda/themes/lightly-qt6/update.rhai | 2 ++ 1 file changed, 2 insertions(+) diff --git a/anda/themes/lightly-qt6/update.rhai b/anda/themes/lightly-qt6/update.rhai index f969fd9229..36206e82eb 100644 --- a/anda/themes/lightly-qt6/update.rhai +++ b/anda/themes/lightly-qt6/update.rhai @@ -1,3 +1,5 @@ +import "andax/bump_extras.rhai" as bump; + fn main() { let branch = bump::as_bodhi_ver(labels.branch); let url = `https://bodhi.fedoraproject.org/updates/?search=qt6-6.&status=stable&releases=${branch}&rows_per_page=1&page=1`; From 17736a58c31b0c3d5cff7b27c67a2cf84972acdd Mon Sep 17 00:00:00 2001 From: Gilver Date: Wed, 30 Apr 2025 06:03:55 -0500 Subject: [PATCH 0990/2977] feat(nvidia-patch): Change requirement to allow use with DKMS package (#4552) Signed-off-by: Gilver --- anda/system/nvidia-patch/nvidia-patch.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/system/nvidia-patch/nvidia-patch.spec b/anda/system/nvidia-patch/nvidia-patch.spec index dcde587685..79ed492617 100644 --- a/anda/system/nvidia-patch/nvidia-patch.spec +++ b/anda/system/nvidia-patch/nvidia-patch.spec @@ -7,7 +7,7 @@ %global patches %{_datadir}/src/nvidia-patch Name: nvidia-patch Version: 0^%commit_date.%{shortcommit} -Release: 1%?dist +Release: 2%?dist Summary: NVENC and NvFBC patches for NVIDIA drivers License: EULA @@ -15,7 +15,7 @@ URL: https://github.com/keylase/nvidia-patch Source0: %{url}/archive/%{commit}.tar.gz BuildRequires: tar -Requires: akmod-nvidia +Requires: nvidia-kmod %description NVENC patch removes restriction on maximum number of simultaneous NVENC video encoding sessions imposed by Nvidia to consumer-grade GPUs. From 28a721d8134ee98c75dd9a912ae487c01a34f9a3 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 30 Apr 2025 12:52:29 +0000 Subject: [PATCH 0991/2977] bump: preview stable --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index f9fe450fe6..3cf536d3b0 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.184.7-pre +%global ver 0.183.13 # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index be799d201e..c52dab3913 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global rustflags_debuginfo 0 Name: zed -Version: 0.183.12 +Version: 0.183.13 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later From f2c468ea840e2ad8c6f9224b79d359e02045eabe Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 30 Apr 2025 13:28:31 +0000 Subject: [PATCH 0992/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 3cf536d3b0..c73b62b015 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.183.13 +%global ver 0.184.8-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ From 7203cecea65e975dfdf48819cce8366a31c8d5c1 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 30 Apr 2025 15:20:04 +0000 Subject: [PATCH 0993/2977] bump: lcevcdec --- anda/multimedia/lcevcdec/LCEVCdec.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/multimedia/lcevcdec/LCEVCdec.spec b/anda/multimedia/lcevcdec/LCEVCdec.spec index ce1cc0a618..d67c991ea3 100644 --- a/anda/multimedia/lcevcdec/LCEVCdec.spec +++ b/anda/multimedia/lcevcdec/LCEVCdec.spec @@ -16,8 +16,8 @@ %bcond docs 0 Name: LCEVCdec -Version: 3.3.5 -Release: 1%{?dist} +Version: 3.3.6 +Release: 1%?dist Summary: MPEG-5 LCEVC Decoder License: BSD-3-Clause-Clear URL: https://docs.v-nova.com/v-nova/lcevc/lcevc-sdk-overview From 9688234489cbcc94443057c5e31ef907a3aceebf Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 30 Apr 2025 17:16:38 +0000 Subject: [PATCH 0994/2977] bump: preview stable --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index c73b62b015..df5b1f2a63 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.184.8-pre +%global ver 0.185.0-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index c52dab3913..d63d1e6797 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global rustflags_debuginfo 0 Name: zed -Version: 0.183.13 +Version: 0.184.8 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later From 1ee289bab489fe6ea4e459e953a84cb2ea92357a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 30 Apr 2025 17:34:19 +0000 Subject: [PATCH 0995/2977] bump: mesa --- anda/lib/mesa/mesa.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index 0f6dbf0ada..7632314250 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -75,7 +75,7 @@ Summary: Mesa graphics libraries # This should not break anything by default as the Mesa stream is ***EXPLICITLY*** # disabled by default, and has to be enabled manually. See `terra/release/terra-mesa.repo` for details. Epoch: 1 -Version: 25.0.4 +Version: 25.0.5 Release: 1%?dist License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org From 694fcfac8c294cc1979ef17683bb6979fc06c45e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 30 Apr 2025 17:45:49 +0000 Subject: [PATCH 0996/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 959d935eb3..687bc21adb 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.666 +Version: 0.0.667 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 0be4c21dfd..e7a06725d9 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.666 +Version: 0.0.667 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 26ffb37a9ea38c8e460d4bd8a64a74825da0a2b8 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 30 Apr 2025 17:55:57 +0000 Subject: [PATCH 0997/2977] bump: nightly --- anda/system/readymade/nightly/readymade-nightly.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/system/readymade/nightly/readymade-nightly.spec b/anda/system/readymade/nightly/readymade-nightly.spec index acd37ce681..c9dee0ecde 100644 --- a/anda/system/readymade/nightly/readymade-nightly.spec +++ b/anda/system/readymade/nightly/readymade-nightly.spec @@ -1,5 +1,5 @@ -%global commit 73982b80058492404842524ebabe4cc1f2a99854 -%global commit_date 20250429 +%global commit b8adbe782eeb67a456714fd1ee66340e6b9bf04a +%global commit_date 20250430 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: readymade-nightly From 23a0de7300a78c434a3de833715e07c92ff0ed8b Mon Sep 17 00:00:00 2001 From: Gilver Date: Wed, 30 Apr 2025 13:03:28 -0500 Subject: [PATCH 0998/2977] add: Some more NVIDIA stuff (#4553) * add: Some more NVIDIA stuff * fix: Add arches in anda.hcl Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/lib/nvidia/libnvjitlink/anda.hcl | 9 ++ .../lib/nvidia/libnvjitlink/libnvjitlink.spec | 82 +++++++++++++++++ anda/lib/nvidia/libnvjitlink/nvjitlink.pc | 8 ++ anda/lib/nvidia/libnvjitlink/update.rhai | 3 + anda/lib/nvidia/libnvjpeg2k/anda.hcl | 9 ++ anda/lib/nvidia/libnvjpeg2k/libnvjpeg2k.spec | 91 +++++++++++++++++++ anda/lib/nvidia/libnvjpeg2k/nvjpeg2k.pc | 8 ++ anda/lib/nvidia/libnvjpeg2k/update.rhai | 5 + anda/lib/nvidia/nv-codec-headers/anda.hcl | 9 ++ .../nv-codec-headers/nv-codec-headers.spec | 37 ++++++++ anda/lib/nvidia/nv-codec-headers/update.rhai | 1 + 11 files changed, 262 insertions(+) create mode 100644 anda/lib/nvidia/libnvjitlink/anda.hcl create mode 100644 anda/lib/nvidia/libnvjitlink/libnvjitlink.spec create mode 100644 anda/lib/nvidia/libnvjitlink/nvjitlink.pc create mode 100644 anda/lib/nvidia/libnvjitlink/update.rhai create mode 100644 anda/lib/nvidia/libnvjpeg2k/anda.hcl create mode 100644 anda/lib/nvidia/libnvjpeg2k/libnvjpeg2k.spec create mode 100644 anda/lib/nvidia/libnvjpeg2k/nvjpeg2k.pc create mode 100644 anda/lib/nvidia/libnvjpeg2k/update.rhai create mode 100644 anda/lib/nvidia/nv-codec-headers/anda.hcl create mode 100644 anda/lib/nvidia/nv-codec-headers/nv-codec-headers.spec create mode 100644 anda/lib/nvidia/nv-codec-headers/update.rhai diff --git a/anda/lib/nvidia/libnvjitlink/anda.hcl b/anda/lib/nvidia/libnvjitlink/anda.hcl new file mode 100644 index 0000000000..76093f29e6 --- /dev/null +++ b/anda/lib/nvidia/libnvjitlink/anda.hcl @@ -0,0 +1,9 @@ +project pkg { + rpm { + spec = "libnvjitlink.spec" + } + labels { + subrepo = "nvidia" + updbranch = 1 + } +} diff --git a/anda/lib/nvidia/libnvjitlink/libnvjitlink.spec b/anda/lib/nvidia/libnvjitlink/libnvjitlink.spec new file mode 100644 index 0000000000..0b71abe311 --- /dev/null +++ b/anda/lib/nvidia/libnvjitlink/libnvjitlink.spec @@ -0,0 +1,82 @@ +%global debug_package %{nil} +%global __strip /bin/true +%global _missing_build_ids_terminate_build 0 +%global _build_id_links none +%global major_package_version 12-8 + +Name: libnvjitlink +Epoch: 1 +Version: 12.8.61 +Release: 1%{?dist} +Summary: NVIDIA compiler library for JIT LTO functionality +License: CUDA Toolkit +URL: https://developer.nvidia.com/cuda-toolkit +ExclusiveArch: x86_64 aarch64 + +Source0: https://developer.download.nvidia.com/compute/cuda/redist/%{name}/linux-x86_64/%{name}-linux-x86_64-%{version}-archive.tar.xz +Source1: https://developer.download.nvidia.com/compute/cuda/redist/%{name}/linux-sbsa/%{name}-linux-sbsa-%{version}-archive.tar.xz +Source3: nvjitlink.pc + +Conflicts: %{name}-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release} + +%description +NVJIT link compiler LTO functionality native runtime library. +Just-in-time link-time-optimization (JIT LTO) allows developers to proved +runtime linking of specialized kernel functions with no-call overhead. + +%package devel +Summary: Development files for NVIDIA compiler library for JIT LTO functionality +Requires: %{name}%{_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Conflicts: %{name}-devel-%{major_package_version} < %{?epoch:%{epoch}:}%{version} + +%description devel +This package provides development files for the CUDA NVIDIA compiler library for +JIT LTO functionality. + +%package static +Summary: Static libraries for NVIDIA compiler library for JIT LTO functionality +Requires: %{name}-devel%{_isa} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description static +This package contains static libraries for NVIDIA compiler library for JIT LTO +functionality. + +%prep +%ifarch x86_64 +%setup -q -n %{name}-linux-x86_64-%{version}-archive +%endif + +%ifarch aarch64 +%setup -q -T -b 1 -n %{name}-linux-sbsa-%{version}-archive +%endif + +%install +mkdir -p %{buildroot}%{_includedir} +mkdir -p %{buildroot}%{_libdir} +mkdir -p %{buildroot}%{_libdir}/pkgconfig/ + +cp -fr include/* %{buildroot}%{_includedir}/ +cp -fr lib/lib* %{buildroot}%{_libdir}/ +cp -fr %{SOURCE3} %{buildroot}/%{_libdir}/pkgconfig/ + +# Set proper variables +sed -i \ + -e 's|CUDA_VERSION|%{version}|g' \ + -e 's|LIBDIR|%{_libdir}|g' \ + -e 's|INCLUDE_DIR|%{_includedir}|g' \ + %{buildroot}/%{_libdir}/pkgconfig/*.pc + +%files +%license LICENSE +%{_libdir}/libnvJitLink.so.* + +%files devel +%{_includedir}/nvJitLink.h +%{_libdir}/libnvJitLink.so +%{_libdir}/pkgconfig/nvjitlink.pc + +%files static +%{_libdir}/libnvJitLink_static.a + +%changelog +%autochangelog diff --git a/anda/lib/nvidia/libnvjitlink/nvjitlink.pc b/anda/lib/nvidia/libnvjitlink/nvjitlink.pc new file mode 100644 index 0000000000..cf0c87d5ad --- /dev/null +++ b/anda/lib/nvidia/libnvjitlink/nvjitlink.pc @@ -0,0 +1,8 @@ +libdir=LIBDIR +includedir=INCLUDE_DIR + +Name: NVIDIA compiler library for JIT LTO functionality +Description: NVIDIA JIT LTO +Version: CUDA_VERSION +Libs: -L${libdir} -lnvjitlink +Cflags: -I${includedir} diff --git a/anda/lib/nvidia/libnvjitlink/update.rhai b/anda/lib/nvidia/libnvjitlink/update.rhai new file mode 100644 index 0000000000..1c6cb5c513 --- /dev/null +++ b/anda/lib/nvidia/libnvjitlink/update.rhai @@ -0,0 +1,3 @@ +import "andax/nvidia.rhai" as nvidia; + +rpm.version(nvidia::nvidia_component_version("libnvjitlink")); diff --git a/anda/lib/nvidia/libnvjpeg2k/anda.hcl b/anda/lib/nvidia/libnvjpeg2k/anda.hcl new file mode 100644 index 0000000000..04a60b590e --- /dev/null +++ b/anda/lib/nvidia/libnvjpeg2k/anda.hcl @@ -0,0 +1,9 @@ +project pkg { + rpm { + spec = "libnvjpeg2k.spec" + } + labels { + subrepo = "nvidia" + updbranch = 1 + } +} diff --git a/anda/lib/nvidia/libnvjpeg2k/libnvjpeg2k.spec b/anda/lib/nvidia/libnvjpeg2k/libnvjpeg2k.spec new file mode 100644 index 0000000000..81865dbd4e --- /dev/null +++ b/anda/lib/nvidia/libnvjpeg2k/libnvjpeg2k.spec @@ -0,0 +1,91 @@ +%global debug_package %{nil} +%global __strip /bin/true +%global _missing_build_ids_terminate_build 0 + +Name: libnvjpeg2k +Version: 0.8.1.40 +Release: 1%{?dist} +Summary: NVIDIA JPEG 2K decoder (nvJPEG2000) +License: NVIDIA EULA +URL: https://developer.nvidia.com/nvjpeg +ExclusiveArch: aarch64 x86_64 + +# https://developer.nvidia.com/nvjpeg2000/downloads +Source0: https://developer.download.nvidia.com/compute/nvjpeg2000/redist/libnvjpeg_2k/linux-x86_64/libnvjpeg_2k-linux-x86_64-%{version}-archive.tar.xz +Source1: https://developer.download.nvidia.com/compute/nvjpeg2000/redist/libnvjpeg_2k/linux-sbsa/libnvjpeg_2k-linux-sbsa-%{version}-archive.tar.xz +Source2: nvjpeg2k.pc + +Obsoletes: cuda-nvjpeg2k < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: cuda-nvjpeg2k = %{?epoch:%{epoch}:}%{version}-%{release} + +Conflicts: libnvjpeg2k0 < %{?epoch:%{epoch}:}%{version}-%{release} + +%description +The nvJPEG2000 library accelerates the decoding of JPEG 2000 images on NVIDIA +GPUs. The library utilizes both CPU and GPU for decoding. Tier 2 decode stage +(First stage of decode, refer to the JPEG 2000 specification for details.) is +run on the CPU. All other stages of the decoding process are offloaded to the +GPU. + +%package devel +Summary: Development files for NVIDIA JPEG 2K decoder (nvJPEG2000) +Requires: %{name}%{_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: cuda-devel%{_isa} >= 1:11 +Conflicts: libnvjpeg2k-devel < %{?epoch:%{epoch}:}%{version} + +%description devel +This package provides development files for the NVIDIA JPEG 2K decoder (nvJPEG2000). + +%package static +Summary: Static libraries for NVIDIA JPEG 2K decoder (nvJPEG2000) +Requires: pkgconf-pkg-config +Requires: %{name}-devel%{_isa} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description static +This package contains static libraries for NVIDIA JPEG 2K decoder (nvJPEG2000). + +%prep +%ifarch x86_64 +%setup -q -n libnvjpeg_2k-linux-x86_64-%{version}-archive +%endif + +%ifarch aarch64 +%setup -q -T -b 1 -n libnvjpeg_2k-linux-sbsa-%{version}-archive +%endif + +%build + +%install +mkdir -p %{buildroot}/%{_libdir}/pkgconfig/ +mkdir -p %{buildroot}/%{_includedir}/cuda/ + +cp -a lib/12/* %{buildroot}/%{_libdir}/ +chmod 755 %{buildroot}/%{_libdir}/*.so* + +cp -a include/* %{buildroot}/%{_includedir}/ +chmod 644 %{buildroot}/%{_includedir}/* + +install -pm 644 %{SOURCE2} %{buildroot}/%{_libdir}/pkgconfig/ + +# Set proper variables +sed -i \ + -e 's|VERSION|%{version}|g' \ + -e 's|LIBDIR|%{_libdir}|g' \ + -e 's|INCLUDE_DIR|%{_includedir}/cuda|g' \ + %{buildroot}/%{_libdir}/pkgconfig/*.pc + +%files +%license LICENSE +%{_libdir}/libnvjpeg2k.so.* + +%files static +%{_libdir}/libnvjpeg2k_static.a + +%files devel +%{_includedir}/nvjpeg2k.h +%{_includedir}/nvjpeg2k_version.h +%{_libdir}/libnvjpeg2k.so +%{_libdir}/pkgconfig/nvjpeg2k.pc + +%changelog +%autochangelog diff --git a/anda/lib/nvidia/libnvjpeg2k/nvjpeg2k.pc b/anda/lib/nvidia/libnvjpeg2k/nvjpeg2k.pc new file mode 100644 index 0000000000..1bb7a610ba --- /dev/null +++ b/anda/lib/nvidia/libnvjpeg2k/nvjpeg2k.pc @@ -0,0 +1,8 @@ +libdir=LIBDIR +includedir=INCLUDE_DIR + +Name: nvjpeg2k +Description: NVIDIA JPEG 2K decoder +Version: VERSION +Libs: -L${libdir} -lnvjpeg2k +Cflags: -I${includedir} diff --git a/anda/lib/nvidia/libnvjpeg2k/update.rhai b/anda/lib/nvidia/libnvjpeg2k/update.rhai new file mode 100644 index 0000000000..5704b3666b --- /dev/null +++ b/anda/lib/nvidia/libnvjpeg2k/update.rhai @@ -0,0 +1,5 @@ +let url = "https://developer.download.nvidia.com/compute/nvjpeg2000/redist/"; +let matches = find_all("redistrib_[\\d.]+.json", get(url)); +let series = `${url}${matches[matches.len - 1][0]}`; +let json = get(series).json(); +rpm.version(json["libnvjpeg_2k"]["version"]); diff --git a/anda/lib/nvidia/nv-codec-headers/anda.hcl b/anda/lib/nvidia/nv-codec-headers/anda.hcl new file mode 100644 index 0000000000..d2d4b12019 --- /dev/null +++ b/anda/lib/nvidia/nv-codec-headers/anda.hcl @@ -0,0 +1,9 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "nv-codec-headers.spec" + } + labels { + subrepo = "nvidia" + } +} diff --git a/anda/lib/nvidia/nv-codec-headers/nv-codec-headers.spec b/anda/lib/nvidia/nv-codec-headers/nv-codec-headers.spec new file mode 100644 index 0000000000..dedf277a7c --- /dev/null +++ b/anda/lib/nvidia/nv-codec-headers/nv-codec-headers.spec @@ -0,0 +1,37 @@ +Name: nv-codec-headers +Version: 13.0.19.0 +Release: 1%{?dist} +Summary: FFmpeg version of Nvidia Codec SDK headers +License: MIT +URL: https://github.com/FFmpeg/nv-codec-headers +BuildArch: noarch + +Source0: %url/archive/n%{version}/%{name}-n%{version}.tar.gz + +BuildRequires: make + +%description +FFmpeg version of headers required to interface with Nvidias codec APIs. + +%prep +%autosetup -n %{name}-n%{version} +sed -i -e 's@/include@/include/ffnvcodec@g' ffnvcodec.pc.in + +# Extract license +sed -n '4,25p' include/ffnvcodec/nvEncodeAPI.h > LICENSE +sed -i '1,22s/^.\{,3\}//' LICENSE + +%build +%make_build PREFIX=%{_prefix} LIBDIR=/share + +%install +%make_install PREFIX=%{_prefix} LIBDIR=/share + +%files +%doc README +%license LICENSE +%{_includedir}/ffnvcodec/ +%{_datadir}/pkgconfig/ffnvcodec.pc + +%changelog +%autochangelog diff --git a/anda/lib/nvidia/nv-codec-headers/update.rhai b/anda/lib/nvidia/nv-codec-headers/update.rhai new file mode 100644 index 0000000000..fe990f0086 --- /dev/null +++ b/anda/lib/nvidia/nv-codec-headers/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("FFmpeg/nv-codec-headers")); From 8d75eecabee0aced92d4ec1f85f898322901ac89 Mon Sep 17 00:00:00 2001 From: Gilver Date: Wed, 30 Apr 2025 13:04:30 -0500 Subject: [PATCH 0999/2977] fix(steam): Remove broken .desktop file flags (#4567) Signed-off-by: Gilver --- anda/games/steam/steam.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/anda/games/steam/steam.spec b/anda/games/steam/steam.spec index 95ffa20dde..66ed1964fe 100644 --- a/anda/games/steam/steam.spec +++ b/anda/games/steam/steam.spec @@ -5,7 +5,7 @@ Name: steam Version: 1.0.0.82 -Release: 3%?dist +Release: 4%?dist Summary: Installer for the Steam software distribution service # Redistribution and repackaging for Linux is allowed, see license file. udev rules are MIT. License: Steam License Agreement and MIT @@ -179,6 +179,10 @@ install -m 644 -p %{SOURCE7} %{buildroot}%{_prefix}/lib/systemd/system.conf.d/ install -m 644 -p %{SOURCE7} %{buildroot}%{_prefix}/lib/systemd/user.conf.d/ install -m 775 -p %{SOURCE9} %{buildroot}%{_bindir}/steamrestart +# https://github.com/ValveSoftware/steam-for-linux/issues/9940 +desktop-file-edit --remove-key=PrefersNonDefaultGPU %{buildroot}%{_datadir}/applications/%{name}.desktop +desktop-file-edit --remove-key=X-KDE-RunOnDiscreteGpu %{buildroot}%{_datadir}/applications/%{name}.desktop + %check desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{appstream_id}.metainfo.xml From 367d8ed927e145fc8dffce8c49ccda4ad2bed55b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 30 Apr 2025 18:26:12 +0000 Subject: [PATCH 1000/2977] bump(branch): libnvjitlink --- anda/lib/nvidia/libnvjitlink/libnvjitlink.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/nvidia/libnvjitlink/libnvjitlink.spec b/anda/lib/nvidia/libnvjitlink/libnvjitlink.spec index 0b71abe311..31a5cc9100 100644 --- a/anda/lib/nvidia/libnvjitlink/libnvjitlink.spec +++ b/anda/lib/nvidia/libnvjitlink/libnvjitlink.spec @@ -6,8 +6,8 @@ Name: libnvjitlink Epoch: 1 -Version: 12.8.61 -Release: 1%{?dist} +Version: 12.8.93 +Release: 1%?dist Summary: NVIDIA compiler library for JIT LTO functionality License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit From a71f6cb33a8294d0deb94393171cb5c86bd57990 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 30 Apr 2025 18:29:56 +0000 Subject: [PATCH 1001/2977] bump: nv-codec-headers --- anda/lib/nvidia/nv-codec-headers/nv-codec-headers.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/nvidia/nv-codec-headers/nv-codec-headers.spec b/anda/lib/nvidia/nv-codec-headers/nv-codec-headers.spec index dedf277a7c..30a391a5e9 100644 --- a/anda/lib/nvidia/nv-codec-headers/nv-codec-headers.spec +++ b/anda/lib/nvidia/nv-codec-headers/nv-codec-headers.spec @@ -1,6 +1,6 @@ Name: nv-codec-headers -Version: 13.0.19.0 -Release: 1%{?dist} +Version: n13.0.19.0 +Release: 1%?dist Summary: FFmpeg version of Nvidia Codec SDK headers License: MIT URL: https://github.com/FFmpeg/nv-codec-headers From 653e60155b74efb7c7d49943155d3087dd5fc38c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 30 Apr 2025 22:26:17 +0000 Subject: [PATCH 1002/2977] bump: tdlib electron --- anda/lib/tdlib/tdlib-nightly.spec | 4 ++-- anda/tools/electron/electron.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index aea5c75403..746d339650 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,6 +1,6 @@ -%global commit 971684a3dcc7bdf99eec024e1c4f57ae729d6d53 +%global commit d7831d9290d9208dd3e5d880d201cd8c8783ad69 %global ver 1.8.47 -%global commit_date 20250423 +%global commit_date 20250430 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: tdlib-nightly diff --git a/anda/tools/electron/electron.spec b/anda/tools/electron/electron.spec index b81109c317..812a1abc21 100644 --- a/anda/tools/electron/electron.spec +++ b/anda/tools/electron/electron.spec @@ -12,7 +12,7 @@ %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so Name: electron -Version: 36.0.0 +Version: 36.0.1 Release: 1%?dist Summary: Build cross platform desktop apps with web technologies License: MIT From f83b92d1a2d978f383ea9c0488964e31acaddd42 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 30 Apr 2025 22:42:02 +0000 Subject: [PATCH 1003/2977] bump: tdlib yt-dlp --- anda/lib/tdlib/tdlib-nightly.spec | 4 ++-- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 746d339650..73bd7aae1e 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,5 +1,5 @@ -%global commit d7831d9290d9208dd3e5d880d201cd8c8783ad69 -%global ver 1.8.47 +%global commit b8b08b02dbbc0c05e7129e2f306c636c5b8ec04f +%global ver 1.8.48 %global commit_date 20250430 %global shortcommit %(c=%{commit}; echo ${c:0:7}) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 266c3be1db..3d288f7589 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.30.011940 +Version: 2025.04.30.222758 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From aec1891e8289a3dafe82596c8d9c8b996d7c1435 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 30 Apr 2025 23:17:57 +0000 Subject: [PATCH 1004/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 3d288f7589..251dec6106 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.30.222758 +Version: 2025.04.30.230140 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 5741892634fb636ce167478bd3d94901d9d1cea5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 1 May 2025 01:45:51 +0000 Subject: [PATCH 1005/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index d8c7746c94..9d0e42fe07 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-04-30 +%global ver 2025-05-01 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 7952e692c514ec31700f8e82534e0087ae1e5e89 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 1 May 2025 01:56:49 +0000 Subject: [PATCH 1006/2977] bump(nightly): nightly nightly prismlauncher-nightly nim-nightly --- anda/devs/ghostty/nightly/ghostty-nightly.spec | 2 +- anda/devs/zed/nightly/zed-nightly.spec | 6 +++--- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 4253f46f25..74bb0c972a 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,4 +1,4 @@ -%global commit b3edc88010e38946072a58fe336081ed104c9d44 +%global commit 2b4f1f8b84ac7960ecd4b9d06bc11cf47f0b9ee9 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global fulldate 2025-04-30 %global commit_date %(echo %{fulldate} | sed 's/-//g') diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 92c3278c2e..3ae5443897 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,7 +1,7 @@ -%global commit b4732235e31cbce6d38388b3ea32852159fa91d0 +%global commit 1bf9e15f2631f930c43c60557c59a6a9fabdb158 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250430 -%global ver 0.185.0 +%global commit_date 20250501 +%global ver 0.186.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 6fb2a4c8bd..b2cbca5ce9 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit f086233186b769eff3273555cf20a0a3164a9054 +%global commit d88d32b917e99cd26dc9a40ab24bec06337f90ca %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250430 +%global commit_date 20250501 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index e8663e571a..dba39c97e3 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 0506d5b973ee5bc2dfb1a1001e634c88aa15a2ad +%global commit b5b7a127fd92349a1517d2c7e7a4f25a532fac59 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250430 +%global commit_date 20250501 %global debug_package %nil Name: nim-nightly From ab771b7737ade2671224e9a58a639b5b64fa449b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 1 May 2025 03:09:35 +0000 Subject: [PATCH 1007/2977] bump: gh-act --- anda/langs/go/gh-act/gh-act.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/go/gh-act/gh-act.spec b/anda/langs/go/gh-act/gh-act.spec index e32dbfb0a1..4aa6dd5d88 100644 --- a/anda/langs/go/gh-act/gh-act.spec +++ b/anda/langs/go/gh-act/gh-act.spec @@ -12,7 +12,7 @@ # https://github.com/nektos/act %global goipath github.com/nektos/act -Version: 0.2.76 +Version: 0.2.77 %gometa -f From 240d87bfc47f0cd7b192095e0bcd48d6372f6c6a Mon Sep 17 00:00:00 2001 From: Gilver Date: Wed, 30 Apr 2025 22:11:34 -0500 Subject: [PATCH 1008/2977] fix: nv-codec-headers update.rhai (#4577) --- anda/lib/nvidia/nv-codec-headers/update.rhai | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/anda/lib/nvidia/nv-codec-headers/update.rhai b/anda/lib/nvidia/nv-codec-headers/update.rhai index fe990f0086..2a9e78536f 100644 --- a/anda/lib/nvidia/nv-codec-headers/update.rhai +++ b/anda/lib/nvidia/nv-codec-headers/update.rhai @@ -1 +1,3 @@ -rpm.version(gh("FFmpeg/nv-codec-headers")); +let v = gh("FFmpeg/nv-codec-headers"); +v.crop(1); +rpm.version(v); From 8ed4936950c74cefde89ef52ccd4747a1ef9b9f9 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 1 May 2025 03:53:26 +0000 Subject: [PATCH 1009/2977] bump: nv-codec-headers --- anda/lib/nvidia/nv-codec-headers/nv-codec-headers.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/nvidia/nv-codec-headers/nv-codec-headers.spec b/anda/lib/nvidia/nv-codec-headers/nv-codec-headers.spec index 30a391a5e9..2725df6a58 100644 --- a/anda/lib/nvidia/nv-codec-headers/nv-codec-headers.spec +++ b/anda/lib/nvidia/nv-codec-headers/nv-codec-headers.spec @@ -1,5 +1,5 @@ Name: nv-codec-headers -Version: n13.0.19.0 +Version: 13.0.19.0 Release: 1%?dist Summary: FFmpeg version of Nvidia Codec SDK headers License: MIT From 214328b26a8045abdc83f46012b1f92bc8272d08 Mon Sep 17 00:00:00 2001 From: Gilver Date: Thu, 1 May 2025 00:22:08 -0500 Subject: [PATCH 1010/2977] refactor(ruffle, heroic): Use desktop-file-utils to more safely edit .desktop files (#4568) * refactor(ruffle-nightly): Use desktop-file-utils to more safely edit the .desktop file Signed-off-by: Gilver * refactor(heroic): Use desktop-file-utils to more safely edit the desktop file, rename some things to edit the desktop file less Signed-off-by: Gilver * fix(heroic): Also rename files section Signed-off-by: Gilver * refactor(heroic): Make the entry more similar to the original Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/apps/ruffle/ruffle-nightly.spec | 8 +++- .../heroic-games-launcher.spec | 44 +++++++++---------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 9d0e42fe07..8ed50d5340 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -9,7 +9,7 @@ language. Ruffle targets both the desktop and the web using WebAssembly.} Name: ruffle-nightly Version: %goodver -Release: 1%?dist +Release: 2%?dist Summary: A Flash Player emulator written in Rust License: Apache-2.0 OR MIT URL: https://ruffle.rs/ @@ -17,6 +17,7 @@ Source0: https://github.com/ruffle-rs/ruffle/archive/refs/tags/nightly-%v Provides: ruffle BuildRequires: cargo-rpm-macros >= 24 BuildRequires: anda-srpm-macros mold +BuildRequires: desktop-file-utils BuildRequires: gcc-c++ cmake java BuildRequires: java-latest-openjdk-headless BuildRequires: pkgconfig(alsa) @@ -39,7 +40,7 @@ Packager: madonuko %prep %autosetup -n ruffle-nightly-%ver -p1 %cargo_prep_online -sed -iE 's@^Exec=ruffle %%u$@Exec=ruffle_desktop %%u@' desktop/packages/linux/rs.ruffle.Ruffle.desktop +desktop-file-edit --set-key=Exec --set-value="ruffle_desktop %u" desktop/packages/linux/rs.ruffle.Ruffle.desktop cat desktop/packages/linux/rs.ruffle.Ruffle.desktop %build @@ -52,6 +53,9 @@ install -Dm644 packages/linux/rs.ruffle.Ruffle.svg %buildroot%_iconsdir/hicolor/ install -Dm644 packages/linux/rs.ruffle.Ruffle.desktop %buildroot%_datadir/applications/rs.ruffle.Ruffle.desktop install -Dm644 packages/linux/rs.ruffle.Ruffle.metainfo.xml %buildroot%_metainfodir/rs.ruffle.Ruffle.metainfo.xml +%check +desktop-file-validate %buildroot%_datadir/applications/rs.ruffle.Ruffle.desktop + %changelog * Mon Jul 29 2024 madonuko - Initial package diff --git a/anda/games/heroic-games-launcher/heroic-games-launcher.spec b/anda/games/heroic-games-launcher/heroic-games-launcher.spec index 35ed2f1365..04d1cee3b2 100644 --- a/anda/games/heroic-games-launcher/heroic-games-launcher.spec +++ b/anda/games/heroic-games-launcher/heroic-games-launcher.spec @@ -17,7 +17,7 @@ Name: %{shortname}-games-launcher Version: 2.16.1 -Release: 3%?dist +Release: 4%?dist Summary: A games launcher for GOG, Amazon, and Epic Games License: GPL-3.0-only AND MIT AND BSD-3-Clause URL: https://heroicgameslauncher.com @@ -31,7 +31,6 @@ BuildRequires: make BuildRequires: nodejs BuildRequires: pnpm BuildRequires: python3 -BuildRequires: sed Requires: alsa-lib Requires: gtk3 Requires: hicolor-icon-theme @@ -52,8 +51,7 @@ Heroic is a Free and Open Source Epic, GOG, and Amazon Prime Games launcher for %prep %git_clone https://github.com/%{org_name}/%{git_name} v%{version} -sed -i 's/Exec=.*%u/Exec=\/usr\/share\/%{shortname}\/%{shortname} %U/g' flatpak/%{reverse_dns}.desktop -sed -i 's/Icon=.*/Icon=%{shortname}/g' flatpak/%{reverse_dns}.desktop +desktop-file-edit --set-key=Exec --set-value="/usr/share/%{shortname}/%{shortname} %u" flatpak/%{reverse_dns}.desktop %build pnpm install @@ -78,18 +76,18 @@ mkdir -p %{buildroot}%{_bindir} # Make names executable ln -sr %{_datadir}/%{shortname}/%{shortname} %{buildroot}%{_bindir}/%{name} ln -sr %{_datadir}/%{shortname}/%{shortname} %{buildroot}%{_bindir}/%{shortname} -install -Dm644 dist/.icon-set/icon_16x16.png %{buildroot}%{_iconsdir}/hicolor/16x16/apps/%{shortname}.png -install -Dm644 dist/.icon-set/icon_32x32.png %{buildroot}%{_iconsdir}/hicolor/32x32/apps/%{shortname}.png -install -Dm644 dist/.icon-set/icon_48x48.png %{buildroot}%{_iconsdir}/hicolor/48x48/apps/%{shortname}.png -install -Dm644 dist/.icon-set/icon_64x64.png %{buildroot}%{_iconsdir}/hicolor/64x64/apps/%{shortname}.png -install -Dm644 dist/.icon-set/icon_128x128.png %{buildroot}%{_iconsdir}/hicolor/128x128/apps/%{shortname}.png -install -Dm644 dist/.icon-set/icon_256x256.png %{buildroot}%{_iconsdir}/hicolor/256x256/apps/%{shortname}.png -install -Dm644 dist/.icon-set/icon_512x512.png %{buildroot}%{_iconsdir}/hicolor/512x512/apps/%{shortname}.png -install -Dm644 dist/.icon-set/icon_1024.png %{buildroot}%{_iconsdir}/hicolor/1024x1024/apps/%{shortname}.png -install -Dm644 flatpak/%{reverse_dns}.desktop %{buildroot}%{_datadir}/applications/%{shortname}.desktop +install -Dm644 dist/.icon-set/icon_16x16.png %{buildroot}%{_iconsdir}/hicolor/16x16/apps/%{reverse_dns}.png +install -Dm644 dist/.icon-set/icon_32x32.png %{buildroot}%{_iconsdir}/hicolor/32x32/apps/%{reverse_dns}.png +install -Dm644 dist/.icon-set/icon_48x48.png %{buildroot}%{_iconsdir}/hicolor/48x48/apps/%{reverse_dns}.png +install -Dm644 dist/.icon-set/icon_64x64.png %{buildroot}%{_iconsdir}/hicolor/64x64/apps/%{reverse_dns}.png +install -Dm644 dist/.icon-set/icon_128x128.png %{buildroot}%{_iconsdir}/hicolor/128x128/apps/%{reverse_dns}.png +install -Dm644 dist/.icon-set/icon_256x256.png %{buildroot}%{_iconsdir}/hicolor/256x256/apps/%{reverse_dns}.png +install -Dm644 dist/.icon-set/icon_512x512.png %{buildroot}%{_iconsdir}/hicolor/512x512/apps/%{reverse_dns}.png +install -Dm644 dist/.icon-set/icon_1024.png %{buildroot}%{_iconsdir}/hicolor/1024x1024/apps/%{reverse_dns}.png +install -Dm644 flatpak/%{reverse_dns}.desktop -t %{buildroot}%{_datadir}/applications/ %check -desktop-file-validate %{buildroot}%{_datadir}/applications/%{shortname}.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/%{reverse_dns}.desktop %files %doc README.md @@ -103,15 +101,15 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{shortname}.desktop %{_datadir}/%{shortname}/* %{_bindir}/%{shortname} %{_bindir}/%{name} -%{_datadir}/applications/%{shortname}.desktop -%{_iconsdir}/hicolor/16x16/apps/%{shortname}.png -%{_iconsdir}/hicolor/32x32/apps/%{shortname}.png -%{_iconsdir}/hicolor/48x48/apps/%{shortname}.png -%{_iconsdir}/hicolor/64x64/apps/%{shortname}.png -%{_iconsdir}/hicolor/128x128/apps/%{shortname}.png -%{_iconsdir}/hicolor/256x256/apps/%{shortname}.png -%{_iconsdir}/hicolor/512x512/apps/%{shortname}.png -%{_iconsdir}/hicolor/1024x1024/apps/%{shortname}.png +%{_datadir}/applications/%{reverse_dns}.desktop +%{_iconsdir}/hicolor/16x16/apps/%{reverse_dns}.png +%{_iconsdir}/hicolor/32x32/apps/%{reverse_dns}.png +%{_iconsdir}/hicolor/48x48/apps/%{reverse_dns}.png +%{_iconsdir}/hicolor/64x64/apps/%{reverse_dns}.png +%{_iconsdir}/hicolor/128x128/apps/%{reverse_dns}.png +%{_iconsdir}/hicolor/256x256/apps/%{reverse_dns}.png +%{_iconsdir}/hicolor/512x512/apps/%{reverse_dns}.png +%{_iconsdir}/hicolor/1024x1024/apps/%{reverse_dns}.png %changelog * Sun Mar 02 2025 Gilver E. From af216950cab63ffa73062d1c6dbd3d81a69072c7 Mon Sep 17 00:00:00 2001 From: Gilver Date: Thu, 1 May 2025 00:23:08 -0500 Subject: [PATCH 1011/2977] chore: Remove kmod-nvidia from Fedora branches (#4579) --- anda/system/nvidia/kmod-nvidia/anda.hcl | 9 -- .../kmod-nvidia/kmod-nvidia-ldflags.patch | 37 ------ .../kmod-nvidia-no-hostname-whoami.patch | 27 ---- .../nvidia/kmod-nvidia/kmod-nvidia.spec | 98 --------------- .../kmod-nvidia/nvidia-kernel-ccflags-y.patch | 117 ------------------ anda/system/nvidia/kmod-nvidia/update.rhai | 1 - 6 files changed, 289 deletions(-) delete mode 100644 anda/system/nvidia/kmod-nvidia/anda.hcl delete mode 100644 anda/system/nvidia/kmod-nvidia/kmod-nvidia-ldflags.patch delete mode 100644 anda/system/nvidia/kmod-nvidia/kmod-nvidia-no-hostname-whoami.patch delete mode 100644 anda/system/nvidia/kmod-nvidia/kmod-nvidia.spec delete mode 100644 anda/system/nvidia/kmod-nvidia/nvidia-kernel-ccflags-y.patch delete mode 100644 anda/system/nvidia/kmod-nvidia/update.rhai diff --git a/anda/system/nvidia/kmod-nvidia/anda.hcl b/anda/system/nvidia/kmod-nvidia/anda.hcl deleted file mode 100644 index 3aa67f1119..0000000000 --- a/anda/system/nvidia/kmod-nvidia/anda.hcl +++ /dev/null @@ -1,9 +0,0 @@ -project pkg { - rpm { - spec = "kmod-nvidia.spec" - } - labels { - subrepo = "nvidia" - mock = 1 - } -} diff --git a/anda/system/nvidia/kmod-nvidia/kmod-nvidia-ldflags.patch b/anda/system/nvidia/kmod-nvidia/kmod-nvidia-ldflags.patch deleted file mode 100644 index 7c6358c2a9..0000000000 --- a/anda/system/nvidia/kmod-nvidia/kmod-nvidia-ldflags.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 38b7e1478b58b983724ec817562301edd5c244a2 Mon Sep 17 00:00:00 2001 -From: Neal Gompa -Date: Mon, 7 Apr 2025 19:34:49 -0400 -Subject: [PATCH] src/nvidia/Makefile: Drop broken addition of userspace linker - flags - -The Makefile currently causes the package build of the kernel modules -to fail with the following error: - -ld: unrecognized option '-Wl,-z,relro' -ld: use the --help option for usage information -make[1]: *** [Makefile:214: _out/Linux_x86_64/nv-kernel.o] Error 1 -make: *** [Makefile:34: src/nvidia/_out/Linux_x86_64/nv-kernel.o] Error 2 - -Dropping this line fixes this issue. - -Signed-off-by: Neal Gompa ---- - src/nvidia/Makefile | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/nvidia/Makefile b/src/nvidia/Makefile -index 931a74c0..423414af 100644 ---- a/src/nvidia/Makefile -+++ b/src/nvidia/Makefile -@@ -208,8 +208,6 @@ all: $(NV_KERNEL_O) - - LINKER_SCRIPT = nv-kernel.ld - --NV_KERNEL_O_LDFLAGS += $(LDFLAGS) -- - $(NV_KERNEL_O): $(OBJS) $(EXPORTS_LINK_COMMAND) $(LINKER_SCRIPT) - $(call quiet_cmd,LD) \ - $(NV_KERNEL_O_LDFLAGS) \ --- -2.48.1 - diff --git a/anda/system/nvidia/kmod-nvidia/kmod-nvidia-no-hostname-whoami.patch b/anda/system/nvidia/kmod-nvidia/kmod-nvidia-no-hostname-whoami.patch deleted file mode 100644 index 59038ca030..0000000000 --- a/anda/system/nvidia/kmod-nvidia/kmod-nvidia-no-hostname-whoami.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur open-gpu-kernel-modules-570.133.07.old/utils.mk open-gpu-kernel-modules-570.133.07/utils.mk ---- open-gpu-kernel-modules-570.133.07.old/utils.mk 2025-04-12 15:13:09.368747667 +0200 -+++ open-gpu-kernel-modules-570.133.07/utils.mk 2025-04-12 15:14:11.297683469 +0200 -@@ -114,14 +114,8 @@ - CHMOD ?= chmod - OBJCOPY ?= objcopy - XZ ?= xz --WHOAMI ?= whoami - PKG_CONFIG ?= pkg-config - --ifndef HOSTNAME -- HOSTNAME = $(shell hostname) --endif -- -- - NV_AUTO_DEPEND ?= 1 - NV_VERBOSE ?= 0 - -@@ -551,7 +545,7 @@ - # g_nvid_string.c depends on all objects except g_nvid_string.o, and version.mk - $(NVIDSTRING): $$(filter-out $$(call BUILD_OBJECT_LIST,$$(NVIDSTRING)), $(3)) $$(VERSION_MK) - $(at_if_quiet)$$(MKDIR) $$(dir $$@) -- $(at_if_quiet)$$(ECHO) "const char $(1)[] = \"nvidia id: NVIDIA $$(strip $(2)) for $$(TARGET_ARCH) $$(NVIDIA_VERSION) $$(NVIDSTRING_BUILD_TYPE_STRING) (`$$(WHOAMI)`@$$(HOSTNAME)) `$$(DATE)`\";" > $$@ -+ $(at_if_quiet)$$(ECHO) "const char $(1)[] = \"nvidia id: NVIDIA $$(strip $(2)) for $$(TARGET_ARCH) $$(NVIDIA_VERSION) $$(NVIDSTRING_BUILD_TYPE_STRING) `$$(DATE)`\";" > $$@ - $(at_if_quiet)$$(ECHO) "const char *const p$$(strip $(1)) = $(1) + 11;" >> $$@; - endef - diff --git a/anda/system/nvidia/kmod-nvidia/kmod-nvidia.spec b/anda/system/nvidia/kmod-nvidia/kmod-nvidia.spec deleted file mode 100644 index f6815a441f..0000000000 --- a/anda/system/nvidia/kmod-nvidia/kmod-nvidia.spec +++ /dev/null @@ -1,98 +0,0 @@ -%global kmod_name nvidia - -%global debug_package %{nil} - -# Generate kernel symbols requirements: -%global _use_internal_dependency_generator 0 - -%{!?kversion: %global kversion %(uname -r)} - -Name: kmod-%{kmod_name} -Version: 575.51.02 -Release: 1%{?dist} -Summary: NVIDIA display driver kernel module -Epoch: 3 -License: NVIDIA License -URL: http://www.nvidia.com/ -ExclusiveArch: x86_64 aarch64 - -Source0: https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/%{version}.tar.gz -# Kbuild: Convert EXTRA_CFLAGS to ccflags-y (6.15+) + std=gnu17 -Patch0: nvidia-kernel-ccflags-y.patch -# https://git.almalinux.org/ngompa/nvidia-kmod-el-rpm/ -Patch1: %{name}-ldflags.patch -Patch2: %{name}-no-hostname-whoami.patch - -BuildRequires: elfutils-libelf-devel -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: kernel-abi-stablelists -BuildRequires: kernel-devel -BuildRequires: kernel-rpm-macros -BuildRequires: kmod -BuildRequires: redhat-rpm-config - -Provides: kabi-modules = %{kversion} -Provides: %{kmod_name}-kmod = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: module-init-tools - -%description -This package provides the proprietary NVIDIA kernel modules. It is built to -depend upon the specific ABI provided by a range of releases of the same variant -of the Linux kernel and not on any one specific build. - -%prep -%autosetup -p1 -n open-gpu-kernel-modules-%{version} - -echo "override %{kmod_name} * weak-updates/%{kmod_name}" > kmod-%{kmod_name}.conf - -%build -export SYSSRC=%{_usrsrc}/kernels/%{kversion} -export IGNORE_XEN_PRESENCE=1 -export IGNORE_PREEMPT_RT_PRESENCE=1 -export IGNORE_CC_MISMATCH=1 - -%make_build modules - -%install -export INSTALL_MOD_PATH=%{buildroot}%{_prefix} -export INSTALL_MOD_DIR=extra/%{kmod_name} - -make -C %{_usrsrc}/kernels/%{kversion} -j$(nproc) modules_install M=$PWD/kernel-open - -install -d %{buildroot}%{_sysconfdir}/depmod.d/ -install kmod-%{kmod_name}.conf %{buildroot}%{_sysconfdir}/depmod.d/ -# Remove the unrequired files. -rm -f %{buildroot}%{_prefix}/lib/modules/%{kversion}/modules.* - -find %{buildroot} -type f -name '*.ko' | xargs %{__strip} --strip-debug -find %{buildroot} -type f -name '*.ko' | xargs xz - -%post -if [ -e "/boot/System.map-%{kversion}" ]; then - %{_sbindir}/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || : -fi -modules=( $(find %{_prefix}/lib/modules/%{kversion}/extra/%{kmod_name} | grep '\.ko.xz$') ) -if [ -x "%{_sbindir}/weak-modules" ]; then - printf '%s\n' "${modules[@]}" | %{_sbindir}/weak-modules --add-modules -fi - -%preun -rpm -ql kmod-%{kmod_name}-%{version}-%{release}.%{_target_cpu} | grep '\.ko.xz$' > %{_var}/run/rpm-kmod-%{kmod_name}-modules - -%postun -if [ -e "/boot/System.map-%{kversion}" ]; then - %{_sbindir}/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || : -fi -modules=( $(cat /var/run/rpm-kmod-%{kmod_name}-modules) ) -rm %{_var}/run/rpm-kmod-%{kmod_name}-modules -if [ -x "%{_sbindir}/weak-modules" ]; then - printf '%s\n' "${modules[@]}" | %{_sbindir}/weak-modules --remove-modules -fi - -%files -%{_prefix}/lib/modules/%{kversion}/extra/* -%config %{_sysconfdir}/depmod.d/kmod-%{kmod_name}.conf - -%changelog -%autochangelog diff --git a/anda/system/nvidia/kmod-nvidia/nvidia-kernel-ccflags-y.patch b/anda/system/nvidia/kmod-nvidia/nvidia-kernel-ccflags-y.patch deleted file mode 100644 index 4f724a820a..0000000000 --- a/anda/system/nvidia/kmod-nvidia/nvidia-kernel-ccflags-y.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff -Naur open-gpu-kernel-modules-575.51.02.old/kernel-open/Kbuild open-gpu-kernel-modules-575.51.02/kernel-open/Kbuild ---- open-gpu-kernel-modules-575.51.02.old/kernel-open/Kbuild 2025-04-22 19:14:10.712973734 +0200 -+++ open-gpu-kernel-modules-575.51.02/kernel-open/Kbuild 2025-04-22 19:16:40.057981220 +0200 -@@ -75,21 +75,15 @@ - $(eval include $(src)/$(_module)/$(_module).Kbuild)) - - --# --# Define CFLAGS that apply to all the NVIDIA kernel modules. EXTRA_CFLAGS --# is deprecated since 2.6.24 in favor of ccflags-y, but we need to support --# older kernels which do not have ccflags-y. Newer kernels append --# $(EXTRA_CFLAGS) to ccflags-y for compatibility. --# -- --EXTRA_CFLAGS += -I$(src)/common/inc --EXTRA_CFLAGS += -I$(src) --EXTRA_CFLAGS += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-format-extra-args --EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DNVRM --EXTRA_CFLAGS += -DNV_VERSION_STRING=\"575.51.02\" -+ccflags-y += -std=gnu17 -+ccflags-y += -I$(src)/common/inc -+ccflags-y += -I$(src) -+ccflags-y += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-format-extra-args -+ccflags-y += -D__KERNEL__ -DMODULE -DNVRM -+ccflags-y += -DNV_VERSION_STRING=\"575.51.02\" - - ifneq ($(SYSSRCHOST1X),) -- EXTRA_CFLAGS += -I$(SYSSRCHOST1X) -+ ccflags-y += -I$(SYSSRCHOST1X) - endif - - # Some Android kernels prohibit driver use of filesystem functions like -@@ -99,57 +93,57 @@ - PLATFORM_IS_ANDROID ?= 0 - - ifeq ($(PLATFORM_IS_ANDROID),1) -- EXTRA_CFLAGS += -DNV_FILESYSTEM_ACCESS_AVAILABLE=0 -+ ccflags-y += -DNV_FILESYSTEM_ACCESS_AVAILABLE=0 - else -- EXTRA_CFLAGS += -DNV_FILESYSTEM_ACCESS_AVAILABLE=1 -+ ccflags-y += -DNV_FILESYSTEM_ACCESS_AVAILABLE=1 - endif - --EXTRA_CFLAGS += -Wno-unused-function -+ccflags-y += -Wno-unused-function - - ifneq ($(NV_BUILD_TYPE),debug) -- EXTRA_CFLAGS += -Wuninitialized -+ ccflags-y += -Wuninitialized - endif - --EXTRA_CFLAGS += -fno-strict-aliasing -+ccflags-y += -fno-strict-aliasing - - ifeq ($(ARCH),arm64) -- EXTRA_CFLAGS += -mstrict-align -+ ccflags-y += -mstrict-align - endif - - ifeq ($(NV_BUILD_TYPE),debug) -- EXTRA_CFLAGS += -g -+ ccflags-y += -g - endif - --EXTRA_CFLAGS += -ffreestanding -+ccflags-y += -ffreestanding - - ifeq ($(ARCH),arm64) -- EXTRA_CFLAGS += -mgeneral-regs-only -march=armv8-a -- EXTRA_CFLAGS += $(call cc-option,-mno-outline-atomics,) -+ ccflags-y += -mgeneral-regs-only -march=armv8-a -+ ccflags-y += $(call cc-option,-mno-outline-atomics,) - endif - - ifeq ($(ARCH),x86_64) -- EXTRA_CFLAGS += -mno-red-zone -mcmodel=kernel -+ ccflags-y += -mno-red-zone -mcmodel=kernel - endif - - ifeq ($(ARCH),powerpc) -- EXTRA_CFLAGS += -mlittle-endian -mno-strict-align -+ ccflags-y += -mlittle-endian -mno-strict-align - endif - --EXTRA_CFLAGS += -DNV_UVM_ENABLE --EXTRA_CFLAGS += $(call cc-option,-Werror=undef,) --EXTRA_CFLAGS += -DNV_SPECTRE_V2=$(NV_SPECTRE_V2) --EXTRA_CFLAGS += -DNV_KERNEL_INTERFACE_LAYER -+ccflags-y += -DNV_UVM_ENABLE -+ccflags-y += $(call cc-option,-Werror=undef,) -+ccflags-y += -DNV_SPECTRE_V2=$(NV_SPECTRE_V2) -+ccflags-y += -DNV_KERNEL_INTERFACE_LAYER - - # - # Detect SGI UV systems and apply system-specific optimizations. - # - - ifneq ($(wildcard /proc/sgi_uv),) -- EXTRA_CFLAGS += -DNV_CONFIG_X86_UV -+ ccflags-y += -DNV_CONFIG_X86_UV - endif - - ifdef VGX_FORCE_VFIO_PCI_CORE -- EXTRA_CFLAGS += -DNV_VGPU_FORCE_VFIO_PCI_CORE -+ ccflags-y += -DNV_VGPU_FORCE_VFIO_PCI_CORE - endif - - WARNINGS_AS_ERRORS ?= -@@ -183,7 +177,7 @@ - - NV_CFLAGS_FROM_CONFTEST := $(shell $(NV_CONFTEST_CMD) build_cflags) - --NV_CONFTEST_CFLAGS = $(NV_CFLAGS_FROM_CONFTEST) $(EXTRA_CFLAGS) -fno-pie -+NV_CONFTEST_CFLAGS = $(NV_CFLAGS_FROM_CONFTEST) $(ccflags-y) -fno-pie - NV_CONFTEST_CFLAGS += $(call cc-disable-warning,pointer-sign) - NV_CONFTEST_CFLAGS += $(call cc-option,-fshort-wchar,) - NV_CONFTEST_CFLAGS += $(call cc-option,-Werror=incompatible-pointer-types,) diff --git a/anda/system/nvidia/kmod-nvidia/update.rhai b/anda/system/nvidia/kmod-nvidia/update.rhai deleted file mode 100644 index f25d05da71..0000000000 --- a/anda/system/nvidia/kmod-nvidia/update.rhai +++ /dev/null @@ -1 +0,0 @@ -rpm.version(gh("NVIDIA/open-gpu-kernel-modules")); From 42e063cde484aca20deca17560119aae1f4c37ae Mon Sep 17 00:00:00 2001 From: Gilver Date: Thu, 1 May 2025 00:23:31 -0500 Subject: [PATCH 1012/2977] chore(steam): Make release number the same on all branches (#4576) Signed-off-by: Gilver --- anda/games/steam/steam.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/steam/steam.spec b/anda/games/steam/steam.spec index 66ed1964fe..726c4210ae 100644 --- a/anda/games/steam/steam.spec +++ b/anda/games/steam/steam.spec @@ -5,7 +5,7 @@ Name: steam Version: 1.0.0.82 -Release: 4%?dist +Release: 8%?dist Summary: Installer for the Steam software distribution service # Redistribution and repackaging for Linux is allowed, see license file. udev rules are MIT. License: Steam License Agreement and MIT From f4deac4a14936a266c2cd77adaf38804deb5d996 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 1 May 2025 12:57:22 +0000 Subject: [PATCH 1013/2977] bump: tdlib --- anda/lib/tdlib/tdlib-nightly.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 73bd7aae1e..7affb7e821 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,6 +1,6 @@ -%global commit b8b08b02dbbc0c05e7129e2f306c636c5b8ec04f +%global commit 25dcecabe2258d151c47c00c9f3c66e8ee5a9022 %global ver 1.8.48 -%global commit_date 20250430 +%global commit_date 20250501 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: tdlib-nightly From ad8ebc9a127df2f3ff84622d8863d47e79ae7c26 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 1 May 2025 13:30:41 +0000 Subject: [PATCH 1014/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index df5b1f2a63..66835f1e19 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.185.0-pre +%global ver 0.185.1-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ From 64862ae238f768d1b3a5ebb57b71a096593b4a70 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 1 May 2025 16:24:17 +0000 Subject: [PATCH 1015/2977] bump: lcevcdec --- anda/multimedia/lcevcdec/LCEVCdec.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/multimedia/lcevcdec/LCEVCdec.spec b/anda/multimedia/lcevcdec/LCEVCdec.spec index d67c991ea3..1d2ffd2926 100644 --- a/anda/multimedia/lcevcdec/LCEVCdec.spec +++ b/anda/multimedia/lcevcdec/LCEVCdec.spec @@ -16,7 +16,7 @@ %bcond docs 0 Name: LCEVCdec -Version: 3.3.6 +Version: 3.3.7 Release: 1%?dist Summary: MPEG-5 LCEVC Decoder License: BSD-3-Clause-Clear From 2a0f5574687e5e56854f03f698631938a6dd5496 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 1 May 2025 16:46:44 +0000 Subject: [PATCH 1016/2977] bump: nightly --- anda/system/readymade/nightly/readymade-nightly.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/system/readymade/nightly/readymade-nightly.spec b/anda/system/readymade/nightly/readymade-nightly.spec index c9dee0ecde..aa371edbe3 100644 --- a/anda/system/readymade/nightly/readymade-nightly.spec +++ b/anda/system/readymade/nightly/readymade-nightly.spec @@ -1,5 +1,5 @@ -%global commit b8adbe782eeb67a456714fd1ee66340e6b9bf04a -%global commit_date 20250430 +%global commit 61f0b3fb59658c7e6a7e134dbda573c6dd262ac4 +%global commit_date 20250501 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: readymade-nightly From 758150adca93dedb3f61f4df2d3964f67334696a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 1 May 2025 19:27:46 +0000 Subject: [PATCH 1017/2977] bump: discord-ptb-openasar discord-ptb --- anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec | 2 +- anda/apps/discord-ptb/discord-ptb.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec index 44776eb02b..4e5805122f 100644 --- a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec +++ b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-ptb-openasar -Version: 0.0.140 +Version: 0.0.141 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-ptb/discord-ptb.spec b/anda/apps/discord-ptb/discord-ptb.spec index 9cd68f9a9c..f26c0c2600 100644 --- a/anda/apps/discord-ptb/discord-ptb.spec +++ b/anda/apps/discord-ptb/discord-ptb.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-ptb -Version: 0.0.140 +Version: 0.0.141 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers. URL: https://discord.com From 1041c92215b4830ddae224aae75ca5d235403867 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 1 May 2025 21:17:58 +0000 Subject: [PATCH 1018/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 66835f1e19..316ac9e24c 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.185.1-pre +%global ver 0.185.2-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ From 0dbd81f5173858009b1d2b3b4435945e69d97863 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 2 May 2025 01:48:32 +0000 Subject: [PATCH 1019/2977] bump(nightly): nightly nightly prismlauncher-nightly nim-nightly --- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 74bb0c972a..684c41b76e 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 2b4f1f8b84ac7960ecd4b9d06bc11cf47f0b9ee9 +%global commit e79bf71f2322fa5d54af07f2985f8460290f2085 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-04-30 +%global fulldate 2025-05-01 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 3ae5443897..4fb13c4800 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 1bf9e15f2631f930c43c60557c59a6a9fabdb158 +%global commit 1ffedf4a08d88299ce23ba4c4b3b49b7223dcebe %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250501 +%global commit_date 20250502 %global ver 0.186.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index b2cbca5ce9..4c59ef1144 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit d88d32b917e99cd26dc9a40ab24bec06337f90ca +%global commit 62afb86c6bcb0c4d048baeebc7096c8c9d4b3484 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250501 +%global commit_date 20250502 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index dba39c97e3..75b4ff1cde 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit b5b7a127fd92349a1517d2c7e7a4f25a532fac59 +%global commit f56568d851eb7f859e6e355495c2be28ac9819e9 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250501 +%global commit_date 20250502 %global debug_package %nil Name: nim-nightly From d40a8f1c5d9d5438102ec7a02e0bd2278490fedf Mon Sep 17 00:00:00 2001 From: Gilver Date: Thu, 1 May 2025 20:50:09 -0500 Subject: [PATCH 1020/2977] chore: Move NVIDIA tools to NVIDIA repo (#4605) * chore: Move cuda-gcc back to NVIDIA repo Signed-off-by: Gilver * chore: Move cuda-nvcc to NVIDIA repo Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/tools/cuda-gcc/anda.hcl | 1 + anda/tools/cuda-nvcc/anda.hcl | 1 + 2 files changed, 2 insertions(+) diff --git a/anda/tools/cuda-gcc/anda.hcl b/anda/tools/cuda-gcc/anda.hcl index 48ea127f9d..b7ae3ad50a 100644 --- a/anda/tools/cuda-gcc/anda.hcl +++ b/anda/tools/cuda-gcc/anda.hcl @@ -5,5 +5,6 @@ project pkg { } labels { updbranch = 1 + subrepo = "nvidia" } } diff --git a/anda/tools/cuda-nvcc/anda.hcl b/anda/tools/cuda-nvcc/anda.hcl index 95c2969059..8d4c402ee9 100644 --- a/anda/tools/cuda-nvcc/anda.hcl +++ b/anda/tools/cuda-nvcc/anda.hcl @@ -4,5 +4,6 @@ project "pkg" { } labels { upbranch = 1 + subrepo = "nvidia" } } From 3ec8db221f80dbeaf45cfb150de32daf4e3d928d Mon Sep 17 00:00:00 2001 From: Gilver Date: Thu, 1 May 2025 20:58:05 -0500 Subject: [PATCH 1021/2977] [frawhide] fix(ffmpeg): Add terra-nvidia repo for builds (#4601) * fix(rawhide): Add terra-nvidia repo for FFmpeg builds I need to do this with `$releasever` on other branches. Signed-off-by: Gilver * Fix? Signed-off-by: Gilver * Does that actually work Signed-off-by: Gilver * Oh. Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/multimedia/ffmpeg/anda.hcl | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/multimedia/ffmpeg/anda.hcl b/anda/multimedia/ffmpeg/anda.hcl index 9dd00c587b..99c0cf5a90 100644 --- a/anda/multimedia/ffmpeg/anda.hcl +++ b/anda/multimedia/ffmpeg/anda.hcl @@ -2,6 +2,7 @@ project pkg { arches = ["x86_64", "aarch64", "i386"] rpm { spec = "ffmpeg.spec" + extra_repos = ["https://repos.fyralabs.com/terrarawhide-nvidia"] } labels { updbranch = 1 From ead8b9cf82296c86deb9cac2a583ac7ab7db6c97 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 2 May 2025 02:03:53 +0000 Subject: [PATCH 1022/2977] bump: cuda-nvcc electron --- anda/tools/cuda-nvcc/cuda-nvcc.spec | 2 +- anda/tools/electron/electron.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/tools/cuda-nvcc/cuda-nvcc.spec b/anda/tools/cuda-nvcc/cuda-nvcc.spec index ec5e389288..890d435b3f 100644 --- a/anda/tools/cuda-nvcc/cuda-nvcc.spec +++ b/anda/tools/cuda-nvcc/cuda-nvcc.spec @@ -8,7 +8,7 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.8.93 +Version: 12.9.41 Release: 1%?dist Summary: CUDA Compiler (NVCC) License: CUDA Toolkit diff --git a/anda/tools/electron/electron.spec b/anda/tools/electron/electron.spec index 812a1abc21..a8587d570f 100644 --- a/anda/tools/electron/electron.spec +++ b/anda/tools/electron/electron.spec @@ -12,7 +12,7 @@ %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so Name: electron -Version: 36.0.1 +Version: 36.1.0 Release: 1%?dist Summary: Build cross platform desktop apps with web technologies License: MIT From 1603a8c061e0535215f67a795bbfa5fd3f6e829f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 2 May 2025 02:51:14 +0000 Subject: [PATCH 1023/2977] bump(branch): cuda-cccl cuda-cudart cuda-cuobjdump cuda-cupti cuda-cuxxfilt cuda-gdb cuda-nvdisasm cuda-nvml cuda-nvprof cuda-nvprune cuda-nvrtc cuda-nvtx cuda-profiler cuda-sandbox cuda-sanitizer cuda libcublas libcudla libcufft libcurand libcusparse libnpp libnvfatbin libnvjitlink libnvjpeg --- anda/lib/nvidia/cuda-cccl/cuda-cccl.spec | 4 ++-- anda/lib/nvidia/cuda-cudart/cuda-cudart.spec | 4 ++-- anda/lib/nvidia/cuda-cuobjdump/cuda-cuobjdump.spec | 4 ++-- anda/lib/nvidia/cuda-cupti/cuda-cupti.spec | 4 ++-- anda/lib/nvidia/cuda-cuxxfilt/cuda-cuxxfilt.spec | 4 ++-- anda/lib/nvidia/cuda-gdb/cuda-gdb.spec | 4 ++-- anda/lib/nvidia/cuda-nvdisasm/cuda-nvdisasm.spec | 4 ++-- anda/lib/nvidia/cuda-nvml/cuda-nvml.spec | 4 ++-- anda/lib/nvidia/cuda-nvprof/cuda-nvprof.spec | 4 ++-- anda/lib/nvidia/cuda-nvprune/cuda-nvprune.spec | 4 ++-- anda/lib/nvidia/cuda-nvrtc/cuda-nvrtc.spec | 4 ++-- anda/lib/nvidia/cuda-nvtx/cuda-nvtx.spec | 4 ++-- anda/lib/nvidia/cuda-profiler/cuda-profiler.spec | 4 ++-- anda/lib/nvidia/cuda-sandbox/cuda-sandbox.spec | 2 +- anda/lib/nvidia/cuda-sanitizer/cuda-sanitizer.spec | 4 ++-- anda/lib/nvidia/cuda/cuda.spec | 4 ++-- anda/lib/nvidia/libcublas/libcublas.spec | 4 ++-- anda/lib/nvidia/libcudla/libcudla.spec | 4 ++-- anda/lib/nvidia/libcufft/libcufft.spec | 4 ++-- anda/lib/nvidia/libcurand/libcurand.spec | 4 ++-- anda/lib/nvidia/libcusparse/libcusparse.spec | 4 ++-- anda/lib/nvidia/libnpp/libnpp.spec | 4 ++-- anda/lib/nvidia/libnvfatbin/libnvfatbin.spec | 4 ++-- anda/lib/nvidia/libnvjitlink/libnvjitlink.spec | 2 +- anda/lib/nvidia/libnvjpeg/libnvjpeg.spec | 4 ++-- 25 files changed, 48 insertions(+), 48 deletions(-) diff --git a/anda/lib/nvidia/cuda-cccl/cuda-cccl.spec b/anda/lib/nvidia/cuda-cccl/cuda-cccl.spec index 163589f96f..c3627f1450 100644 --- a/anda/lib/nvidia/cuda-cccl/cuda-cccl.spec +++ b/anda/lib/nvidia/cuda-cccl/cuda-cccl.spec @@ -5,8 +5,8 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.8.90 -Release: 2%?dist +Version: 12.9.27 +Release: 1%?dist Summary: CXX Core Compute Libraries License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-cudart/cuda-cudart.spec b/anda/lib/nvidia/cuda-cudart/cuda-cudart.spec index 11130f94bf..b9a474b9a2 100644 --- a/anda/lib/nvidia/cuda-cudart/cuda-cudart.spec +++ b/anda/lib/nvidia/cuda-cudart/cuda-cudart.spec @@ -8,8 +8,8 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.8.90 -Release: 2%?dist +Version: 12.9.37 +Release: 1%?dist Summary: CUDA Runtime API library License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-cuobjdump/cuda-cuobjdump.spec b/anda/lib/nvidia/cuda-cuobjdump/cuda-cuobjdump.spec index da413f6265..569e2e090b 100644 --- a/anda/lib/nvidia/cuda-cuobjdump/cuda-cuobjdump.spec +++ b/anda/lib/nvidia/cuda-cuobjdump/cuda-cuobjdump.spec @@ -8,8 +8,8 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.8.90 -Release: 2%?dist +Version: 12.9.26 +Release: 1%?dist Summary: Utility to extract information from CUDA binary files License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-cupti/cuda-cupti.spec b/anda/lib/nvidia/cuda-cupti/cuda-cupti.spec index 8ac6712534..e372036e0c 100644 --- a/anda/lib/nvidia/cuda-cupti/cuda-cupti.spec +++ b/anda/lib/nvidia/cuda-cupti/cuda-cupti.spec @@ -8,8 +8,8 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.8.90 -Release: 2%?dist +Version: 12.9.19 +Release: 1%?dist Summary: NVIDIA CUDA Profiling Tools Interface (CUPTI) library License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-cuxxfilt/cuda-cuxxfilt.spec b/anda/lib/nvidia/cuda-cuxxfilt/cuda-cuxxfilt.spec index 8320f05bce..b2fbca0e99 100644 --- a/anda/lib/nvidia/cuda-cuxxfilt/cuda-cuxxfilt.spec +++ b/anda/lib/nvidia/cuda-cuxxfilt/cuda-cuxxfilt.spec @@ -8,8 +8,8 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.8.90 -Release: 2%?dist +Version: 12.9.19 +Release: 1%?dist Summary: CUDA cuxxfilt (demangler) License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-gdb/cuda-gdb.spec b/anda/lib/nvidia/cuda-gdb/cuda-gdb.spec index deabaee892..4482b77b4e 100644 --- a/anda/lib/nvidia/cuda-gdb/cuda-gdb.spec +++ b/anda/lib/nvidia/cuda-gdb/cuda-gdb.spec @@ -7,8 +7,8 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.8.90 -Release: 2%?dist +Version: 12.9.19 +Release: 1%?dist Summary: CUDA GDB License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-nvdisasm/cuda-nvdisasm.spec b/anda/lib/nvidia/cuda-nvdisasm/cuda-nvdisasm.spec index 4408566f91..5ee401cee2 100644 --- a/anda/lib/nvidia/cuda-nvdisasm/cuda-nvdisasm.spec +++ b/anda/lib/nvidia/cuda-nvdisasm/cuda-nvdisasm.spec @@ -8,8 +8,8 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.8.90 -Release: 2%?dist +Version: 12.9.19 +Release: 1%?dist Summary: Utility to extract information from CUDA binary files License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-nvml/cuda-nvml.spec b/anda/lib/nvidia/cuda-nvml/cuda-nvml.spec index e5d6ce5949..270e96380e 100644 --- a/anda/lib/nvidia/cuda-nvml/cuda-nvml.spec +++ b/anda/lib/nvidia/cuda-nvml/cuda-nvml.spec @@ -8,8 +8,8 @@ Name: cuda-nvml Epoch: 1 -Version: 12.8.90 -Release: 2%?dist +Version: 12.9.40 +Release: 1%?dist Summary: NVIDIA Management library (NVML) License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-nvprof/cuda-nvprof.spec b/anda/lib/nvidia/cuda-nvprof/cuda-nvprof.spec index 69bd05acc5..51e8d665ba 100644 --- a/anda/lib/nvidia/cuda-nvprof/cuda-nvprof.spec +++ b/anda/lib/nvidia/cuda-nvprof/cuda-nvprof.spec @@ -8,8 +8,8 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.8.90 -Release: 2%?dist +Version: 12.9.19 +Release: 1%?dist Summary: CUDA command line profiling tool License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-nvprune/cuda-nvprune.spec b/anda/lib/nvidia/cuda-nvprune/cuda-nvprune.spec index 29e6baed13..0a31cb1f56 100644 --- a/anda/lib/nvidia/cuda-nvprune/cuda-nvprune.spec +++ b/anda/lib/nvidia/cuda-nvprune/cuda-nvprune.spec @@ -8,8 +8,8 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.8.90 -Release: 2%?dist +Version: 12.9.19 +Release: 1%?dist Summary: CUDA nvprune License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-nvrtc/cuda-nvrtc.spec b/anda/lib/nvidia/cuda-nvrtc/cuda-nvrtc.spec index ee7f8408f2..12ca44aa46 100644 --- a/anda/lib/nvidia/cuda-nvrtc/cuda-nvrtc.spec +++ b/anda/lib/nvidia/cuda-nvrtc/cuda-nvrtc.spec @@ -8,8 +8,8 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.8.93 -Release: 2%?dist +Version: 12.9.41 +Release: 1%?dist Summary: CUDA runtime compilation library (NVRTC) License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-nvtx/cuda-nvtx.spec b/anda/lib/nvidia/cuda-nvtx/cuda-nvtx.spec index a96cd28c2b..ce7e0e774c 100644 --- a/anda/lib/nvidia/cuda-nvtx/cuda-nvtx.spec +++ b/anda/lib/nvidia/cuda-nvtx/cuda-nvtx.spec @@ -8,8 +8,8 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.8.90 -Release: 2%?dist +Version: 12.9.19 +Release: 1%?dist Summary: NVIDIA Tools Extension (NVTX) library License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-profiler/cuda-profiler.spec b/anda/lib/nvidia/cuda-profiler/cuda-profiler.spec index 3f22a1b85f..ab3d320aba 100644 --- a/anda/lib/nvidia/cuda-profiler/cuda-profiler.spec +++ b/anda/lib/nvidia/cuda-profiler/cuda-profiler.spec @@ -5,8 +5,8 @@ Name: cuda-profiler Epoch: 1 -Version: 12.8.90 -Release: 2%?dist +Version: 12.9.19 +Release: 1%?dist Summary: CUDA Profiler API License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda-sandbox/cuda-sandbox.spec b/anda/lib/nvidia/cuda-sandbox/cuda-sandbox.spec index fbfc7cfb86..55a1ad5c4c 100644 --- a/anda/lib/nvidia/cuda-sandbox/cuda-sandbox.spec +++ b/anda/lib/nvidia/cuda-sandbox/cuda-sandbox.spec @@ -8,7 +8,7 @@ Name: cuda-sandbox Epoch: 1 -Version: 12.8.90 +Version: 12.9.19 Release: 1%?dist Summary: CUDA nvsandboxutils License: CUDA Toolkit diff --git a/anda/lib/nvidia/cuda-sanitizer/cuda-sanitizer.spec b/anda/lib/nvidia/cuda-sanitizer/cuda-sanitizer.spec index b52871be49..c4198bba74 100644 --- a/anda/lib/nvidia/cuda-sanitizer/cuda-sanitizer.spec +++ b/anda/lib/nvidia/cuda-sanitizer/cuda-sanitizer.spec @@ -8,8 +8,8 @@ Name: cuda-sanitizer Epoch: 1 -Version: 12.8.93 -Release: 2%?dist +Version: 12.9.27 +Release: 1%?dist Summary: CUDA Compute Sanitizer API License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/cuda/cuda.spec b/anda/lib/nvidia/cuda/cuda.spec index 1142390e76..559148bbcb 100644 --- a/anda/lib/nvidia/cuda/cuda.spec +++ b/anda/lib/nvidia/cuda/cuda.spec @@ -2,8 +2,8 @@ %global major_package_version 12-8 Name: cuda -Version: 12.8.90 -Release: 2%?dist +Version: 12.9.43 +Release: 1%?dist Summary: NVIDIA Compute Unified Device Architecture Toolkit Epoch: 1 License: CUDA Toolkit diff --git a/anda/lib/nvidia/libcublas/libcublas.spec b/anda/lib/nvidia/libcublas/libcublas.spec index a845854435..53578d5d67 100644 --- a/anda/lib/nvidia/libcublas/libcublas.spec +++ b/anda/lib/nvidia/libcublas/libcublas.spec @@ -6,8 +6,8 @@ Name: libcublas Epoch: 1 -Version: 12.8.4.1 -Release: 2%?dist +Version: 12.9.0.13 +Release: 1%?dist Summary: NVIDIA CUDA Basic Linear Algebra Subroutines (cuBLAS) libraries License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/libcudla/libcudla.spec b/anda/lib/nvidia/libcudla/libcudla.spec index 9335c494e4..767f925972 100644 --- a/anda/lib/nvidia/libcudla/libcudla.spec +++ b/anda/lib/nvidia/libcudla/libcudla.spec @@ -6,8 +6,8 @@ Name: libcudla Epoch: 1 -Version: 12.8.90 -Release: 2%?dist +Version: 12.9.19 +Release: 1%?dist Summary: NVIDIA CUDA Deep Learning Accelerator (DLA) engines (Jetson Xavier + Orin) License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/libcufft/libcufft.spec b/anda/lib/nvidia/libcufft/libcufft.spec index 2caf9ac4f1..995f188bb4 100644 --- a/anda/lib/nvidia/libcufft/libcufft.spec +++ b/anda/lib/nvidia/libcufft/libcufft.spec @@ -6,8 +6,8 @@ Name: libcufft Epoch: 2 -Version: 11.3.3.83 -Release: 2%?dist +Version: 11.4.0.6 +Release: 1%?dist Summary: NVIDIA CUDA Fast Fourier Transform library (cuFFT) libraries License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/libcurand/libcurand.spec b/anda/lib/nvidia/libcurand/libcurand.spec index e9ec726065..e3a76a6224 100644 --- a/anda/lib/nvidia/libcurand/libcurand.spec +++ b/anda/lib/nvidia/libcurand/libcurand.spec @@ -6,8 +6,8 @@ Name: libcurand Epoch: 2 -Version: 10.3.9.90 -Release: 2%?dist +Version: 10.3.10.19 +Release: 1%?dist Summary: NVIDIA CUDA Random Number Generation library (cuRAND) License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/libcusparse/libcusparse.spec b/anda/lib/nvidia/libcusparse/libcusparse.spec index 6c553d9040..dd84ac2325 100644 --- a/anda/lib/nvidia/libcusparse/libcusparse.spec +++ b/anda/lib/nvidia/libcusparse/libcusparse.spec @@ -6,8 +6,8 @@ Name: libcusparse Epoch: 1 -Version: 12.5.8.93 -Release: 2%?dist +Version: 12.5.9.5 +Release: 1%?dist Summary: NVIDIA CUDA Sparse Matrix library (cuSPARSE) library License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/libnpp/libnpp.spec b/anda/lib/nvidia/libnpp/libnpp.spec index 8d6b0e8eb8..14df786c51 100644 --- a/anda/lib/nvidia/libnpp/libnpp.spec +++ b/anda/lib/nvidia/libnpp/libnpp.spec @@ -6,8 +6,8 @@ Name: libnpp Epoch: 1 -Version: 12.3.3.100 -Release: 2%?dist +Version: 12.4.0.27 +Release: 1%?dist Summary: NVIDIA Performance Primitives libraries License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/libnvfatbin/libnvfatbin.spec b/anda/lib/nvidia/libnvfatbin/libnvfatbin.spec index 2a3395e948..b07e62ca67 100644 --- a/anda/lib/nvidia/libnvfatbin/libnvfatbin.spec +++ b/anda/lib/nvidia/libnvfatbin/libnvfatbin.spec @@ -6,8 +6,8 @@ Name: libnvfatbin Epoch: 1 -Version: 12.8.90 -Release: 2%?dist +Version: 12.9.19 +Release: 1%?dist Summary: CUDA Fatbin Creator API License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit diff --git a/anda/lib/nvidia/libnvjitlink/libnvjitlink.spec b/anda/lib/nvidia/libnvjitlink/libnvjitlink.spec index 31a5cc9100..4d8cbcf500 100644 --- a/anda/lib/nvidia/libnvjitlink/libnvjitlink.spec +++ b/anda/lib/nvidia/libnvjitlink/libnvjitlink.spec @@ -6,7 +6,7 @@ Name: libnvjitlink Epoch: 1 -Version: 12.8.93 +Version: 12.9.41 Release: 1%?dist Summary: NVIDIA compiler library for JIT LTO functionality License: CUDA Toolkit diff --git a/anda/lib/nvidia/libnvjpeg/libnvjpeg.spec b/anda/lib/nvidia/libnvjpeg/libnvjpeg.spec index 03f922874f..38ddaf48ae 100644 --- a/anda/lib/nvidia/libnvjpeg/libnvjpeg.spec +++ b/anda/lib/nvidia/libnvjpeg/libnvjpeg.spec @@ -6,8 +6,8 @@ Name: libnvjpeg Epoch: 1 -Version: 12.3.5.92 -Release: 2%?dist +Version: 12.4.0.16 +Release: 1%?dist Summary: CUDA NVIDIA JPEG decoder (nvJPEG) License: CUDA Toolkit URL: https://developer.nvidia.com/cuda-toolkit From 55acdbe23bc3b2bb2e7fae56aa746947458ffeb6 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 2 May 2025 05:27:38 +0000 Subject: [PATCH 1024/2977] bump: zig --- anda/langs/zig/zig-master.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/langs/zig/zig-master.spec b/anda/langs/zig/zig-master.spec index b7dd4f7688..c7e625a39b 100644 --- a/anda/langs/zig/zig-master.spec +++ b/anda/langs/zig/zig-master.spec @@ -7,7 +7,7 @@ %define llvm_compat 20 %endif %global llvm_version 20.0.0 -%global ver 0.15.0-dev.386+2e35fdd03 +%global ver 0.15.0-dev.441+c1649d586 %bcond bootstrap 0 %bcond docs %{without bootstrap} %bcond test 1 @@ -39,7 +39,7 @@ Name: zig-master Version: %(echo %{ver} | sed 's/-/~/g') -Release: 2%?dist +Release: 1%?dist Summary: Master builds of the Zig language License: MIT AND NCSA AND LGPL-2.1-or-later AND LGPL-2.1-or-later WITH GCC-exception-2.0 AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND BSD-3-Clause AND Inner-Net-2.0 AND ISC AND LicenseRef-Fedora-Public-Domain AND GFDL-1.1-or-later AND ZPL-2.1 URL: https://ziglang.org From 07c0c750e514b2f3219e763c3e9eb4a906f15e63 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 2 May 2025 06:28:15 +0000 Subject: [PATCH 1025/2977] bump: eza --- anda/langs/rust/eza/rust-eza.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/rust/eza/rust-eza.spec b/anda/langs/rust/eza/rust-eza.spec index 7d909c2da6..4965c1b63b 100644 --- a/anda/langs/rust/eza/rust-eza.spec +++ b/anda/langs/rust/eza/rust-eza.spec @@ -4,7 +4,7 @@ %global crate eza Name: rust-eza -Version: 0.21.2 +Version: 0.21.3 Release: 1%?dist Summary: Modern replacement for ls From 738b88a0898f0922da270cbb0a301cdcae0fe523 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 2 May 2025 07:48:29 +0000 Subject: [PATCH 1026/2977] bump: tdlib --- anda/lib/tdlib/tdlib-nightly.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 7affb7e821..6797df5f07 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,6 +1,6 @@ -%global commit 25dcecabe2258d151c47c00c9f3c66e8ee5a9022 +%global commit b6303f0cc8f8fe6c0e0314a2df286e1d54f04b41 %global ver 1.8.48 -%global commit_date 20250501 +%global commit_date 20250502 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: tdlib-nightly From 38781967e0ba467a2f004f3a000fe3324496ab58 Mon Sep 17 00:00:00 2001 From: Gilver Date: Fri, 2 May 2025 03:23:03 -0500 Subject: [PATCH 1027/2977] fix(cuda-nvcc): Missing D in updbranch (#4610) Signed-off-by: Gilver --- anda/tools/cuda-nvcc/anda.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/cuda-nvcc/anda.hcl b/anda/tools/cuda-nvcc/anda.hcl index 8d4c402ee9..0003b49cf7 100644 --- a/anda/tools/cuda-nvcc/anda.hcl +++ b/anda/tools/cuda-nvcc/anda.hcl @@ -3,7 +3,7 @@ project "pkg" { spec = "cuda-nvcc.spec" } labels { - upbranch = 1 + updbranch = 1 subrepo = "nvidia" } } From 5994ed2bbb014b403d877150cd093ad790e47124 Mon Sep 17 00:00:00 2001 From: Gilver Date: Fri, 2 May 2025 03:23:56 -0500 Subject: [PATCH 1028/2977] add: epsonscan2 (#4611) * add: epsonscan2 * fix: Symlink * cleanup: Testing stuff I forgot to yoink * Pffffpdfods * I'm falling asleep at my desk * fix(anda.hcl): x86_64 only Signed-off-by: Gilver * feat?: Apparently this actually builds on aarch64 --------- Signed-off-by: Gilver --- anda/apps/epsonscan2/anda.hcl | 5 ++ anda/apps/epsonscan2/epsonscan2.spec | 119 +++++++++++++++++++++++++++ 2 files changed, 124 insertions(+) create mode 100644 anda/apps/epsonscan2/anda.hcl create mode 100644 anda/apps/epsonscan2/epsonscan2.spec diff --git a/anda/apps/epsonscan2/anda.hcl b/anda/apps/epsonscan2/anda.hcl new file mode 100644 index 0000000000..c520cd979d --- /dev/null +++ b/anda/apps/epsonscan2/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "epsonscan2.spec" + } +} diff --git a/anda/apps/epsonscan2/epsonscan2.spec b/anda/apps/epsonscan2/epsonscan2.spec new file mode 100644 index 0000000000..2a88e4cc9b --- /dev/null +++ b/anda/apps/epsonscan2/epsonscan2.spec @@ -0,0 +1,119 @@ +# Despite supposedly being a purely C++ project it will not build without this flag. Don't ask me. +%global build_cflags %{__build_flags_lang_c} %{?_distro_extra_cflags} -Wno-implicit-function-declaration +%global build_cxxflags %(%{__build_flags_lang_cxx}) %{?_distro_extra_cxxflags} -Wno-template-body + +Name: epsonscan2 +Version: 6.7.70.0 +Release: 1 +Summary: Package for Epson scanner drivers and software +# This was a licensing determination nightmare +License: LGPL-2.1-or-later AND MIT AND Zlib AND LicenseRef-SHA1 +URL: https://support.epson.net/linux/en/epsonscan2.php +# This software doesn't have versioned download links, absolute nightmare +Source0: https://download3.ebz.epson.net/dsc/f/03/00/16/60/70/c7fc14e41ec84255008c6125b63bcac40f55e11c/epsonscan2-%{version}-%{release}.src.tar.gz +# The non-free-plugin should be redistributable as far as anything I can find in the license but it is NOT provided externally?? Repackage the RPM I guess. +%ifarch x86_64 +Source1: https://download3.ebz.epson.net/dsc/f/03/00/16/14/40/9cb99579f9fa7facf54f77f0ce6fe5600677f30a/epsonscan2-bundle-%{version}.x86_64.rpm.tar.gz +%endif +BuildRequires: boost-filesystem >= 1.36.0 +BuildRequires: boost-devel >= 1.36.0 +BuildRequires: cmake >= 2.8.12.2 +BuildRequires: cpio +BuildRequires: gcc-c++ +BuildRequires: libharu +BuildRequires: libjpeg-turbo-devel +BuildRequires: libpng-devel +BuildRequires: libsane-hpaio +BuildRequires: libtiff-devel +BuildRequires: libusbx-devel +BuildRequires: make +BuildRequires: qt-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: qtsinglecoreapplication-qt5 +BuildRequires: rapidjson-devel +BuildRequires: sane-backends-devel +BuildRequires: systemd-rpm-macros +Requires: qt5-qtbase +Packager: Gilver E. + +%description +This package contains all essential software to use Epson scanners. + +%ifarch x86_64 +%package non-free-plugin +License: Epson End User Software License Agreement +Summary: Non free plugin for Epson scanners +Requires: %{name} = %{version}-%{release} + +%description non-free-plugin +Non-free but redistributable plugin for %{name}. +%endif + +%prep +%autosetup -n %{name}-%{version}-%{release} +%ifarch x86_64 +gzip -dc '%{SOURCE1}' | tar -xof - --strip-components=1 +rpm2cpio plugins/*.rpm | cpio -idmv +%endif + +%build +# CMake macro fails to generate the build files somehow? This works however. I don't really understand. +cmake . \ + -DBUILD_TYPE=Release + +%make_build + +%install +%make_install + +# The Makefile fails to do these steps correctly but just using CMake was even more problematic. +# The file is also very annoying to patch. Thank God this doesn't seem to update anymore. +mkdir -p %{buildroot}%{_udevrulesdir} +mv %{buildroot}/lib/udev/rules.d/60-%{name}.rules -t %{buildroot}%{_udevrulesdir} +install -Dpm644 desktop/rpm/x86_64/%{name}.desktop -t %{buildroot}%{_datadir}/applications/ + +mkdir -p %{buildroot}%{_libdir}/sane +ln -sf ../%{name}/libsane-%{name}.so %{buildroot}%{_libdir}/sane/libsane-%{name}.so.1 +ln -sf ../%{name}/libsane-%{name}.so %{buildroot}%{_libdir}/sane/libsane-%{name}.so.1.0.0 + +# Let RPM handle the doc files. This project's build incorrectly puts licenses in this folder. +rm -rf %{buildroot}%{_defaultdocdir}/%{name}* + +%ifarch x86_64 +mv usr/share/doc/%{name}*/* -t plugins +rm -rf usr/share/doc/%{name}* +cp -pr usr %{buildroot} +%endif + +%files +%doc changelog.Debian +%doc NEWS +%doc README +%license AUTHORS +%license COPYING +%license LICENSE +%{_bindir}/%{name} +%{_libdir}/%{name}/*.so* +%{_libdir}/%{name}/detectalert +%{_libdir}/%{name}/Resources +%{_libdir}/sane/* +%{_udevrulesdir}/60-%{name}.rules +%{_sysconfdir}/sane.d/dll.d/%{name} +%{_datadir}/applications/%{name}.desktop + +%ifarch x86_64 +%files non-free-plugin +%doc plugins/NEWS +%license plugins/COPYING.EPSON +%license plugins/copyright +%{_libdir}/%{name}/libexec +%{_libdir}/%{name}/non-free-exec +%{_libdir}/%{name}-ocr +%{_libexecdir}/%{name}-ocr +%{_datadir}/%{name} +%{_datadir}/%{name}-ocr +%endif + +%changelog +* Thu May 1 2025 Gilver E. +- Initial package From 24a6dc24e11b5b3e13c9c8ec79276dcf0e711db5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 2 May 2025 08:33:04 +0000 Subject: [PATCH 1029/2977] bump: nightly --- anda/system/readymade/nightly/readymade-nightly.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/system/readymade/nightly/readymade-nightly.spec b/anda/system/readymade/nightly/readymade-nightly.spec index aa371edbe3..855da97cba 100644 --- a/anda/system/readymade/nightly/readymade-nightly.spec +++ b/anda/system/readymade/nightly/readymade-nightly.spec @@ -1,5 +1,5 @@ -%global commit 61f0b3fb59658c7e6a7e134dbda573c6dd262ac4 -%global commit_date 20250501 +%global commit 4dc78ec5a73215482a09bd9a581411c8538a2b22 +%global commit_date 20250502 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: readymade-nightly From 375d3219026e7642182cd6a83c7872dad84effa7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 2 May 2025 08:52:13 +0000 Subject: [PATCH 1030/2977] bump: lomiri-system-settings --- .../lomiri-system-settings/lomiri-system-settings.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 73751a310c..0aa3e73c4d 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,10 +1,10 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit e583c542521ada6c88c5e7c09eb745b6794bc7b6 +%global commit 08a81b051f616f8934589eb6b0d4a3c144f829ac %forgemeta Name: lomiri-system-settings -Version: 1.3.0 -Release: 2%?dist +Version: 1.3.1 +Release: 1%?dist Summary: The system settings application for Lomiri License: GPLv3 URL: https://gitlab.com/ubports/development/core/lomiri-system-settings From cf3cf7e58e616a502d5a834588cf484f42b2da73 Mon Sep 17 00:00:00 2001 From: Pornpipat Popum Date: Fri, 2 May 2025 18:03:28 +0700 Subject: [PATCH 1031/2977] move joycond into system, add udev rules patch (#4619) * move joycond into system, add udev rules patch * add metainfo --- anda/{games => system}/joycond/anda.hcl | 0 anda/{games => system}/joycond/joycond.spec | 7 +++---- 2 files changed, 3 insertions(+), 4 deletions(-) rename anda/{games => system}/joycond/anda.hcl (100%) rename anda/{games => system}/joycond/joycond.spec (84%) diff --git a/anda/games/joycond/anda.hcl b/anda/system/joycond/anda.hcl similarity index 100% rename from anda/games/joycond/anda.hcl rename to anda/system/joycond/anda.hcl diff --git a/anda/games/joycond/joycond.spec b/anda/system/joycond/joycond.spec similarity index 84% rename from anda/games/joycond/joycond.spec rename to anda/system/joycond/joycond.spec index 41bce51cca..2bb0f1a80d 100644 --- a/anda/games/joycond/joycond.spec +++ b/anda/system/joycond/joycond.spec @@ -1,4 +1,4 @@ -%global commit 9d1f5098b716681d087cca695ad714218a18d4e8 +%global commit 39d5728d41b70840342ddc116a59125b337fbde2 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date %(date '+%Y%m%d') Name: joycond @@ -9,6 +9,7 @@ License: GPL-3.0-or-later URL: https://github.com/DanielOgorchock/joycond Source0: %url/archive/%{commit}/%{commit}.tar.gz#/%{name}-%{commit_date}.git~%{shortcommit}.tar.gz Patch0: https://github.com/terrapkg/pkg-joycond/raw/refs/heads/main/0001-Revert-virt_ctrlr_passthrough-send-uevent-change-eve.patch +Patch1: https://github.com/terrapkg/pkg-joycond/raw/refs/heads/main/0001-Change-permissions-for-hidraw-access.patch Packager: Cappy Ishihara BuildRequires: libevdev-devel libudev-devel BuildRequires: cmake make systemd-rpm-macros gcc-c++ @@ -27,9 +28,6 @@ joycond is a linux daemon which uses the evdev devices provided by hid-nintendo %install %cmake_install -mkdir -p %buildroot%_unitdir %buildroot%_prefix -mv %buildroot%_sysconfdir/systemd/system/joycond.service %buildroot%_unitdir/joycond.service -mv %buildroot/lib/udev/ %buildroot%_prefix/lib/ %post %systemd_post joycond.service @@ -46,3 +44,4 @@ mv %buildroot/lib/udev/ %buildroot%_prefix/lib/ %_udevrulesdir/89-joycond.rules %_unitdir/joycond.service %_sysconfdir/modules-load.d/joycond.conf +%_datadir/metainfo/com.github.DanielOgorchock.joycond.metainfo.xml \ No newline at end of file From c3309295468ccaf09689f15de62dc35eee3306b5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 2 May 2025 13:14:19 +0000 Subject: [PATCH 1032/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 687bc21adb..4f4cb0b118 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.667 +Version: 0.0.668 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index e7a06725d9..e3b3857082 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.667 +Version: 0.0.668 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From a8d518ecdaca63fa5645e6801ec9e20896541ae9 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 2 May 2025 13:40:22 +0000 Subject: [PATCH 1033/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 316ac9e24c..6e1a5234f2 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.185.2-pre +%global ver 0.185.3-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ From b5e5aa223102cd3ffbbe6178cea1e435281e9e0a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 2 May 2025 14:38:54 +0000 Subject: [PATCH 1034/2977] bump: zig --- anda/langs/zig/zig-master.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/zig/zig-master.spec b/anda/langs/zig/zig-master.spec index c7e625a39b..2ee438db47 100644 --- a/anda/langs/zig/zig-master.spec +++ b/anda/langs/zig/zig-master.spec @@ -7,7 +7,7 @@ %define llvm_compat 20 %endif %global llvm_version 20.0.0 -%global ver 0.15.0-dev.441+c1649d586 +%global ver 0.15.0-dev.451+a843be44a %bcond bootstrap 0 %bcond docs %{without bootstrap} %bcond test 1 From d92141dded3c36044029d2cf3ddb146d29b82dca Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 2 May 2025 14:59:57 +0000 Subject: [PATCH 1035/2977] bump: lomiri-indicator-network --- .../lomiri-indicator-network/lomiri-indicator-network.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/desktops/lomiri-unity/lomiri-indicator-network/lomiri-indicator-network.spec b/anda/desktops/lomiri-unity/lomiri-indicator-network/lomiri-indicator-network.spec index 50647f4a41..437bf29862 100644 --- a/anda/desktops/lomiri-unity/lomiri-indicator-network/lomiri-indicator-network.spec +++ b/anda/desktops/lomiri-unity/lomiri-indicator-network/lomiri-indicator-network.spec @@ -1,9 +1,9 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-indicator-network -%global commit 8393f80825de7447a5567a90d3725b469fae471b +%global commit 4aa16a3674bf513995cf07fffaf700d007e726d8 %forgemeta Name: lomiri-indicator-network -Version: 1.1.0 +Version: 1.1.1 Release: 1%?dist Summary: The Network indicator for Ubuntu Touch License: GPL-3.0 AND LGPL-3.0 From 1d4c05415e39bc5794563d5012a7d806069fa87b Mon Sep 17 00:00:00 2001 From: Tulip Blossom Date: Fri, 2 May 2025 12:26:57 -0300 Subject: [PATCH 1036/2977] fix: make it so readymade package doesnt conflict w/ downstream packages (#4623) * fix: make it so readymade package doesnt conflict w/ downstream packages This just removes `/usr/share/readymade` from the spec entirely. Theres probably a better way to do this tho * chore: also bump readymade packages --- anda/system/readymade/nightly/readymade-nightly.spec | 4 ++-- anda/system/readymade/stable/readymade.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/system/readymade/nightly/readymade-nightly.spec b/anda/system/readymade/nightly/readymade-nightly.spec index 855da97cba..4146923ac2 100644 --- a/anda/system/readymade/nightly/readymade-nightly.spec +++ b/anda/system/readymade/nightly/readymade-nightly.spec @@ -4,7 +4,7 @@ Name: readymade-nightly Version: %commit_date.%shortcommit -Release: 1%?dist +Release: 2%?dist Summary: Install ready-made distribution images! License: GPL-3.0-or-later URL: https://github.com/FyraLabs/readymade @@ -57,6 +57,6 @@ ln -sf %{_datadir}/applications/com.fyralabs.Readymade.desktop %{buildroot}%{_da %_datadir/polkit-1/actions/com.fyralabs.pkexec.readymade.policy %_datadir/applications/com.fyralabs.Readymade.desktop %_datadir/applications/liveinst.desktop -%_datadir/readymade +%ghost %_datadir/readymade %_datadir/icons/hicolor/scalable/apps/com.fyralabs.Readymade.svg diff --git a/anda/system/readymade/stable/readymade.spec b/anda/system/readymade/stable/readymade.spec index ac13df8f33..2e82b23d5e 100644 --- a/anda/system/readymade/stable/readymade.spec +++ b/anda/system/readymade/stable/readymade.spec @@ -1,6 +1,6 @@ Name: readymade Version: 0.12.2 -Release: 1%?dist +Release: 2%?dist Summary: Install ready-made distribution images! License: GPL-3.0-or-later URL: https://github.com/FyraLabs/readymade @@ -50,6 +50,6 @@ ln -sf %{_datadir}/applications/com.fyralabs.Readymade.desktop %{buildroot}%{_da %_datadir/polkit-1/actions/com.fyralabs.pkexec.readymade.policy %_datadir/applications/com.fyralabs.Readymade.desktop %_datadir/applications/liveinst.desktop -%_datadir/readymade +%ghost %_datadir/readymade %_datadir/icons/hicolor/scalable/apps/com.fyralabs.Readymade.svg From 7f0292244004726c3cbe969910471de9cc1fb693 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 2 May 2025 16:24:51 +0000 Subject: [PATCH 1037/2977] bump: lomiri-schemas --- anda/desktops/lomiri-unity/lomiri-schemas/lomiri-schemas.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/desktops/lomiri-unity/lomiri-schemas/lomiri-schemas.spec b/anda/desktops/lomiri-unity/lomiri-schemas/lomiri-schemas.spec index c1698ba60c..89c169fe64 100644 --- a/anda/desktops/lomiri-unity/lomiri-schemas/lomiri-schemas.spec +++ b/anda/desktops/lomiri-unity/lomiri-schemas/lomiri-schemas.spec @@ -1,9 +1,9 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-schemas -%global commit 4a74eca0e4dcb745521abf20f975854cc3478a70 +%global commit 139e6090d18040270e942429cf08f6b48a67b0cc %forgemeta Name: lomiri-schemas -Version: 0.1.7 +Version: 0.1.8 Release: 1%?dist Summary: Configuration schemas for lomiri License: LGPL-2.0-or-later From 137ed8ccb9956f5c09a62c3cc7a2ef5ff9e50716 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 2 May 2025 17:19:30 +0000 Subject: [PATCH 1038/2977] bump: stable --- anda/devs/zed/stable/zed.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index d63d1e6797..65594fb8ae 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global rustflags_debuginfo 0 Name: zed -Version: 0.184.8 +Version: 0.184.9 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later From d09f7210b8f5e982b9dc7bd95d498ed4e6b6a3f3 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 2 May 2025 20:15:25 +0000 Subject: [PATCH 1039/2977] bump(branch): cuda-cudnn --- anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec b/anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec index 5213c6fc7f..87c8884e3c 100644 --- a/anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec +++ b/anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec @@ -5,8 +5,8 @@ %global cuda_version 12 Name: cuda-cudnn -Version: 9.8.0.87 -Release: 2%?dist +Version: 9.9.0.52 +Release: 1%?dist Epoch: 1 Summary: NVIDIA CUDA Deep Neural Network library (cuDNN) License: NVIDIA Software Development Kit From eb9ea01a1aa11fbd68b69631082cc46af7596b94 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 2 May 2025 22:50:34 +0000 Subject: [PATCH 1040/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 6e1a5234f2..cbbfa38829 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.185.3-pre +%global ver 0.185.4-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ From 81fda3cf0f383e22042358a45ffda4b88657aa76 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 3 May 2025 01:46:00 +0000 Subject: [PATCH 1041/2977] bump(nightly): envision nightly nightly nightly kmod-common --- anda/apps/envision/envision.spec | 4 ++-- anda/apps/legcord/nightly/legcord-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/system/xone/kmod-common/xone.spec | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/anda/apps/envision/envision.spec b/anda/apps/envision/envision.spec index 64bf00c5a1..45888db4ce 100644 --- a/anda/apps/envision/envision.spec +++ b/anda/apps/envision/envision.spec @@ -1,5 +1,5 @@ -%global commit c794037377bbddc014ce4a58b3662038fc6b056f -%global commit_date 20250430 +%global commit d0df943e483f1c768eb35ad60f06a7854e1b3a91 +%global commit_date 20250503 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: envision-nightly diff --git a/anda/apps/legcord/nightly/legcord-nightly.spec b/anda/apps/legcord/nightly/legcord-nightly.spec index 6877b47c7a..90643041e8 100644 --- a/anda/apps/legcord/nightly/legcord-nightly.spec +++ b/anda/apps/legcord/nightly/legcord-nightly.spec @@ -1,5 +1,5 @@ -%global commit a5e0c2e5ae7d2be97bf8407eb5d2bfc89671b5dd -%global commit_date 20250422 +%global commit c7963dddaf126124a4731d5dfa8d02aeab62f83b +%global commit_date 20250503 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define debug_package %nil diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 684c41b76e..fb74d777ca 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit e79bf71f2322fa5d54af07f2985f8460290f2085 +%global commit 464b85b64c6228f1dfcf5cd853a342e582701126 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-05-01 +%global fulldate 2025-05-02 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 4fb13c4800..83b43f46e6 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 1ffedf4a08d88299ce23ba4c4b3b49b7223dcebe +%global commit 10a7f2a97281f7356570262bd8ac83ea00d05035 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250502 +%global commit_date 20250503 %global ver 0.186.0 %bcond_with check diff --git a/anda/system/xone/kmod-common/xone.spec b/anda/system/xone/kmod-common/xone.spec index fa154992f6..5e25448df0 100644 --- a/anda/system/xone/kmod-common/xone.spec +++ b/anda/system/xone/kmod-common/xone.spec @@ -1,6 +1,6 @@ -%global commit c682b0cd4fd56d2d9639b64787034a375535eb4b +%global commit 197b160f7806d7d27117b12198cacb7656a07f1f %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20250419 +%global commitdate 20250503 %global ver 0.3 %global _dracutconfdir %{_prefix}/lib/dracut/dracut.conf.d %global firmware_hash0 48084d9fa53b9bb04358f3bb127b7495dc8f7bb0b3ca1437bd24ef2b6eabdf66 @@ -8,7 +8,7 @@ Name: xone Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 3%?dist +Release: 1%?dist %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 Epoch: 1 %endif From d7b83ebaf9d630b611c522c10becb7ad328b398d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 3 May 2025 02:00:49 +0000 Subject: [PATCH 1042/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 8ed50d5340..4dc81521ef 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-05-01 +%global ver 2025-05-03 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold @@ -9,7 +9,7 @@ language. Ruffle targets both the desktop and the web using WebAssembly.} Name: ruffle-nightly Version: %goodver -Release: 2%?dist +Release: 1%?dist Summary: A Flash Player emulator written in Rust License: Apache-2.0 OR MIT URL: https://ruffle.rs/ From 9029ef46d76ca0ff6e664ed699bcc427ce147759 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 3 May 2025 02:46:56 +0000 Subject: [PATCH 1043/2977] bump(branch): akmod dkms --- anda/system/xone/akmod/xone-kmod.spec | 6 +++--- anda/system/xone/dkms/dkms-xone.spec | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/anda/system/xone/akmod/xone-kmod.spec b/anda/system/xone/akmod/xone-kmod.spec index 179a5e85ee..429e497c4e 100644 --- a/anda/system/xone/akmod/xone-kmod.spec +++ b/anda/system/xone/akmod/xone-kmod.spec @@ -1,6 +1,6 @@ -%global commit c682b0cd4fd56d2d9639b64787034a375535eb4b +%global commit 197b160f7806d7d27117b12198cacb7656a07f1f %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20250419 +%global commitdate 20250503 %global ver 0.3 %define buildforkernels akmod %global debug_package %{nil} @@ -8,7 +8,7 @@ Name: %{modulename}-kmod Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 2%?dist +Release: 1%?dist %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 Epoch: 1 %endif diff --git a/anda/system/xone/dkms/dkms-xone.spec b/anda/system/xone/dkms/dkms-xone.spec index bb087b2651..52c6333c8d 100644 --- a/anda/system/xone/dkms/dkms-xone.spec +++ b/anda/system/xone/dkms/dkms-xone.spec @@ -1,13 +1,13 @@ -%global commit c682b0cd4fd56d2d9639b64787034a375535eb4b +%global commit 197b160f7806d7d27117b12198cacb7656a07f1f %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20250419 +%global commitdate 20250503 %global ver 0.3 %global debug_package %{nil} %global modulename xone Name: dkms-%{modulename} Version: %{ver}^%{commitdate}git.%{shortcommit} -Release: 2%?dist +Release: 1%?dist %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 Epoch: 1 %endif From 54e2869a9c17955ea716be8c7aa36a6e7466cd6f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 3 May 2025 03:10:51 +0000 Subject: [PATCH 1044/2977] bump: lazygit --- anda/langs/go/lazygit/golang-github-jesseduffield-lazygit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/go/lazygit/golang-github-jesseduffield-lazygit.spec b/anda/langs/go/lazygit/golang-github-jesseduffield-lazygit.spec index bf6e3c9ba2..78f8be07c7 100644 --- a/anda/langs/go/lazygit/golang-github-jesseduffield-lazygit.spec +++ b/anda/langs/go/lazygit/golang-github-jesseduffield-lazygit.spec @@ -2,7 +2,7 @@ # https://github.com/jesseduffield/lazygit %global goipath github.com/jesseduffield/lazygit -Version: 0.49.0 +Version: 0.50.0 %gometa -f From 3e10e3ed8f940dffec512fa942bbe36e514aa9e2 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 3 May 2025 00:37:49 -0500 Subject: [PATCH 1045/2977] chore: Remove Zig bootstrap (#4625) Signed-off-by: Gilver --- anda/langs/zig/zig-master.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/zig/zig-master.spec b/anda/langs/zig/zig-master.spec index 2ee438db47..a60b48a9f5 100644 --- a/anda/langs/zig/zig-master.spec +++ b/anda/langs/zig/zig-master.spec @@ -8,7 +8,7 @@ %endif %global llvm_version 20.0.0 %global ver 0.15.0-dev.451+a843be44a -%bcond bootstrap 0 +%bcond bootstrap 1 %bcond docs %{without bootstrap} %bcond test 1 %global zig_cache_dir %{builddir}/zig-cache From ec4cb55aa9837240ff015ad015286212d95fc175 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 3 May 2025 02:17:54 -0500 Subject: [PATCH 1046/2977] fix(ruffle-nightly): Use %cargo_build instead of %cargo_install (#4628) * fix(ruffle-nightly): Use %cargo_build instead of %cargo_install Signed-off-by: Gilver * fix: Not sure what happened there, also remove now unused build dep Signed-off-by: Gilver * Oops...? Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/apps/ruffle/ruffle-nightly.spec | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 4dc81521ef..d7287a44b2 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -17,7 +17,6 @@ Source0: https://github.com/ruffle-rs/ruffle/archive/refs/tags/nightly-%v Provides: ruffle BuildRequires: cargo-rpm-macros >= 24 BuildRequires: anda-srpm-macros mold -BuildRequires: desktop-file-utils BuildRequires: gcc-c++ cmake java BuildRequires: java-latest-openjdk-headless BuildRequires: pkgconfig(alsa) @@ -32,7 +31,7 @@ Packager: madonuko %doc README.md %license LICENSE.md %license LICENSE.dependencies -%_bindir/ruffle_desktop +%_bindir/ruffle %_datadir/applications/rs.ruffle.Ruffle.desktop %_iconsdir/hicolor/scalable/apps/rs.ruffle.Ruffle.svg %_metainfodir/rs.ruffle.Ruffle.metainfo.xml @@ -40,21 +39,18 @@ Packager: madonuko %prep %autosetup -n ruffle-nightly-%ver -p1 %cargo_prep_online -desktop-file-edit --set-key=Exec --set-value="ruffle_desktop %u" desktop/packages/linux/rs.ruffle.Ruffle.desktop -cat desktop/packages/linux/rs.ruffle.Ruffle.desktop %build -%{cargo_license_online} > LICENSE.dependencies +cd desktop +%cargo_build %install -cd desktop -%cargo_install -install -Dm644 packages/linux/rs.ruffle.Ruffle.svg %buildroot%_iconsdir/hicolor/scalable/apps/rs.ruffle.Ruffle.svg -install -Dm644 packages/linux/rs.ruffle.Ruffle.desktop %buildroot%_datadir/applications/rs.ruffle.Ruffle.desktop -install -Dm644 packages/linux/rs.ruffle.Ruffle.metainfo.xml %buildroot%_metainfodir/rs.ruffle.Ruffle.metainfo.xml +install -Dm755 target/rpm/ruffle_desktop %buildroot%_bindir/ruffle +install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.svg %buildroot%_iconsdir/hicolor/scalable/apps/rs.ruffle.Ruffle.svg +install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.desktop %buildroot%_datadir/applications/rs.ruffle.Ruffle.desktop +install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.metainfo.xml %buildroot%_metainfodir/rs.ruffle.Ruffle.metainfo.xml -%check -desktop-file-validate %buildroot%_datadir/applications/rs.ruffle.Ruffle.desktop +%{cargo_license_online} > LICENSE.dependencies %changelog * Mon Jul 29 2024 madonuko From 335b48fa8fc033cc5a0420e4cabf716c40557e3f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 3 May 2025 07:37:21 +0000 Subject: [PATCH 1047/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 251dec6106..d1ddb2a55f 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.04.30.230140 +Version: 2025.05.03.072006 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 2d8748f4b1a2664939d27b1932791279bdc9b675 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 3 May 2025 02:47:42 -0500 Subject: [PATCH 1048/2977] chore: Rename readymade-nightly to readymade-git (#4626) --- anda/system/readymade/{nightly => git}/anda.hcl | 2 +- .../readymade-nightly.spec => git/readymade-git.spec} | 8 +++++--- anda/system/readymade/{nightly => git}/update.rhai | 0 3 files changed, 6 insertions(+), 4 deletions(-) rename anda/system/readymade/{nightly => git}/anda.hcl (54%) rename anda/system/readymade/{nightly/readymade-nightly.spec => git/readymade-git.spec} (87%) rename anda/system/readymade/{nightly => git}/update.rhai (100%) diff --git a/anda/system/readymade/nightly/anda.hcl b/anda/system/readymade/git/anda.hcl similarity index 54% rename from anda/system/readymade/nightly/anda.hcl rename to anda/system/readymade/git/anda.hcl index 9a6037464b..e8898266d1 100644 --- a/anda/system/readymade/nightly/anda.hcl +++ b/anda/system/readymade/git/anda.hcl @@ -1,6 +1,6 @@ project pkg { rpm { - spec = "readymade-nightly.spec" + spec = "readymade-git.spec" } labels { } diff --git a/anda/system/readymade/nightly/readymade-nightly.spec b/anda/system/readymade/git/readymade-git.spec similarity index 87% rename from anda/system/readymade/nightly/readymade-nightly.spec rename to anda/system/readymade/git/readymade-git.spec index 4146923ac2..af9e4c7a36 100644 --- a/anda/system/readymade/nightly/readymade-nightly.spec +++ b/anda/system/readymade/git/readymade-git.spec @@ -2,7 +2,7 @@ %global commit_date 20250502 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Name: readymade-nightly +Name: readymade-git Version: %commit_date.%shortcommit Release: 2%?dist Summary: Install ready-made distribution images! @@ -15,6 +15,7 @@ BuildRequires: pkgconfig(gnome-desktop-4) BuildRequires: clang-devel BuildRequires: cmake Conflicts: readymade +Obsoletes: readymade-nightly < 20250502.4dc78ec-3 Requires: efibootmgr @@ -26,9 +27,10 @@ It is created as a replacement to Red Hat's Anaconda installer. %package config-ultramarine Summary: Readymade Configuration for Ultramarine Linux -Requires: readymade-nightly -Provides: readymade-nightly-config +Requires: readymade-git +Provides: readymade-git-config Conflicts: readymade-config-ultramarine +Obsoletes: readymade-nightly-config-ultramarine < 20250502.4dc78ec-3 %description config-ultramarine This package contains the configuration files for Readymade to install Ultramarine Linux. diff --git a/anda/system/readymade/nightly/update.rhai b/anda/system/readymade/git/update.rhai similarity index 100% rename from anda/system/readymade/nightly/update.rhai rename to anda/system/readymade/git/update.rhai From 90fdf235e8d3f8e83dbe62926798bc91b531dbaf Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 3 May 2025 10:38:09 +0000 Subject: [PATCH 1049/2977] bump: git --- anda/system/readymade/git/readymade-git.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/system/readymade/git/readymade-git.spec b/anda/system/readymade/git/readymade-git.spec index af9e4c7a36..43f8fe2633 100644 --- a/anda/system/readymade/git/readymade-git.spec +++ b/anda/system/readymade/git/readymade-git.spec @@ -1,10 +1,10 @@ -%global commit 4dc78ec5a73215482a09bd9a581411c8538a2b22 -%global commit_date 20250502 +%global commit 541ce6adc6d86a62c6f97c2856685764b4483c7b +%global commit_date 20250503 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: readymade-git Version: %commit_date.%shortcommit -Release: 2%?dist +Release: 1%?dist Summary: Install ready-made distribution images! License: GPL-3.0-or-later URL: https://github.com/FyraLabs/readymade From 1153d812108ad7f9e84730518026d264fdaed067 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 3 May 2025 11:30:09 +0000 Subject: [PATCH 1050/2977] bump: tela-icon-theme --- anda/themes/tela-icon-theme/tela-icon-theme.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/themes/tela-icon-theme/tela-icon-theme.spec b/anda/themes/tela-icon-theme/tela-icon-theme.spec index aaadf8d5de..4e2219271e 100644 --- a/anda/themes/tela-icon-theme/tela-icon-theme.spec +++ b/anda/themes/tela-icon-theme/tela-icon-theme.spec @@ -1,5 +1,5 @@ -%global commit becb1687c8ee0cafc312fd8c231234436735f8e8 -%global commit_date 20250411 +%global commit 69d31d1067916e5ac3694d311c73b6f3515991ed +%global commit_date 20250503 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: tela-icon-theme From d7325d66effa60713a297ef8680b8e0eb0edfd08 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 3 May 2025 12:34:15 +0000 Subject: [PATCH 1051/2977] bump: git --- anda/system/readymade/git/readymade-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/readymade/git/readymade-git.spec b/anda/system/readymade/git/readymade-git.spec index 43f8fe2633..4b7563518f 100644 --- a/anda/system/readymade/git/readymade-git.spec +++ b/anda/system/readymade/git/readymade-git.spec @@ -1,4 +1,4 @@ -%global commit 541ce6adc6d86a62c6f97c2856685764b4483c7b +%global commit e96dbe2553583e542d1f4341feecd4aa246432cc %global commit_date 20250503 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From 81226c3b6ef8c21493ee0335cb2e9937bee1d748 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 3 May 2025 15:33:12 +0000 Subject: [PATCH 1052/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index d1ddb2a55f..c9d1933e09 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.05.03.072006 +Version: 2025.05.03.152345 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 2061bfc3e323e9e411782d9d437d451892fdeea9 Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 3 May 2025 23:51:28 +0800 Subject: [PATCH 1053/2977] fix(rnote): rustflags_debuginfo 1 (#4545) * fix(rnote): rustflags_debuginfo 0 Signed-off-by: madomado * honestly let's try 1 first Signed-off-by: madomado --------- Signed-off-by: madomado --- anda/langs/rust/rnote/rnote.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/anda/langs/rust/rnote/rnote.spec b/anda/langs/rust/rnote/rnote.spec index ddf94bd528..0167730e79 100644 --- a/anda/langs/rust/rnote/rnote.spec +++ b/anda/langs/rust/rnote/rnote.spec @@ -1,4 +1,5 @@ %global build_rustflags %build_rustflags -C link-arg=-fuse-ld=mold +%global rustflags_debuginfo 1 Name: rnote Version: 0.12.0 @@ -36,8 +37,9 @@ import/export, an infinite canvas and an adaptive UI for big and small screens. %files %doc README.md %license LICENSE - +%_bindir/rnote-cli %_bindir/rnote +%_datadir/thumbnailers/rnote.thumbnailer %_datadir/applications/com.github.flxzt.rnote.desktop %_datadir/glib-2.0/schemas/com.github.flxzt.rnote.gschema.xml %_datadir/icons/hicolor/scalable/apps/com.github.flxzt.rnote.svg From 405e5400af0ea29821f79f5c9e79ec12d40c5eca Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 3 May 2025 17:31:48 +0000 Subject: [PATCH 1054/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index c9d1933e09..4ec1d47321 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.05.03.152345 +Version: 2025.05.03.171517 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 1786cbf8be6c4796ac0dc61e4f0820603b66ea3a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 3 May 2025 19:14:14 +0000 Subject: [PATCH 1055/2977] bump: zig --- anda/langs/zig/zig-master.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/zig/zig-master.spec b/anda/langs/zig/zig-master.spec index a60b48a9f5..8fb24c8b54 100644 --- a/anda/langs/zig/zig-master.spec +++ b/anda/langs/zig/zig-master.spec @@ -7,7 +7,7 @@ %define llvm_compat 20 %endif %global llvm_version 20.0.0 -%global ver 0.15.0-dev.451+a843be44a +%global ver 0.15.0-dev.452+c0ec264f7 %bcond bootstrap 1 %bcond docs %{without bootstrap} %bcond test 1 From 5bb783052baaf88315e23c9c70ed70155faf28c7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 3 May 2025 19:48:05 +0000 Subject: [PATCH 1056/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 4ec1d47321..7bafefe2c6 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.05.03.171517 +Version: 2025.05.03.193148 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 677949cadcc719a1651e8aec032640c4abee8720 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 3 May 2025 20:24:45 +0000 Subject: [PATCH 1057/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 7bafefe2c6..36863d3ab0 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.05.03.193148 +Version: 2025.05.03.201155 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From a7578bbb6fc93b329bed7701992e88776615b48d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 3 May 2025 21:23:00 +0000 Subject: [PATCH 1058/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index 3c2c662035..f357b938bc 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.4.12 +Version: 2025.5.0 Release: 1%?dist Summary: Front-end to your dev env From c0458c3b4e055fc2d3b6d1ca0c9e62a2a4589826 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 3 May 2025 22:21:24 +0000 Subject: [PATCH 1059/2977] bump: libde265 --- anda/lib/libde265/libde265.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/libde265/libde265.spec b/anda/lib/libde265/libde265.spec index 08fe3fc697..aab40f5c62 100644 --- a/anda/lib/libde265/libde265.spec +++ b/anda/lib/libde265/libde265.spec @@ -1,7 +1,7 @@ Name: libde265 Summary: Open H.265 video codec implementation -Version: 1.0.15 -Release: 1%{?dist} +Version: 1.0.16 +Release: 1%?dist License: LGPLv3+ URL: https://www.libde265.org/ Source0: https://github.com/strukturag/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz From b83184d60607247be98a2ad75bbdb726449edf03 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 4 May 2025 01:57:31 +0000 Subject: [PATCH 1060/2977] bump(nightly): mpv nightly nightly nim-nightly nvidia-patch spotx-bash --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- anda/system/nvidia-patch/nvidia-patch.spec | 6 +++--- anda/tools/spotx-bash/spotx-bash.spec | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index d978f4f595..6a89319e91 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 61be67071617889282bc477e8d701333ea834783 +%global commit d702e5fec8090e1700e9b00557680a81e925a507 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250429 +%global commit_date 20250504 %global ver 0.40.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index fb74d777ca..450882e9f0 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit 464b85b64c6228f1dfcf5cd853a342e582701126 +%global commit b6f338065eb45935627a51a7d9102019aaeae1c0 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-05-02 +%global fulldate 2025-05-03 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 83b43f46e6..5f3e3e0105 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 10a7f2a97281f7356570262bd8ac83ea00d05035 +%global commit 425f32e068f7a7a04a0248a06452a2b3ae8c193f %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250503 +%global commit_date 20250504 %global ver 0.186.0 %bcond_with check diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 75b4ff1cde..36ec31f759 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit f56568d851eb7f859e6e355495c2be28ac9819e9 +%global commit 98ec87d65e678ccf3aee9f59c729607089e7cece %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250502 +%global commit_date 20250504 %global debug_package %nil Name: nim-nightly diff --git a/anda/system/nvidia-patch/nvidia-patch.spec b/anda/system/nvidia-patch/nvidia-patch.spec index 79ed492617..e517d105b7 100644 --- a/anda/system/nvidia-patch/nvidia-patch.spec +++ b/anda/system/nvidia-patch/nvidia-patch.spec @@ -1,13 +1,13 @@ %global debug_package %{nil} -%global commit 39f21ee316e6740be2fb1350086c8086906529a0 +%global commit 0c21bb5407668d0151a7dcdb9a3d940fa9ee0e33 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250430 +%global commit_date 20250504 %global patches %{_datadir}/src/nvidia-patch Name: nvidia-patch Version: 0^%commit_date.%{shortcommit} -Release: 2%?dist +Release: 1%?dist Summary: NVENC and NvFBC patches for NVIDIA drivers License: EULA diff --git a/anda/tools/spotx-bash/spotx-bash.spec b/anda/tools/spotx-bash/spotx-bash.spec index cbc1a98b3a..6169368245 100644 --- a/anda/tools/spotx-bash/spotx-bash.spec +++ b/anda/tools/spotx-bash/spotx-bash.spec @@ -1,5 +1,5 @@ -%global commit d5a23bfc64d75979373c5fddc81641dabff051aa -%global commit_date 20250424 +%global commit 1d16abcbb6cdd0a2882084d91dedc4e1f0e3844c +%global commit_date 20250504 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: spotx-bash From 1adef507ba015a5bab07eb53b067f2c72d91f142 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 4 May 2025 05:18:41 +0000 Subject: [PATCH 1061/2977] bump: zig --- anda/langs/zig/zig-master.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/zig/zig-master.spec b/anda/langs/zig/zig-master.spec index 8fb24c8b54..99694af6ce 100644 --- a/anda/langs/zig/zig-master.spec +++ b/anda/langs/zig/zig-master.spec @@ -7,7 +7,7 @@ %define llvm_compat 20 %endif %global llvm_version 20.0.0 -%global ver 0.15.0-dev.452+c0ec264f7 +%global ver 0.15.0-dev.453+bf9b15ee6 %bcond bootstrap 1 %bcond docs %{without bootstrap} %bcond test 1 From 5a64f9b2f2d63b251692947f9ef7d79d0295eca4 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 4 May 2025 05:57:31 +0000 Subject: [PATCH 1062/2977] bump: lomiri-system-settings --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 0aa3e73c4d..9c5969671b 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit 08a81b051f616f8934589eb6b0d4a3c144f829ac +%global commit 0c4242a1c48a46669e0fba78662df3afe560671b %forgemeta Name: lomiri-system-settings From 49204071a57012610d31ffa6f06be0907409d062 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 4 May 2025 13:15:33 +0000 Subject: [PATCH 1063/2977] bump: legcord-bin stable --- anda/apps/legcord/legcord-bin/legcord-bin.spec | 2 +- anda/apps/legcord/stable/legcord.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/legcord/legcord-bin/legcord-bin.spec b/anda/apps/legcord/legcord-bin/legcord-bin.spec index 0be09978e7..0e2b0a8d39 100644 --- a/anda/apps/legcord/legcord-bin/legcord-bin.spec +++ b/anda/apps/legcord/legcord-bin/legcord-bin.spec @@ -14,7 +14,7 @@ %global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so Name: legcord-bin -Version: 1.1.1 +Version: 1.1.2 Release: 1%?dist License: OSL-3.0 Summary: Custom lightweight Discord client designed to enhance your experience diff --git a/anda/apps/legcord/stable/legcord.spec b/anda/apps/legcord/stable/legcord.spec index 470cfc5ef2..9943a43d5f 100644 --- a/anda/apps/legcord/stable/legcord.spec +++ b/anda/apps/legcord/stable/legcord.spec @@ -5,7 +5,7 @@ %global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so Name: legcord -Version: 1.1.1 +Version: 1.1.2 Release: 1%?dist License: OSL-3.0 Summary: Custom lightweight Discord client designed to enhance your experience From 8240f2aabfec0725e0fdfa8f680200e832d5dc27 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 4 May 2025 13:46:17 +0000 Subject: [PATCH 1064/2977] bump: tdlib --- anda/lib/tdlib/tdlib-nightly.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 6797df5f07..27d86aa216 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,6 +1,6 @@ -%global commit b6303f0cc8f8fe6c0e0314a2df286e1d54f04b41 +%global commit 34c390f9afe074071e01c623e42adfbd17e350ab %global ver 1.8.48 -%global commit_date 20250502 +%global commit_date 20250504 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: tdlib-nightly From 6a98792a11bb334ab808eda863179083c661c660 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 4 May 2025 14:33:58 +0000 Subject: [PATCH 1065/2977] bump: zig --- anda/langs/zig/zig-master.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/zig/zig-master.spec b/anda/langs/zig/zig-master.spec index 99694af6ce..64a7a1424b 100644 --- a/anda/langs/zig/zig-master.spec +++ b/anda/langs/zig/zig-master.spec @@ -7,7 +7,7 @@ %define llvm_compat 20 %endif %global llvm_version 20.0.0 -%global ver 0.15.0-dev.453+bf9b15ee6 +%global ver 0.15.0-dev.460+f4e9846bc %bcond bootstrap 1 %bcond docs %{without bootstrap} %bcond test 1 From dd9957298c370d85a274cf820e973ebd53f63188 Mon Sep 17 00:00:00 2001 From: VirtualFreeEx <122599332+VirtualFreeEx@users.noreply.github.com> Date: Sun, 4 May 2025 14:58:51 +0000 Subject: [PATCH 1066/2977] add: zapret (#4597) * feat: zapret * fix(zapret): re-enable debuginfo --- anda/misc/zapret/anda.hcl | 5 + anda/misc/zapret/build-dont-strip.patch | 119 +++++++++++++ .../zapret/chore-move-to-different-dirs.patch | 164 ++++++++++++++++++ anda/misc/zapret/zapret.spec | 149 ++++++++++++++++ 4 files changed, 437 insertions(+) create mode 100644 anda/misc/zapret/anda.hcl create mode 100644 anda/misc/zapret/build-dont-strip.patch create mode 100644 anda/misc/zapret/chore-move-to-different-dirs.patch create mode 100644 anda/misc/zapret/zapret.spec diff --git a/anda/misc/zapret/anda.hcl b/anda/misc/zapret/anda.hcl new file mode 100644 index 0000000000..17c1ddc2ba --- /dev/null +++ b/anda/misc/zapret/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "zapret.spec" + } +} diff --git a/anda/misc/zapret/build-dont-strip.patch b/anda/misc/zapret/build-dont-strip.patch new file mode 100644 index 0000000000..7ddc2b01f6 --- /dev/null +++ b/anda/misc/zapret/build-dont-strip.patch @@ -0,0 +1,119 @@ +From 77ade97f4c3a1acc5955feeac3bf6e83e0f4d22e Mon Sep 17 00:00:00 2001 +From: VirtualFreeEx +Date: Thu, 1 May 2025 18:21:33 +0300 +Subject: [PATCH 2/2] build: dont strip + +--- + ip2net/Makefile | 6 +++--- + mdig/Makefile | 8 ++++---- + nfq/Makefile | 4 ++-- + tpws/Makefile | 8 ++++---- + 4 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/ip2net/Makefile b/ip2net/Makefile +index 484f3d7..209ad3c 100644 +--- a/ip2net/Makefile ++++ b/ip2net/Makefile +@@ -9,14 +9,14 @@ SRC_FILES = ip2net.c qsort.c + all: ip2net + + ip2net: $(SRC_FILES) +- $(CC) -s $(CFLAGS) -o ip2net $(SRC_FILES) $(LIBS) $(LDFLAGS) ++ $(CC) $(CFLAGS) -o ip2net $(SRC_FILES) $(LIBS) $(LDFLAGS) + + systemd: ip2net + + android: ip2net + + bsd: $(SRC_FILES) +- $(CC) -s $(CFLAGS) $(CFLAGS_BSD) -o ip2net $(SRC_FILES) $(LIBS) $(LDFLAGS) ++ $(CC) $(CFLAGS) $(CFLAGS_BSD) -o ip2net $(SRC_FILES) $(LIBS) $(LDFLAGS) + + mac: $(SRC_FILES) + $(CC) $(CFLAGS) $(CFLAGS_BSD) -o ip2neta $(SRC_FILES) -target arm64-apple-macos10.8 $(LIBS) $(LDFLAGS) +@@ -26,7 +26,7 @@ mac: $(SRC_FILES) + rm -f ip2netx ip2neta + + win: $(SRC_FILES) +- $(CC) -s $(CFLAGS) $(CFLAGS_WIN) -o ip2net $(SRC_FILES) $(LIBS_WIN) $(LDFLAGS) ++ $(CC) $(CFLAGS) $(CFLAGS_WIN) -o ip2net $(SRC_FILES) $(LIBS_WIN) $(LDFLAGS) + + clean: + rm -f ip2net *.o +diff --git a/mdig/Makefile b/mdig/Makefile +index 21b6c84..a9ea0e1 100644 +--- a/mdig/Makefile ++++ b/mdig/Makefile +@@ -10,15 +10,15 @@ SRC_FILES = *.c + all: mdig + + mdig: $(SRC_FILES) +- $(CC) -s $(CFLAGS) -o mdig $(SRC_FILES) $(LIBS) $(LDFLAGS) ++ $(CC) $(CFLAGS) -o mdig $(SRC_FILES) $(LIBS) $(LDFLAGS) + + systemd: mdig + + android: $(SRC_FILES) +- $(CC) -s $(CFLAGS) -o mdig $(SRC_FILES) $(LIBS_ANDROID) $(LDFLAGS) ++ $(CC) $(CFLAGS) -o mdig $(SRC_FILES) $(LIBS_ANDROID) $(LDFLAGS) + + bsd: $(SRC_FILES) +- $(CC) -s $(CFLAGS) $(CFLAGS_BSD) -o mdig $(SRC_FILES) $(LIBS) $(LDFLAGS) ++ $(CC) $(CFLAGS) $(CFLAGS_BSD) -o mdig $(SRC_FILES) $(LIBS) $(LDFLAGS) + + mac: $(SRC_FILES) + $(CC) $(CFLAGS) $(CFLAGS_BSD) -o mdiga $(SRC_FILES) -target arm64-apple-macos10.8 $(LIBS_BSD) $(LDFLAGS) +@@ -28,7 +28,7 @@ mac: $(SRC_FILES) + rm -f mdigx mdiga + + win: $(SRC_FILES) +- $(CC) -s $(CFLAGS) $(CFLAGS_WIN) -o mdig $(SRC_FILES) $(LIBS_WIN) $(LDFLAGS) ++ $(CC) $(CFLAGS) $(CFLAGS_WIN) -o mdig $(SRC_FILES) $(LIBS_WIN) $(LDFLAGS) + + clean: + rm -f mdig *.o +diff --git a/nfq/Makefile b/nfq/Makefile +index 85a29e4..4b6491b 100644 +--- a/nfq/Makefile ++++ b/nfq/Makefile +@@ -16,10 +16,10 @@ SRC_FILES = *.c crypto/*.c + all: nfqws + + nfqws: $(SRC_FILES) +- $(CC) -s $(CFLAGS) -o nfqws $(SRC_FILES) $(LIBS_LINUX) $(LDFLAGS) ++ $(CC) $(CFLAGS) -o nfqws $(SRC_FILES) $(LIBS_LINUX) $(LDFLAGS) + + systemd: $(SRC_FILES) +- $(CC) -s $(CFLAGS) $(CFLAGS_SYSTEMD) -o nfqws $(SRC_FILES) $(LIBS_LINUX) $(LIBS_SYSTEMD) $(LDFLAGS) ++ $(CC) $(CFLAGS) $(CFLAGS_SYSTEMD) -o nfqws $(SRC_FILES) $(LIBS_LINUX) $(LIBS_SYSTEMD) $(LDFLAGS) + + android: nfqws + +diff --git a/tpws/Makefile b/tpws/Makefile +index 2f53263..4fc1743 100644 +--- a/tpws/Makefile ++++ b/tpws/Makefile +@@ -11,16 +11,16 @@ SRC_FILES_ANDROID = $(SRC_FILES) andr/*.c + all: tpws + + tpws: $(SRC_FILES) +- $(CC) -s $(CFLAGS) -o tpws $(SRC_FILES) $(LIBS) $(LDFLAGS) ++ $(CC) -g $(CFLAGS) -o tpws $(SRC_FILES) $(LIBS) $(LDFLAGS) + + systemd: $(SRC_FILES) +- $(CC) -s $(CFLAGS) $(CFLAGS_SYSTEMD) -o tpws $(SRC_FILES) $(LIBS) $(LIBS_SYSTEMD) $(LDFLAGS) ++ $(CC) -g $(CFLAGS) $(CFLAGS_SYSTEMD) -o tpws $(SRC_FILES) $(LIBS) $(LIBS_SYSTEMD) $(LDFLAGS) + + android: $(SRC_FILES) +- $(CC) -s $(CFLAGS) -o tpws $(SRC_FILES_ANDROID) $(LIBS_ANDROID) $(LDFLAGS) ++ $(CC) -g $(CFLAGS) -o tpws $(SRC_FILES_ANDROID) $(LIBS_ANDROID) $(LDFLAGS) + + bsd: $(SRC_FILES) +- $(CC) -s $(CFLAGS) $(CFLAGS_BSD) -Iepoll-shim/include -o tpws $(SRC_FILES) epoll-shim/src/*.c $(LIBS) $(LDFLAGS) ++ $(CC) $(CFLAGS) $(CFLAGS_BSD) -Iepoll-shim/include -o tpws $(SRC_FILES) epoll-shim/src/*.c $(LIBS) $(LDFLAGS) + + mac: $(SRC_FILES) + $(CC) $(CFLAGS) $(CFLAGS_BSD) -Iepoll-shim/include -Imacos -o tpwsa -target arm64-apple-macos10.8 $(SRC_FILES) epoll-shim/src/*.c $(LIBS) $(LDFLAGS) +-- +2.49.0 + diff --git a/anda/misc/zapret/chore-move-to-different-dirs.patch b/anda/misc/zapret/chore-move-to-different-dirs.patch new file mode 100644 index 0000000000..e363b2a391 --- /dev/null +++ b/anda/misc/zapret/chore-move-to-different-dirs.patch @@ -0,0 +1,164 @@ +From 97c9edf12cad05fb8c682ce432a3e8e5ff4c1956 Mon Sep 17 00:00:00 2001 +From: VirtualFreeEx +Date: Thu, 1 May 2025 18:22:41 +0300 +Subject: [PATCH 1/2] chore: move to different dirs + +--- + blockcheck.sh | 15 ++++++++------- + config.default | 3 --- + init.d/systemd/nfqws@.service | 2 +- + init.d/systemd/tpws@.service | 2 +- + init.d/systemd/zapret-list-update.service | 2 +- + init.d/systemd/zapret.service | 4 ++-- + init.d/sysv/functions | 9 +++++---- + init.d/sysv/zapret | 2 +- + 8 files changed, 19 insertions(+), 20 deletions(-) + +diff --git a/blockcheck.sh b/blockcheck.sh +index a827843..9fb0d2b 100755 +--- a/blockcheck.sh ++++ b/blockcheck.sh +@@ -3,9 +3,10 @@ + EXEDIR="$(dirname "$0")" + EXEDIR="$(cd "$EXEDIR"; pwd)" + ZAPRET_BASE=${ZAPRET_BASE:-"$EXEDIR"} +-ZAPRET_RW=${ZAPRET_RW:-"$ZAPRET_BASE"} ++ZAPRET_BINARIES="/usr/bin" ++ZAPRET_RW=${ZAPRET_RW:-"/etc/zapret"} + ZAPRET_CONFIG=${ZAPRET_CONFIG:-"$ZAPRET_RW/config"} +-ZAPRET_CONFIG_DEFAULT="$ZAPRET_BASE/config.default" ++ZAPRET_CONFIG_DEFAULT="$ZAPRET_RW/config.default" + + CURL=${CURL:-curl} + +@@ -28,11 +29,11 @@ QNUM=${QNUM:-59780} + SOCKS_PORT=${SOCKS_PORT:-1993} + TPWS_UID=${TPWS_UID:-1} + TPWS_GID=${TPWS_GID:-3003} +-NFQWS=${NFQWS:-${ZAPRET_BASE}/nfq/nfqws} +-DVTWS=${DVTWS:-${ZAPRET_BASE}/nfq/dvtws} +-WINWS=${WINWS:-${ZAPRET_BASE}/nfq/winws} +-TPWS=${TPWS:-${ZAPRET_BASE}/tpws/tpws} +-MDIG=${MDIG:-${ZAPRET_BASE}/mdig/mdig} ++NFQWS=${NFQWS:-${ZAPRET_BINARIES}/nfqws} ++DVTWS=${DVTWS:-${ZAPRET_BINARIES}/dvtws} ++WINWS=${WINWS:-${ZAPRET_BINARIES}/winws} ++TPWS=${TPWS:-${ZAPRET_BINARIES}/tpws} ++MDIG=${MDIG:-${ZAPRET_BINARIES}/mdig} + DESYNC_MARK=0x10000000 + IPFW_RULE_NUM=${IPFW_RULE_NUM:-1} + IPFW_DIVERT_PORT=${IPFW_DIVERT_PORT:-59780} +diff --git a/config.default b/config.default +index 3a79e59..6a4fc31 100644 +--- a/config.default ++++ b/config.default +@@ -1,9 +1,6 @@ + # this file is included from init scripts + # change values here + +-# can help in case /tmp has not enough space +-#TMPDIR=/opt/zapret/tmp +- + # redefine user for zapret daemons. required on Keenetic + #WS_USER=nobody + +diff --git a/init.d/systemd/nfqws@.service b/init.d/systemd/nfqws@.service +index ca1a6d5..3ddbbb5 100644 +--- a/init.d/systemd/nfqws@.service ++++ b/init.d/systemd/nfqws@.service +@@ -30,7 +30,7 @@ After=network.target + Type=notify + Restart=on-failure + +-ExecSearchPath=/opt/zapret/binaries/my ++ExecSearchPath=/usr/bin + ExecStart=nfqws @${CONFIG_DIR}/${INSTANCE}.conf + Environment=CONFIG_DIR=/etc/zapret + Environment=INSTANCE=%i +diff --git a/init.d/systemd/tpws@.service b/init.d/systemd/tpws@.service +index d6cce63..6ce1ca9 100644 +--- a/init.d/systemd/tpws@.service ++++ b/init.d/systemd/tpws@.service +@@ -30,7 +30,7 @@ After=network.target + Type=notify + Restart=on-failure + +-ExecSearchPath=/opt/zapret/binaries/my ++ExecSearchPath=/usr/bin + ExecStart=tpws @${CONFIG_DIR}/${INSTANCE}.conf + Environment=CONFIG_DIR=/etc/zapret + Environment=INSTANCE=%i +diff --git a/init.d/systemd/zapret-list-update.service b/init.d/systemd/zapret-list-update.service +index eeee1b0..1a476d2 100644 +--- a/init.d/systemd/zapret-list-update.service ++++ b/init.d/systemd/zapret-list-update.service +@@ -7,7 +7,7 @@ IgnoreSIGPIPE=no + KillMode=control-group + GuessMainPID=no + RemainAfterExit=no +-ExecStart=/opt/zapret/ipset/get_config.sh ++ExecStart=/usr/share/zapret/ipset/get_config.sh + + [Install] + WantedBy=multi-user.target +diff --git a/init.d/systemd/zapret.service b/init.d/systemd/zapret.service +index 9d3bf41..4d13d3c 100644 +--- a/init.d/systemd/zapret.service ++++ b/init.d/systemd/zapret.service +@@ -10,8 +10,8 @@ IgnoreSIGPIPE=no + KillMode=none + GuessMainPID=no + RemainAfterExit=no +-ExecStart=/opt/zapret/init.d/sysv/zapret start +-ExecStop=/opt/zapret/init.d/sysv/zapret stop ++ExecStart=/usr/bin/zapret start ++ExecStop=/usr/bin/zapret stop + + [Install] + WantedBy=multi-user.target +diff --git a/init.d/sysv/functions b/init.d/sysv/functions +index 59e488e..4eb7c97 100644 +--- a/init.d/sysv/functions ++++ b/init.d/sysv/functions +@@ -1,7 +1,8 @@ + # init script functions library for desktop linux systems + +-ZAPRET_BASE=${ZAPRET_BASE:-/opt/zapret} +-ZAPRET_RW=${ZAPRET_RW:-"$ZAPRET_BASE"} ++ZAPRET_BASE=${ZAPRET_BASE:-/usr/share/zapret} ++ZAPRET_BINARIES="/usr/bin" ++ZAPRET_RW=${ZAPRET_RW:-"/etc/zapret"} + ZAPRET_CONFIG=${ZAPRET_CONFIG:-"$ZAPRET_RW/config"} + . "$ZAPRET_CONFIG" + . "$ZAPRET_BASE/common/base.sh" +@@ -74,12 +75,12 @@ IPSET_CR="$ZAPRET_BASE/ipset/create_ipset.sh" + [ -n "$DESYNC_MARK_POSTNAT" ] || DESYNC_MARK_POSTNAT=0x20000000 + + [ -n "$QNUM" ] || QNUM=200 +-[ -n "$NFQWS" ] || NFQWS="$ZAPRET_BASE/nfq/nfqws" ++[ -n "$NFQWS" ] || NFQWS="$ZAPRET_BINARIES/nfqws" + NFQWS_OPT_BASE="$USEROPT --dpi-desync-fwmark=$DESYNC_MARK" + + [ -n "$TPPORT" ] || TPPORT=988 + [ -n "$TPPORT_SOCKS" ] || TPPORT_SOCKS=987 +-[ -n "$TPWS" ] || TPWS="$ZAPRET_BASE/tpws/tpws" ++[ -n "$TPWS" ] || TPWS="$ZAPRET_BINARIES/tpws" + TPWS_LOCALHOST4=127.0.0.127 + + TPWS_OPT_BASE="$USEROPT" +diff --git a/init.d/sysv/zapret b/init.d/sysv/zapret +index bb15abb..8d45cec 100755 +--- a/init.d/sysv/zapret ++++ b/init.d/sysv/zapret +@@ -9,7 +9,7 @@ + + SCRIPT=$(readlink -f "$0") + EXEDIR=$(dirname "$SCRIPT") +-ZAPRET_BASE=$(readlink -f "$EXEDIR/../..") ++# ZAPRET_BASE=$(readlink -f "$EXEDIR/../..") + . "$EXEDIR/functions" + + NAME=zapret +-- +2.49.0 + diff --git a/anda/misc/zapret/zapret.spec b/anda/misc/zapret/zapret.spec new file mode 100644 index 0000000000..e982b1ec96 --- /dev/null +++ b/anda/misc/zapret/zapret.spec @@ -0,0 +1,149 @@ +Name: zapret +Version: 70.6 +Release: 6%{?dist} +Summary: A multi-platform Deep Packet Inspection (DPI) bypass tool +License: MIT +ExcludeArch: s390x +Packager: libffi + +URL: https://github.com/bol-van/%{name} +Source0: https://github.com/bol-van/%{name}/archive/refs/tags/v%{version}.tar.gz +Patch0: chore-move-to-different-dirs.patch +Patch1: build-dont-strip.patch + +# Build tools. +BuildRequires: gcc +BuildRequires: make +BuildRequires: git +# Headers. +BuildRequires: libcap-devel +BuildRequires: systemd-devel + +# Runtime libraries. +Requires: libcap +Requires: systemd +Requires: glibc +# Runtime binaries - scripts. +Suggests: nmap-ncat +Suggests: curl +# Runtime binaries - networking. +Requires: ipset +Requires: nftables +# Subpackage dependencies. +Requires: %{name}-nfqws +Requires: %{name}-tpws + +# NFQws. +%package nfqws +Summary: NFQUEUE-based worker solution. + +BuildRequires: libnetfilter_queue-devel +BuildRequires: zlib-ng-compat-devel + +Requires: libnetfilter_queue +Requires: zlib-ng-compat + +# TPws. +%package tpws +Summary: Transparent proxy worker solution. + +%description +A stand-alone (without 3rd party servers) DPI circumvention tool. +May allow to bypass HTTP(S) website blocking or speed shaping, resist +signature TCP/UDP protocol discovery. + +%description nfqws +NFQUEUE-based worker solution. + +%description tpws +Transparent proxy worker solution. + +%prep +%autosetup -S git +rm -rf files/huawei/ # FIX: Remove a busybox dependency. + +%build +%make_build systemd + +# Credit: https://aur.archlinux.org/packages/zapret-git +%install + for n in ip2net mdig; do + install -Dm755 "binaries/my/$n" "%{buildroot}/%{_bindir}/$n" + done + + install -Dm755 blockcheck.sh -t "%{buildroot}/%{_datadir}/%{name}/" + install -dm755 "%{buildroot}" %{buildroot}/%{_datadir}/%{name}/files + cp --reflink=auto -a files/* "%{buildroot}"/%{_datadir}/%{name}/files + + install -Dm644 init.d/systemd/* -t "%{buildroot}%{_prefix}/lib/systemd/system/" + install -Dm755 init.d/sysv/{functions,%{name}} -t "%{buildroot}/%{_datadir}/%{name}/init.d/sysv/" + install -Dm755 ipset/* -t "%{buildroot}/%{_datadir}/%{name}/ipset/" + install -Dm644 common/* -t "%{buildroot}/%{_datadir}/%{name}/common/" + + install -Dm644 /dev/stdin "%{buildroot}/%{_prefix}/lib/sysusers.d/%{name}.conf" << END +u %{name} - "%{name} dpi bypasser" +END + + install -dm755 "%{buildroot}/{%_bindir}" + for i in init.d/sysv/zapret; do + mkdir %{buildroot}/%{_bindir} -p + ln -s "%{_datadir}/%{name}/$i" "%{buildroot}/%{_bindir}/${i##*/}" + done + + sed -e '1s/$/\n\nWS_USER=%{name}/' -i "%{buildroot}/%{_datadir}/%{name}/init.d/sysv/functions" + + for i in nfq/nfqws tpws/tpws; do + install -Dm755 "binaries/my/${i##*/}" "%{buildroot}/%{_bindir}/${i##*/}" + done + + # docs + install -Dm644 docs/*.* -t "%{buildroot}/usr/share/doc/%{name}" + install -Dm644 docs/LICENSE.txt "%{buildroot}/usr/share/licenses/%{name}/LICENSE" + + # config + install -Dm755 config.default %{buildroot}/etc/zapret/config.default + ln -s config.default %{buildroot}/etc/zapret/config + +%files +# Configuration. +%{_sysconfdir}/%{name}/ +%{_prefix}/lib/sysusers.d/zapret.conf + +# Units. +%{_unitdir}/%{name}-list-update.service +%{_unitdir}/%{name}-list-update.timer +%{_unitdir}/%{name}.service + +# Executables. +%{_bindir}/%{name} +%{_bindir}/ip2net +%{_bindir}/mdig + +# Share. +%{_datadir}/%{name} + +# Documentation. +%{_docdir}/%{name} +%license LICENSE + +%files nfqws +# Binaries. +%{_bindir}/nfqws +%{_unitdir}/nfqws@.service + +%files tpws +# Binaries. +%{_bindir}/tpws +%{_unitdir}/tpws@.service + +%changelog +* Thu May 1 2025 libffi - 70.6-6 +- Fix init.d breakages. +* Thu May 1 2025 libffi - 70.6-5 +- Depend on subpackages. +* Thu May 1 2025 libffi - 70.6-4 +- Use subpackages. +* Wed Apr 30 2025 libffi - 70.6-3 +- Use more macros in the .spec file +* Wed Apr 23 2025 libffi - 70.6-2 +- Change from /opt/ to /usr/ From 655b6de0a88eb5a851cd17ac930242e7102bae44 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 4 May 2025 18:45:28 +0000 Subject: [PATCH 1067/2977] bump: legcord-bin stable --- anda/apps/legcord/legcord-bin/legcord-bin.spec | 2 +- anda/apps/legcord/stable/legcord.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/legcord/legcord-bin/legcord-bin.spec b/anda/apps/legcord/legcord-bin/legcord-bin.spec index 0e2b0a8d39..fa6a014c2e 100644 --- a/anda/apps/legcord/legcord-bin/legcord-bin.spec +++ b/anda/apps/legcord/legcord-bin/legcord-bin.spec @@ -14,7 +14,7 @@ %global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so Name: legcord-bin -Version: 1.1.2 +Version: 1.1.3 Release: 1%?dist License: OSL-3.0 Summary: Custom lightweight Discord client designed to enhance your experience diff --git a/anda/apps/legcord/stable/legcord.spec b/anda/apps/legcord/stable/legcord.spec index 9943a43d5f..5d9ad21569 100644 --- a/anda/apps/legcord/stable/legcord.spec +++ b/anda/apps/legcord/stable/legcord.spec @@ -5,7 +5,7 @@ %global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so Name: legcord -Version: 1.1.2 +Version: 1.1.3 Release: 1%?dist License: OSL-3.0 Summary: Custom lightweight Discord client designed to enhance your experience From 6ac86ce5fd4b3f324bdcc23c1291be563af4e7ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= Date: Sun, 4 May 2025 21:56:20 +0300 Subject: [PATCH 1068/2977] [frawhide] fix(mesa): remove duplicated vulkan_drivers (#4637) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This extra line accidentally removes the virtio vulkan driver from the final mesa-vulkan-drivers package, as documented in the following bazzite issue: fixes: ublue-os/bazzite #2472 Signed-off-by: José Pekkarinen --- anda/lib/mesa/mesa.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index 7632314250..683b41fc8f 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -68,7 +68,6 @@ %endif %global vulkan_drivers swrast,virtio%{?base_vulkan}%{?intel_platform_vulkan}%{?extra_platform_vulkan}%{?with_nvk:,nouveau} -%global vulkan_drivers swrast%{?base_vulkan}%{?intel_platform_vulkan}%{?extra_platform_vulkan}%{?with_nvk:,nouveau} Name: %{srcname} Summary: Mesa graphics libraries # Make the dep solver always prefer our Mesa over the distro's @@ -682,8 +681,8 @@ popd %files vulkan-drivers %{_libdir}/libvulkan_lvp.so %{_datadir}/vulkan/icd.d/lvp_icd.*.json -%dnl %{_libdir}/libvulkan_virtio.so -%dnl %{_datadir}/vulkan/icd.d/virtio_icd.*.json +%{_libdir}/libvulkan_virtio.so +%{_datadir}/vulkan/icd.d/virtio_icd.*.json %{_libdir}/libVkLayer_MESA_device_select.so %{_datadir}/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json %if 0%{?with_vulkan_hw} From 386bb0cc5fbffcc071418c1cfdae0bf67b22e652 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 4 May 2025 19:35:23 +0000 Subject: [PATCH 1069/2977] bump(branch): kf6-kio --- anda/desktops/kde/kf6-kio/kf6-kio.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/kde/kf6-kio/kf6-kio.spec b/anda/desktops/kde/kf6-kio/kf6-kio.spec index 39a0e0e4e2..0b0c3ff37e 100644 --- a/anda/desktops/kde/kf6-kio/kf6-kio.spec +++ b/anda/desktops/kde/kf6-kio/kf6-kio.spec @@ -1,7 +1,7 @@ %global framework kio %global stable_kf6 stable -%global majmin_ver_kf6 6.13 +%global majmin_ver_kf6 6.14 Name: kf6-%{framework} Version: %{majmin_ver_kf6}.0 From ee95a5e541df441823348f0e0ea7f4bb33d6f869 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 4 May 2025 20:55:35 +0000 Subject: [PATCH 1070/2977] bump: bun --- anda/devs/bun/bun-bin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/bun/bun-bin.spec b/anda/devs/bun/bun-bin.spec index 8e9def2a29..a71ac365b8 100644 --- a/anda/devs/bun/bun-bin.spec +++ b/anda/devs/bun/bun-bin.spec @@ -6,7 +6,7 @@ %endif Name: bun-bin -Version: 1.2.11 +Version: 1.2.12 Release: 1%?dist Summary: Incredibly fast JavaScript runtime, bundler, test runner, and package manager – all in one License: MIT From 9c19eda9fb5a13639a6ff0dd198a5ac133c62e56 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 4 May 2025 23:31:46 +0000 Subject: [PATCH 1071/2977] bump: preview stable zig --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- anda/langs/zig/zig-master.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index cbbfa38829..9509c2ecb9 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.185.4-pre +%global ver 0.184.10 # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 65594fb8ae..9eddca2634 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global rustflags_debuginfo 0 Name: zed -Version: 0.184.9 +Version: 0.184.10 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later diff --git a/anda/langs/zig/zig-master.spec b/anda/langs/zig/zig-master.spec index 64a7a1424b..3bf90afdc4 100644 --- a/anda/langs/zig/zig-master.spec +++ b/anda/langs/zig/zig-master.spec @@ -7,7 +7,7 @@ %define llvm_compat 20 %endif %global llvm_version 20.0.0 -%global ver 0.15.0-dev.460+f4e9846bc +%global ver 0.15.0-dev.464+dffd18f13 %bcond bootstrap 1 %bcond docs %{without bootstrap} %bcond test 1 From ed21fb3423b783d3c1b2d30807a7c316f4474a5b Mon Sep 17 00:00:00 2001 From: Gilver Date: Sun, 4 May 2025 19:34:31 -0500 Subject: [PATCH 1072/2977] fix(gstreamer1*): Update specs (#4551) * Update gstreamer1-plugins-bad.spec Signed-off-by: Gilver * Update gstreamer1-plugins-ugly.spec Signed-off-by: Gilver * Update gstreamer1-plugin-libav.spec Signed-off-by: Gilver * Update gstreamer1-plugins-bad.spec Signed-off-by: Gilver * Update gstreamer1-plugins-ugly.spec Signed-off-by: Gilver * Update gstreamer1-plugin-libav.spec Signed-off-by: Gilver * Update gstreamer1-plugins-ugly.spec Signed-off-by: Gilver * Update gstreamer1-plugins-ugly.spec Signed-off-by: Gilver * Update gstreamer1-plugins-bad.spec Signed-off-by: Gilver * Update gstreamer1-plugin-libav.spec Signed-off-by: Gilver * Update gstreamer1-plugins-bad.spec Signed-off-by: Gilver --------- Signed-off-by: Gilver --- .../gstreamer1-plugin-libav.spec | 8 +- .../gstreamer1-plugins-bad.spec | 92 +++++++++++++------ .../gstreamer1-plugins-ugly.spec | 7 +- 3 files changed, 73 insertions(+), 34 deletions(-) diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugin-libav/gstreamer1-plugin-libav.spec b/anda/multimedia/gstreamer1/gstreamer1-plugin-libav/gstreamer1-plugin-libav.spec index 8a6d8e6431..fb07089b99 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugin-libav/gstreamer1-plugin-libav.spec +++ b/anda/multimedia/gstreamer1/gstreamer1-plugin-libav/gstreamer1-plugin-libav.spec @@ -1,8 +1,9 @@ Name: gstreamer1-plugin-libav Version: 1.26.1 -Release: 1%?dist +Release: 1%{?dist} +Epoch: 1 Summary: GStreamer Libav plugin -License: LGPLv2+ +License: LGPL-2.0-or-later URL: https://gstreamer.freedesktop.org/modules/gst-libav.html Source0: https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz @@ -34,9 +35,10 @@ GStreamer plugin containing libav library code. %autosetup -p1 -n gst-libav-%{version} %build +#export CFLAGS="%{optflags} -Wno-error=attributes" %meson \ -D package-name="Fedora GStreamer-plugins-ugly package" \ - -D package-origin="https://gstreamer.freedesktop.org" \ + -D package-origin="https://terra.fyralabs.com" \ -D doc=disabled %meson_build diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec index 9476df8148..4d18d26ca7 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec +++ b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec @@ -1,16 +1,19 @@ %define _legacy_common_support 1 +%global __brp_check_rpaths %{nil} %global majorminor 1.0 Name: gstreamer1-plugins-bad Version: 1.26.1 -Release: 1%?dist +Release: 2%{?dist} +Epoch: 1 Summary: GStreamer streaming media framework "bad" plugins -License: LGPLv2+ and LGPLv2 +License: LGPL-2.0-or-later and LGPL-2.0-only URL: http://gstreamer.freedesktop.org/ Source0: https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.xz Source1: gstreamer-bad.metainfo.xml +# Requires Provides with and without _isa defined due to package dependencies Obsoletes: %{name}-free < %{?epoch}:%{version}-%{release} Provides: %{name}-free = %{?epoch}:%{version}-%{release} Provides: %{name}-free%{?_isa} = %{?epoch}:%{version}-%{release} @@ -38,10 +41,16 @@ Provides: gstreamer1-svt-hevc%{?_isa} = %{?epoch}:%{version}-%{release} Obsoletes: %{name}-free-libs < %{?epoch}:%{version}-%{release} Provides: %{name}-free-libs = %{?epoch}:%{version}-%{release} Provides: %{name}-free-libs%{?_isa} = %{?epoch}:%{version}-%{release} +Obsoletes: gstreamer1-plugin-vaapi < %{?epoch}:%{version}-%{release} +Provides: gstreamer1-plugin-vaapi = %{?epoch}:%{version}-%{release} +Provides: gstreamer1-plugin-vaapi%{?_isa} = %{?epoch}:%{version}-%{release} + BuildRequires: gcc-c++ BuildRequires: meson >= 0.62 + BuildRequires: gstreamer1-devel >= %{version} BuildRequires: gstreamer1-plugins-base-devel >= %{version} + BuildRequires: bzip2-devel BuildRequires: check BuildRequires: exempi-devel @@ -52,21 +61,25 @@ BuildRequires: glslc BuildRequires: gobject-introspection-devel >= 1.31.1 BuildRequires: gsm-devel BuildRequires: ladspa-devel +BuildRequires: libatomic BuildRequires: libcdaudio-devel BuildRequires: libmicrodns-devel +#BuildRequires: libmpcdec-devel - Old API BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel -BuildRequires: orc-devel >= 0.4.17 BuildRequires: srt-devel BuildRequires: vulkan-devel BuildRequires: xvidcore-devel -BuildRequires: pkgconfig(aom) + + +BuildRequires: pkgconfig(aom) >= 3.0.2 BuildRequires: pkgconfig(avtp) BuildRequires: pkgconfig(bluez) >= 5.0 BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(clutter-1.0) >= 1.8 BuildRequires: pkgconfig(clutter-glx-1.0) >= 1.8 BuildRequires: pkgconfig(clutter-x11-1.0) >= 1.8 +#BuildRequires: pkgconfig(dssim) BuildRequires: pkgconfig(dvdnav) >= 4.1.2 BuildRequires: pkgconfig(dvdread) >= 4.1.2 BuildRequires: pkgconfig(egl) @@ -79,7 +92,8 @@ BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(gmodule-export-2.0) BuildRequires: pkgconfig(gmodule-no-export-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gstreamer-1.0) >= %{version} +#BuildRequires: pkgconfig(google_cloud_cpp_storage) >= 1.25.0 +BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-allocators-1.0) BuildRequires: pkgconfig(gstreamer-app-1.0) BuildRequires: pkgconfig(gstreamer-audio-1.0) @@ -90,6 +104,7 @@ BuildRequires: pkgconfig(gstreamer-fft-1.0) BuildRequires: pkgconfig(gstreamer-gl-1.0) BuildRequires: pkgconfig(gstreamer-gl-egl-1.0) BuildRequires: pkgconfig(gstreamer-gl-prototypes-1.0) +#BuildRequires: pkgconfig(gstreamer-gl-viv-fb-1.0) BuildRequires: pkgconfig(gstreamer-gl-wayland-1.0) BuildRequires: pkgconfig(gstreamer-gl-x11-1.0) BuildRequires: pkgconfig(gstreamer-net-1.0) @@ -110,37 +125,41 @@ BuildRequires: pkgconfig(lcms2) >= 2.7 BuildRequires: pkgconfig(ldacBT-enc) BuildRequires: pkgconfig(libass) >= 0.10.2 BuildRequires: pkgconfig(libbs2b) >= 3.1.0 +BuildRequires: pkgconfig(lcevc_dec) BuildRequires: pkgconfig(libchromaprint) BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(libcurl) >= 7.55.0 BuildRequires: pkgconfig(libdca) BuildRequires: pkgconfig(libdc1394-2) >= 2.2.5 -BuildRequires: pkgconfig(libde265) -BuildRequires: pkgconfig(libdrm) >= 2.4.104 +BuildRequires: pkgconfig(libde265) >= 0.9 +BuildRequires: pkgconfig(libdrm) >= 2.4.108 BuildRequires: pkgconfig(libexif) >= 0.6.16 BuildRequires: pkgconfig(libfreeaptx) >= 0.1.1 BuildRequires: pkgconfig(libmodplug) +#BuildRequires: pkgconfig(libonnxruntime) >= 1.16.1 BuildRequires: pkgconfig(libopenjp2) >= 2.2 BuildRequires: pkgconfig(libopenmpt) +#BuildRequires: pkgconfig(libopenni2) >= 0.26 BuildRequires: pkgconfig(libpng) >= 1.0 BuildRequires: pkgconfig(libqrencode) BuildRequires: pkgconfig(librsvg-2.0) >= 2.36.2 BuildRequires: pkgconfig(librtmp) BuildRequires: pkgconfig(libSoundTouch) -BuildRequires: pkgconfig(libsoup-2.4) >= 2.48 +BuildRequires: pkgconfig(libsoup-3.0) BuildRequires: pkgconfig(libsrtp2) >= 2.1.0 BuildRequires: pkgconfig(libssh2) >= 1.4.3 BuildRequires: pkgconfig(libusb-1.0) -BuildRequires: pkgconfig(libva) -BuildRequires: pkgconfig(libva-drm) -BuildRequires: pkgconfig(libva-x11) +BuildRequires: pkgconfig(libva) >= 1.18 +BuildRequires: pkgconfig(libva-drm) >= 1.18 +BuildRequires: pkgconfig(libva-x11) >= 1.18 BuildRequires: pkgconfig(libvisual-0.4) >= 0.4.0 BuildRequires: pkgconfig(libwebp) >= 0.2.1 -BuildRequires: pkgconfig(libxml-2.0) >= 2.8 +BuildRequires: pkgconfig(libwebpmux) >= 0.2.1 +BuildRequires: pkgconfig(libxml-2.0) >= 2.9.2 BuildRequires: pkgconfig(lilv-0) >= 0.22 BuildRequires: pkgconfig(lrdf) BuildRequires: pkgconfig(ltc) >= 1.1.4 -BuildRequires: pkgconfig(mjpegtools) +BuildRequires: pkgconfig(mjpegtools) >= 2.0.0 BuildRequires: pkgconfig(nice) >= 0.1.20 BuildRequires: pkgconfig(neon) >= 0.27 BuildRequires: pkgconfig(nettle) >= 3.0 @@ -151,19 +170,17 @@ BuildRequires: pkgconfig(OpenEXR) BuildRequires: pkgconfig(openh264) >= 1.3.0 BuildRequires: pkgconfig(openssl) >= 1.0.1 BuildRequires: pkgconfig(opus) >= 0.9.4 +BuildRequires: pkgconfig(orc-0.4) BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(pangocairo) >= 1.22.0 -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Quick) -BuildRequires: pkgconfig(Qt5WaylandClient) -BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(sbc) >= 1.0 BuildRequires: pkgconfig(schroedinger-1.0) >= 1.0.10 BuildRequires: pkgconfig(sndfile) >= 1.0.16 +#BuildRequires: pkgconfig(soundtouch-1.4) BuildRequires: pkgconfig(spandsp) >= 0.0.6 BuildRequires: pkgconfig(srt) >= 1.3.0 BuildRequires: pkgconfig(SvtAv1Enc) >= 1.1 +#BuildRequires: pkgconfig(SvtJpegxs) >= 0.9 BuildRequires: pkgconfig(tiger) >= 0.3.2 BuildRequires: pkgconfig(vo-aacenc) BuildRequires: pkgconfig(vo-amrwbenc) >= 0.1.0 @@ -173,16 +190,22 @@ BuildRequires: pkgconfig(wayland-cursor) >= 1.15 BuildRequires: pkgconfig(wayland-egl) >= 1.15 BuildRequires: pkgconfig(wayland-protocols) >= 1.15 BuildRequires: pkgconfig(wayland-server) >= 1.15 -BuildRequires: pkgconfig(webrtc-audio-processing-1) +#BuildRequires: pkgconfig(webrtc-audio-coding-1) +BuildRequires: pkgconfig(webrtc-audio-processing-1) >= 1.0 +#BuildRequires: pkgconfig(webrtc-audio-processing-2) >= 2.0 +#BuildRequires: pkgconfig(webview2) +BuildRequires: pkgconfig(wildmidi) >= 0.4.2 +#BuildRequires: pkgconfig(wpe-webkit-1.1) >= 2.28 +#BuildRequires: pkgconfig(wpebackend-fdo-1.0) >= 1.8 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x265) BuildRequires: pkgconfig(xcb) >= 1.10 BuildRequires: pkgconfig(xkbcommon) >= 0.8 BuildRequires: pkgconfig(xkbcommon-x11) -BuildRequires: pkgconfig(wildmidi) >= 0.4.2 -BuildRequires: pkgconfig(zbar) >= 0.9 +BuildRequires: pkgconfig(zbar) >= 0.23.1 BuildRequires: pkgconfig(zvbi-0.2) -BuildRequires: pkgconfig(zxing) +BuildRequires: pkgconfig(zxing) >= 1.4.0 + %ifarch x86_64 BuildRequires: pkgconfig(libmfx) >= 1.0 BuildRequires: pkgconfig(libmfx) <= 1.99 @@ -214,9 +237,12 @@ Requires: gstreamer1-plugins-base-devel Obsoletes: %{name}-free-devel < %{?epoch}:%{version}-%{release} Provides: %{name}-free-devel = %{?epoch}:%{version}-%{release} Provides: %{name}-free-devel%{?_isa} = %{?epoch}:%{version}-%{release} +# Drop after Fedora 36: +Provides: gst-transcoder-devel = 1.16.0-4 +Obsoletes: gst-transcoder-devel < 1.16.0-4 %description devel -%summary. +%summary. %prep %autosetup -p1 -n gst-plugins-bad-%{version} @@ -231,7 +257,7 @@ Provides: %{name}-free-devel%{?_isa} = %{?epoch}:%{version}-%{release} -D aja=disabled \ -D amfcodec=disabled \ -D analyticsoverlay=enabled \ - -D androidmedia=enabled \ + -D androidmedia=disabled \ -D aom=enabled \ -D applemedia=enabled \ -D asfmux=enabled \ @@ -256,6 +282,7 @@ Provides: %{name}-free-devel%{?_isa} = %{?epoch}:%{version}-%{release} -D codectimestamper=enabled \ -D coloreffects=enabled \ -D colormanagement=enabled \ + -D cuda-nvmm=disabled \ -D curl=enabled \ -D curl-ssh2=enabled \ -D d3d11=disabled \ @@ -324,6 +351,8 @@ Provides: %{name}-free-devel%{?_isa} = %{?epoch}:%{version}-%{release} -D ladspa=enabled \ -D ladspa-rdf=enabled \ -D lc3=enabled \ + -D lcevcdecoder=enabled \ + -D lcevcencoder=disabled \ -D ldac=enabled \ -D libde265=enabled \ -D librfb=enabled \ @@ -347,6 +376,8 @@ Provides: %{name}-free-devel%{?_isa} = %{?epoch}:%{version}-%{release} -D netsim=enabled \ -D nls=enabled \ -D nvcodec=enabled \ + -D nvcomp=disabled \ + -D nvdswrapper=disabled \ -D onnx=disabled \ -D onvif=enabled \ -D openal=enabled \ @@ -361,7 +392,7 @@ Provides: %{name}-free-devel%{?_isa} = %{?epoch}:%{version}-%{release} -D opus=enabled \ -D orc=enabled \ -D package-name="Fedora GStreamer-plugins-bad package" \ - -D package-origin="https://gstreamer.freedesktop.org" \ + -D package-origin="https://terra.fyralabs.com" \ -D pcapparse=enabled \ -D pnm=enabled \ -D proxy=enabled \ @@ -392,6 +423,7 @@ Provides: %{name}-free-devel%{?_isa} = %{?epoch}:%{version}-%{release} -D srtp=enabled \ -D subenc=enabled \ -D svtav1=enabled \ + -D svtjpegxs=disabled \ -D svthevcenc=disabled \ -D switchbin=enabled \ -D teletext=enabled \ @@ -416,12 +448,14 @@ Provides: %{name}-free-devel%{?_isa} = %{?epoch}:%{version}-%{release} -D voamrwbenc=enabled \ -D vulkan=enabled \ -D vulkan-video=enabled \ + -D vulkan-windowing=x11,wayland \ -D wasapi=disabled \ -D wasapi2=disabled \ -D wayland=enabled \ -D webp=enabled \ -D webrtc=enabled \ -D webrtcdsp=enabled \ + -D webview2=enabled \ -D wic=enabled \ -D wildmidi=enabled \ -D win32ipc=disabled \ @@ -442,9 +476,6 @@ Provides: %{name}-free-devel%{?_isa} = %{?epoch}:%{version}-%{release} -D msdk=disabled \ -D qsv=disabled \ %endif -%if "%?version" < "1.25.1" - -D asio-sdk-path=enabled -%endif %meson_build @@ -500,6 +531,7 @@ install -p -m 644 -D %{SOURCE1} %{buildroot}%{_metainfodir}/gstreamer-bad.metain %{_libdir}/libgstwayland-%{majorminor}.so.* %{_libdir}/libgstwebrtc-%{majorminor}.so.* %{_libdir}/libgstwebrtcnice-%{majorminor}.so.* +# Encoder profiles %dir %{_datadir}/gstreamer-%{majorminor}/encoding-profiles/ %dir %{_datadir}/gstreamer-%{majorminor}/encoding-profiles/device/ %{_datadir}/gstreamer-%{majorminor}/encoding-profiles/device/dvd.gep @@ -515,9 +547,11 @@ install -p -m 644 -D %{SOURCE1} %{buildroot}%{_metainfodir}/gstreamer-bad.metain %{_datadir}/gstreamer-%{majorminor}/encoding-profiles/file-extension/webm.gep %dir %{_datadir}/gstreamer-%{majorminor}/encoding-profiles/online-services/ %{_datadir}/gstreamer-%{majorminor}/encoding-profiles/online-services/youtube.gep +# Presets %dir %{_datadir}/gstreamer-%{majorminor}/presets %{_datadir}/gstreamer-%{majorminor}/presets/GstFreeverb.prs %{_datadir}/gstreamer-%{majorminor}/presets/GstVoAmrwbEnc.prs +# Plugins %{_libdir}/gstreamer-%{majorminor}/libgstaccurip.so %{_libdir}/gstreamer-%{majorminor}/libgstadpcmdec.so %{_libdir}/gstreamer-%{majorminor}/libgstadpcmenc.so @@ -584,6 +618,7 @@ install -p -m 644 -D %{SOURCE1} %{buildroot}%{_metainfodir}/gstreamer-bad.metain %{_libdir}/gstreamer-%{majorminor}/libgstkms.so %{_libdir}/gstreamer-%{majorminor}/libgstladspa.so %{_libdir}/gstreamer-%{majorminor}/libgstlc3.so +%{_libdir}/gstreamer-%{majorminor}/libgstlcevcdecoder.so %{_libdir}/gstreamer-%{majorminor}/libgstldac.so %{_libdir}/gstreamer-%{majorminor}/libgstlegacyrawparse.so %{_libdir}/gstreamer-%{majorminor}/libgstlv2.so @@ -647,6 +682,7 @@ install -p -m 644 -D %{SOURCE1} %{buildroot}%{_metainfodir}/gstreamer-bad.metain %{_libdir}/gstreamer-%{majorminor}/libgstsubenc.so %{_libdir}/gstreamer-%{majorminor}/libgstswitchbin.so %{_libdir}/gstreamer-%{majorminor}/libgstteletext.so +%{_libdir}/gstreamer-%{majorminor}/libgsttensordecoders.so %{_libdir}/gstreamer-%{majorminor}/libgsttimecode.so %{_libdir}/gstreamer-%{majorminor}/libgsttranscode.so %{_libdir}/gstreamer-%{majorminor}/libgstttmlsubs.so diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec b/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec index 60f54f6b3f..b339bd3ef9 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec +++ b/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec @@ -2,9 +2,10 @@ Name: gstreamer1-plugins-ugly Version: 1.26.1 -Release: 1%?dist +Release: 1%{?dist} +Epoch: 1 Summary: GStreamer streaming media framework "ugly" plugins -License: LGPLv2+ and LGPLv2 +License: LGPL-2.0-or-later and LGPL-2.0-only URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-%{version}.tar.xz @@ -38,7 +39,7 @@ This module contains a set of plugins that have good quality and are well tested %build %meson \ -D package-name="Fedora GStreamer-plugins-ugly package" \ - -D package-origin="http://gstreamer.freedesktop.org" \ + -D package-origin="https://terra.fyralabs.com" \ -D a52dec=enabled \ -D asfdemux=enabled \ -D cdio=enabled \ From 97340523103c3e2de59aa64efe0cdd8855d1f61f Mon Sep 17 00:00:00 2001 From: Gilver Date: Sun, 4 May 2025 20:05:48 -0500 Subject: [PATCH 1073/2977] Add: GStreamer VA-API (#3276) * Add: GStreamer VA-API * Subrepo label format change --- .../gstreamer1/gstreamer1-vaapi/anda.hcl | 10 +++ .../gstreamer1-vaapi/gstreamer1-vaapi.spec | 76 +++++++++++++++++++ .../gstreamer1/gstreamer1-vaapi/update.rhai | 4 + 3 files changed, 90 insertions(+) create mode 100644 anda/multimedia/gstreamer1/gstreamer1-vaapi/anda.hcl create mode 100644 anda/multimedia/gstreamer1/gstreamer1-vaapi/gstreamer1-vaapi.spec create mode 100644 anda/multimedia/gstreamer1/gstreamer1-vaapi/update.rhai diff --git a/anda/multimedia/gstreamer1/gstreamer1-vaapi/anda.hcl b/anda/multimedia/gstreamer1/gstreamer1-vaapi/anda.hcl new file mode 100644 index 0000000000..d4a7941e7e --- /dev/null +++ b/anda/multimedia/gstreamer1/gstreamer1-vaapi/anda.hcl @@ -0,0 +1,10 @@ +project pkg { + arches = ["x86_64", "aarch64", "i386"] + rpm { + spec = "gstreamer1-vaapi.spec" + } + labels { + subrepo = "extras" + mock = 1 + } +} diff --git a/anda/multimedia/gstreamer1/gstreamer1-vaapi/gstreamer1-vaapi.spec b/anda/multimedia/gstreamer1/gstreamer1-vaapi/gstreamer1-vaapi.spec new file mode 100644 index 0000000000..c42585c109 --- /dev/null +++ b/anda/multimedia/gstreamer1/gstreamer1-vaapi/gstreamer1-vaapi.spec @@ -0,0 +1,76 @@ +Name: gstreamer1-plugin-vaapi +Version: 1.26.0 +Release: 1%{?dist} +Epoch: 1 +Summary: GStreamer VA-API integration +License: LGPLv2+ +URL: https://gstreamer.freedesktop.org/modules/gstreamer-vaapi.html + +Source0: https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-%{version}.tar.xz + +BuildRequires: gcc +BuildRequires: glib2-devel >= 2.44 +BuildRequires: gstreamer1-devel >= %{version} +BuildRequires: gstreamer1-plugins-base-devel >= %{version} +BuildRequires: gstreamer1-plugins-bad-devel >= %{version} +BuildRequires: libvpx-devel +BuildRequires: meson >= 0.48.0 +BuildRequires: pkgconfig(egl) +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(glesv2) +#BuildRequires: pkgconfig(glesv3) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libdrm) +BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(libva) >= 0.39.0 +BuildRequires: pkgconfig(libva-x11) >= 0.31.0 +BuildRequires: pkgconfig(libva-drm) >= 0.33.0 +BuildRequires: pkgconfig(libva-wayland) >= 0.33.0 +BuildRequires: pkgconfig(wayland-client) >= 1.11.0 +BuildRequires: pkgconfig(wayland-cursor) >= 1.11.0 +BuildRequires: pkgconfig(wayland-egl) +BuildRequires: pkgconfig(wayland-protocols) >= 1.11.0 +BuildRequires: pkgconfig(wayland-scanner) >= 1.11.0 +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xrandr) +BuildRequires: pkgconfig(xrender) + +Obsoletes: gstreamer1-vaapi < 1:1.20.3-2 +Provides: gstreamer1-vaapi = 1:%{version}-%{release} +Provides: gstreamer1-vaapi%{?_isa} = 1:%{version}-%{release} + +%description +GStreamer is a streaming media framework, based on graphs of elements which +operate on media data. + +VA-API-based decoder, encoder, postprocessing and video sink elements for +GStreamer. + +%prep +%autosetup -n gstreamer-vaapi-%{version} + +%build +%meson \ + -D doc=disabled \ + -D drm=enabled \ + -D egl=enabled \ + -D encoders=enabled \ + -D glx=enabled \ + -D wayland=enabled \ + -D x11=enabled + +%meson_build + +%install +%meson_install +find %{buildroot} -name "*.la" -delete + +%ldconfig_scriptlets + +%files +%license COPYING.LIB +%doc AUTHORS NEWS README +%{_libdir}/gstreamer-1.0/*.so + +%changelog +%autochangelog diff --git a/anda/multimedia/gstreamer1/gstreamer1-vaapi/update.rhai b/anda/multimedia/gstreamer1/gstreamer1-vaapi/update.rhai new file mode 100644 index 0000000000..aa26a804e7 --- /dev/null +++ b/anda/multimedia/gstreamer1/gstreamer1-vaapi/update.rhai @@ -0,0 +1,4 @@ +let release = labels.branch.to_upper(); +let ver = get(`https://bodhi.fedoraproject.org/updates/?search=gstreamer1-vaapi&status=stable&releases=${release}&rows_per_page=1&page=1`).json().updates[0].title; +rpm.version(find(`gstreamer1-vaapi-([\d.]+)`, ver, 1)); +rpm.release(find(`gstreamer1-vaapi-[\d.]+-([\d.])`, ver, 1)); From 724e295b20174132d59f0da7c326cc0a0c0a5c0d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 5 May 2025 01:10:18 +0000 Subject: [PATCH 1074/2977] bump(branch): gstreamer1-plugin-libav gstreamer1-plugins-bad gstreamer1-plugins-ugly --- .../gstreamer1-plugin-libav/gstreamer1-plugin-libav.spec | 2 +- .../gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec | 2 +- .../gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugin-libav/gstreamer1-plugin-libav.spec b/anda/multimedia/gstreamer1/gstreamer1-plugin-libav/gstreamer1-plugin-libav.spec index fb07089b99..7ed5bbf0fe 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugin-libav/gstreamer1-plugin-libav.spec +++ b/anda/multimedia/gstreamer1/gstreamer1-plugin-libav/gstreamer1-plugin-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-plugin-libav Version: 1.26.1 -Release: 1%{?dist} +Release: 1%?dist Epoch: 1 Summary: GStreamer Libav plugin License: LGPL-2.0-or-later diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec index 4d18d26ca7..852dc1fd33 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec +++ b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec @@ -4,7 +4,7 @@ Name: gstreamer1-plugins-bad Version: 1.26.1 -Release: 2%{?dist} +Release: 1%?dist Epoch: 1 Summary: GStreamer streaming media framework "bad" plugins License: LGPL-2.0-or-later and LGPL-2.0-only diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec b/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec index b339bd3ef9..2c5cfaa33c 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec +++ b/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec @@ -2,7 +2,7 @@ Name: gstreamer1-plugins-ugly Version: 1.26.1 -Release: 1%{?dist} +Release: 1%?dist Epoch: 1 Summary: GStreamer streaming media framework "ugly" plugins License: LGPL-2.0-or-later and LGPL-2.0-only From 6407faa3d60d1ee1118abc6967cd1fbb22c6a175 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 5 May 2025 01:40:43 +0000 Subject: [PATCH 1075/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index d7287a44b2..2c7347c9bc 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-05-03 +%global ver 2025-05-05 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 3b1be9a0202c9337d1339e1198ada602a00f0724 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 5 May 2025 01:52:51 +0000 Subject: [PATCH 1076/2977] bump(nightly): nightly nightly prismlauncher-nightly --- anda/apps/legcord/nightly/legcord-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/anda/apps/legcord/nightly/legcord-nightly.spec b/anda/apps/legcord/nightly/legcord-nightly.spec index 90643041e8..6fe0887ba3 100644 --- a/anda/apps/legcord/nightly/legcord-nightly.spec +++ b/anda/apps/legcord/nightly/legcord-nightly.spec @@ -1,5 +1,5 @@ -%global commit c7963dddaf126124a4731d5dfa8d02aeab62f83b -%global commit_date 20250503 +%global commit 77e2ccafb221936a99654c237cb385d486780bc7 +%global commit_date 20250505 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define debug_package %nil diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 5f3e3e0105..1f6ee88b98 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 425f32e068f7a7a04a0248a06452a2b3ae8c193f +%global commit 55eb0710edef8f967ef28b374f2a5cf4c13fde6a %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250504 +%global commit_date 20250505 %global ver 0.186.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 4c59ef1144..287876daa8 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 62afb86c6bcb0c4d048baeebc7096c8c9d4b3484 +%global commit 693d9d02bca3348b9a59e013867c3f6c8c5a9f98 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250502 +%global commit_date 20250505 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 From cb65463d4196fe1432c0cdcdaa66e0d8d8d4f6db Mon Sep 17 00:00:00 2001 From: Gilver Date: Sun, 4 May 2025 21:48:35 -0500 Subject: [PATCH 1077/2977] feat(gstreamer1-plugins-bad): Provide and obsolete freeworld (#4662) Signed-off-by: Gilver --- .../gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec index 852dc1fd33..4d0e5472c9 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec +++ b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec @@ -44,6 +44,8 @@ Provides: %{name}-free-libs%{?_isa} = %{?epoch}:%{version}-%{release} Obsoletes: gstreamer1-plugin-vaapi < %{?epoch}:%{version}-%{release} Provides: gstreamer1-plugin-vaapi = %{?epoch}:%{version}-%{release} Provides: gstreamer1-plugin-vaapi%{?_isa} = %{?epoch}:%{version}-%{release} +Obsoletes: %{name}-freeworld < %{?epoch}:%{version}-%{release} +Provides: %{name}-freeworld = %{?epoch}:%{version}-%{release} BuildRequires: gcc-c++ BuildRequires: meson >= 0.62 @@ -237,9 +239,6 @@ Requires: gstreamer1-plugins-base-devel Obsoletes: %{name}-free-devel < %{?epoch}:%{version}-%{release} Provides: %{name}-free-devel = %{?epoch}:%{version}-%{release} Provides: %{name}-free-devel%{?_isa} = %{?epoch}:%{version}-%{release} -# Drop after Fedora 36: -Provides: gst-transcoder-devel = 1.16.0-4 -Obsoletes: gst-transcoder-devel < 1.16.0-4 %description devel %summary. From 910e697ead8e8ae346b22b2476887bfec196a8f7 Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 5 May 2025 00:14:56 -0500 Subject: [PATCH 1078/2977] fix?(gstreamer1-plugins-bad): Fully obsolete freeworld (#4665) Signed-off-by: Gilver --- .../gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec index 4d0e5472c9..0092829d6b 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec +++ b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec @@ -44,8 +44,7 @@ Provides: %{name}-free-libs%{?_isa} = %{?epoch}:%{version}-%{release} Obsoletes: gstreamer1-plugin-vaapi < %{?epoch}:%{version}-%{release} Provides: gstreamer1-plugin-vaapi = %{?epoch}:%{version}-%{release} Provides: gstreamer1-plugin-vaapi%{?_isa} = %{?epoch}:%{version}-%{release} -Obsoletes: %{name}-freeworld < %{?epoch}:%{version}-%{release} -Provides: %{name}-freeworld = %{?epoch}:%{version}-%{release} +Obsoletes: %{name}-freeworld <= %{?epoch}:%{version}-%{release} BuildRequires: gcc-c++ BuildRequires: meson >= 0.62 From f3b8def1787c9bbd1cbde992b41d08c3e1e89ef7 Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 5 May 2025 00:24:07 -0500 Subject: [PATCH 1079/2977] chore(epsonscan2): Working CMake macro (#4644) * chore(epsonscan2): Working CMake macro, move to system since this contains drivers * fix: Unsure what happened there, average Gilver curse * a * feat: Fully switch to CMake Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/{apps => system}/epsonscan2/anda.hcl | 0 anda/{apps => system}/epsonscan2/epsonscan2.spec | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename anda/{apps => system}/epsonscan2/anda.hcl (100%) rename anda/{apps => system}/epsonscan2/epsonscan2.spec (96%) diff --git a/anda/apps/epsonscan2/anda.hcl b/anda/system/epsonscan2/anda.hcl similarity index 100% rename from anda/apps/epsonscan2/anda.hcl rename to anda/system/epsonscan2/anda.hcl diff --git a/anda/apps/epsonscan2/epsonscan2.spec b/anda/system/epsonscan2/epsonscan2.spec similarity index 96% rename from anda/apps/epsonscan2/epsonscan2.spec rename to anda/system/epsonscan2/epsonscan2.spec index 2a88e4cc9b..1a7e6616cf 100644 --- a/anda/apps/epsonscan2/epsonscan2.spec +++ b/anda/system/epsonscan2/epsonscan2.spec @@ -58,15 +58,15 @@ rpm2cpio plugins/*.rpm | cpio -idmv %build # CMake macro fails to generate the build files somehow? This works however. I don't really understand. -cmake . \ +%cmake \ -DBUILD_TYPE=Release -%make_build +%cmake_build %install -%make_install +%cmake_install -# The Makefile fails to do these steps correctly but just using CMake was even more problematic. +# The CMakeLists.txt fails to do these steps correctly. # The file is also very annoying to patch. Thank God this doesn't seem to update anymore. mkdir -p %{buildroot}%{_udevrulesdir} mv %{buildroot}/lib/udev/rules.d/60-%{name}.rules -t %{buildroot}%{_udevrulesdir} From c81bad9d44c3248d8072214af44563ba769be336 Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 5 May 2025 00:25:03 -0500 Subject: [PATCH 1080/2977] feat: Split Zig package (#4652) * feat: Split Zig package into bootstrap and full build, have full build track bootstrap * fix: Folder typo --- ...ve-native-lib-directories-from-rpath.patch | 0 ...-bounds-of-main-zig-executable-to-9G.patch | 0 ...ib-dir-as-directory-instead-of-as-st.patch | 0 anda/langs/zig/bootstrap/anda.hcl | 5 + anda/langs/zig/{ => bootstrap}/update.rhai | 0 .../zig/bootstrap/zig-master-bootstrap.spec | 203 ++++++++++++++++++ ...ve-native-lib-directories-from-rpath.patch | 18 ++ ...-bounds-of-main-zig-executable-to-9G.patch | 11 + ...ib-dir-as-directory-instead-of-as-st.patch | 18 ++ anda/langs/zig/{ => master}/anda.hcl | 3 + anda/langs/zig/master/update.rhai | 8 + anda/langs/zig/{ => master}/zig-master.spec | 4 +- 12 files changed, 268 insertions(+), 2 deletions(-) rename anda/langs/zig/{ => bootstrap}/0000-remove-native-lib-directories-from-rpath.patch (100%) rename anda/langs/zig/{ => bootstrap}/0001-increase-upper-bounds-of-main-zig-executable-to-9G.patch (100%) rename anda/langs/zig/{ => bootstrap}/0002-build-pass-zig-lib-dir-as-directory-instead-of-as-st.patch (100%) create mode 100644 anda/langs/zig/bootstrap/anda.hcl rename anda/langs/zig/{ => bootstrap}/update.rhai (100%) create mode 100644 anda/langs/zig/bootstrap/zig-master-bootstrap.spec create mode 100644 anda/langs/zig/master/0000-remove-native-lib-directories-from-rpath.patch create mode 100644 anda/langs/zig/master/0001-increase-upper-bounds-of-main-zig-executable-to-9G.patch create mode 100644 anda/langs/zig/master/0002-build-pass-zig-lib-dir-as-directory-instead-of-as-st.patch rename anda/langs/zig/{ => master}/anda.hcl (62%) create mode 100644 anda/langs/zig/master/update.rhai rename anda/langs/zig/{ => master}/zig-master.spec (99%) diff --git a/anda/langs/zig/0000-remove-native-lib-directories-from-rpath.patch b/anda/langs/zig/bootstrap/0000-remove-native-lib-directories-from-rpath.patch similarity index 100% rename from anda/langs/zig/0000-remove-native-lib-directories-from-rpath.patch rename to anda/langs/zig/bootstrap/0000-remove-native-lib-directories-from-rpath.patch diff --git a/anda/langs/zig/0001-increase-upper-bounds-of-main-zig-executable-to-9G.patch b/anda/langs/zig/bootstrap/0001-increase-upper-bounds-of-main-zig-executable-to-9G.patch similarity index 100% rename from anda/langs/zig/0001-increase-upper-bounds-of-main-zig-executable-to-9G.patch rename to anda/langs/zig/bootstrap/0001-increase-upper-bounds-of-main-zig-executable-to-9G.patch diff --git a/anda/langs/zig/0002-build-pass-zig-lib-dir-as-directory-instead-of-as-st.patch b/anda/langs/zig/bootstrap/0002-build-pass-zig-lib-dir-as-directory-instead-of-as-st.patch similarity index 100% rename from anda/langs/zig/0002-build-pass-zig-lib-dir-as-directory-instead-of-as-st.patch rename to anda/langs/zig/bootstrap/0002-build-pass-zig-lib-dir-as-directory-instead-of-as-st.patch diff --git a/anda/langs/zig/bootstrap/anda.hcl b/anda/langs/zig/bootstrap/anda.hcl new file mode 100644 index 0000000000..60172542b7 --- /dev/null +++ b/anda/langs/zig/bootstrap/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "zig-master-bootstrap.spec" + } +} diff --git a/anda/langs/zig/update.rhai b/anda/langs/zig/bootstrap/update.rhai similarity index 100% rename from anda/langs/zig/update.rhai rename to anda/langs/zig/bootstrap/update.rhai diff --git a/anda/langs/zig/bootstrap/zig-master-bootstrap.spec b/anda/langs/zig/bootstrap/zig-master-bootstrap.spec new file mode 100644 index 0000000000..479bedb1fd --- /dev/null +++ b/anda/langs/zig/bootstrap/zig-master-bootstrap.spec @@ -0,0 +1,203 @@ +# https://ziglang.org/download/VERSION/release-notes.html#Support-Table +%global zig_arches x86_64 aarch64 riscv64 %{mips64} +# Signing key from https://ziglang.org/download/ +%global public_key RWSGOq2NVecA2UPNdBUZykf1CCb147pkmdtYxgb3Ti+JO/wCYvhbAb/U +# Not needed yet +%if 0%{?fedora} >= 42 || 0%{?rhel} >= 9 +%define llvm_compat 20 +%endif +%global llvm_version 20.0.0 +%global ver 0.15.0-dev.452+c0ec264f7 +%bcond bootstrap 1 +%bcond docs %{without bootstrap} +%bcond test 1 +%global zig_cache_dir %{builddir}/zig-cache +%global zig_build_options %{shrink: \ + --verbose \ + --release=fast \ + --summary all \ + \ + -Dtarget=native \ + -Dcpu=baseline \ + --zig-lib-dir lib \ + --build-id=sha1 \ + \ + --cache-dir "%{zig_cache_dir}" \ + --global-cache-dir "%{zig_cache_dir}" \ + \ + -Dversion-string="%(v=%{ver}; echo ${v:0:6})" \ + -Dstatic-llvm=false \ + -Denable-llvm=true \ + -Dno-langref=true \ + -Dstd-docs=false \ + -Dpie \ + -Dconfig_h="%{__cmake_builddir}/config.h" \ +} +%global zig_install_options %zig_build_options %{shrink: \ + --prefix "%{_prefix}" \ +} + +Name: zig-master-bootstrap +Version: %(echo %{ver} | sed 's/-/~/g') +Release: 1%?dist +Summary: Boostrap builds for Zig. +License: MIT AND NCSA AND LGPL-2.1-or-later AND LGPL-2.1-or-later WITH GCC-exception-2.0 AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND BSD-3-Clause AND Inner-Net-2.0 AND ISC AND LicenseRef-Fedora-Public-Domain AND GFDL-1.1-or-later AND ZPL-2.1 +URL: https://ziglang.org +Source0: %{url}/builds/zig-%{ver}.tar.xz +Source1: %{url}/builds/zig-%{ver}.tar.xz.minisig +Patch0: 0000-remove-native-lib-directories-from-rpath.patch +Patch1: 0001-increase-upper-bounds-of-main-zig-executable-to-9G.patch +Patch2: 0002-build-pass-zig-lib-dir-as-directory-instead-of-as-st.patch +BuildRequires: cmake +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: libxml2-devel +BuildRequires: llvm-devel +BuildRequires: clang-devel +BuildRequires: lld-devel +BuildRequires: zlib-devel +# for man page generation +BuildRequires: help2man +# for signature verification +BuildRequires: minisign +%if %{without bootstrap} +BuildRequires: %{name} <= %{version} +%endif +%if %{with test} +BuildRequires: elfutils-libelf-devel +BuildRequires: libstdc++-static +%endif +Requires: %{name}-libs = %{version} +# Apache-2.0 WITH LLVM-exception OR NCSA OR MIT +Provides: bundled(compiler-rt) = %{llvm_version} +# LGPL-2.1-or-later AND SunPro AND LGPL-2.1-or-later WITH GCC-exception-2.0 AND BSD-3-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later WITH GNU-compiler-exception AND GPL-2.0-only AND ISC AND LicenseRef-Fedora-Public-Domain AND HPND AND CMU-Mach AND LGPL-2.0-or-later AND Unicode-3.0 AND GFDL-1.1-or-later AND GPL-1.0-or-later AND FSFUL AND MIT AND Inner-Net-2.0 AND X11 AND GPL-2.0-or-later WITH GCC-exception-2.0 AND GFDL-1.3-only AND GFDL-1.1-only +Provides: bundled(glibc) = 2.41 +# Apache-2.0 WITH LLVM-exception OR MIT OR NCSA +Provides: bundled(libcxx) = %{llvm_version} +# Apache-2.0 WITH LLVM-exception OR MIT OR NCSA +Provides: bundled(libcxxabi) = %{llvm_version} +# NCSA +Provides: bundled(libunwind) = %{llvm_version} +# BSD, LGPG, ZPL +Provides: bundled(mingw) = 3839e21b08807479a31d5a9764666f82ae2f0356 +# MIT +Provides: bundled(musl) = 1.2.5 +# Apache-2.0 WITH LLVM-exception AND Apache-2.0 AND MIT AND BSD-2-Clause +Provides: bundled(wasi-libc) = d03829489904d38c624f6de9983190f1e5e7c9c5 +Conflicts: zig +ExclusiveArch: %{zig_arches} +Packager: Gilver E. + +%description +Zig is an open source alternative to C. +This package provides the bootstrap to build full "prerelease"/master builds of Zig. +It is not recommended to use this build on its own. + +# The Zig stdlib only contains uncompiled code +%package libs +Summary: Zig Standard Library +Conflicts: zig-libs +BuildArch: noarch + +%description libs +Zig Standard Library + +%prep +/usr/bin/minisign -V -m %{SOURCE0} -x %{SOURCE1} -P %{public_key} +%autosetup -p1 -n zig-%{ver} +%if %{without bootstrap} +# Ensure that the pre-build stage1 binary is not used +rm -f stage1/zig1.wasm +%endif + +%build +# zig doesn't know how to dynamically link llvm on its own so we need cmake to generate a header ahead of time +# if we provide the header we need to also build zigcpp + +# C_FLAGS: wasm2c output generates a lot of noise with -Wunused. +# EXTRA_BUILD_ARGS: explicitly specify a build-id +%cmake \ + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ + -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="-DNDEBUG -Wno-unused" \ + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="-DNDEBUG -Wno-unused" \ + \ + -DZIG_EXTRA_BUILD_ARGS:STRING="--verbose;--build-id=sha1" \ + -DZIG_SHARED_LLVM:BOOL=true \ + -DZIG_PIE:BOOL=true \ + \ + -DZIG_TARGET_MCPU:STRING=baseline \ + -DZIG_TARGET_TRIPLE:STRING=native \ + \ + -DZIG_VERSION:STRING="%(v=%{ver}; echo ${v:0:6})" + +%if %{with bootstrap} +%cmake_build --target stage3 +%else +%cmake_build --target zigcpp +zig build %{zig_build_options} + +# Zig has no official manpage +# https://github.com/ziglang/zig/issues/715 +help2man --no-discard-stderr --no-info "./zig-out/bin/zig" --version-option=version --output=zig.1 +%endif + + +%if %{with docs} +# Use the newly made stage 3 compiler to generate docs +# Zig has an extremely annoying issue with transitive failures when trying to build the docs, retry until it succeeds +max=3 +attempt=1 +while ./zig-out/bin/zig build docs \ + --verbose \ + --global-cache-dir "%{zig_cache_dir}" \ + -Dversion-string="%(v=%{ver}; echo ${v:0:6})"; [[ $? -ne 0 ]]; +do + echo "Transitive failure. Trying again." + + if [[ $attempt -eq $max ]] + then + break + fi + + sleep 1 + ((attempt++)) +done +%endif + +%install +%if %{with bootstrap} +%cmake_install +%else +DESTDIR="%{buildroot}" zig build install %{zig_install_options} + +install -Dpm644 zig.1 -t %{buildroot}%{_mandir}/man1/ +%endif + +%if %{with test} +%check +# Run reduced set of tests, based on the Zig CI +"%{buildroot}%{_bindir}/zig" test test/behavior.zig -Itest +%endif + +%files +%license LICENSE +%{_bindir}/zig +%if %{without bootstrap} +%{_mandir}/man1/zig.1.* +%endif + +%files libs +%{_prefix}/lib/zig + +%if %{with docs} +%files doc +%doc README.md +%doc zig-out/doc/langref.html +%doc zig-out/doc/std +%endif + +%changelog +* Fri Apr 25 2025 Gilver E. - 0.15.0~dev.384+c06fecd46-2 +- Ported Fedora Zig patches +* Wed Apr 23 2025 Gilver E. +- Initial package diff --git a/anda/langs/zig/master/0000-remove-native-lib-directories-from-rpath.patch b/anda/langs/zig/master/0000-remove-native-lib-directories-from-rpath.patch new file mode 100644 index 0000000000..1e1c1f1709 --- /dev/null +++ b/anda/langs/zig/master/0000-remove-native-lib-directories-from-rpath.patch @@ -0,0 +1,18 @@ +--- a/src/main.zig 2025-04-25 06:01:31.337458939 -0500 ++++ b/src/main.zig 2025-04-25 06:03:02.239473385 -0500 +@@ -4072,6 +4072,15 @@ + + try create_module.lib_directories.ensureUnusedCapacity(arena, paths.lib_dirs.items.len); + for (paths.lib_dirs.items) |path| addLibDirectoryWarn2(&create_module.lib_directories, path, true); ++ ++ for (paths.lib_dirs.items) |native_lib_dir| { ++ for (0.., create_module.rpath_list.items) |i, rpath_dir| { ++ if (std.mem.eql(u8, native_lib_dir, rpath_dir)) { ++ _ = create_module.rpath_list.orderedRemove(i); ++ break; ++ } ++ } ++ } + } + + if (create_module.libc_paths_file) |paths_file| { diff --git a/anda/langs/zig/master/0001-increase-upper-bounds-of-main-zig-executable-to-9G.patch b/anda/langs/zig/master/0001-increase-upper-bounds-of-main-zig-executable-to-9G.patch new file mode 100644 index 0000000000..2101ac8a2d --- /dev/null +++ b/anda/langs/zig/master/0001-increase-upper-bounds-of-main-zig-executable-to-9G.patch @@ -0,0 +1,11 @@ +--- a/build.zig 2025-04-23 22:33:17.801652844 -0500 ++++ b/build.zig 2025-04-23 22:34:14.127282140 -0500 +@@ -679,7 +679,7 @@ + + const exe = b.addExecutable(.{ + .name = "zig", +- .max_rss = 7_800_000_000, ++ .max_rss = 9_000_000_000, + .root_module = compiler_mod, + }); + exe.stack_size = stack_size; diff --git a/anda/langs/zig/master/0002-build-pass-zig-lib-dir-as-directory-instead-of-as-st.patch b/anda/langs/zig/master/0002-build-pass-zig-lib-dir-as-directory-instead-of-as-st.patch new file mode 100644 index 0000000000..21438943cc --- /dev/null +++ b/anda/langs/zig/master/0002-build-pass-zig-lib-dir-as-directory-instead-of-as-st.patch @@ -0,0 +1,18 @@ +--- a/build.zig 2025-04-25 05:56:25.033100994 -0500 ++++ b/build.zig 2025-04-25 05:57:16.965173352 -0500 +@@ -1392,7 +1392,14 @@ + // in a temporary directory + "--cache-root", b.cache_root.path orelse ".", + }); +- cmd.addArgs(&.{ "--zig-lib-dir", b.fmt("{}", .{b.graph.zig_lib_directory}) }); ++ if (b.graph.zig_lib_directory.path) |zig_lib_dir| { ++ cmd.addArgs(&.{"--zig-lib-dir"}); ++ if (fs.path.isAbsolute(zig_lib_dir)) { ++ cmd.addArgs(&.{zig_lib_dir}); ++ } else { ++ cmd.addDirectoryArg(b.path(zig_lib_dir)); ++ } ++ } + cmd.addArgs(&.{"-i"}); + cmd.addFileArg(b.path(b.fmt("doc/langref/{s}", .{entry.name}))); + diff --git a/anda/langs/zig/anda.hcl b/anda/langs/zig/master/anda.hcl similarity index 62% rename from anda/langs/zig/anda.hcl rename to anda/langs/zig/master/anda.hcl index 2ed6c200f0..5daedf31a8 100644 --- a/anda/langs/zig/anda.hcl +++ b/anda/langs/zig/master/anda.hcl @@ -2,4 +2,7 @@ project pkg { rpm { spec = "zig-master.spec" } + labels { + updbranch = 1 + } } diff --git a/anda/langs/zig/master/update.rhai b/anda/langs/zig/master/update.rhai new file mode 100644 index 0000000000..fb5cefc6c1 --- /dev/null +++ b/anda/langs/zig/master/update.rhai @@ -0,0 +1,8 @@ +import "andax/bump_extras.rhai" as bump; + +rpm.version(bump::madoguchi("zig-master-bootstrap", labels.branch)); +if rpm.changed () { + let v = sh("cat anda/langs/zig/bootstrap/zig-master-bootstrap.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout; + v.pop(); + rpm.global("ver", v); +} diff --git a/anda/langs/zig/zig-master.spec b/anda/langs/zig/master/zig-master.spec similarity index 99% rename from anda/langs/zig/zig-master.spec rename to anda/langs/zig/master/zig-master.spec index 3bf90afdc4..160db01929 100644 --- a/anda/langs/zig/zig-master.spec +++ b/anda/langs/zig/master/zig-master.spec @@ -8,7 +8,7 @@ %endif %global llvm_version 20.0.0 %global ver 0.15.0-dev.464+dffd18f13 -%bcond bootstrap 1 +%bcond bootstrap 0 %bcond docs %{without bootstrap} %bcond test 1 %global zig_cache_dir %{builddir}/zig-cache @@ -61,7 +61,7 @@ BuildRequires: help2man # for signature verification BuildRequires: minisign %if %{without bootstrap} -BuildRequires: %{name} <= %{version} +BuildRequires: %{name}-bootstrap = %{version} %endif %if %{with test} BuildRequires: elfutils-libelf-devel From 889086d8ced09cb6ae7d5d18a217635ae47d4e6e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 5 May 2025 05:42:52 +0000 Subject: [PATCH 1081/2977] bump: lomiri-system-settings bootstrap --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- anda/langs/zig/bootstrap/zig-master-bootstrap.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 9c5969671b..ed23627ba4 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit 0c4242a1c48a46669e0fba78662df3afe560671b +%global commit 839e70c5eca4b6e0f32b8d3be399ae68cfd784f7 %forgemeta Name: lomiri-system-settings diff --git a/anda/langs/zig/bootstrap/zig-master-bootstrap.spec b/anda/langs/zig/bootstrap/zig-master-bootstrap.spec index 479bedb1fd..21d279e9ac 100644 --- a/anda/langs/zig/bootstrap/zig-master-bootstrap.spec +++ b/anda/langs/zig/bootstrap/zig-master-bootstrap.spec @@ -7,7 +7,7 @@ %define llvm_compat 20 %endif %global llvm_version 20.0.0 -%global ver 0.15.0-dev.452+c0ec264f7 +%global ver 0.15.0-dev.464+dffd18f13 %bcond bootstrap 1 %bcond docs %{without bootstrap} %bcond test 1 From 7b6233f656436d6e9d55ee256fc9f53ec67d322d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 5 May 2025 06:29:22 +0000 Subject: [PATCH 1082/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 9509c2ecb9..1ae47b443f 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.184.10 +%global ver 0.185.5-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ From 27e73ea0acf95beff6522635d9c86dc01a63b560 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 5 May 2025 06:51:56 +0000 Subject: [PATCH 1083/2977] bump: nekoray --- anda/apps/nekoray/Sagernet.SingBox.Version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/nekoray/Sagernet.SingBox.Version.txt b/anda/apps/nekoray/Sagernet.SingBox.Version.txt index b2271b264a..754b11c226 100644 --- a/anda/apps/nekoray/Sagernet.SingBox.Version.txt +++ b/anda/apps/nekoray/Sagernet.SingBox.Version.txt @@ -1 +1 @@ -v1.11.9 \ No newline at end of file +v1.11.10 \ No newline at end of file From 53ee0096f6d355627416c1a48b6e1a914da3d243 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 5 May 2025 07:56:16 +0000 Subject: [PATCH 1084/2977] bump: lomiri-app-launch --- .../lomiri-unity/lomiri-app-launch/lomiri-app-launch.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/desktops/lomiri-unity/lomiri-app-launch/lomiri-app-launch.spec b/anda/desktops/lomiri-unity/lomiri-app-launch/lomiri-app-launch.spec index e7cb74c9dd..463aa251db 100644 --- a/anda/desktops/lomiri-unity/lomiri-app-launch/lomiri-app-launch.spec +++ b/anda/desktops/lomiri-unity/lomiri-app-launch/lomiri-app-launch.spec @@ -1,10 +1,10 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch -%global commit 3a0dacbbf99b45b67c39bb92449235c576cbf05a +%global commit ca7670c0a74c42f03c0bb4196773519c270a0d75 %forgemeta Name: lomiri-app-launch -Version: 0.1.11 -Release: 2%?dist +Version: 0.1.12 +Release: 1%?dist Summary: Provides the Lomiri App Launch user space daemon License: GPL-3.0 URL: https://gitlab.com/ubports/development/core/lomiri-app-launch From d7148466ac486c864a1bace475037f6ee64d8433 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 5 May 2025 08:27:51 +0000 Subject: [PATCH 1085/2977] bump: lomiri-system-settings lomiri-url-dispatcher --- .../lomiri-system-settings/lomiri-system-settings.spec | 4 ++-- .../lomiri-url-dispatcher/lomiri-url-dispatcher.spec | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index ed23627ba4..a7805cfca1 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,9 +1,9 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit 839e70c5eca4b6e0f32b8d3be399ae68cfd784f7 +%global commit cce1e38b31eb1af3526f30c130e7377c3fa2bc95 %forgemeta Name: lomiri-system-settings -Version: 1.3.1 +Version: 1.3.2 Release: 1%?dist Summary: The system settings application for Lomiri License: GPLv3 diff --git a/anda/desktops/lomiri-unity/lomiri-url-dispatcher/lomiri-url-dispatcher.spec b/anda/desktops/lomiri-unity/lomiri-url-dispatcher/lomiri-url-dispatcher.spec index d8e74dad10..338303c598 100644 --- a/anda/desktops/lomiri-unity/lomiri-url-dispatcher/lomiri-url-dispatcher.spec +++ b/anda/desktops/lomiri-unity/lomiri-url-dispatcher/lomiri-url-dispatcher.spec @@ -1,10 +1,10 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-url-dispatcher -%global commit 6b6f2277e2a63fe0893c1fddd1cc75da5da87eb7 +%global commit 8aa052982ef67fdd130ee7b5d4731eb2162e4e47 %forgemeta Name: lomiri-url-dispatcher -Version: 0.1.3 -Release: 2%{?dist} +Version: 0.1.4 +Release: 1%?dist Summary: A small library for handling URLs over dbus License: LGPL-3.0 From 35d5326e4b823e99141a213de939fa01c6f1a986 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 5 May 2025 08:49:49 +0000 Subject: [PATCH 1086/2977] bump: bootstrap --- anda/langs/zig/bootstrap/zig-master-bootstrap.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/zig/bootstrap/zig-master-bootstrap.spec b/anda/langs/zig/bootstrap/zig-master-bootstrap.spec index 21d279e9ac..fa79ca34c2 100644 --- a/anda/langs/zig/bootstrap/zig-master-bootstrap.spec +++ b/anda/langs/zig/bootstrap/zig-master-bootstrap.spec @@ -7,7 +7,7 @@ %define llvm_compat 20 %endif %global llvm_version 20.0.0 -%global ver 0.15.0-dev.464+dffd18f13 +%global ver 0.15.0-dev.465+bb79c85cb %bcond bootstrap 1 %bcond docs %{without bootstrap} %bcond test 1 From 2873737db4a9fb856201d44496e416e6fb0c6ed2 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 5 May 2025 09:45:02 +0000 Subject: [PATCH 1087/2977] bump: rio --- anda/devs/rio/rio.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/rio/rio.spec b/anda/devs/rio/rio.spec index 10422c3d4e..fa9dd1c6f6 100644 --- a/anda/devs/rio/rio.spec +++ b/anda/devs/rio/rio.spec @@ -3,7 +3,7 @@ A hardware-accelerated terminal emulator focusing to run in desktops and browsers.} Name: rio -Version: 0.2.12 +Version: 0.2.13 Release: 1%?dist Summary: A hardware-accelerated terminal written in Rust. SourceLicense: MIT From 565b8a4d2b6fa8dc43e4d726244cf2c044c290c5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 5 May 2025 10:21:15 +0000 Subject: [PATCH 1088/2977] bump: git --- anda/system/readymade/git/readymade-git.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/system/readymade/git/readymade-git.spec b/anda/system/readymade/git/readymade-git.spec index 4b7563518f..92dde3a71d 100644 --- a/anda/system/readymade/git/readymade-git.spec +++ b/anda/system/readymade/git/readymade-git.spec @@ -1,5 +1,5 @@ -%global commit e96dbe2553583e542d1f4341feecd4aa246432cc -%global commit_date 20250503 +%global commit 1e5f07286cde1a403a021c2bd9a742808ce2debc +%global commit_date 20250505 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: readymade-git From 90477606094c07ea819fff139a417e3b13ca5a8e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 5 May 2025 10:45:12 +0000 Subject: [PATCH 1089/2977] bump: git --- anda/system/readymade/git/readymade-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/readymade/git/readymade-git.spec b/anda/system/readymade/git/readymade-git.spec index 92dde3a71d..5b2ed7c5db 100644 --- a/anda/system/readymade/git/readymade-git.spec +++ b/anda/system/readymade/git/readymade-git.spec @@ -1,4 +1,4 @@ -%global commit 1e5f07286cde1a403a021c2bd9a742808ce2debc +%global commit 6be7869f4af9c76748266a235a62e1a3e2a4cf10 %global commit_date 20250505 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From bbaf9637d9940d12040a9223f42de9099ed6e1f6 Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 5 May 2025 05:50:31 -0500 Subject: [PATCH 1090/2977] fix(zig-master): Normalize version (#4674) Signed-off-by: Gilver --- anda/langs/zig/master/zig-master.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/zig/master/zig-master.spec b/anda/langs/zig/master/zig-master.spec index 160db01929..46a35b1eb3 100644 --- a/anda/langs/zig/master/zig-master.spec +++ b/anda/langs/zig/master/zig-master.spec @@ -38,7 +38,7 @@ } Name: zig-master -Version: %(echo %{ver} | sed 's/-/~/g') +Version: 0.15.0~dev.464+dffd18f13 Release: 1%?dist Summary: Master builds of the Zig language License: MIT AND NCSA AND LGPL-2.1-or-later AND LGPL-2.1-or-later WITH GCC-exception-2.0 AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND BSD-3-Clause AND Inner-Net-2.0 AND ISC AND LicenseRef-Fedora-Public-Domain AND GFDL-1.1-or-later AND ZPL-2.1 From 05c1d59a060a448a12352735ec1d57bfaa7fde18 Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 5 May 2025 05:51:32 -0500 Subject: [PATCH 1091/2977] fix(lightly-qt6): Update script and build (#4673) * fix(lightly-qt6): Funny missing labels in update.rhai Signed-off-by: Gilver * While I'm here Signed-off-by: Gilver * That was the name of the CMake file but okay Signed-off-by: Gilver * Update lightly-qt6.spec Signed-off-by: Gilver * Update lightly-qt6.spec Signed-off-by: Gilver * Try to rule out any missing build deps but I don't think it's that Signed-off-by: Gilver * ? Signed-off-by: Gilver * Update lightly-qt6.spec Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/themes/lightly-qt6/lightly-qt6.spec | 13 +++++++++++-- anda/themes/lightly-qt6/update.rhai | 4 ++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/anda/themes/lightly-qt6/lightly-qt6.spec b/anda/themes/lightly-qt6/lightly-qt6.spec index ae5a5462fb..1540ed38e2 100644 --- a/anda/themes/lightly-qt6/lightly-qt6.spec +++ b/anda/themes/lightly-qt6/lightly-qt6.spec @@ -2,6 +2,7 @@ %global _style lightly %global dev boehs %global _qt_major_version 6 +%global _qt_old_major 5 %global forgeurl https://github.com/%{dev}/%{style} %global commit 00ca23447844114d41bfc0d37cf8823202c082e8 @@ -49,7 +50,10 @@ BuildRequires: cmake(KF%{_qt_major_version}Kirigami2) BuildRequires: cmake(KF%{_qt_major_version}Notifications) BuildRequires: cmake(KF%{_qt_major_version}Package) BuildRequires: cmake(KF%{_qt_major_version}WindowSystem) - + +BuildRequires: cmake(Qt%{_qt_old_major}Core) +BuildRequires: cmake(Qt%{_qt_old_major}Gui) + BuildRequires: cmake(KDecoration2) BuildRequires: cmake(KWayland) BuildRequires: cmake(Plasma) @@ -71,7 +75,12 @@ Lightly is a fork of breeze theme style that aims to be visually modern and mini %forgeautosetup -p1 %build -%cmake_kf6 -DQT_MAJOR_VERSION=%{_qt_major_version} +%cmake_kf6 \ + -DQT_MAJOR_VERSION=%{_qt_major_version} \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_TESTING=OFF \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON %cmake_build %install diff --git a/anda/themes/lightly-qt6/update.rhai b/anda/themes/lightly-qt6/update.rhai index 36206e82eb..7bb777b29d 100644 --- a/anda/themes/lightly-qt6/update.rhai +++ b/anda/themes/lightly-qt6/update.rhai @@ -1,6 +1,6 @@ import "andax/bump_extras.rhai" as bump; -fn main() { +fn main(labels) { let branch = bump::as_bodhi_ver(labels.branch); let url = `https://bodhi.fedoraproject.org/updates/?search=qt6-6.&status=stable&releases=${branch}&rows_per_page=1&page=1`; for entry in get(url).json().updates[0].title.split(' ') { @@ -11,4 +11,4 @@ fn main() { } } -open_file("anda/themes/lightly-qt6/VER6.txt").write(`${main()}`); // will trig rebuild when changed +open_file("anda/themes/lightly-qt6/VER6.txt").write(`${main(labels)}`); // will trig rebuild when changed From 6b14611a18f3f76ddca108cfe68ca2fdbea86822 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 5 May 2025 11:12:04 +0000 Subject: [PATCH 1092/2977] bump(branch): master lightly-qt6 --- anda/langs/zig/master/zig-master.spec | 4 ++-- anda/themes/lightly-qt6/VER6.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/langs/zig/master/zig-master.spec b/anda/langs/zig/master/zig-master.spec index 46a35b1eb3..9b64401777 100644 --- a/anda/langs/zig/master/zig-master.spec +++ b/anda/langs/zig/master/zig-master.spec @@ -7,7 +7,7 @@ %define llvm_compat 20 %endif %global llvm_version 20.0.0 -%global ver 0.15.0-dev.464+dffd18f13 +%global ver 0.15.0-dev.465+bb79c85cb %bcond bootstrap 0 %bcond docs %{without bootstrap} %bcond test 1 @@ -38,7 +38,7 @@ } Name: zig-master -Version: 0.15.0~dev.464+dffd18f13 +Version: 0.15.0~dev.465+bb79c85cb Release: 1%?dist Summary: Master builds of the Zig language License: MIT AND NCSA AND LGPL-2.1-or-later AND LGPL-2.1-or-later WITH GCC-exception-2.0 AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND BSD-3-Clause AND Inner-Net-2.0 AND ISC AND LicenseRef-Fedora-Public-Domain AND GFDL-1.1-or-later AND ZPL-2.1 diff --git a/anda/themes/lightly-qt6/VER6.txt b/anda/themes/lightly-qt6/VER6.txt index 45a4fb75db..ec635144f6 100644 --- a/anda/themes/lightly-qt6/VER6.txt +++ b/anda/themes/lightly-qt6/VER6.txt @@ -1 +1 @@ -8 +9 From b97c48098aac56bc2f54e04e221bad3886405cac Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 5 May 2025 20:09:40 +0800 Subject: [PATCH 1093/2977] fix(minecraft): allow other kwallets (#4672) Signed-off-by: madomado --- anda/games/minecraft-java/minecraft-java.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/minecraft-java/minecraft-java.spec b/anda/games/minecraft-java/minecraft-java.spec index f558081007..2df0e94b45 100644 --- a/anda/games/minecraft-java/minecraft-java.spec +++ b/anda/games/minecraft-java/minecraft-java.spec @@ -17,7 +17,7 @@ ExclusiveArch: x86_64 Requires: java >= 1.8.0 Requires: gtk3 Requires: libgpg-error -Requires: (gnome-keyring or kwallet) +Requires: (gnome-keyring or kf6-kwallet or kf5-kwallet or kwallet) %description The official Linux release of the launcher for Minecraft, a game about placing blocks and going on adventures. From 541e4c1c795eb6899d9cf4efdb27aacbb0d0a28f Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 5 May 2025 08:02:19 -0500 Subject: [PATCH 1094/2977] fix(gstreamer1-vaapi): Properly track Bodhi (#4682) * fix(gstreamer1-vaapi): Update script Signed-off-by: Gilver * fix(gstreamer1-vaapi): Add updbranch label Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/multimedia/gstreamer1/gstreamer1-vaapi/anda.hcl | 1 + anda/multimedia/gstreamer1/gstreamer1-vaapi/update.rhai | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/anda/multimedia/gstreamer1/gstreamer1-vaapi/anda.hcl b/anda/multimedia/gstreamer1/gstreamer1-vaapi/anda.hcl index d4a7941e7e..b3231c6cd4 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-vaapi/anda.hcl +++ b/anda/multimedia/gstreamer1/gstreamer1-vaapi/anda.hcl @@ -6,5 +6,6 @@ project pkg { labels { subrepo = "extras" mock = 1 + updbranch = 1 } } diff --git a/anda/multimedia/gstreamer1/gstreamer1-vaapi/update.rhai b/anda/multimedia/gstreamer1/gstreamer1-vaapi/update.rhai index aa26a804e7..b852f108b2 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-vaapi/update.rhai +++ b/anda/multimedia/gstreamer1/gstreamer1-vaapi/update.rhai @@ -1,4 +1,5 @@ -let release = labels.branch.to_upper(); -let ver = get(`https://bodhi.fedoraproject.org/updates/?search=gstreamer1-vaapi&status=stable&releases=${release}&rows_per_page=1&page=1`).json().updates[0].title; -rpm.version(find(`gstreamer1-vaapi-([\d.]+)`, ver, 1)); -rpm.release(find(`gstreamer1-vaapi-[\d.]+-([\d.])`, ver, 1)); +import "andax/bump_extras.rhai" as bump; + +let vr = bump::bodhi_vr("gstreamer1-vaapi", bump::as_bodhi_ver(labels.branch)); +rpm.version(vr[1]); +rpm.release(vr[2]); From 12344bd1db814de69bf44517a9a3ead06ce9a8cc Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 5 May 2025 13:05:21 +0000 Subject: [PATCH 1095/2977] bump(branch): gstreamer1-vaapi --- .../gstreamer1/gstreamer1-vaapi/gstreamer1-vaapi.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/multimedia/gstreamer1/gstreamer1-vaapi/gstreamer1-vaapi.spec b/anda/multimedia/gstreamer1/gstreamer1-vaapi/gstreamer1-vaapi.spec index c42585c109..7a0f6fd533 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-vaapi/gstreamer1-vaapi.spec +++ b/anda/multimedia/gstreamer1/gstreamer1-vaapi/gstreamer1-vaapi.spec @@ -1,6 +1,6 @@ Name: gstreamer1-plugin-vaapi -Version: 1.26.0 -Release: 1%{?dist} +Version: 1.26.1 +Release: 1%?dist Epoch: 1 Summary: GStreamer VA-API integration License: LGPLv2+ From a26d8c1323f4e3e27769bb8a7dfcb3e507c2f029 Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 5 May 2025 22:30:26 +0800 Subject: [PATCH 1096/2977] add: ignis (#4681) * add: ignis * Update python-ignis.spec Signed-off-by: madomado * libpulse Signed-off-by: madomado --------- Signed-off-by: madomado --- anda/langs/python/ignis/anda.hcl | 5 ++ anda/langs/python/ignis/python-ignis.spec | 58 +++++++++++++++++++++++ anda/langs/python/ignis/update.rhai | 1 + 3 files changed, 64 insertions(+) create mode 100644 anda/langs/python/ignis/anda.hcl create mode 100644 anda/langs/python/ignis/python-ignis.spec create mode 100644 anda/langs/python/ignis/update.rhai diff --git a/anda/langs/python/ignis/anda.hcl b/anda/langs/python/ignis/anda.hcl new file mode 100644 index 0000000000..185d3fbfba --- /dev/null +++ b/anda/langs/python/ignis/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "python-ignis.spec" + } +} diff --git a/anda/langs/python/ignis/python-ignis.spec b/anda/langs/python/ignis/python-ignis.spec new file mode 100644 index 0000000000..ad2ebc818a --- /dev/null +++ b/anda/langs/python/ignis/python-ignis.spec @@ -0,0 +1,58 @@ +Name: python-ignis +Version: 0.5 +Release: 1%{?dist} +Summary: A widget framework for building desktop shells, written and configurable in Python + +License: ??? +URL: https://linkfrg.github.io/ignis +Source: https://github.com/linkfrg/ignis/archive/v%{version}/ignis-%{version}.tar.gz +Packager: madonuko + +BuildRequires: python3-devel +BuildRequires: gcc git-core +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gtk4) +BuildRequires: pkgconfig(gtk4-layer-shell-0) +BuildRequires: pkgconfig(libpulse) +BuildRequires: python3dist(meson-python) +BuildRequires: python3dist(pip) + +%global _description %{expand: +%summary.} + +%description %_description + +%package -n python3-ignis +Summary: %{summary} + +%description -n python3-ignis %_description + + +%prep +%autosetup -p1 -n ignis-%{version} + + +%generate_buildrequires +%pyproject_buildrequires -R + + +%build +%pyproject_wheel + + +%install +%pyproject_install +%pyproject_save_files 'ignis*' + + +%files -n python3-ignis -f %{pyproject_files} +%doc README.* +%license LICENSE +%{_bindir}/ignis + + +%changelog +* Sun May 05 2024 madonuko - 0.5-1 +- Initial package. diff --git a/anda/langs/python/ignis/update.rhai b/anda/langs/python/ignis/update.rhai new file mode 100644 index 0000000000..085895bca4 --- /dev/null +++ b/anda/langs/python/ignis/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("linkfrg/ignis")); From 646bb14b9e5a0fabb733da6e04c31c4e82b8ab2d Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 5 May 2025 23:09:18 +0800 Subject: [PATCH 1097/2977] add: yadm (#4691) close #4594 --- anda/devs/yadm/anda.hcl | 6 +++ anda/devs/yadm/update.rhai | 1 + anda/devs/yadm/yadm.spec | 78 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+) create mode 100644 anda/devs/yadm/anda.hcl create mode 100644 anda/devs/yadm/update.rhai create mode 100644 anda/devs/yadm/yadm.spec diff --git a/anda/devs/yadm/anda.hcl b/anda/devs/yadm/anda.hcl new file mode 100644 index 0000000000..5e67c2251a --- /dev/null +++ b/anda/devs/yadm/anda.hcl @@ -0,0 +1,6 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "yadm.spec" + } +} diff --git a/anda/devs/yadm/update.rhai b/anda/devs/yadm/update.rhai new file mode 100644 index 0000000000..3a14a8a34b --- /dev/null +++ b/anda/devs/yadm/update.rhai @@ -0,0 +1 @@ +rpm.version(gh_tag("yadm-dev/yadm")); diff --git a/anda/devs/yadm/yadm.spec b/anda/devs/yadm/yadm.spec new file mode 100644 index 0000000000..c063388855 --- /dev/null +++ b/anda/devs/yadm/yadm.spec @@ -0,0 +1,78 @@ +Name: yadm +Version: 3.5.0 +Release: 1%{?dist} +Summary: Yet Another Dotfiles Manager + +License: GPL-3.0-only +URL: https://yadm.io +Source: https://github.com/yadm-dev/yadm/archive/refs/tags/%{version}.tar.gz +Packager: madonuko + +BuildArch: noarch +Requires: bash git + +%description +yadm is a tool for managing a collection of files across multiple computers, +using a shared Git repository. In addition, yadm provides a feature to select +alternate versions of files based on the operation system or host name. Lastly, +yadm supplies the ability to manage a subset of secure files, which are +encrypted before they are included in the repository. + + +%package bash-completion +Summary: Bash completion for %{name} +Requires: %{name} = %{version}-%{release} +Requires: bash-completion +Supplements: (%{name} and bash-completion) + +%description bash-completion +Bash command line completion support for %{name}. + +%package fish-completion +Summary: Fish completion for %{name} +Requires: %{name} = %{version}-%{release} +Requires: fish +Supplements: (%{name} and fish) + +%description fish-completion +Fish command line completion support for %{name}. + +%package zsh-completion +Summary: Zsh completion for %{name} +Requires: %{name} = %{version}-%{release} +Requires: zsh +Supplements: (%{name} and zsh) + +%description zsh-completion +Zsh command line completion support for %{name}. + + +%prep +%autosetup + +%install +install -Dpm755 yadm -t %buildroot%_bindir +install -Dpm644 yadm.1 -t %buildroot%_mandir/man1 +install -Dpm644 -t %buildroot%bash_completions_dir completion/bash/yadm +install -Dpm644 -t %buildroot%fish_completions_dir completion/fish/yadm.fish +install -Dpm644 -t %buildroot%zsh_completions_dir completion/zsh/_yadm + +%files +%doc README.* CHANGES CONTRIBUTORS +%doc contrib +%license LICENSE +%_bindir/yadm +%_mandir/man1/yadm.1.gz + +%files bash-completion +%bash_completions_dir/yadm + +%files fish-completion +%fish_completions_dir/yadm.fish + +%files zsh-completion +%zsh_completions_dir/_yadm + +%changelog +* Sun May 05 2024 madonuko - 0.5-1 +- Initial package. From 7cb7faa8e3ba823943b476dc550753c33ec84f03 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 5 May 2025 15:20:38 +0000 Subject: [PATCH 1098/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 36863d3ab0..d0181da636 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.05.03.201155 +Version: 2025.05.05.150322 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From aa4aa98db453a32df8c050a3959e82b5b8a8950a Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 5 May 2025 10:25:44 -0500 Subject: [PATCH 1099/2977] feat(rio): Doc package, use desktop-file-utils, cleanup (#4675) * feat(rio): Doc package * feat(rio): bcond, changelog, and better doc folder * cleanup: Doc release in suggestion * cleanup: Remove unnecessary explicit dep * chore: The desktop file also has TryExec * chore: Validate the desktop file * Agh --- anda/devs/rio/rio.spec | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/anda/devs/rio/rio.spec b/anda/devs/rio/rio.spec index fa9dd1c6f6..fa86e92993 100644 --- a/anda/devs/rio/rio.spec +++ b/anda/devs/rio/rio.spec @@ -1,6 +1,7 @@ %global crate rioterm %global _description %{expand: A hardware-accelerated terminal emulator focusing to run in desktops and browsers.} +%bcond docs 1 Name: rio Version: 0.2.13 @@ -12,6 +13,7 @@ URL: http://rioterm.com Source0: https://github.com/raphamorim/%{name}/archive/refs/tags/v%{version}.tar.gz BuildRequires: anda-srpm-macros BuildRequires: cargo-rpm-macros +BuildRequires: desktop-file-utils BuildRequires: freetype-devel BuildRequires: cmake BuildRequires: gcc-c++ @@ -22,8 +24,10 @@ BuildRequires: sed Requires: freetype Requires: fontconfig Requires: hicolor-icon-theme -Requires: libgcc Obsoletes: %{crate} < %{version}-%{release} +%if %{with docs} +Suggests: %{name}-doc = %{version}-%{release} +%endif Packager: Gilver E. %description %_description @@ -35,10 +39,18 @@ Requires: %{name} = %{version}-%{release} %description devel This package contains the development libraries for Rio. +%if %{with docs} +%package doc +Summary: Documentation for Rio + +%description doc +This package contains all official documentation files for the Rio terminal. +%endif + %prep %autosetup -n %{name}-%{version} -sed -i 's/Exec=.*/Exec=%{crate}/g' misc/%{name}.desktop %cargo_prep_online +sed -i 's/Exec=.*/Exec=%{crate}/g' misc/%{name}.desktop %build %cargo_build -a @@ -46,10 +58,13 @@ sed -i 's/Exec=.*/Exec=%{crate}/g' misc/%{name}.desktop %install install -Dm755 target/rpm/%{name} %{buildroot}%{_bindir}/%{crate} install -Dm755 target/rpm/*.so -t %{buildroot}%{_libdir} -install -Dm644 misc/%{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop install -Dm644 docs/static/assets/%{name}-logo.svg %{buildroot}%{_iconsdir}/hicolor/scalable/apps/%{name}.svg +desktop-file-install misc/%{name}.desktop %{cargo_license_online -a} > LICENSE.dependencies +%check +desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop + %files %doc README.md %license LICENSE @@ -63,6 +78,13 @@ install -Dm644 docs/static/assets/%{name}-logo.svg %{buildroot}%{_iconsdir}/hico %{_libdir}/librio_proc_macros.so %{_libdir}/libsugarloaf.so +%if %{with docs} +%files doc +%doc docs/docs/* +%endif + %changelog +* Mon May 5 2025 Gilver E. - 0.2.13-1 +- Added doc package * Sat Mar 8 2025 Gilver E. - Initial package From 7b027b343b5646b769722e30cd64eba010f84dcc Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 5 May 2025 23:31:51 +0800 Subject: [PATCH 1100/2977] fix: arduino-create-agent (#4534) * fix: arduino-create-agent Signed-off-by: madomado * Delete anda/tools/arduino-create-agent/update.patch Signed-off-by: madomado * Update arduino-create-agent.spec Signed-off-by: madomado * wat Signed-off-by: madomado * what the heck? --------- Signed-off-by: madomado --- .../arduino-create-agent.spec | 4 +-- anda/tools/arduino-create-agent/update.patch | 25 ------------------- 2 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 anda/tools/arduino-create-agent/update.patch diff --git a/anda/tools/arduino-create-agent/arduino-create-agent.spec b/anda/tools/arduino-create-agent/arduino-create-agent.spec index 44ca64a82a..45d90793de 100644 --- a/anda/tools/arduino-create-agent/arduino-create-agent.spec +++ b/anda/tools/arduino-create-agent/arduino-create-agent.spec @@ -20,7 +20,6 @@ Packager: Owen Zimmerman URL: %{gourl} Source: %{url}/archive/%{version}.tar.gz -Patch0: update.patch BuildRequires: anda-srpm-macros %description %{common_description} @@ -29,10 +28,11 @@ BuildRequires: anda-srpm-macros %prep %goprep -%autopatch -p1 %go_prep_online %build +sed -E '/^func Start\(/,/^\}$/s@return start\(src\)@return ""@' -i updater/updater.go +sed -E '\?r.POST\("/update", updateHandler\)?d' -i main.go %define gomodulesmode GO111MODULE=on %gobuild -o %{gobuilddir}/bin/arduino-create-agent %{goipath} diff --git a/anda/tools/arduino-create-agent/update.patch b/anda/tools/arduino-create-agent/update.patch deleted file mode 100644 index f6a59cc201..0000000000 --- a/anda/tools/arduino-create-agent/update.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/main.go b/main.go -index 1ca857b..c945487 100755 ---- a/main.go -+++ b/main.go -@@ -461,7 +461,6 @@ func loop() { - r.Handle("WSS", "/socket.io/", socketHandler) - r.GET("/info", infoHandler) - r.POST("/pause", pauseHandler) -- r.POST("/update", updateHandler) - - // Mount goa handlers - goa := v2.Server(config.GetDataDir().String(), Index) -diff --git a/updater/updater.go b/updater/updater.go -index db4e545..693431a 100644 ---- a/updater/updater.go -+++ b/updater/updater.go -@@ -34,7 +34,7 @@ import ( - // binary to be executed to perform the update. If no update has been downloaded - // it returns an empty string. - func Start(src string) string { -- return start(src) -+ return "" - } - - // CheckForUpdates checks if there is a new version of the binary available and From ad9f7baae1760c37943330ffdcbb8d9a666c88dd Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 5 May 2025 23:34:33 +0800 Subject: [PATCH 1101/2977] add: flameshot-nightly (#4683) * add: flameshot-nightly close #4624 * fix indents Signed-off-by: madomado * Update flameshot-nightly.spec Signed-off-by: madomado --------- Signed-off-by: madomado --- anda/apps/flameshot/anda.hcl | 8 ++ anda/apps/flameshot/flameshot-nightly.spec | 128 +++++++++++++++++++++ anda/apps/flameshot/update.rhai | 5 + 3 files changed, 141 insertions(+) create mode 100644 anda/apps/flameshot/anda.hcl create mode 100644 anda/apps/flameshot/flameshot-nightly.spec create mode 100644 anda/apps/flameshot/update.rhai diff --git a/anda/apps/flameshot/anda.hcl b/anda/apps/flameshot/anda.hcl new file mode 100644 index 0000000000..7309723ea9 --- /dev/null +++ b/anda/apps/flameshot/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "flameshot-nightly.spec" + } + labels { + nightly = 1 + } +} diff --git a/anda/apps/flameshot/flameshot-nightly.spec b/anda/apps/flameshot/flameshot-nightly.spec new file mode 100644 index 0000000000..58fd0700c4 --- /dev/null +++ b/anda/apps/flameshot/flameshot-nightly.spec @@ -0,0 +1,128 @@ +#? https://github.com/flameshot-org/flameshot/blob/master/packaging/rpm/fedora/flameshot.spec + +%global ver 12.1.0 +%global commit f4cde19c63473f8fadd448ad2056c22f0f847f34 +%global shortcommit %{sub %{commit} 1 7} +%global commit_date 20250504 + +Name: flameshot.nightly +Version: %ver^%{commit_date}git.%shortcommit +Release: 1%?dist +License: GPL-3.0-or-later AND ASL-2.0 AND GPL-2.0-only AND LGPL-3.0-only AND FAL-1.3 +Summary: Powerful yet simple to use screenshot software +URL: https://flameshot.org +Source0: https://github.com/flameshot-org/flameshot/archive/%commit/flameshot-%commit.tar.gz +Packager: madonuko + +BuildRequires: cmake >= 3.13.0 +BuildRequires: gcc-c++ >= 7 +BuildRequires: fdupes +BuildRequires: libappstream-glib +BuildRequires: ninja-build +BuildRequires: desktop-file-utils + +BuildRequires: cmake(Qt5Core) >= 5.9.0 +BuildRequires: cmake(KF5GuiAddons) >= 5.89.0 +BuildRequires: cmake(Qt5DBus) >= 5.9.0 +BuildRequires: cmake(Qt5Gui) >= 5.9.0 +BuildRequires: cmake(Qt5LinguistTools) >= 5.9.0 +BuildRequires: cmake(Qt5Network) >= 5.9.0 +BuildRequires: cmake(Qt5Svg) >= 5.9.0 +BuildRequires: cmake(Qt5Widgets) >= 5.9.0 + +Requires: hicolor-icon-theme +Requires: qt5-qtbase >= 5.9.0 +Requires: qt5-qttools >= 5.9.0 +Requires: qt5-qtsvg%{?_isa} >= 5.9.0 + +%dnl Provides: flameshot = %version-%release +Conflicts: flameshot + +Recommends: xdg-desktop-portal%{?_isa} +Recommends: (xdg-desktop-portal-gnome%{?_isa} if gnome-shell%{?_isa}) +Recommends: (xdg-desktop-portal-kde%{?_isa} if plasma-workspace-wayland%{?_isa}) +Recommends: (xdg-desktop-portal-wlr%{?_isa} if wlroots%{?_isa}) + +%description +Powerful and simple to use screenshot software with built-in +editor with advanced features. + +Features: + + * Customizable appearance. + * Easy to use. + * In-app screenshot edition. + * DBus interface. + * Upload to Imgur + + +%package bash-completion +Summary: Bash completion for %{name} +Requires: %{name} = %{version}-%{release} +Requires: bash-completion +Supplements: (%{name} and bash-completion) + +%description bash-completion +Bash command line completion support for %{name}. + +%package fish-completion +Summary: Fish completion for %{name} +Requires: %{name} = %{version}-%{release} +Requires: fish +Supplements: (%{name} and fish) + +%description fish-completion +Fish command line completion support for %{name}. + +%package zsh-completion +Summary: Zsh completion for %{name} +Requires: %{name} = %{version}-%{release} +Requires: zsh +Supplements: (%{name} and zsh) + +%description zsh-completion +Zsh command line completion support for %{name}. + + +%prep +%autosetup -p1 -n flameshot-%commit + +%build +%cmake -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ + -DUSE_WAYLAND_CLIPBOARD:BOOL=ON \ +%cmake_build + +%install +%cmake_install +# https://fedoraproject.org/wiki/PackagingDrafts/find_lang +%find_lang Internationalization --with-qt +%fdupes %{buildroot}%{_datadir}/icons + +%check +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml +desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop + +%files -f Internationalization.lang +%{_datadir}/flameshot/translations/Internationalization_grc.qm +%doc README.md +%license LICENSE +%dir %{_datadir}/flameshot +%dir %{_datadir}/flameshot/translations +%{_bindir}/flameshot +%{_datadir}/applications/org.flameshot.Flameshot.desktop +%{_metainfodir}/org.flameshot.Flameshot.metainfo.xml +%{_datadir}/dbus-1/interfaces/org.flameshot.Flameshot.xml +%{_datadir}/dbus-1/services/org.flameshot.Flameshot.service +%{_datadir}/icons/hicolor/*/apps/*.png +%{_datadir}/icons/hicolor/scalable/apps/*.svg +%{_mandir}/man1/flameshot.1* + +%files bash-completion +%{bash_completions_dir}/flameshot + +%files fish-completion +%{fish_completions_dir}/flameshot.fish + +%files zsh-completion +%{zsh_completions_dir}/_flameshot diff --git a/anda/apps/flameshot/update.rhai b/anda/apps/flameshot/update.rhai new file mode 100644 index 0000000000..ea700708a8 --- /dev/null +++ b/anda/apps/flameshot/update.rhai @@ -0,0 +1,5 @@ +rpm.global("commit", gh_commit("flameshot-org/flameshot")); +if rpm.changed() { + rpm.global("ver", gh("flameshot-org/flameshot")); + rpm.global("commit_date", date()); +} From 5ece288b4348c44c75ed883c46a76d67f18fe035 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 5 May 2025 15:38:42 +0000 Subject: [PATCH 1102/2977] bump: mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index f357b938bc..363aee3de6 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.5.0 +Version: 2025.5.1 Release: 1%?dist Summary: Front-end to your dev env From 9d17af5a333886d948fbe4ee4fbe562d4c9e0266 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 5 May 2025 15:49:07 +0000 Subject: [PATCH 1103/2977] bump: deviceinfo --- anda/lib/deviceinfo/deviceinfo.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/lib/deviceinfo/deviceinfo.spec b/anda/lib/deviceinfo/deviceinfo.spec index 0d7ad527e7..bf9aabb0ab 100644 --- a/anda/lib/deviceinfo/deviceinfo.spec +++ b/anda/lib/deviceinfo/deviceinfo.spec @@ -1,10 +1,10 @@ %global forgeurl https://gitlab.com/ubports/development/core/deviceinfo -%global commit e42f12b96d1745286f3c3c88b4a19bd7c3ead9ef +%global commit 4423aab5a9f25ac1f6baf0623c7cf7a040d254ff %forgemeta Name: deviceinfo -Version: 0.2.2 -Release: 1%{?dist} +Version: 0.2.3 +Release: 1%?dist Summary: Library to detect and configure devices License: GPLv3+ URL: https://gitlab.com/ubports/development/core/deviceinfo From 28a806229dc5ca4ab01a9ce0ba5fb900316e99d0 Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 5 May 2025 23:56:59 +0800 Subject: [PATCH 1104/2977] fix(ignis): license LGPL-2.1-or-later (#4708) Signed-off-by: madomado --- anda/langs/python/ignis/python-ignis.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/langs/python/ignis/python-ignis.spec b/anda/langs/python/ignis/python-ignis.spec index ad2ebc818a..2148b85600 100644 --- a/anda/langs/python/ignis/python-ignis.spec +++ b/anda/langs/python/ignis/python-ignis.spec @@ -1,9 +1,9 @@ Name: python-ignis Version: 0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A widget framework for building desktop shells, written and configurable in Python -License: ??? +License: LGPL-2.1-or-later URL: https://linkfrg.github.io/ignis Source: https://github.com/linkfrg/ignis/archive/v%{version}/ignis-%{version}.tar.gz Packager: madonuko From 74892d57345fb7705dea78ea9116aff6cc230de7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 5 May 2025 15:59:22 +0000 Subject: [PATCH 1105/2977] bump: lomiri --- anda/desktops/lomiri-unity/lomiri/lomiri.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/desktops/lomiri-unity/lomiri/lomiri.spec b/anda/desktops/lomiri-unity/lomiri/lomiri.spec index 25087c52ba..4b68a9d6e8 100644 --- a/anda/desktops/lomiri-unity/lomiri/lomiri.spec +++ b/anda/desktops/lomiri-unity/lomiri/lomiri.spec @@ -1,9 +1,9 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri -%global commit 5911df7b4f25210e4d88d3e959e04538fe64387f +%global commit 39840a77525e57f29cde9d6773bd2742feae2486 %forgemeta Name: lomiri -Version: 0.4.1 +Version: 0.5.0 Release: 1%?dist Summary: A convergent desktop environment by Ubports From 1363aaef403eb4c8ce584a8158be66b2c1a9d4f5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 5 May 2025 16:33:12 +0000 Subject: [PATCH 1106/2977] bump: git --- anda/system/readymade/git/readymade-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/readymade/git/readymade-git.spec b/anda/system/readymade/git/readymade-git.spec index 5b2ed7c5db..a3d132250a 100644 --- a/anda/system/readymade/git/readymade-git.spec +++ b/anda/system/readymade/git/readymade-git.spec @@ -1,4 +1,4 @@ -%global commit 6be7869f4af9c76748266a235a62e1a3e2a4cf10 +%global commit 43bb6ef22e3092a07b46e7092d6a8eba7ec88624 %global commit_date 20250505 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From 0a28a1a55d26ef4c22197ba6b3f8b44b16937eb4 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 5 May 2025 17:34:59 +0000 Subject: [PATCH 1107/2977] bump: discord-openasar discord rio --- anda/apps/discord-openasar/discord-openasar.spec | 2 +- anda/apps/discord/discord.spec | 2 +- anda/devs/rio/rio.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/apps/discord-openasar/discord-openasar.spec b/anda/apps/discord-openasar/discord-openasar.spec index a6fd8eafc7..d1cddc42ff 100644 --- a/anda/apps/discord-openasar/discord-openasar.spec +++ b/anda/apps/discord-openasar/discord-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-openasar -Version: 0.0.93 +Version: 0.0.94 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord/discord.spec b/anda/apps/discord/discord.spec index b4edc3f065..585ef00ccd 100644 --- a/anda/apps/discord/discord.spec +++ b/anda/apps/discord/discord.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord -Version: 0.0.93 +Version: 0.0.94 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: https://discord.com diff --git a/anda/devs/rio/rio.spec b/anda/devs/rio/rio.spec index fa86e92993..2762d13bf1 100644 --- a/anda/devs/rio/rio.spec +++ b/anda/devs/rio/rio.spec @@ -4,7 +4,7 @@ A hardware-accelerated terminal emulator focusing to run in desktops and browser %bcond docs 1 Name: rio -Version: 0.2.13 +Version: 0.2.14 Release: 1%?dist Summary: A hardware-accelerated terminal written in Rust. SourceLicense: MIT From ed00ed31416211450b94cee6b8c633c1079b8cf1 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 5 May 2025 19:13:59 +0000 Subject: [PATCH 1108/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 4f4cb0b118..9763768503 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.668 +Version: 0.0.669 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index e3b3857082..611cfdb774 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.668 +Version: 0.0.669 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From a614199922b16b968788e3c2134f10d99036a6a1 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 5 May 2025 20:43:53 +0000 Subject: [PATCH 1109/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 1ae47b443f..17efcb5695 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.185.5-pre +%global ver 0.185.6-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ From 7328235b54ab6f96fc18ec7334c9569458dd286e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 5 May 2025 22:19:38 +0000 Subject: [PATCH 1110/2977] bump: lomiri-system-settings --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index a7805cfca1..44c48a1ebd 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit cce1e38b31eb1af3526f30c130e7377c3fa2bc95 +%global commit a67be8edb863e7c66f2ae9416c06f7ebb239e8d3 %forgemeta Name: lomiri-system-settings From ba2b35ca6f68b2d9fc2569178546ba00edab5a12 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 6 May 2025 01:49:27 +0000 Subject: [PATCH 1111/2977] bump(nightly): nightly prismlauncher-nightly nim-nightly --- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 1f6ee88b98..2b608df0db 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 55eb0710edef8f967ef28b374f2a5cf4c13fde6a +%global commit 377909a64603b44fdbc681a41b2e0ede9ee9e359 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250505 +%global commit_date 20250506 %global ver 0.186.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 287876daa8..64e75eb757 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 693d9d02bca3348b9a59e013867c3f6c8c5a9f98 +%global commit cb8f6f5e80e42dc7d59336109d5ae3daa45f024e %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250505 +%global commit_date 20250506 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 36ec31f759..3af7b5efd3 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 98ec87d65e678ccf3aee9f59c729607089e7cece +%global commit 8b82f5de3848f195305d297a03d0f6796e0ab121 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250504 +%global commit_date 20250506 %global debug_package %nil Name: nim-nightly From 6c794c2d93b11435cecda4fa76b7fce5fa714d2f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 6 May 2025 02:05:08 +0000 Subject: [PATCH 1112/2977] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 2c7347c9bc..225afe0efb 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-05-05 +%global ver 2025-05-06 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 1744c1994db9acfc2099f53d9cd7baa404a36072 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 6 May 2025 05:19:20 +0000 Subject: [PATCH 1113/2977] bump: bootstrap --- anda/langs/zig/bootstrap/zig-master-bootstrap.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/zig/bootstrap/zig-master-bootstrap.spec b/anda/langs/zig/bootstrap/zig-master-bootstrap.spec index fa79ca34c2..4a8ec4f071 100644 --- a/anda/langs/zig/bootstrap/zig-master-bootstrap.spec +++ b/anda/langs/zig/bootstrap/zig-master-bootstrap.spec @@ -7,7 +7,7 @@ %define llvm_compat 20 %endif %global llvm_version 20.0.0 -%global ver 0.15.0-dev.465+bb79c85cb +%global ver 0.15.0-dev.471+369177f0b %bcond bootstrap 1 %bcond docs %{without bootstrap} %bcond test 1 From 791cd9994429024c673b510fad11e6336c48434b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 6 May 2025 06:20:03 +0000 Subject: [PATCH 1114/2977] bump(branch): master --- anda/langs/zig/master/zig-master.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/langs/zig/master/zig-master.spec b/anda/langs/zig/master/zig-master.spec index 9b64401777..4099874785 100644 --- a/anda/langs/zig/master/zig-master.spec +++ b/anda/langs/zig/master/zig-master.spec @@ -7,7 +7,7 @@ %define llvm_compat 20 %endif %global llvm_version 20.0.0 -%global ver 0.15.0-dev.465+bb79c85cb +%global ver 0.15.0-dev.471+369177f0b %bcond bootstrap 0 %bcond docs %{without bootstrap} %bcond test 1 @@ -38,7 +38,7 @@ } Name: zig-master -Version: 0.15.0~dev.465+bb79c85cb +Version: 0.15.0~dev.471+369177f0b Release: 1%?dist Summary: Master builds of the Zig language License: MIT AND NCSA AND LGPL-2.1-or-later AND LGPL-2.1-or-later WITH GCC-exception-2.0 AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND BSD-3-Clause AND Inner-Net-2.0 AND ISC AND LicenseRef-Fedora-Public-Domain AND GFDL-1.1-or-later AND ZPL-2.1 From 634f4818df7fa0fde15fca35d737c5a0a64ff828 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 6 May 2025 08:58:51 +0000 Subject: [PATCH 1115/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 17efcb5695..ba1a6cfae1 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.185.6-pre +%global ver 0.185.7-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ From aad7d4e1718642cf5857dafed5a3bb4c7283d5ce Mon Sep 17 00:00:00 2001 From: Gilver Date: Tue, 6 May 2025 08:00:05 -0500 Subject: [PATCH 1116/2977] fix?(gstreamer1-plugins-ugly): Self obsolete to obsolete Fusion (#4715) Signed-off-by: Gilver --- .../gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec b/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec index 2c5cfaa33c..4ddf90e7e0 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec +++ b/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/gstreamer1-plugins-ugly.spec @@ -29,6 +29,7 @@ BuildRequires: pkgconfig(x264) >= 0.120 Obsoletes: %{name}-free < %{?epoch}:%{version}-%{release} Provides: %{name}-free = %{?epoch}:%{version}-%{release} Provides: %{name}-free%{?_isa} = %{?epoch}:%{version}-%{release} +Obsoletes: %{name} < %{?epoch}:%{version}-%{release} %description This module contains a set of plugins that have good quality and are well tested, but can be questionable to distribute due to patents. From 101c109977f2c21961ac9d757d485a5f6f6e7ba8 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 6 May 2025 13:21:59 +0000 Subject: [PATCH 1117/2977] bump: git --- anda/system/readymade/git/readymade-git.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/system/readymade/git/readymade-git.spec b/anda/system/readymade/git/readymade-git.spec index a3d132250a..72cb54646f 100644 --- a/anda/system/readymade/git/readymade-git.spec +++ b/anda/system/readymade/git/readymade-git.spec @@ -1,5 +1,5 @@ -%global commit 43bb6ef22e3092a07b46e7092d6a8eba7ec88624 -%global commit_date 20250505 +%global commit 6d5c6b0a943ee9931d889ab5e3c04366220f4e8b +%global commit_date 20250506 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: readymade-git From 8dab5d25b227db0ac461f62c84707ec755c29414 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 6 May 2025 14:23:42 +0000 Subject: [PATCH 1118/2977] bump: kvrocks klassy --- anda/devs/kvrocks/kvrocks.spec | 2 +- anda/themes/klassy/klassy.spec | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/devs/kvrocks/kvrocks.spec b/anda/devs/kvrocks/kvrocks.spec index 287de5aa3b..cf3abf2561 100644 --- a/anda/devs/kvrocks/kvrocks.spec +++ b/anda/devs/kvrocks/kvrocks.spec @@ -1,5 +1,5 @@ Name: kvrocks -Version: 2.12.0 +Version: 2.12.1 Release: 1%?dist Summary: Distributed key value NoSQL database that uses RocksDB License: Apache-2.0 diff --git a/anda/themes/klassy/klassy.spec b/anda/themes/klassy/klassy.spec index ce5bcb9218..bd7fed6c81 100644 --- a/anda/themes/klassy/klassy.spec +++ b/anda/themes/klassy/klassy.spec @@ -1,12 +1,12 @@ Name: klassy %global forgeurl https://github.com/paulmcauley/%{name} -%global tag 6.2.breeze6.2.1 -%global date 20250226 +%global tag 6.3.breeze6.3.5 +%global date 20250506 %forgemeta Version: %{tag} -Release: 2%?dist +Release: 1%?dist Summary: Window Decoration, Application Style and Global Theme plugin for recent versions of the KDE Plasma desktop. License: GPL-2.0-or-later Group: System/GUI/KDE From 069ff1d6a18766ca865b4c79fc10f03bd6e9442f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 6 May 2025 16:26:37 +0000 Subject: [PATCH 1119/2977] bump: git --- anda/system/readymade/git/readymade-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/readymade/git/readymade-git.spec b/anda/system/readymade/git/readymade-git.spec index 72cb54646f..6de43c9ebc 100644 --- a/anda/system/readymade/git/readymade-git.spec +++ b/anda/system/readymade/git/readymade-git.spec @@ -1,4 +1,4 @@ -%global commit 6d5c6b0a943ee9931d889ab5e3c04366220f4e8b +%global commit f8d606518bb4be5806b9a68ea0c920fc98cbb4bf %global commit_date 20250506 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From a459d84f5a8b0f3c83c03ce4801cb39211b19e32 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 6 May 2025 16:58:01 +0000 Subject: [PATCH 1120/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index ba1a6cfae1..bfbc485341 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.185.7-pre +%global ver 0.185.8-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ From ed1d899a4db897073c6f40408eacd5708fd9a38e Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Tue, 6 May 2025 12:02:03 -0700 Subject: [PATCH 1121/2977] fix(ffmpeg): remove patch (#4595) (#4718) (cherry picked from commit 095ba422fb5f5e01ee9022ffde72f6160be98ab6) Signed-off-by: madomado Co-authored-by: madomado --- anda/multimedia/ffmpeg/ffmpeg.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/multimedia/ffmpeg/ffmpeg.spec b/anda/multimedia/ffmpeg/ffmpeg.spec index ab21a3db50..ec454e8769 100644 --- a/anda/multimedia/ffmpeg/ffmpeg.spec +++ b/anda/multimedia/ffmpeg/ffmpeg.spec @@ -662,4 +662,4 @@ mv doc/*.html doc/html %{_includedir}/libswscale %{_libdir}/pkgconfig/libswscale.pc %{_libdir}/libswscale.so -%{_mandir}/man3/libswscale.3* +%{_mandir}/man3/libswscale.3* \ No newline at end of file From eb60cd61797368be4afdecdd7d9d7e8ea731ab1e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 6 May 2025 20:29:11 +0000 Subject: [PATCH 1122/2977] bump: preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index bfbc485341..c78ca5d8bb 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.185.8-pre +%global ver 0.185.9-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ From d61757684678dfce010674cdab1e2ec83873f17a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 6 May 2025 20:44:06 +0000 Subject: [PATCH 1123/2977] bump: yt-dlp --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index d0181da636..7ba16d66bd 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.05.05.150322 +Version: 2025.05.06.203259 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 24c0b5acf1032c529a866b75526a20c12a7aa72a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 6 May 2025 20:55:59 +0000 Subject: [PATCH 1124/2977] bump: inputplumber --- anda/games/inputplumber/inputplumber.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index c605bb442c..f4c7843cd9 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.56.0 +Version: 0.56.1 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later From 0dc0c27982d26afdc4fc34a4322a2fd13a07f4fd Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 6 May 2025 21:18:24 +0000 Subject: [PATCH 1125/2977] bump: chezmoi --- anda/langs/go/chezmoi/chezmoi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/go/chezmoi/chezmoi.spec b/anda/langs/go/chezmoi/chezmoi.spec index 4a7eabe21c..d690542be2 100644 --- a/anda/langs/go/chezmoi/chezmoi.spec +++ b/anda/langs/go/chezmoi/chezmoi.spec @@ -4,7 +4,7 @@ # https://github.com/twpayne/chezmoi %global goipath github.com/twpayne/chezmoi -Version: 2.62.2 +Version: 2.62.3 %gometa -f From 573d35149f37fea51b814b4c40f473e9e46e34b6 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 6 May 2025 23:23:59 +0000 Subject: [PATCH 1126/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 9763768503..b4e9be6b43 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.669 +Version: 0.0.670 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 611cfdb774..891f443065 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.669 +Version: 0.0.670 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 3cd7c708d5189884c252fb6429e9511e82521d7e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 7 May 2025 01:50:05 +0000 Subject: [PATCH 1127/2977] bump(nightly): nightly micro nightly nim-nightly --- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/micro/micro-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 6 +++--- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 450882e9f0..911470fef3 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit b6f338065eb45935627a51a7d9102019aaeae1c0 +%global commit 35c9d32e696637475a1b854f56cd7f497b318761 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-05-03 +%global fulldate 2025-05-07 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 diff --git a/anda/devs/micro/micro-nightly.spec b/anda/devs/micro/micro-nightly.spec index d4f4ab2fc8..ea0fc98481 100644 --- a/anda/devs/micro/micro-nightly.spec +++ b/anda/devs/micro/micro-nightly.spec @@ -12,8 +12,8 @@ # Naming variable as something other than "commit" is necessary # to stop %%gometa from putting commit hash in release -%global commit_hash 06fe85c8c97de418f0f906edc4d84b877f744ca4 -%global commit_date 20250430 +%global commit_hash 91832d0016d0610141ab44c438316d5fdf38b4c5 +%global commit_date 20250507 %global shortcommit %{sub %{commit_hash} 1 7} %global ver 2.0.14 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 2b608df0db..275067d73d 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,7 +1,7 @@ -%global commit 377909a64603b44fdbc681a41b2e0ede9ee9e359 +%global commit 5539d82ea647584cdd69e48d4532933fdbe14d5e %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250506 -%global ver 0.186.0 +%global commit_date 20250507 +%global ver 0.187.0 %bcond_with check diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 3af7b5efd3..df3b7511ab 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 8b82f5de3848f195305d297a03d0f6796e0ab121 +%global commit 59ceff4f1afdbc35cfc1dd679ca31369e71b3873 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250506 +%global commit_date 20250507 %global debug_package %nil Name: nim-nightly From e485940f0179aa7bef47c8456608646884813c4c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 7 May 2025 02:05:50 +0000 Subject: [PATCH 1128/2977] bump: feishin ruffle limine --- anda/apps/feishin/feishin.spec | 2 +- anda/apps/ruffle/ruffle-nightly.spec | 2 +- anda/system/limine/limine.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/apps/feishin/feishin.spec b/anda/apps/feishin/feishin.spec index 21b5208af4..1b474ceccd 100644 --- a/anda/apps/feishin/feishin.spec +++ b/anda/apps/feishin/feishin.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: feishin -Version: 0.12.3 +Version: 0.12.5 Release: 1%?dist Summary: A modern self-hosted music player License: GPL-3.0 diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 225afe0efb..56b8b0128a 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-05-06 +%global ver 2025-05-07 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/system/limine/limine.spec b/anda/system/limine/limine.spec index 2213c37482..b0fe4464b1 100644 --- a/anda/system/limine/limine.spec +++ b/anda/system/limine/limine.spec @@ -1,5 +1,5 @@ Name: limine -Version: 9.2.3 +Version: 9.3.0 Release: 1%?dist Summary: Modern, advanced, portable, multiprotocol bootloader License: BSD-2-Clause From cec5a0095ac449e0f843b386ec8f5376237241b0 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 7 May 2025 03:50:30 +0000 Subject: [PATCH 1129/2977] bump: inputplumber --- anda/games/inputplumber/inputplumber.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index f4c7843cd9..702e5300c9 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.56.1 +Version: 0.57.0 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later From 5defa4063fae1f62e67f207d92989e381ed18b66 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 7 May 2025 04:33:59 +0000 Subject: [PATCH 1130/2977] bump: preview stable --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index c78ca5d8bb..1e0e06eac0 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.185.9-pre +%global ver 0.186.0-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 9eddca2634..f9c8cf23dc 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global rustflags_debuginfo 0 Name: zed -Version: 0.184.10 +Version: 0.185.9 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later From b7f040629af40df78359aaaade663980a4a63b3d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 7 May 2025 07:18:59 +0000 Subject: [PATCH 1131/2977] bump: git --- anda/system/readymade/git/readymade-git.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/system/readymade/git/readymade-git.spec b/anda/system/readymade/git/readymade-git.spec index 6de43c9ebc..b6a80df5ff 100644 --- a/anda/system/readymade/git/readymade-git.spec +++ b/anda/system/readymade/git/readymade-git.spec @@ -1,5 +1,5 @@ -%global commit f8d606518bb4be5806b9a68ea0c920fc98cbb4bf -%global commit_date 20250506 +%global commit 8a25e8cadd0f6f42c3b9e65bce3b8cb91f2aefc3 +%global commit_date 20250507 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: readymade-git From 2f90d5c6f0230dee1af56972cc04188ac98a16e6 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 7 May 2025 07:34:07 +0000 Subject: [PATCH 1132/2977] bump: git --- anda/system/readymade/git/readymade-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/readymade/git/readymade-git.spec b/anda/system/readymade/git/readymade-git.spec index b6a80df5ff..914e3151d3 100644 --- a/anda/system/readymade/git/readymade-git.spec +++ b/anda/system/readymade/git/readymade-git.spec @@ -1,4 +1,4 @@ -%global commit 8a25e8cadd0f6f42c3b9e65bce3b8cb91f2aefc3 +%global commit 8891605847b2ce7407947fd6f529b848835c44e6 %global commit_date 20250507 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From 537b7c76fa3e128c45c698ea4d4b628d95674592 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 7 May 2025 08:50:21 +0000 Subject: [PATCH 1133/2977] bump: git --- anda/system/readymade/git/readymade-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/readymade/git/readymade-git.spec b/anda/system/readymade/git/readymade-git.spec index 914e3151d3..5348c7f0ce 100644 --- a/anda/system/readymade/git/readymade-git.spec +++ b/anda/system/readymade/git/readymade-git.spec @@ -1,4 +1,4 @@ -%global commit 8891605847b2ce7407947fd6f529b848835c44e6 +%global commit 6cb25e1d10aef7f7a4d4b6f7851cfe54635d31c9 %global commit_date 20250507 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From 375c89fdfd70afdc087ae86118b0ebce1c77d5a1 Mon Sep 17 00:00:00 2001 From: Gilver Date: Wed, 7 May 2025 04:22:48 -0500 Subject: [PATCH 1134/2977] chore: Move nvidia-patch to NVIDIA subrepo (#4722) Signed-off-by: Gilver --- anda/system/nvidia-patch/anda.hcl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anda/system/nvidia-patch/anda.hcl b/anda/system/nvidia-patch/anda.hcl index 96eebb3875..8ea88871d3 100644 --- a/anda/system/nvidia-patch/anda.hcl +++ b/anda/system/nvidia-patch/anda.hcl @@ -4,5 +4,6 @@ project "pkg" { } labels { nightly = "1" + subrepo = "nvidia" } -} \ No newline at end of file +} From a8d805dda79a8a94605b6e51c037476c504e3357 Mon Sep 17 00:00:00 2001 From: Gilver Date: Wed, 7 May 2025 04:23:24 -0500 Subject: [PATCH 1135/2977] fix(prismlauncher-nightly): Update build steps (#4723) * fix(prismlauncher-nightly): Remove non-existent directory from rmdir step Signed-off-by: Gilver * fix?: Use %git_clone Signed-off-by: Gilver * fix: If I could type a URL maybe Signed-off-by: Gilver * fix: rmdir does not work for this Signed-off-by: Gilver --------- Signed-off-by: Gilver --- .../prismlauncher-nightly/prismlauncher-nightly.spec | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 64e75eb757..dd6fb0f8e0 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -3,7 +3,6 @@ %global commit cb8f6f5e80e42dc7d59336109d5ae3daa45f024e %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad %global commit_date 20250506 %global snapshot_info %{commit_date}.%{shortcommit} @@ -36,8 +35,6 @@ Summary: Minecraft launcher with ability to manage multiple instances License: GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later Group: Amusements/Games URL: https://prismlauncher.org/ -Source0: https://github.com/PrismLauncher/PrismLauncher/archive/%{commit}/%{real_name}-%{shortcommit}.tar.gz -Source1: https://github.com/PrismLauncher/libnbtplusplus/archive/%{libnbtplusplus_commit}/libnbtplusplus-%{libnbtplusplus_commit}.tar.gz Patch0: 0001-find-cmark-with-pkgconfig.patch BuildRequires: cmake >= 3.15 @@ -53,6 +50,7 @@ BuildRequires: temurin-17-jdk %else BuildRequires: java-17-openjdk-devel %endif +BuildRequires: anda-srpm-macros BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: tomlplusplus-devel @@ -112,12 +110,9 @@ multiple installations of Minecraft at once (Fork of MultiMC) %prep -%autosetup -p1 -n PrismLauncher-%{commit} +%git_clone https://github.com/%{nice_name}/%{nice_name}.git %{commit} -tar -xzf %{SOURCE1} -C libraries - -rmdir libraries/{extra-cmake-modules,filesystem,libnbtplusplus,zlib}/ -mv -f libraries/libnbtplusplus-%{libnbtplusplus_commit} libraries/libnbtplusplus +rm -rf libraries/{extra-cmake-modules,zlib}/ # Do not set RPATH sed -i "s|\$ORIGIN/||" CMakeLists.txt From 6509b8810396b6e5724098b4bc96392cd8c6a8db Mon Sep 17 00:00:00 2001 From: madomado Date: Wed, 7 May 2025 18:06:04 +0800 Subject: [PATCH 1136/2977] fix(readymade-git): lock cargo dependencies (#4733) Signed-off-by: madomado --- anda/system/readymade/git/readymade-git.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anda/system/readymade/git/readymade-git.spec b/anda/system/readymade/git/readymade-git.spec index 5348c7f0ce..f250503ba5 100644 --- a/anda/system/readymade/git/readymade-git.spec +++ b/anda/system/readymade/git/readymade-git.spec @@ -42,9 +42,10 @@ ls -l %cargo_prep_online %build +%{cargo_build} --locked %install -%cargo_install +install -Dm755 target/rpm/readymade -t %buildroot%_bindir ./install.sh %buildroot ln -sf %{_datadir}/applications/com.fyralabs.Readymade.desktop %{buildroot}%{_datadir}/applications/liveinst.desktop From 7de992923bfeee7f2f7c9cb0e6e6b544d6428bf8 Mon Sep 17 00:00:00 2001 From: madomado Date: Wed, 7 May 2025 18:34:27 +0800 Subject: [PATCH 1137/2977] feat(ci): better autoupdate commit messages (#4720) * feat(ci): better autoupdate commit messages * fix: also sort --- .github/workflows/update-branch.yml | 2 +- .github/workflows/update-nightly.yml | 2 +- .github/workflows/update-weekly.yml | 2 +- .github/workflows/update.yml | 2 +- andax/ci/update_commit_message.rhai | 13 +++++++++++++ 5 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 andax/ci/update_commit_message.rhai diff --git a/.github/workflows/update-branch.yml b/.github/workflows/update-branch.yml index 20aaa8d3ab..8f082e659e 100644 --- a/.github/workflows/update-branch.yml +++ b/.github/workflows/update-branch.yml @@ -49,7 +49,7 @@ jobs: git config user.email "raboneko@fyralabs.com" git config gpg.format "ssh" git config user.signingkey "${{ runner.temp }}/signing_key" - msg="bump(branch): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')" + msg="bump(branch): $(anda run andax/ci/update_commit_message.rhai)" git commit -S -a -m "$msg" git push -u origin --all fi diff --git a/.github/workflows/update-nightly.yml b/.github/workflows/update-nightly.yml index 0ee9552bd3..091f36972b 100644 --- a/.github/workflows/update-nightly.yml +++ b/.github/workflows/update-nightly.yml @@ -37,7 +37,7 @@ jobs: git config user.email "raboneko@fyralabs.com" git config gpg.format "ssh" git config user.signingkey "${{ runner.temp }}/signing_key" - msg="bump(nightly): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')" + msg="bump(nightly): $(anda run andax/ci/update_commit_message.rhai)" git commit -S -a -m "$msg" git format-patch HEAD^ copy_over () { diff --git a/.github/workflows/update-weekly.yml b/.github/workflows/update-weekly.yml index 075405b2e3..65edb49785 100644 --- a/.github/workflows/update-weekly.yml +++ b/.github/workflows/update-weekly.yml @@ -37,7 +37,7 @@ jobs: git config user.email "raboneko@fyralabs.com" git config gpg.format "ssh" git config user.signingkey "${{ runner.temp }}/signing_key" - msg="bump(weekly): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')" + msg="bump(weekly): $(anda run andax/ci/update_commit_message.rhai)" git commit -S -a -m "$msg" git format-patch HEAD^ copy_over () { diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index d178a81ffe..60cdc844a5 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -37,7 +37,7 @@ jobs: git config user.email "raboneko@fyralabs.com" git config gpg.format "ssh" git config user.signingkey "${{ runner.temp }}/signing_key" - msg="bump: $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')" + msg="bump: $(anda run andax/ci/update_commit_message.rhai)" git commit -S -a -m "$msg" git format-patch HEAD^ copy_over () { diff --git a/andax/ci/update_commit_message.rhai b/andax/ci/update_commit_message.rhai new file mode 100644 index 0000000000..889800652c --- /dev/null +++ b/andax/ci/update_commit_message.rhai @@ -0,0 +1,13 @@ +import "anda::cfg" as cfg; + +let cmd = `git status | sed -nE '/^\tmodified:/{s@^\tmodified:\s+@@;s@[^/]+$@@;p}' | sort -u`; +let filelist = sh(cmd, #{ "stdout": "piped" }).ctx.stdout.split('\n'); + +let modified_list = ""; +for file in filelist { + if file.is_empty() { continue; } + let spec = cfg::load_file(`${file}/anda.hcl`).project.pkg.rpm.spec; + spec.pop(5); // remove `.spec` suffix + modified_list += `${spec} `; +} +print(modified_list[..modified_list.len()-1]); From b2baed8501fd6727e16d59c43396596405a60fcc Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 7 May 2025 12:41:24 +0000 Subject: [PATCH 1138/2977] bump: zed-preview zed --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 1e0e06eac0..126bb87a22 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.186.0-pre +%global ver 0.186.1-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index f9c8cf23dc..ffe9487b37 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global rustflags_debuginfo 0 Name: zed -Version: 0.185.9 +Version: 0.185.10 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later From a762cff843a9aa87b9f93792b67eefb10b7c1e1b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 7 May 2025 17:25:55 +0000 Subject: [PATCH 1139/2977] bump: mesa --- anda/lib/mesa/mesa.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index 683b41fc8f..9f0cb8ab53 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -74,7 +74,7 @@ Summary: Mesa graphics libraries # This should not break anything by default as the Mesa stream is ***EXPLICITLY*** # disabled by default, and has to be enabled manually. See `terra/release/terra-mesa.repo` for details. Epoch: 1 -Version: 25.0.5 +Version: 25.1.0 Release: 1%?dist License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org From 0a5a4b47e95262d4b354768ca7aaaa18bd849b74 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 7 May 2025 19:57:40 +0000 Subject: [PATCH 1140/2977] bump: zed-preview zed --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 126bb87a22..e2be05476a 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.186.1-pre +%global ver 0.186.2-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index ffe9487b37..01e5c54f3a 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global rustflags_debuginfo 0 Name: zed -Version: 0.185.10 +Version: 0.185.11 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later From bb25ecb29ff6fa7565b457c8f2dc393f8848e0d1 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 7 May 2025 22:19:22 +0000 Subject: [PATCH 1141/2977] bump: komikku electron --- anda/apps/komikku/komikku.spec | 4 ++-- anda/tools/electron/electron.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/apps/komikku/komikku.spec b/anda/apps/komikku/komikku.spec index 3256accc7f..46429ac355 100644 --- a/anda/apps/komikku/komikku.spec +++ b/anda/apps/komikku/komikku.spec @@ -3,10 +3,10 @@ %global gtk4_version 4.14.4 %global libadwaita_version 1.5.1 %global pure_protobuf_version 2.0.0 -%global raw_ver v1.75.0 +%global raw_ver v1.76.0 Name: komikku -Version: 1.75.0 +Version: 1.76.0 %forgemeta Release: 1%?dist Summary: A manga reader for GNOME diff --git a/anda/tools/electron/electron.spec b/anda/tools/electron/electron.spec index a8587d570f..fa9dc92af7 100644 --- a/anda/tools/electron/electron.spec +++ b/anda/tools/electron/electron.spec @@ -12,7 +12,7 @@ %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so Name: electron -Version: 36.1.0 +Version: 36.2.0 Release: 1%?dist Summary: Build cross platform desktop apps with web technologies License: MIT From eefea49513823f761325ad9bafabe68a5f4dfd0e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 7 May 2025 22:41:11 +0000 Subject: [PATCH 1142/2977] bump(branch): kf6-kio --- anda/desktops/kde/kf6-kio/kf6-kio.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/kde/kf6-kio/kf6-kio.spec b/anda/desktops/kde/kf6-kio/kf6-kio.spec index 0b0c3ff37e..e9b85caa9d 100644 --- a/anda/desktops/kde/kf6-kio/kf6-kio.spec +++ b/anda/desktops/kde/kf6-kio/kf6-kio.spec @@ -5,7 +5,7 @@ Name: kf6-%{framework} Version: %{majmin_ver_kf6}.0 -Release: 1%{?dist}.switcheroo +Release: 2%{?dist}.switcheroo Summary: KDE Frameworks 6 Tier 3 solution for filesystem abstraction Provides: kf6-%{framework}.switcheroo = %version-%release From 2e28262bdb4faccbb62ac6cfdf3012dd3ccb3d81 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 7 May 2025 22:50:10 +0000 Subject: [PATCH 1143/2977] bump: rust-mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index 363aee3de6..d6d2780b85 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.5.1 +Version: 2025.5.2 Release: 1%?dist Summary: Front-end to your dev env From 759cb9b057818e9e7259c7f6022a909be624db98 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 7 May 2025 23:13:17 +0000 Subject: [PATCH 1144/2977] bump(branch): cuda-cudnn --- anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec b/anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec index 87c8884e3c..b2f12c46a1 100644 --- a/anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec +++ b/anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec @@ -5,7 +5,7 @@ %global cuda_version 12 Name: cuda-cudnn -Version: 9.9.0.52 +Version: 9.10.0.56 Release: 1%?dist Epoch: 1 Summary: NVIDIA CUDA Deep Neural Network library (cuDNN) From 774ece3481cea7a1156e68f37c84db4f3ef4b9b3 Mon Sep 17 00:00:00 2001 From: Gilver Date: Wed, 7 May 2025 19:34:08 -0500 Subject: [PATCH 1145/2977] fix(komikku): New file (#4741) Signed-off-by: Gilver --- anda/apps/komikku/komikku.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/apps/komikku/komikku.spec b/anda/apps/komikku/komikku.spec index 46429ac355..34c080b02d 100644 --- a/anda/apps/komikku/komikku.spec +++ b/anda/apps/komikku/komikku.spec @@ -99,6 +99,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/applications/*.desktop +%{_datadir}/dbus-1/services/%{uuid}.service %{_datadir}/glib-2.0/schemas/*.gschema.xml %{_datadir}/icons/hicolor/scalable/*/*.svg %{_datadir}/icons/hicolor/symbolic/*/*.svg From 4b2a9c0ed4513400d5e17355f9b0d5af6a0af935 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 8 May 2025 01:50:29 +0000 Subject: [PATCH 1146/2977] bump(nightly): mpv-nightly ghostty-nightly zed-nightly prismlauncher-nightly --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 2 +- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 6a89319e91..5c9df458fd 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit d702e5fec8090e1700e9b00557680a81e925a507 +%global commit 139591a0782d34579c9c16fd932f828e4bc371b6 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250504 +%global commit_date 20250508 %global ver 0.40.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 911470fef3..a36876563d 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,4 +1,4 @@ -%global commit 35c9d32e696637475a1b854f56cd7f497b318761 +%global commit bcff488095cab023f26bb7bbfaf674cb0086ef87 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global fulldate 2025-05-07 %global commit_date %(echo %{fulldate} | sed 's/-//g') diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 275067d73d..d18ceeb2df 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 5539d82ea647584cdd69e48d4532933fdbe14d5e +%global commit 6cc6e4d4b36a0310b282ec98395829ed0311715f %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250507 +%global commit_date 20250508 %global ver 0.187.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index dd6fb0f8e0..01b1674d5e 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,10 +1,10 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit cb8f6f5e80e42dc7d59336109d5ae3daa45f024e +%global commit b7bcc2f61208c0329968d12d058a9f616f495a5d %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250506 +%global commit_date 20250508 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 From 4dee30a503e00af790ef67066b03ff00a6148a74 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 8 May 2025 02:06:46 +0000 Subject: [PATCH 1147/2977] bump: ruffle-nightly --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 56b8b0128a..467ec412ab 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-05-07 +%global ver 2025-05-08 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From d86ee8aa86345e6e17aca2591751f3fd5c530856 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 8 May 2025 03:16:13 +0000 Subject: [PATCH 1148/2977] bump: zed-preview zed --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index e2be05476a..04aebdf9c3 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.186.2-pre +%global ver 0.186.3-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 01e5c54f3a..6ef778ff98 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global rustflags_debuginfo 0 Name: zed -Version: 0.185.11 +Version: 0.185.12 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later From 4a1a7793b0e8d071df966e55885f65e7b8d6a632 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 8 May 2025 07:19:13 +0000 Subject: [PATCH 1149/2977] bump: libva-nvidia-driver --- .../nvidia/libva-nvidia-driver/libva-nvidia-driver.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/system/nvidia/libva-nvidia-driver/libva-nvidia-driver.spec b/anda/system/nvidia/libva-nvidia-driver/libva-nvidia-driver.spec index f0ba9c769d..30ccd2c215 100644 --- a/anda/system/nvidia/libva-nvidia-driver/libva-nvidia-driver.spec +++ b/anda/system/nvidia/libva-nvidia-driver/libva-nvidia-driver.spec @@ -1,5 +1,5 @@ -%global commit0 c2860cc621ae1ef515c003d43315c63a41529ff4 -%global date 20250419 +%global commit0 8e6a439600137d9105d238b810857e185cfe4cec +%global date 20250508 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global upstream_name nvidia-vaapi-driver From 7e240a1c541c962f6c6d0539dfeb7f4afafb307c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 8 May 2025 07:46:03 +0000 Subject: [PATCH 1150/2977] bump: readymade-git --- anda/system/readymade/git/readymade-git.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/system/readymade/git/readymade-git.spec b/anda/system/readymade/git/readymade-git.spec index f250503ba5..2821213812 100644 --- a/anda/system/readymade/git/readymade-git.spec +++ b/anda/system/readymade/git/readymade-git.spec @@ -1,5 +1,5 @@ -%global commit 6cb25e1d10aef7f7a4d4b6f7851cfe54635d31c9 -%global commit_date 20250507 +%global commit 22b0ede4e40c86fbbd309dec8752fec7138d9005 +%global commit_date 20250508 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: readymade-git From 3e5f123cbd9bdc8ac3e9ce088242cc04505bd56b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 8 May 2025 08:27:32 +0000 Subject: [PATCH 1151/2977] bump: feishin --- anda/apps/feishin/feishin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/feishin/feishin.spec b/anda/apps/feishin/feishin.spec index 1b474ceccd..71f6a8074a 100644 --- a/anda/apps/feishin/feishin.spec +++ b/anda/apps/feishin/feishin.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: feishin -Version: 0.12.5 +Version: 0.12.6 Release: 1%?dist Summary: A modern self-hosted music player License: GPL-3.0 From a1e2ff8e62d71bf45331e62901f8c6e6a1ffa738 Mon Sep 17 00:00:00 2001 From: Gilver Date: Thu, 8 May 2025 03:28:32 -0500 Subject: [PATCH 1152/2977] chore(lcevdec): Update spec and drop old patches (#4750) --- anda/multimedia/lcevcdec/LCEVCdec-cstdint.patch | 11 ----------- anda/multimedia/lcevcdec/LCEVCdec-docs.patch | 14 -------------- anda/multimedia/lcevcdec/LCEVCdec.spec | 14 +++++++++----- 3 files changed, 9 insertions(+), 30 deletions(-) delete mode 100644 anda/multimedia/lcevcdec/LCEVCdec-cstdint.patch delete mode 100644 anda/multimedia/lcevcdec/LCEVCdec-docs.patch diff --git a/anda/multimedia/lcevcdec/LCEVCdec-cstdint.patch b/anda/multimedia/lcevcdec/LCEVCdec-cstdint.patch deleted file mode 100644 index b1a35ca845..0000000000 --- a/anda/multimedia/lcevcdec/LCEVCdec-cstdint.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur LCEVCdec-3.3.5.old/src/api/src/buffer_manager.h LCEVCdec-3.3.5/src/api/src/buffer_manager.h ---- LCEVCdec-3.3.5.old/src/api/src/buffer_manager.h 2025-03-22 11:46:05.946962992 +0100 -+++ LCEVCdec-3.3.5/src/api/src/buffer_manager.h 2025-03-22 11:46:36.029979290 +0100 -@@ -15,6 +15,7 @@ - #ifndef VN_API_BUFFER_MANAGER_H_ - #define VN_API_BUFFER_MANAGER_H_ - -+#include - #include - #include - #include diff --git a/anda/multimedia/lcevcdec/LCEVCdec-docs.patch b/anda/multimedia/lcevcdec/LCEVCdec-docs.patch deleted file mode 100644 index ec6e2146a9..0000000000 --- a/anda/multimedia/lcevcdec/LCEVCdec-docs.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur LCEVCdec-3.3.5.old/docs/sphinx/CMakeLists.txt LCEVCdec-3.3.5/docs/sphinx/CMakeLists.txt ---- LCEVCdec-3.3.5.old/docs/sphinx/CMakeLists.txt 2025-03-23 16:27:09.553289475 +0100 -+++ LCEVCdec-3.3.5/docs/sphinx/CMakeLists.txt 2025-03-24 08:54:32.562734384 +0100 -@@ -41,8 +41,8 @@ - documentation ALL - DEPENDS doxygen - COMMAND -- ${SPHINX_EXECUTABLE} -b html -W -n -a -Dversion=${GIT_SHORT_VERSION} -+ ${SPHINX_EXECUTABLE} ${SPHINX_SOURCE} ${SPHINX_BUILD} -+ -b html -W -n -a -Dversion=${GIT_SHORT_VERSION} - -Drelease=${GIT_VERSION} -Dbreathe_projects.LCEVC_DEC=${DOXYGEN_OUTPUT_DIR}/xml -- ${SPHINX_SOURCE} ${SPHINX_BUILD} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMENT "Generating docs with Sphinx") diff --git a/anda/multimedia/lcevcdec/LCEVCdec.spec b/anda/multimedia/lcevcdec/LCEVCdec.spec index 1d2ffd2926..6835bfe02e 100644 --- a/anda/multimedia/lcevcdec/LCEVCdec.spec +++ b/anda/multimedia/lcevcdec/LCEVCdec.spec @@ -23,9 +23,7 @@ License: BSD-3-Clause-Clear URL: https://docs.v-nova.com/v-nova/lcevc/lcevc-sdk-overview Source0: https://github.com/v-novaltd/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: %{name}-cstdint.patch -Patch1: %{name}-docs.patch -Patch2: %{name}-soversion.patch +Patch1: %{name}-soversion.patch BuildRequires: cmake BuildRequires: cmake(CLI11) @@ -72,7 +70,7 @@ Features: %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: plutovg-devel%{?_isa} +Requires: plutovg-devel%{?_isa} %description devel The %{name}-devel package contains libraries and header files for @@ -128,13 +126,14 @@ sed -i \ %install %cmake_install + %ifnarch %ix86 mv %{buildroot}%{_prefix}/lib/*.a %{buildroot}%{_libdir}/ rm -fr %{buildroot}%{_prefix}/lib %endif # Let RPM pick up docs in the files section -rm -fr %{buildroot}%{_docdir} +rm -fr %{buildroot}%{_docdir} %{buildroot}%{_prefix}/licenses %if %{with tests} %check @@ -151,13 +150,18 @@ python3 src/func_tests/run_tests.py %files devel %{_includedir}/LCEVC +%{_includedir}/lcevc_config.h %{_libdir}/liblcevc_dec_api.so %{_libdir}/liblcevc_dec_core.so %{_libdir}/pkgconfig/lcevc_dec.pc %files static +%{_libdir}/liblcevc_dec_api_static.a %{_libdir}/liblcevc_dec_api_utility.a %{_libdir}/liblcevc_dec_core_sequencing.a +%{_libdir}/liblcevc_dec_core_static.a +%{_libdir}/liblcevc_dec_enhancement_cpu.a +%{_libdir}/liblcevc_dec_overlay_images.a %{_libdir}/liblcevc_dec_unit_test_utilities.a %{_libdir}/liblcevc_dec_utility.a From 2eed4b9207eb30ed0847eecaafd8e9eb0759e7fe Mon Sep 17 00:00:00 2001 From: Gilver Date: Thu, 8 May 2025 03:28:52 -0500 Subject: [PATCH 1153/2977] chore(libde265): Update spec (#4751) --- anda/lib/libde265/libde265.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/anda/lib/libde265/libde265.spec b/anda/lib/libde265/libde265.spec index aab40f5c62..f9baa6453d 100644 --- a/anda/lib/libde265/libde265.spec +++ b/anda/lib/libde265/libde265.spec @@ -2,7 +2,7 @@ Name: libde265 Summary: Open H.265 video codec implementation Version: 1.0.16 Release: 1%?dist -License: LGPLv3+ +License: LGPL-3.0-or-later URL: https://www.libde265.org/ Source0: https://github.com/strukturag/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: autoconf @@ -50,13 +50,11 @@ autoreconf -vif %make_install find %{buildroot} -name '*.la' -delete -%{?ldconfig_scriptlets} - %files %license COPYING %doc AUTHORS %{_libdir}/%{name}.so.0 -%{_libdir}/%{name}.so.0.1.8 +%{_libdir}/%{name}.so.0.1.9 %files devel %doc README.md @@ -66,7 +64,6 @@ find %{buildroot} -name '*.la' -delete %files tools %doc README.md -%{_bindir}/acceleration_speed %{_bindir}/bjoentegaard %{_bindir}/block-rate-estim %{_bindir}/dec265 From 1acfbfeb5642295231f4ba7234c58f44e3a03634 Mon Sep 17 00:00:00 2001 From: Gilver Date: Thu, 8 May 2025 05:43:58 -0500 Subject: [PATCH 1154/2977] fix(libva-nvidia-driver): Ifcond for ix86 (#4757) * fix(libva-nvidia-driver): Ifcond for ix86 Signed-off-by: Gilver * ? Signed-off-by: Gilver * ?? Signed-off-by: Gilver * ??? Signed-off-by: Gilver * Try this too Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/system/nvidia/libva-nvidia-driver/anda.hcl | 3 ++- .../nvidia/libva-nvidia-driver/libva-nvidia-driver.spec | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/anda/system/nvidia/libva-nvidia-driver/anda.hcl b/anda/system/nvidia/libva-nvidia-driver/anda.hcl index d3a613011e..007aa44ec7 100644 --- a/anda/system/nvidia/libva-nvidia-driver/anda.hcl +++ b/anda/system/nvidia/libva-nvidia-driver/anda.hcl @@ -6,5 +6,6 @@ project "pkg" { labels = { subrepo = "nvidia" mock = 1 + nightly = 1 } -} \ No newline at end of file +} diff --git a/anda/system/nvidia/libva-nvidia-driver/libva-nvidia-driver.spec b/anda/system/nvidia/libva-nvidia-driver/libva-nvidia-driver.spec index 30ccd2c215..1876bde529 100644 --- a/anda/system/nvidia/libva-nvidia-driver/libva-nvidia-driver.spec +++ b/anda/system/nvidia/libva-nvidia-driver/libva-nvidia-driver.spec @@ -4,6 +4,10 @@ %global upstream_name nvidia-vaapi-driver +%ifarch %ix86 +%global build_cflags %{__build_flags_lang_c} %{?_distro_extra_cflags} -Wno-error=format= +%endif + Name: libva-nvidia-driver Epoch: 1 Version: 0.0.13%{!?tag:^%{date}git%{shortcommit0}} @@ -91,4 +95,4 @@ decode of web content, and may not operate correctly in other applications. - Add latest fixes. * Sat Feb 04 2023 Simone Caronni - 0.0.8-1.20230131git2bb71a5 -- Rebase to latest snapshot. \ No newline at end of file +- Rebase to latest snapshot. From 813767084da12c3a175c9dc228cd01e469604c3c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 8 May 2025 10:45:21 +0000 Subject: [PATCH 1155/2977] bump: readymade-git --- anda/system/readymade/git/readymade-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/readymade/git/readymade-git.spec b/anda/system/readymade/git/readymade-git.spec index 2821213812..2ce626807d 100644 --- a/anda/system/readymade/git/readymade-git.spec +++ b/anda/system/readymade/git/readymade-git.spec @@ -1,4 +1,4 @@ -%global commit 22b0ede4e40c86fbbd309dec8752fec7138d9005 +%global commit bf175e8f501b33993433d3a25c247115fce6b2eb %global commit_date 20250508 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From b31f08bbeb0bb7826efd23062df95cd9e13fe1a5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 8 May 2025 13:18:13 +0000 Subject: [PATCH 1156/2977] bump: inputplumber --- anda/games/inputplumber/inputplumber.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index 702e5300c9..7e5612b63d 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.57.0 +Version: 0.57.1 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later From 3085dbb97d4daf77d052983d4101eeae24f65c71 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 8 May 2025 15:45:43 +0000 Subject: [PATCH 1157/2977] bump: zed-preview zed --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 04aebdf9c3..5ac3dd18e7 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.186.3-pre +%global ver 0.186.4-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 6ef778ff98..15eec6d31f 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global rustflags_debuginfo 0 Name: zed -Version: 0.185.12 +Version: 0.185.13 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later From 674931b38d23da632bdd883c3718d62a50a9ed01 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 8 May 2025 19:15:23 +0000 Subject: [PATCH 1158/2977] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index b4e9be6b43..0a6e8eedcd 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.670 +Version: 0.0.671 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 891f443065..35ab071d61 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.670 +Version: 0.0.671 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 70c5cb8a8a902175693fd09a199c804071e44b2f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 8 May 2025 20:55:38 +0000 Subject: [PATCH 1159/2977] bump: tdlib-nightly --- anda/lib/tdlib/tdlib-nightly.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 27d86aa216..b631ce00cc 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,6 +1,6 @@ -%global commit 34c390f9afe074071e01c623e42adfbd17e350ab -%global ver 1.8.48 -%global commit_date 20250504 +%global commit dcb133ca898d44df205a4592bf6bd7b0e2819383 +%global ver 1.8.49 +%global commit_date 20250508 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: tdlib-nightly From 63e43f6363e6db1f2b733dbce10a58a0ee66aa5b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 8 May 2025 21:45:55 +0000 Subject: [PATCH 1160/2977] bump: tdlib-nightly --- anda/lib/tdlib/tdlib-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index b631ce00cc..a73e104802 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,4 +1,4 @@ -%global commit dcb133ca898d44df205a4592bf6bd7b0e2819383 +%global commit e6d0516e0def13ed6a75ec10b9ac8d4383379245 %global ver 1.8.49 %global commit_date 20250508 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From 9b018233d7f8e991ee58dd74a5f44f2dd68ea51c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 8 May 2025 21:56:01 +0000 Subject: [PATCH 1161/2977] bump: rio --- anda/devs/rio/rio.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/rio/rio.spec b/anda/devs/rio/rio.spec index 2762d13bf1..74b2c44191 100644 --- a/anda/devs/rio/rio.spec +++ b/anda/devs/rio/rio.spec @@ -4,7 +4,7 @@ A hardware-accelerated terminal emulator focusing to run in desktops and browser %bcond docs 1 Name: rio -Version: 0.2.14 +Version: 0.2.15 Release: 1%?dist Summary: A hardware-accelerated terminal written in Rust. SourceLicense: MIT From 909e2b58cf8f551b042a8230e0fc23da2435c165 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 8 May 2025 22:19:01 +0000 Subject: [PATCH 1162/2977] bump: codium --- anda/devs/codium/codium.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/codium/codium.spec b/anda/devs/codium/codium.spec index bf5225ffed..78db324901 100644 --- a/anda/devs/codium/codium.spec +++ b/anda/devs/codium/codium.spec @@ -12,7 +12,7 @@ %endif Name: codium -Version: 1.99.32846 +Version: 1.100.03093 Release: 1%?dist Summary: Code editing. Redefined. License: MIT From 4fb020018a404775dce310963afcf12ebc610d06 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 9 May 2025 01:49:35 +0000 Subject: [PATCH 1163/2977] bump(nightly): zed-nightly intel-ipu6-drivers --- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index d18ceeb2df..b17e8a29d8 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 6cc6e4d4b36a0310b282ec98395829ed0311715f +%global commit 29c31f020e30004ca9bfae269fd39868d6cdc660 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250508 +%global commit_date 20250509 %global ver 0.187.0 %bcond_with check diff --git a/anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec b/anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec index 738a4a119c..6e1c697391 100644 --- a/anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec +++ b/anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec @@ -1,6 +1,6 @@ %global debug_package %{nil} -%global ipu6_commit c09e2198d801e1eb701984d2948373123ba92a56 -%global ipu6_commitdate 20250424 +%global ipu6_commit 1a884d5124dc149af4a645aa1493873bf796d677 +%global ipu6_commitdate 20250509 %global ipu6_shortcommit %(c=%{ipu6_commit}; echo ${c:0:7}) %global usbio_commit 4fb690c6d15a81c492954636c2db396cb700a119 %global usbio_commitdate 20241210 From 6b0b1172693748fbd19ebd5b26b170b7ab9829e1 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 9 May 2025 02:05:11 +0000 Subject: [PATCH 1164/2977] bump: ruffle-nightly --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 467ec412ab..f1d3dc6339 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-05-08 +%global ver 2025-05-09 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 96eb2c00b2376787186867f1d97865807bd3121e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 9 May 2025 02:53:51 +0000 Subject: [PATCH 1165/2977] bump(branch): intel-ipu6-kmod dkms-intel-ipu6 --- anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec | 4 ++-- anda/system/ipu6-drivers/dkms/dkms-intel-ipu6.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec b/anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec index e5928571dc..955a1d210f 100644 --- a/anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec +++ b/anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec @@ -2,8 +2,8 @@ %global buildforkernels akmod %global debug_package %{nil} %endif -%global ipu6_commit c09e2198d801e1eb701984d2948373123ba92a56 -%global ipu6_commitdate 20250424 +%global ipu6_commit 1a884d5124dc149af4a645aa1493873bf796d677 +%global ipu6_commitdate 20250509 %global ipu6_shortcommit %(c=%{ipu6_commit}; echo ${c:0:7}) %global usbio_commit 450939ff5f8af733bc89c564603222a4d420acf3 %global usbio_commitdate 20241210 diff --git a/anda/system/ipu6-drivers/dkms/dkms-intel-ipu6.spec b/anda/system/ipu6-drivers/dkms/dkms-intel-ipu6.spec index 29aa079677..96f457c04a 100644 --- a/anda/system/ipu6-drivers/dkms/dkms-intel-ipu6.spec +++ b/anda/system/ipu6-drivers/dkms/dkms-intel-ipu6.spec @@ -1,6 +1,6 @@ %global debug_package %{nil} -%global ipu6_commit c09e2198d801e1eb701984d2948373123ba92a56 -%global ipu6_commitdate 20250424 +%global ipu6_commit 1a884d5124dc149af4a645aa1493873bf796d677 +%global ipu6_commitdate 20250509 %global ipu6_shortcommit %(c=%{ipu6_commit}; echo ${c:0:7}) %global usbio_commit 450939ff5f8af733bc89c564603222a4d420acf3 %global usbio_commitdate 20241210 From 6b53e28e7e75d53758f8c75de16ea26afd29c5e8 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 9 May 2025 04:40:52 +0000 Subject: [PATCH 1166/2977] bump: readymade-git --- anda/system/readymade/git/readymade-git.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/system/readymade/git/readymade-git.spec b/anda/system/readymade/git/readymade-git.spec index 2ce626807d..beb06372f8 100644 --- a/anda/system/readymade/git/readymade-git.spec +++ b/anda/system/readymade/git/readymade-git.spec @@ -1,5 +1,5 @@ -%global commit bf175e8f501b33993433d3a25c247115fce6b2eb -%global commit_date 20250508 +%global commit 2b68a6738ee99cc336531b8f54df232d71415dc0 +%global commit_date 20250509 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: readymade-git From b66b3ed893b1d2f8e0573635620f64f905f9fc21 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 9 May 2025 13:41:07 +0000 Subject: [PATCH 1167/2977] bump: komikku --- anda/apps/komikku/komikku.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/komikku/komikku.spec b/anda/apps/komikku/komikku.spec index 34c080b02d..64866d9128 100644 --- a/anda/apps/komikku/komikku.spec +++ b/anda/apps/komikku/komikku.spec @@ -3,10 +3,10 @@ %global gtk4_version 4.14.4 %global libadwaita_version 1.5.1 %global pure_protobuf_version 2.0.0 -%global raw_ver v1.76.0 +%global raw_ver v1.76.1 Name: komikku -Version: 1.76.0 +Version: 1.76.1 %forgemeta Release: 1%?dist Summary: A manga reader for GNOME From 04c45ccc07f69997e5beb29f97add252d551ae2b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 9 May 2025 14:39:47 +0000 Subject: [PATCH 1168/2977] bump: zed-preview --- anda/devs/zed/preview/zed-preview.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 5ac3dd18e7..bb576aa449 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.186.4-pre +%global ver 0.186.5-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ From 567da72d628e8c11925ea66ef2306d1dd208cc2a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 9 May 2025 15:56:11 +0000 Subject: [PATCH 1169/2977] bump: zed --- anda/devs/zed/stable/zed.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 15eec6d31f..a28166d72c 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global rustflags_debuginfo 0 Name: zed -Version: 0.185.13 +Version: 0.185.14 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later From 8b5ac5987b0a819299447b6aef5a6a5d06d3b0ce Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 9 May 2025 21:45:41 +0000 Subject: [PATCH 1170/2977] bump: rust-mise --- anda/tools/buildsys/mise/rust-mise.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index d6d2780b85..272accc5e7 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -5,7 +5,7 @@ %global crate mise Name: rust-mise -Version: 2025.5.2 +Version: 2025.5.3 Release: 1%?dist Summary: Front-end to your dev env From cee02c768f1ab2b43d75d028b8ba8e9eff99631d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 9 May 2025 22:58:21 +0000 Subject: [PATCH 1171/2977] bump: zed-preview zed --- anda/devs/zed/preview/zed-preview.spec | 2 +- anda/devs/zed/stable/zed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index bb576aa449..b959bf7d49 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_with check -%global ver 0.186.5-pre +%global ver 0.186.6-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index a28166d72c..8c9aa2091f 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -9,7 +9,7 @@ %global rustflags_debuginfo 0 Name: zed -Version: 0.185.14 +Version: 0.185.15 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later From 3ba6c5cdf55cc7f88e41fd5f14de5e5ab3aaf52b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 10 May 2025 01:05:34 +0000 Subject: [PATCH 1172/2977] bump(branch): kf6-kio --- anda/desktops/kde/kf6-kio/kf6-kio.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/kde/kf6-kio/kf6-kio.spec b/anda/desktops/kde/kf6-kio/kf6-kio.spec index e9b85caa9d..6f8a8e9d29 100644 --- a/anda/desktops/kde/kf6-kio/kf6-kio.spec +++ b/anda/desktops/kde/kf6-kio/kf6-kio.spec @@ -5,7 +5,7 @@ Name: kf6-%{framework} Version: %{majmin_ver_kf6}.0 -Release: 2%{?dist}.switcheroo +Release: 3%{?dist}.switcheroo Summary: KDE Frameworks 6 Tier 3 solution for filesystem abstraction Provides: kf6-%{framework}.switcheroo = %version-%release From 97afaaef68a3826a8339988af5c800937d1ee9fb Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 10 May 2025 01:45:33 +0000 Subject: [PATCH 1173/2977] bump(nightly): mpv-nightly ghostty-nightly zed-nightly --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/ghostty/nightly/ghostty-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 5c9df458fd..4afed706d0 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 139591a0782d34579c9c16fd932f828e4bc371b6 +%global commit b3070d1255c461871db2e66918cab225512ea38f %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250508 +%global commit_date 20250510 %global ver 0.40.0 Name: mpv-nightly diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index a36876563d..c921460e6b 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit bcff488095cab023f26bb7bbfaf674cb0086ef87 +%global commit 7f9bb3c0e54f585e11259bc0c9064813d061929c %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-05-07 +%global fulldate 2025-05-09 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index b17e8a29d8..a4c295320e 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 29c31f020e30004ca9bfae269fd39868d6cdc660 +%global commit 39da72161f6bd9472b11725f587ee989072618f4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250509 +%global commit_date 20250510 %global ver 0.187.0 %bcond_with check From e2e309baba572429520681a0744324cd1c4ac980 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 10 May 2025 01:59:32 +0000 Subject: [PATCH 1174/2977] bump: ruffle-nightly --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index f1d3dc6339..0b0db5a89a 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-05-09 +%global ver 2025-05-10 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 6a8318be8aa80f24c62c568e9ae6c0f238551106 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 10 May 2025 03:08:55 +0000 Subject: [PATCH 1175/2977] bump: mpvpaper --- anda/desktops/waylands/mpvpaper/mpvpaper.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/waylands/mpvpaper/mpvpaper.spec b/anda/desktops/waylands/mpvpaper/mpvpaper.spec index 3588295b1d..360c1b71bc 100644 --- a/anda/desktops/waylands/mpvpaper/mpvpaper.spec +++ b/anda/desktops/waylands/mpvpaper/mpvpaper.spec @@ -1,5 +1,5 @@ Name: mpvpaper -Version: 1.7 +Version: 1.8 Release: 1%?dist Summary: A video wallpaper program for wlroots based wayland compositors License: GPL-3.0-or-later From 5b28230d3e3bd068abf2119005f1ff6971f63665 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sat, 10 May 2025 02:46:59 -0500 Subject: [PATCH 1176/2977] chore: Bump vvenc, add update script (#4765) * bump: vvenc Signed-off-by: Gilver * feat: Add update script Signed-off-by: Gilver * fix: Define global variable later Signed-off-by: Gilver * I love 32-bit ifconds Signed-off-by: Gilver * Oops Signed-off-by: Gilver * It'd be nice if the LDFLAGS stuff was easier to look into Signed-off-by: Gilver * ? Signed-off-by: Gilver * Update vvenc.spec Signed-off-by: Gilver * Screw it Signed-off-by: Gilver * Try a less severe approach now that the issue is found? Signed-off-by: Gilver * Sigh Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/multimedia/vvenc/update.rhai | 4 ++++ anda/multimedia/vvenc/vvenc.spec | 19 +++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 anda/multimedia/vvenc/update.rhai diff --git a/anda/multimedia/vvenc/update.rhai b/anda/multimedia/vvenc/update.rhai new file mode 100644 index 0000000000..cb650ae083 --- /dev/null +++ b/anda/multimedia/vvenc/update.rhai @@ -0,0 +1,4 @@ +let v = gh_tag("fraunhoferhhi/vvenc"); +if `[\d.]+-rc\d+`.find_all(v).len == 0 { + rpm.version(v); +} diff --git a/anda/multimedia/vvenc/vvenc.spec b/anda/multimedia/vvenc/vvenc.spec index 260403c943..6ea29d0550 100644 --- a/anda/multimedia/vvenc/vvenc.spec +++ b/anda/multimedia/vvenc/vvenc.spec @@ -1,5 +1,7 @@ +%global build_cxxflags %{__build_flags_lang_cxx} %{?_distro_extra_cxxflags} -Wno-error=maybe-uninitialized -Wno-error=uninitialized + Name: vvenc -Version: 1.12.1 +Version: 1.13.1 Release: 1%{?dist} Summary: VVenC, the Fraunhofer Versatile Video Encoder License: BSD-3-Clause @@ -10,6 +12,9 @@ Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: cmake BuildRequires: gcc-c++ +# Define this after the version is defined +%global vvenc_majorminor %(v=%{version}; echo ${v:0:4}) + %description VVenC, the Fraunhofer Versatile Video Encoder, is a fast and efficient software H.266/VVC encoder implementation with the following main features: @@ -40,7 +45,9 @@ developing applications that use %{name}. %autosetup -p1 %build -export CXXFLAGS="%{optflags} -Wno-error=maybe-uninitialized -Wno-error=uninitialized" +%ifarch %ix86 +export LDFLAGS="%{optflags} -Wl,--unresolved-symbols=ignore-all" +%endif %cmake \ -DCMAKE_SKIP_INSTALL_RPATH=OFF \ -DVVENC_INSTALL_FULLFEATURE_APP=ON @@ -56,7 +63,7 @@ export CXXFLAGS="%{optflags} -Wno-error=maybe-uninitialized -Wno-error=uninitial %files libs %license LICENSE.txt %doc README.md changelog.txt -%{_libdir}/lib%{name}.so.1.12 +%{_libdir}/lib%{name}.so.%{vvenc_majorminor} %{_libdir}/lib%{name}.so.%{version} %files devel @@ -66,8 +73,4 @@ export CXXFLAGS="%{optflags} -Wno-error=maybe-uninitialized -Wno-error=uninitial %{_libdir}/pkgconfig/lib%{name}.pc %changelog -* Mon Nov 11 2024 Simone Caronni - 1.12.1-1 -- Update to 1.12.1. - -* Mon Aug 19 2024 Simone Caronni - 1.12.0-1 -- First build. \ No newline at end of file +%autochangelog From e1f798e2106b9b977576400bb59dcc6d697ae3ad Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 10 May 2025 08:32:30 +0000 Subject: [PATCH 1177/2977] bump: tdlib-nightly --- anda/lib/tdlib/tdlib-nightly.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index a73e104802..e5b3c1e05b 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,6 +1,6 @@ -%global commit e6d0516e0def13ed6a75ec10b9ac8d4383379245 +%global commit aaddce62789bd9d6175d0543f40b7cfdfa5da0d4 %global ver 1.8.49 -%global commit_date 20250508 +%global commit_date 20250510 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: tdlib-nightly From dad44f01c28a374a167d6aa0323ff334153d0df5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 10 May 2025 09:24:47 +0000 Subject: [PATCH 1178/2977] bump: yt-dlp-git --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 7ba16d66bd..cdb42f5ee7 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.05.06.203259 +Version: 2025.05.10.085414 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 73acdc60d83beb8e958ff38807c623c281064b90 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 10 May 2025 17:55:58 +0000 Subject: [PATCH 1179/2977] bump: bun-bin --- anda/devs/bun/bun-bin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/bun/bun-bin.spec b/anda/devs/bun/bun-bin.spec index a71ac365b8..df64dfc886 100644 --- a/anda/devs/bun/bun-bin.spec +++ b/anda/devs/bun/bun-bin.spec @@ -6,7 +6,7 @@ %endif Name: bun-bin -Version: 1.2.12 +Version: 1.2.13 Release: 1%?dist Summary: Incredibly fast JavaScript runtime, bundler, test runner, and package manager – all in one License: MIT From 17bfbf1032c6e011440b72e0ae9209202e94fe96 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 10 May 2025 18:24:03 +0000 Subject: [PATCH 1180/2977] bump: lomiri-system-settings tdlib-nightly --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- anda/lib/tdlib/tdlib-nightly.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 44c48a1ebd..2b502fd1fe 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit a67be8edb863e7c66f2ae9416c06f7ebb239e8d3 +%global commit 2c7a2f4400a624abfad8bd6abae1b8b3d914a497 %forgemeta Name: lomiri-system-settings diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index e5b3c1e05b..0b5cbf3b10 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,4 +1,4 @@ -%global commit aaddce62789bd9d6175d0543f40b7cfdfa5da0d4 +%global commit 1d6c95a77f156827909891f7a9715feb4ba71697 %global ver 1.8.49 %global commit_date 20250510 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From fe38ae95ad516e6b780ff70f8d74b9f9872dff92 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 10 May 2025 18:55:44 +0000 Subject: [PATCH 1181/2977] bump: tdlib-nightly --- anda/lib/tdlib/tdlib-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 0b5cbf3b10..5f7f7bfe52 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,4 +1,4 @@ -%global commit 1d6c95a77f156827909891f7a9715feb4ba71697 +%global commit 51743dfd01dff6179e2d8f7095729caa4e2222e9 %global ver 1.8.49 %global commit_date 20250510 %global shortcommit %(c=%{commit}; echo ${c:0:7}) From 4cf578f7ed0627ad7794053554aa69565ca66076 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 10 May 2025 19:14:16 +0000 Subject: [PATCH 1182/2977] bump: zig-master-bootstrap --- anda/langs/zig/bootstrap/zig-master-bootstrap.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/zig/bootstrap/zig-master-bootstrap.spec b/anda/langs/zig/bootstrap/zig-master-bootstrap.spec index 4a8ec4f071..ce74995ef6 100644 --- a/anda/langs/zig/bootstrap/zig-master-bootstrap.spec +++ b/anda/langs/zig/bootstrap/zig-master-bootstrap.spec @@ -7,7 +7,7 @@ %define llvm_compat 20 %endif %global llvm_version 20.0.0 -%global ver 0.15.0-dev.471+369177f0b +%global ver 0.15.0-dev.479+6eb5e5630 %bcond bootstrap 1 %bcond docs %{without bootstrap} %bcond test 1 From 4cb69d29b15221a7e2556c0366072d25a4daf084 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 10 May 2025 20:13:48 +0000 Subject: [PATCH 1183/2977] bump(branch): zig-master --- anda/langs/zig/master/zig-master.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/langs/zig/master/zig-master.spec b/anda/langs/zig/master/zig-master.spec index 4099874785..14aa45f96f 100644 --- a/anda/langs/zig/master/zig-master.spec +++ b/anda/langs/zig/master/zig-master.spec @@ -7,7 +7,7 @@ %define llvm_compat 20 %endif %global llvm_version 20.0.0 -%global ver 0.15.0-dev.471+369177f0b +%global ver 0.15.0-dev.479+6eb5e5630 %bcond bootstrap 0 %bcond docs %{without bootstrap} %bcond test 1 @@ -38,7 +38,7 @@ } Name: zig-master -Version: 0.15.0~dev.471+369177f0b +Version: 0.15.0~dev.479+6eb5e5630 Release: 1%?dist Summary: Master builds of the Zig language License: MIT AND NCSA AND LGPL-2.1-or-later AND LGPL-2.1-or-later WITH GCC-exception-2.0 AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND BSD-3-Clause AND Inner-Net-2.0 AND ISC AND LicenseRef-Fedora-Public-Domain AND GFDL-1.1-or-later AND ZPL-2.1 From 7ab67316207752ae5da217531d6dff74ae0c6fd0 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 10 May 2025 22:46:48 +0000 Subject: [PATCH 1184/2977] bump: sass yt-dlp-git --- anda/misc/sass/sass.spec | 2 +- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/misc/sass/sass.spec b/anda/misc/sass/sass.spec index 2ecc2dd151..223cb31fc7 100644 --- a/anda/misc/sass/sass.spec +++ b/anda/misc/sass/sass.spec @@ -4,7 +4,7 @@ %define _build_id_links none Name: sass -Version: 1.87.0 +Version: 1.88.0 Release: 1%?dist Summary: The reference implementation of Sass, written in Dart License: MIT diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index cdb42f5ee7..f7d4c71d73 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.05.10.085414 +Version: 2025.05.10.223412 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 76d2493682ce03180d918d99751690234f06d590 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 10 May 2025 22:56:56 +0000 Subject: [PATCH 1185/2977] bump: yt-dlp-git --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index f7d4c71d73..925785fad6 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.05.10.223412 +Version: 2025.05.10.224736 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From b36fcd54d9b25c64d20b85a06d51341c5c67e32b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 10 May 2025 23:31:04 +0000 Subject: [PATCH 1186/2977] bump: yt-dlp-git --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 925785fad6..40e21474b8 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.05.10.224736 +Version: 2025.05.10.232251 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From e833c669afe5f81ce0c504c665febb8d968e364f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 10 May 2025 23:45:46 +0000 Subject: [PATCH 1187/2977] bump: yt-dlp-git --- anda/tools/yt-dlp/yt-dlp-git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 40e21474b8..79777f240f 100644 --- a/anda/tools/yt-dlp/yt-dlp-git.spec +++ b/anda/tools/yt-dlp/yt-dlp-git.spec @@ -2,7 +2,7 @@ %global oldpkgname yt-dlp-nightly Name: yt-dlp-git -Version: 2025.05.10.232251 +Version: 2025.05.10.232932 Release: 1%?dist Summary: A command-line program to download videos from online video platforms From 6dc0c96d2ae02a5af0b7f375f956e514732f4852 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 11 May 2025 01:46:14 +0000 Subject: [PATCH 1188/2977] bump: ruffle-nightly --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 0b0db5a89a..25aa9c00fe 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-05-10 +%global ver 2025-05-11 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 42a5aa0f974161353bcbb1d807feee249aa38896 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 11 May 2025 01:55:39 +0000 Subject: [PATCH 1189/2977] bump(nightly): envision flameshot-nightly micro-nightly zed-nightly prismlauncher-nightly nim-nightly --- anda/apps/envision/envision.spec | 4 ++-- anda/apps/flameshot/flameshot-nightly.spec | 6 +++--- anda/devs/micro/micro-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 4 ++-- anda/langs/nim/nim-nightly/nim-nightly.spec | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/anda/apps/envision/envision.spec b/anda/apps/envision/envision.spec index 45888db4ce..ec38d56623 100644 --- a/anda/apps/envision/envision.spec +++ b/anda/apps/envision/envision.spec @@ -1,5 +1,5 @@ -%global commit d0df943e483f1c768eb35ad60f06a7854e1b3a91 -%global commit_date 20250503 +%global commit fc4a2d3993d4cfd363537114b491b5b3da937e3a +%global commit_date 20250511 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: envision-nightly diff --git a/anda/apps/flameshot/flameshot-nightly.spec b/anda/apps/flameshot/flameshot-nightly.spec index 58fd0700c4..bfd2a6491d 100644 --- a/anda/apps/flameshot/flameshot-nightly.spec +++ b/anda/apps/flameshot/flameshot-nightly.spec @@ -1,9 +1,9 @@ #? https://github.com/flameshot-org/flameshot/blob/master/packaging/rpm/fedora/flameshot.spec -%global ver 12.1.0 -%global commit f4cde19c63473f8fadd448ad2056c22f0f847f34 +%global ver v12.1.0 +%global commit 90fd5fcb2e97527c3d10bd05087628870da0b3e7 %global shortcommit %{sub %{commit} 1 7} -%global commit_date 20250504 +%global commit_date 20250511 Name: flameshot.nightly Version: %ver^%{commit_date}git.%shortcommit diff --git a/anda/devs/micro/micro-nightly.spec b/anda/devs/micro/micro-nightly.spec index ea0fc98481..1f82507cca 100644 --- a/anda/devs/micro/micro-nightly.spec +++ b/anda/devs/micro/micro-nightly.spec @@ -12,8 +12,8 @@ # Naming variable as something other than "commit" is necessary # to stop %%gometa from putting commit hash in release -%global commit_hash 91832d0016d0610141ab44c438316d5fdf38b4c5 -%global commit_date 20250507 +%global commit_hash 809db4ee243adca5daed659b37dce56d26ad9849 +%global commit_date 20250511 %global shortcommit %{sub %{commit_hash} 1 7} %global ver 2.0.14 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index a4c295320e..ddf59b513d 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 39da72161f6bd9472b11725f587ee989072618f4 +%global commit 5ba1d3edec67157426b68cac13ca7354a63022ec %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250510 +%global commit_date 20250511 %global ver 0.187.0 %bcond_with check diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 01b1674d5e..1799392155 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,10 +1,10 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit b7bcc2f61208c0329968d12d058a9f616f495a5d +%global commit a89fc7d1e0296c84aab500bc592c632442521e0e %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250508 +%global commit_date 20250511 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index df3b7511ab..298a5c89c0 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 59ceff4f1afdbc35cfc1dd679ca31369e71b3873 +%global commit 6f5e5811fc876fb713ac34608b5a40b27c96d01f %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250507 +%global commit_date 20250511 %global debug_package %nil Name: nim-nightly From 1d219cbd9fd66c34b7ceb21a57886d2cc23ffb0e Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Sat, 10 May 2025 21:18:55 -0700 Subject: [PATCH 1190/2977] lib/mesa: import doom patches from steamos (#4773) (#4774) (cherry picked from commit 500dcdc406d6dba67fb0ae3ab6388d8c2d847e4d) Co-authored-by: Atapi <34801996+Sterophonick@users.noreply.github.com> --- anda/lib/mesa/doom-dta.patch | 30 ++++++++++++++++++++++++++++++ anda/lib/mesa/mesa.spec | 3 +++ 2 files changed, 33 insertions(+) create mode 100644 anda/lib/mesa/doom-dta.patch diff --git a/anda/lib/mesa/doom-dta.patch b/anda/lib/mesa/doom-dta.patch new file mode 100644 index 0000000000..284ad456e3 --- /dev/null +++ b/anda/lib/mesa/doom-dta.patch @@ -0,0 +1,30 @@ +From 80ac865565c8b2cbdf9cca953a234cb630549802 Mon Sep 17 00:00:00 2001 +From: Atapi <34801996+Sterophonick@users.noreply.github.com> +Date: Sat, 10 May 2025 20:07:43 -0600 +Subject: [PATCH] util: import doom changes from SteamOS + +--- + src/util/00-radv-defaults.conf | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/util/00-radv-defaults.conf b/src/util/00-radv-defaults.conf +index aef8b9006cd..3bb0f3451a4 100644 +--- a/src/util/00-radv-defaults.conf ++++ b/src/util/00-radv-defaults.conf +@@ -123,6 +123,13 @@ Application bugs worked around in this file: +