diff --git a/.backportrc.json b/.backportrc.json index 1c5d20bad8..56a845a0d2 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -2,7 +2,7 @@ "repoOwner": "terrapkg", "repoName": "packages", "resetAuthor": true, - "targetBranchChoices": ["el10", "f40", "f41", "f42", "frawhide"], + "targetBranchChoices": ["el10", "f41", "f42", "frawhide"], "branchLabelMapping": { "^sync-(.+)$": "$1" } diff --git a/.github/workflows/update-branch.yml b/.github/workflows/update-branch.yml index 8f082e659e..acb04d0dae 100644 --- a/.github/workflows/update-branch.yml +++ b/.github/workflows/update-branch.yml @@ -11,7 +11,6 @@ jobs: matrix: branch: - frawhide - - f40 - f41 - f42 - el10 diff --git a/.github/workflows/update-comps.yml b/.github/workflows/update-comps.yml index 40f5627232..107a1511d6 100644 --- a/.github/workflows/update-comps.yml +++ b/.github/workflows/update-comps.yml @@ -6,7 +6,6 @@ on: - frawhide - f42 - f41 - - f40 - el10 paths: - comps.xml diff --git a/.github/workflows/update-nightly.yml b/.github/workflows/update-nightly.yml index 091f36972b..c645b2b71d 100644 --- a/.github/workflows/update-nightly.yml +++ b/.github/workflows/update-nightly.yml @@ -46,7 +46,6 @@ jobs: git add anda git commit -S -a -m "$msg" } - copy_over f40 || true copy_over f41 || true copy_over f42 || true copy_over el10 || true diff --git a/.github/workflows/update-weekly.yml b/.github/workflows/update-weekly.yml index 65edb49785..9d68edece2 100644 --- a/.github/workflows/update-weekly.yml +++ b/.github/workflows/update-weekly.yml @@ -46,7 +46,6 @@ jobs: git add anda git commit -S -a -m "$msg" } - copy_over f40 || true copy_over f41 || true copy_over f42 || true copy_over el10 || true diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 60cdc844a5..b63ad29afc 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -46,7 +46,6 @@ jobs: git add anda git commit -S -a -m "$msg" } - copy_over f40 || true copy_over f41 || true copy_over f42 || true copy_over el10 || true diff --git a/.gitignore b/.gitignore index b94a9b5645..44eb52965d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ anda-build/ **/*.tar* +**/*.crate +**/*.zip diff --git a/README.md b/README.md index 2db5d61314..fc0c5d7f18 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,8 @@ This monorepo contains the package manifests for all packages in Terra. ## Installation +### Fedora + ```bash sudo dnf install --nogpgcheck --repofrompath 'terra,https://repos.fyralabs.com/terra$releasever' terra-release ``` @@ -24,6 +26,24 @@ curl -fsSL https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo | pke sudo rpm-ostree install terra-release ``` +Optionally, you can install `terra-release-extra` to use the Extras repository. This also installs the Nvidia, and Mesa streams but does not enable them. + +### Enterprise Linux (EL) + +Only EL10 is supported. Not all packages available in Terra are available in Terra EL at this time. + +Terra EL requires the EPEL repos, which may be installed with: + +```bash +sudo dnf install 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-$releasever.noarch.rpm' +``` + +And Terra EL itself can be installed with: + +```bash +sudo dnf install --nogpgcheck --repofrompath 'terra,https://repos.fyralabs.com/terrael$releasever' terra-release +``` + ## Documentation Our documentation can be found on our [Devdocs](https://developer.fyralabs.com/terra/). diff --git a/anda/apps/anki-bin/anki-bin.spec b/anda/apps/anki-bin/anki-bin.spec index 92d8980fca..3b2391a659 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/32/51/cf365e03f3820f8b8adfd11717c38b3fcc167d08c0e53591dbfc702b2292/anki-25.02.5-cp39-abi3-manylinux_2_35_x86_64.whl -%global aurl https://files.pythonhosted.org/packages/c9/9d/6e27cec817c7f0f208e880f78585071eedc1bfd4294ebbae4ac5e49bf98d/anki-25.02.5-cp39-abi3-manylinux_2_35_aarch64.whl -%global qurl https://files.pythonhosted.org/packages/5e/8b/2651dcd76e3a670bc0ae95e462ad0776c3bcb9cc2b0b19eaa9cb8f92b709/aqt-25.02.5-py3-none-any.whl +%global xurl https://files.pythonhosted.org/packages/f4/be/4b66f654302eb99e02f691ba1fdd1a5cd1f439d439b3b16f58aa4786836f/anki-25.02.7-cp39-abi3-manylinux_2_35_x86_64.whl +%global aurl https://files.pythonhosted.org/packages/71/40/19545c12e7d14cf00a5d669317bc39e8b0e14b538da9a1bf753a0b59269f/anki-25.02.7-cp39-abi3-manylinux_2_35_aarch64.whl +%global qurl https://files.pythonhosted.org/packages/c9/ea/9dd58dee2ac85626335b73b742f67dadfb25c4bb31fd607c1415dc9fdfc3/aqt-25.02.7-py3-none-any.whl Name: anki-bin -Version: 25.02.5 +Version: 25.02.7 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/apps/anki-qt5/anki-qt5.spec b/anda/apps/anki-qt5/anki-qt5.spec index 70596ba93d..e3b7ca0b87 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.5 +Version: 25.02.7 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 9d65a93d59..35191aa3be 100644 --- a/anda/apps/anki/anki.spec +++ b/anda/apps/anki/anki.spec @@ -1,5 +1,5 @@ Name: anki -Version: 25.02.5 +Version: 25.02.7 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/audacity-freeworld/audacity-freeworld.spec b/anda/apps/audacity-freeworld/audacity-freeworld.spec index e2e22a8c86..1f62153eb5 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.3 +%global ver Audacity-3.7.4 %global sanitized_ver %(echo %{ver} | sed 's/Audacity-//g') Name: audacity-freeworld diff --git a/anda/apps/coolercontrol/coolercontrol.spec b/anda/apps/coolercontrol/coolercontrol.spec index 3d48729265..3b5482f509 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.2.0 +Version: 2.2.1 Release: 1%?dist Summary: Cooling device control for Linux License: GPL-3.0-or-later diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index c5cfe75c7b..7f336403e2 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.687 +Version: 0.0.697 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 4bdca222ca..1d977e3989 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.687 +Version: 0.0.697 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 caf8345786..476fadade0 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.95 +Version: 0.0.97 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-openasar/discord-ptb-openasar.spec b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec index d9a1967275..f1484025f5 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.146 +Version: 0.0.148 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 daf28b889c..b9324d27c0 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.146 +Version: 0.0.148 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers. URL: https://discord.com diff --git a/anda/apps/discord/discord.spec b/anda/apps/discord/discord.spec index 7af5b0510b..97cee36bcb 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.95 +Version: 0.0.97 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: https://discord.com diff --git a/anda/apps/envision/envision.spec b/anda/apps/envision/envision.spec index d809c583bf..e4ec6534b3 100644 --- a/anda/apps/envision/envision.spec +++ b/anda/apps/envision/envision.spec @@ -1,5 +1,5 @@ -%global commit d42de840a2d1f2bb973278c45a873db75b773e25 -%global commit_date 20250521 +%global commit 8f3f9b8759eecca4768f4860cbf6dc878337fb82 +%global commit_date 20250615 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: envision-nightly diff --git a/anda/apps/feishin/feishin.spec b/anda/apps/feishin/feishin.spec index 18937c3507..fb19be9e83 100644 --- a/anda/apps/feishin/feishin.spec +++ b/anda/apps/feishin/feishin.spec @@ -6,14 +6,15 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: feishin -Version: 0.13.0 +Version: 0.14.0 Release: 1%?dist Summary: A modern self-hosted music player License: GPL-3.0 URL: https://github.com/jeffvli/feishin Source0: %url/archive/refs/tags/v%version.tar.gz Requires: fuse mpv -BuildRequires: nodejs20-npm jq libxcrypt-compat +Packager: madonuko +BuildRequires: jq libxcrypt-compat pnpm %description %summary. @@ -38,13 +39,9 @@ Keywords=Music;Jellyfin;Audio;Stream;Sonixd EOF %build -export PATH="$PATH:$(pwd)/bin" -mkdir bin -ln -s /usr/bin/node-20 bin/node -ln -s /usr/bin/npm-20 bin/npm -npm-20 install --legacy-peer-deps -npm-20 run postinstall -npm-20 run build +pnpm i +pnpm run postinstall +pnpm run build %ifarch x86_64 %define a linux @@ -52,11 +49,11 @@ npm-20 run build %define a arm64 %endif -npx-20 electron-builder --linux dir --%a +pnpm exec electron-builder --linux dir --%a %install mkdir -p %buildroot%_datadir/{pixmaps,applications} %buildroot%_bindir -mv release/build/*-unpacked %buildroot%_datadir/feishin +mv dist/*-unpacked %buildroot%_datadir/feishin install -Dm644 assets/icons/icon.png %buildroot%_datadir/pixmaps/feishin.png ln -s %_datadir/feishin/feishin %buildroot%_bindir/feishin install -Dm644 feishin.desktop %buildroot%_datadir/applications/ diff --git a/anda/apps/flameshot/flameshot-nightly.spec b/anda/apps/flameshot/flameshot-nightly.spec index 5fc8b646b2..27a1c0da80 100644 --- a/anda/apps/flameshot/flameshot-nightly.spec +++ b/anda/apps/flameshot/flameshot-nightly.spec @@ -1,14 +1,14 @@ #? https://github.com/flameshot-org/flameshot/blob/master/packaging/rpm/fedora/flameshot.spec %global ver v12.1.0 -%global commit 134238b8ebf93b118c81f41dee73c473dbcef256 +%global commit 58afdce7414bbe3881610042e4da3772d2d0365f %global shortcommit %{sub %{commit} 1 7} -%global commit_date 20250531 +%global commit_date 20250613 %global devel_name QtColorWidgets Name: flameshot.nightly Version: %ver^%{commit_date}git.%shortcommit -Release: 1%?dist +Release: 2%?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 @@ -57,32 +57,7 @@ Features: * 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}. +%pkg_completion -Bfz flameshot %package devel Summary: Flameshot development files @@ -126,15 +101,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_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 - %files devel %{_libdir}/lib%{devel_name}.so %{_libdir}/cmake/%{devel_name}/ diff --git a/anda/apps/flatpost/flatpost.spec b/anda/apps/flatpost/flatpost.spec index 720712cf36..d6e695362a 100644 --- a/anda/apps/flatpost/flatpost.spec +++ b/anda/apps/flatpost/flatpost.spec @@ -1,5 +1,5 @@ Name: flatpost -Version: 1.0.5 +Version: 1.0.6 Release: 1%?dist License: BSD-2-Clause Summary: Desktop environment agnostic Flathub software center. diff --git a/anda/apps/fontviewer/fontviewer.spec b/anda/apps/fontviewer/fontviewer.spec index e54b93a5c1..0911c2b911 100644 --- a/anda/apps/fontviewer/fontviewer.spec +++ b/anda/apps/fontviewer/fontviewer.spec @@ -1,6 +1,6 @@ Name: fontviewer Epoch: 1 -Version: 1.1.0 +Version: 1.2.0 Release: 1%?dist Summary: View and install fonts diff --git a/anda/apps/komikku/komikku.spec b/anda/apps/komikku/komikku.spec index 7f422c324d..5ccf186a78 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.78.0 +%global raw_ver v1.80.0 Name: komikku -Version: 1.78.0 +Version: 1.80.0 %forgemeta Release: 1%?dist Summary: A manga reader for GNOME diff --git a/anda/apps/legcord/legcord-bin/anda.hcl b/anda/apps/legcord/legcord-bin/anda.hcl deleted file mode 100644 index 5c31d7cdce..0000000000 --- a/anda/apps/legcord/legcord-bin/anda.hcl +++ /dev/null @@ -1,5 +0,0 @@ -project pkg { - rpm { - spec = "legcord-bin.spec" - } -} diff --git a/anda/apps/legcord/legcord-bin/legcord-bin.spec b/anda/apps/legcord/legcord-bin/legcord-bin.spec deleted file mode 100644 index 0032ed2e87..0000000000 --- a/anda/apps/legcord/legcord-bin/legcord-bin.spec +++ /dev/null @@ -1,92 +0,0 @@ -%define debug_package %nil -%global _build_id_links none - -%ifarch x86_64 -%global src Legcord-%version-linux-x64 -%elifarch aarch64 -%global src Legcord-%version-linux-arm64 -%elifarch armv7l -%global src Legcord-%version-linux-armv7l -%endif - -# Exclude private libraries -%global __requires_exclude libffmpeg.so -%global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so - -Name: legcord-bin -Version: 1.1.5 -Release: 1%?dist -License: OSL-3.0 -Summary: Custom lightweight Discord client designed to enhance your experience -URL: https://github.com/Legcord/Legcord -Group: Applications/Internet -Source0: %url/releases/download/v%version/%src.tar.gz -Source1: legcord.png -Source2: https://raw.githubusercontent.com/Legcord/Legcord/v%version/README.md -Requires: xdg-utils -ExclusiveArch: x86_64 aarch64 armv7l -Conflicts: legcord -Conflicts: legcord-nightly -BuildRequires: add-determinism -Obsoletes: armcord < 3.3.2-1 - -%description -Legcord is a custom client designed to enhance your Discord experience -while keeping everything lightweight. - -%prep -%autosetup -n %src - -cat < .legcord.desktop -[Desktop Entry] -Name=Legcord -Comment=%summary -GenericName=Internet Messenger -Type=Application -Exec=%_bindir/legcord -Icon=legcord -Categories=Network;InstantMessaging; -StartupWMClass=legcord -Keywords=discord;armcord;legcord;vencord;shelter;electron; -EOF - -%build - -%install -mkdir -p %buildroot%_bindir %buildroot%_datadir/applications %buildroot%_datadir/pixmaps %buildroot%_datadir/legcord %buildroot%_docdir/%name -cp -a * %buildroot%_datadir/legcord/ -ln -s %_datadir/legcord/legcord %buildroot%_bindir/legcord -ln -s %_datadir/legcord %buildroot%_datadir/armcord -chmod +x -R %buildroot%_datadir/legcord/* -chmod 755 %buildroot%_datadir/legcord/legcord -install -Dm644 .legcord.desktop %buildroot%_datadir/applications/LegCord.desktop -install -Dm644 %SOURCE1 %buildroot%_datadir/pixmaps/legcord.png -install -Dm644 %SOURCE2 %buildroot%_docdir/%name/ - -# HACK: rpm bug for unability to replace existing files on system. -%pre -if [ -d %_datadir/armcord ] && [ ! -L %_datadir/armcord ]; then - echo "Found old %_datadir/armcord directory, removing…" - rm -rf %_datadir/armcord -fi - -%files -%doc README.md -%_datadir/legcord -%_datadir/armcord -%_bindir/legcord -%_datadir/applications/LegCord.desktop -%_datadir/pixmaps/legcord.png - -%changelog -* Mon Oct 21 2024 madonuko - 1.0.2-2 -- Rename to LegCord. - -* Sat Jun 17 2023 madonuko - 3.2.0-2 -- Remove libnotify dependency. -- Fix desktop entry. -- Set as noarch package because there are not binary files. -- Use /usr/share/ instead of /opt/ - -* Sat May 6 2023 madonuko - 3.1.7-1 -- Initial package diff --git a/anda/apps/legcord/legcord-bin/legcord.png b/anda/apps/legcord/legcord-bin/legcord.png deleted file mode 100644 index bb87d3bafe..0000000000 Binary files a/anda/apps/legcord/legcord-bin/legcord.png and /dev/null differ diff --git a/anda/apps/legcord/legcord-bin/update.rhai b/anda/apps/legcord/legcord-bin/update.rhai deleted file mode 100644 index 15bcc4981d..0000000000 --- a/anda/apps/legcord/legcord-bin/update.rhai +++ /dev/null @@ -1 +0,0 @@ -rpm.version(gh("LegCord/LegCord")); diff --git a/anda/apps/legcord/nightly/anda.hcl b/anda/apps/legcord/nightly/anda.hcl index 819f094492..993068d0b8 100644 --- a/anda/apps/legcord/nightly/anda.hcl +++ b/anda/apps/legcord/nightly/anda.hcl @@ -1,9 +1,9 @@ project pkg { - arches = ["x86_64"] rpm { spec = "legcord-nightly.spec" } labels { nightly = 1 + mock = 1 } -} \ No newline at end of file +} diff --git a/anda/apps/legcord/nightly/launch.sh b/anda/apps/legcord/nightly/launch.sh deleted file mode 100644 index 3ce4e0c829..0000000000 --- a/anda/apps/legcord/nightly/launch.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -electron=/usr/bin/electron - -CONFIG=${XDG_CONFIG_HOME:-~/.config} -FLAGS="$CONFIG/armcord-flags.conf" - -# Allow users to override command-line options -if [ -f "$FLAGS" ]; then - USER_FLAGS="$(cat "$FLAGS")" -fi - -# shellcheck disable=SC2086 # USER_FLAGS has to be unquoted -"$electron" /usr/share/armcord/app.asar $USER_FLAGS "$@" diff --git a/anda/apps/legcord/nightly/legcord-nightly.spec b/anda/apps/legcord/nightly/legcord-nightly.spec index 42a8d0182f..0b0452a47e 100644 --- a/anda/apps/legcord/nightly/legcord-nightly.spec +++ b/anda/apps/legcord/nightly/legcord-nightly.spec @@ -1,7 +1,13 @@ -%global commit cc6b582c8b5cdcd81c856a2916f88776d37a7b46 -%global commit_date 20250530 +%global commit 774311e9473dbf7741f0daced1bad98ddac17de8 +%global commit_date 20250614 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define debug_package %nil +%global __provides_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 Name: legcord-nightly Version: %commit_date.%shortcommit @@ -10,67 +16,60 @@ License: OSL-3.0 Summary: Custom lightweight Discord client designed to enhance your experience URL: https://github.com/Legcord/Legcord Group: Applications/Internet -Source0: %url/archive/%commit/Legcord-%commit.tar.gz -Source1: launch.sh Packager: Owen -Requires: electron xdg-utils -Provides: armcord-nightly +Requires: xdg-utils Obsoletes: armcord < 3.3.2-1 -Conflicts: legcord-bin Conflicts: legcord -BuildArch: noarch -BuildRequires: anda-srpm-macros pnpm +BuildRequires: anda-srpm-macros pnpm nodejs-npm git-core gcc gcc-c++ make desktop-file-utils zlib-ng-compat-devel %description Legcord is a custom client designed to enhance your Discord experience while keeping everything lightweight. %prep -%autosetup -n Legcord-%commit - -cat < legcord.desktop -[Desktop Entry] -Name=Legcord -Comment=%summary -GenericName=Internet Messenger -Type=Application -Exec=/usr/bin/legcord -Icon=legcord -Categories=Network;InstantMessaging; -StartupWMClass=legcord -Keywords=discord;armcord;legcord;vencord;shelter;electron; -EOF - +%git_clone %{url}.git %{commit} %build -pnpm install --no-frozen-lockfile -pnpm run packageQuick - +pnpm install +pnpm run build +pnpm run package --linux AppImage tar.gz %install -install -Dm644 dist/*-unpacked/resources/app.asar %buildroot/usr/share/legcord/app.asar +mkdir -p %{buildroot}%{_datadir}/legcord +%ifarch aarch64 +mv dist/linux-arm64-unpacked/* %{buildroot}%{_datadir}/legcord +%else +mv dist/linux-unpacked/* -t %{buildroot}%{_datadir}/legcord +%endif -install -Dm755 %SOURCE1 %buildroot/usr/bin/legcord -install -Dm644 legcord.desktop %buildroot/usr/share/applications/LegCord.desktop -install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/legcord.png +mkdir -p %{buildroot}%{_bindir} +ln -sf %{_datadir}/legcord/legcord %{buildroot}%{_bindir}/legcord +install -Dm644 dist/.icon-set/icon_16.png %{buildroot}%{_iconsdir}/hicolor/16x16/apps/legcord.png +install -Dm644 dist/.icon-set/icon_32.png %{buildroot}%{_iconsdir}/hicolor/32x32/apps/legcord.png +install -Dm644 dist/.icon-set/icon_48x48.png %{buildroot}%{_iconsdir}/hicolor/48x48/apps/legcord.png +install -Dm644 dist/.icon-set/icon_64.png %{buildroot}%{_iconsdir}/hicolor/64x64/apps/legcord.png +install -Dm644 dist/.icon-set/icon_128.png %{buildroot}%{_iconsdir}/hicolor/128x128/apps/legcord.png +install -Dm644 dist/.icon-set/icon_256.png %{buildroot}%{_iconsdir}/hicolor/256x256/apps/legcord.png +install -Dm644 dist/.icon-set/icon_512.png %{buildroot}%{_iconsdir}/hicolor/512x512/apps/legcord.png +install -Dm644 dist/.icon-set/icon_1024.png %{buildroot}%{_iconsdir}/hicolor/1024x1024/apps/legcord.png -ln -s %_datadir/legcord %buildroot%_datadir/armcord - -# HACK: rpm bug for unability to replace existing files on system. -%pre -if [ -d %_datadir/armcord ] && [ ! -L %_datadir/armcord ]; then - echo "Found old %_datadir/armcord directory, removing…" - rm -rf %_datadir/armcord -fi +dist/Legcord-*.AppImage --appimage-extract '*.desktop' +desktop-file-install --set-key=Exec --set-value="%{_datadir}/legcord/legcord %U" squashfs-root/legcord.desktop %files %doc README.md %license license.txt -/usr/bin/legcord -/usr/share/applications/LegCord.desktop -/usr/share/pixmaps/legcord.png -/usr/share/legcord/app.asar -/usr/share/armcord +%{_bindir}/legcord +%{_datadir}/applications/legcord.desktop +%{_datadir}/legcord/ +%{_iconsdir}/hicolor/16x16/apps/legcord.png +%{_iconsdir}/hicolor/32x32/apps/legcord.png +%{_iconsdir}/hicolor/48x48/apps/legcord.png +%{_iconsdir}/hicolor/64x64/apps/legcord.png +%{_iconsdir}/hicolor/128x128/apps/legcord.png +%{_iconsdir}/hicolor/256x256/apps/legcord.png +%{_iconsdir}/hicolor/512x512/apps/legcord.png +%{_iconsdir}/hicolor/1024x1024/apps/legcord.png %changelog * Fri Nov 22 2024 owen - 1.0.2-2 diff --git a/anda/apps/legcord/stable/anda.hcl b/anda/apps/legcord/stable/anda.hcl index a60a7c45fd..3a5fd3890d 100644 --- a/anda/apps/legcord/stable/anda.hcl +++ b/anda/apps/legcord/stable/anda.hcl @@ -1,6 +1,8 @@ project pkg { - arches = ["x86_64"] rpm { spec = "legcord.spec" } -} + labels { + mock =1 + } +} diff --git a/anda/apps/legcord/stable/launch.sh b/anda/apps/legcord/stable/launch.sh deleted file mode 100644 index 3ce4e0c829..0000000000 --- a/anda/apps/legcord/stable/launch.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -electron=/usr/bin/electron - -CONFIG=${XDG_CONFIG_HOME:-~/.config} -FLAGS="$CONFIG/armcord-flags.conf" - -# Allow users to override command-line options -if [ -f "$FLAGS" ]; then - USER_FLAGS="$(cat "$FLAGS")" -fi - -# shellcheck disable=SC2086 # USER_FLAGS has to be unquoted -"$electron" /usr/share/armcord/app.asar $USER_FLAGS "$@" diff --git a/anda/apps/legcord/stable/legcord.spec b/anda/apps/legcord/stable/legcord.spec index 68fad2c554..2d6e752d8f 100644 --- a/anda/apps/legcord/stable/legcord.spec +++ b/anda/apps/legcord/stable/legcord.spec @@ -1,25 +1,26 @@ %define debug_package %nil # Exclude private libraries -%global __requires_exclude libffmpeg.so -%global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so +%global __provides_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 Name: legcord Version: 1.1.5 -Release: 1%?dist +Release: 2%?dist License: OSL-3.0 Summary: Custom lightweight Discord client designed to enhance your experience URL: https://github.com/Legcord/Legcord Group: Applications/Internet -Source1: launch.sh Packager: madonuko -Requires: electron xdg-utils -Provides: armcord +Requires: xdg-utils Obsoletes: armcord < 3.3.2-1 -Conflicts: legcord-bin +Obsoletes: legcord-bin < 1.1.5-2 Conflicts: legcord-nightly -BuildArch: noarch -BuildRequires: anda-srpm-macros pnpm +BuildRequires: anda-srpm-macros pnpm nodejs-npm git-core gcc gcc-c++ make desktop-file-utils zlib-ng-compat-devel %description Legcord is a custom client designed to enhance your Discord experience @@ -28,49 +29,47 @@ while keeping everything lightweight. %prep %git_clone %url v%version -cat < legcord.desktop -[Desktop Entry] -Name=Legcord -Comment=%summary -GenericName=Internet Messenger -Type=Application -Exec=/usr/bin/legcord -Icon=legcord -Categories=Network;InstantMessaging; -StartupWMClass=legcord -Keywords=discord;armcord;legcord;vencord;shelter;electron; -EOF - - %build -pnpm install --no-frozen-lockfile -pnpm run packageQuick - +pnpm install +pnpm run build +pnpm run package --linux AppImage tar.gz %install -install -Dm644 dist/*-unpacked/resources/app.asar %buildroot/usr/share/legcord/app.asar +mkdir -p %{buildroot}%{_datadir}/legcord +%ifarch aarch64 +mv dist/linux-arm64-unpacked/* %{buildroot}%{_datadir}/legcord +%else +mv dist/linux-unpacked/* -t %{buildroot}%{_datadir}/legcord +%endif -install -Dm755 %SOURCE1 %buildroot/usr/bin/legcord -install -Dm644 legcord.desktop %buildroot/usr/share/applications/LegCord.desktop -install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/legcord.png +mkdir -p %{buildroot}%{_bindir} +ln -sf %{_datadir}/legcord/legcord %{buildroot}%{_bindir}/legcord +install -Dm644 dist/.icon-set/icon_16.png %{buildroot}%{_iconsdir}/hicolor/16x16/apps/legcord.png +install -Dm644 dist/.icon-set/icon_32.png %{buildroot}%{_iconsdir}/hicolor/32x32/apps/legcord.png +install -Dm644 dist/.icon-set/icon_48x48.png %{buildroot}%{_iconsdir}/hicolor/48x48/apps/legcord.png +install -Dm644 dist/.icon-set/icon_64.png %{buildroot}%{_iconsdir}/hicolor/64x64/apps/legcord.png +install -Dm644 dist/.icon-set/icon_128.png %{buildroot}%{_iconsdir}/hicolor/128x128/apps/legcord.png +install -Dm644 dist/.icon-set/icon_256.png %{buildroot}%{_iconsdir}/hicolor/256x256/apps/legcord.png +install -Dm644 dist/.icon-set/icon_512.png %{buildroot}%{_iconsdir}/hicolor/512x512/apps/legcord.png +install -Dm644 dist/.icon-set/icon_1024.png %{buildroot}%{_iconsdir}/hicolor/1024x1024/apps/legcord.png -ln -s %_datadir/legcord %buildroot%_datadir/armcord - -# HACK: rpm bug for unability to replace existing files on system. -%pre -if [ -d %_datadir/armcord ] && [ ! -L %_datadir/armcord ]; then - echo "Found old %_datadir/armcord directory, removing…" - rm -rf %_datadir/armcord -fi +dist/Legcord-*.AppImage --appimage-extract '*.desktop' +desktop-file-install --set-key=Exec --set-value="%{_datadir}/legcord/legcord %U" squashfs-root/legcord.desktop %files %doc README.md %license license.txt -/usr/bin/legcord -/usr/share/applications/LegCord.desktop -/usr/share/pixmaps/legcord.png -/usr/share/legcord/app.asar -/usr/share/armcord +%{_bindir}/legcord +%{_datadir}/applications/legcord.desktop +%{_datadir}/legcord/ +%{_iconsdir}/hicolor/16x16/apps/legcord.png +%{_iconsdir}/hicolor/32x32/apps/legcord.png +%{_iconsdir}/hicolor/48x48/apps/legcord.png +%{_iconsdir}/hicolor/64x64/apps/legcord.png +%{_iconsdir}/hicolor/128x128/apps/legcord.png +%{_iconsdir}/hicolor/256x256/apps/legcord.png +%{_iconsdir}/hicolor/512x512/apps/legcord.png +%{_iconsdir}/hicolor/1024x1024/apps/legcord.png %changelog * Mon Oct 21 2024 madonuko - 1.0.2-2 diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index f5d9b85c62..07a939c892 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 1d1535ff9124fdeb3c81a2f089551e2cc8404613 +%global commit e8ade130faef6a18971325d49213b8d166935d50 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250523 +%global commit_date 20250613 %global ver 0.40.0 Name: mpv-nightly @@ -124,32 +124,7 @@ 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. +%pkg_completion -Bfz mpv %prep %autosetup -p1 -n mpv-%commit @@ -246,15 +221,3 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/mpv.desktop %{_includedir}/mpv/ %{_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 diff --git a/anda/apps/nekoray/Sagernet.SingBox.Version.txt b/anda/apps/nekoray/Sagernet.SingBox.Version.txt index 12410289c4..273d4e8c57 100644 --- a/anda/apps/nekoray/Sagernet.SingBox.Version.txt +++ b/anda/apps/nekoray/Sagernet.SingBox.Version.txt @@ -1 +1 @@ -v1.11.11 \ No newline at end of file +v1.11.13 \ No newline at end of file diff --git a/anda/apps/neohtop/neohtop.spec b/anda/apps/neohtop/neohtop.spec index 8000151906..b6da0e0383 100644 --- a/anda/apps/neohtop/neohtop.spec +++ b/anda/apps/neohtop/neohtop.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: neohtop -Version: 1.1.2 +Version: 1.2.0 Release: 1%?dist Summary: System monitoring on steroids License: MIT diff --git a/anda/apps/opensnitch/anda.hcl b/anda/apps/opensnitch/anda.hcl new file mode 100644 index 0000000000..31ac55bb1c --- /dev/null +++ b/anda/apps/opensnitch/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "opensnitch.spec" + } +} diff --git a/anda/apps/opensnitch/opensnitch.spec b/anda/apps/opensnitch/opensnitch.spec new file mode 100644 index 0000000000..981612ce2b --- /dev/null +++ b/anda/apps/opensnitch/opensnitch.spec @@ -0,0 +1,119 @@ +# Generated by go2rpm 1.16.0 +%bcond check 1 +%bcond bootstrap 0 + +# https://github.com/evilsocket/opensnitch +%global goipath github.com/evilsocket/opensnitch +Version: 1.7.0.0 + +%gometa -f + +%global common_description %{expand: +OpenSnitch is a GNU/Linux interactive application firewall inspired by Little +Snitch.} + +%global golicenses LICENSE ui/LICENSE\\\ + ui/opensnitch/res/themes/dark/icons/LICENSE +%global godocs README.md ebpf_prog/README ui/requirements.txt\\\ + ui/i18n/README.md example example example\\\ + utils/packaging/daemon/deb/debian/changelog\\\ + utils/packaging/ui/deb/debian/changelog + +Name: opensnitch +Release: %autorelease +Summary: OpenSnitch is a GNU/Linux interactive application firewall inspired by Little Snitch + +License: GPL-3.0-only AND LGPL-2.1-or-later +URL: %{gourl} +Source: %{gosource} +BuildRequires: gcc-c++ +BuildRequires: python3-devel +BuildRequires: python-rpm-macros +BuildRequires: python3dist(pip) +BuildRequires: python3dist(setuptools) >= 61.0 +BuildRequires: python3dist(wheel) >= 0.37.1 +BuildRequires: python3dist(pyqt5) +BuildRequires: /usr/bin/lrelease-qt5 +BuildRequires: protobuf-compiler +BuildRequires: pkgconfig(libnetfilter_queue) +#BuildRequires: protoc-gen-go +#BuildRequires: /usr/bin/protoc-gen-go-grpc + +%description %{common_description} + +%gopkg + + +%prep +%goprep -A +%autopatch -p1 + +export GOBIN=$(go env GOPATH | sed -E 's/:.+$//')/bin +echo $GOBIN > %_builddir/gobin +go install github.com/golang/protobuf/protoc-gen-go@latest +go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.34.1 +go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 + +sed -i 's/@pip3 /@python3 -m pip /' ui/Makefile + +%build +pushd ui +%make_build deps +popd + +export GOBIN=$(cat %_builddir/gobin) +export PATH=$GOBIN:$PATH +pushd proto +%make_build +popd + +pushd ui +%make_build +%pyproject_wheel +popd + +%global gomodulesmode GO111MODULE=on +pushd daemon +%gobuild -o ../opensnitchd . +popd + + +%install +%gopkginstall +install -Dm755 opensnitchd -t %buildroot%_bindir + +pushd ui +%if 0%{?fedora} <= 41 +%py3_install +%else +%pyproject_install +%pyproject_save_files %name +%endif +popd + +rm -rf %buildroot%python3_sitelib/tests/ +cp -r %buildroot%python3_sitelib%_usr/ %buildroot%_usr/ --preserve=all --no-target-directory +rm -rf %buildroot%python3_sitelib%_usr + + +%if 0%{?fedora} <= 41 +%files +%{python3_sitelib}/%name/ +%{python3_sitelib}/%name-%{version}-py%{python3_version}.egg-info/ +%else +%files -f %{pyproject_files} +%endif +%license LICENSE +%doc README.md +%_bindir/opensnitch-ui +%_bindir/opensnitchd +%_datadir/applications/opensnitch_ui.desktop +%_iconsdir/hicolor/48x48/apps/opensnitch-ui.png +%_iconsdir/hicolor/64x64/apps/opensnitch-ui.png +%_iconsdir/hicolor/scalable/apps/opensnitch-ui.svg +%_datadir/kservices5/kcm_opensnitch.desktop +%_metainfodir/io.github.evilsocket.opensnitch.appdata.xml + +/usr/share/icons/hicolor/scalable/apps/opensnitch-ui.svg + +%gopkgfiles diff --git a/anda/apps/opensnitch/update.rhai b/anda/apps/opensnitch/update.rhai new file mode 100644 index 0000000000..e69de29bb2 diff --git a/anda/apps/peazip/peazip.spec b/anda/apps/peazip/peazip.spec index d5dea2257f..70aa15a162 100644 --- a/anda/apps/peazip/peazip.spec +++ b/anda/apps/peazip/peazip.spec @@ -2,7 +2,7 @@ %define debug_package %nil Name: peazip -Version: 10.4.0 +Version: 10.5.0 Release: 1%?dist Summary: Free Zip / Unzip software and Rar file extractor. Cross-platform file and archive manager License: LGPL-3.0-only diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 5de75b33a6..28a9349be7 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2025-05-31 +%global ver 2025-06-16 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold diff --git a/anda/apps/vencord-desktop/vencord-desktop.spec b/anda/apps/vencord-desktop/vencord-desktop.spec index afcef180fd..0a033b9f2e 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.6 +Version: 1.5.7 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/apps/voicevox/voicevox.spec b/anda/apps/voicevox/voicevox.spec index 33b49aa934..3b4f0eecf3 100644 --- a/anda/apps/voicevox/voicevox.spec +++ b/anda/apps/voicevox/voicevox.spec @@ -13,8 +13,8 @@ %global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$ Name: voicevox -Version: 0.23.0 -Release: 2%?dist +Version: 0.23.1 +Release: 1%?dist Summary: Free Japanese text-to-speech editor License: LGPL-3.0 URL: https://voicevox.hiroshiba.jp diff --git a/anda/apps/vpkedit/anda.hcl b/anda/apps/vpkedit/anda.hcl new file mode 100644 index 0000000000..5d7de00c43 --- /dev/null +++ b/anda/apps/vpkedit/anda.hcl @@ -0,0 +1,6 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "vpkedit.spec" + } +} diff --git a/anda/apps/vpkedit/update.rhai b/anda/apps/vpkedit/update.rhai new file mode 100644 index 0000000000..5dd599ac04 --- /dev/null +++ b/anda/apps/vpkedit/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("craftablescience/VPKEdit")); diff --git a/anda/apps/vpkedit/vpkedit.spec b/anda/apps/vpkedit/vpkedit.spec new file mode 100644 index 0000000000..01a3e30b47 --- /dev/null +++ b/anda/apps/vpkedit/vpkedit.spec @@ -0,0 +1,54 @@ +Name: vpkedit +Version: 4.4.2 +Release: 2%?dist +Summary: A CLI/GUI tool to create, read, and write several pack file formats +License: MIT +URL: https://github.com/craftablescience/VPKEdit +Requires: qt6-qtbase hicolor-icon-theme +Suggests: qt6-qtwayland +Packager: madonuko +BuildRequires: cmake git-core gcc gcc-c++ binutils +BuildRequires: cmake(Qt6) +BuildRequires: cmake(Qt6Svg) +BuildRequires: cmake(Qt6Linguist) +BuildRequires: cmake(Qt6Charts) +BuildRequires: cmake(Qt6LinguistTools) +ExclusiveArch: x86_64 + +%description +VPKEdit is an open source MIT-licensed tool that can extract from, preview the +contents of and write to several pack file formats. It also supports creating +new VPKs. + + +%prep +%git_clone %url v%version + + +%build +%cmake -DCMAKE_INSTALL_PREFIX=%_libdir/%name \ + -DBUILD_SHARED_LIBS:BOOL=OFF +# -DVPKEDIT_BUILD_LIBC=ON +%cmake_build + + +%install +%cmake_install +pushd %buildroot%_libdir/%name +rm -rf libQt* +popd +ln -sf %_libdir/vpkedit/vpkedit %buildroot%_bindir/vpkedit +ln -sf %_libdir/vpkedit/vpkeditcli %buildroot%_bindir/vpkeditcli +sed -i 's@Exec=/opt/vpkedit/@Exec=@g' %buildroot%_datadir/applications/vpkedit.desktop + + +%files +%doc README.md CREDITS.md +%license LICENSE +%_bindir/vpkedit +%_bindir/vpkeditcli +%_libdir/%name/ +%_datadir/applications/vpkedit.desktop +%_iconsdir/hicolor/128x128/mimetypes/application-x-vpkedit.png +%_datadir/mime/packages/vpkedit.xml +%_datadir/pixmaps/vpkedit.png diff --git a/anda/apps/winetricks/git/winetricks-git.spec b/anda/apps/winetricks/git/winetricks-git.spec index cb5bd1ff7f..ee4ba75000 100644 --- a/anda/apps/winetricks/git/winetricks-git.spec +++ b/anda/apps/winetricks/git/winetricks-git.spec @@ -1,9 +1,9 @@ # Fedora sometimes sources the snapshots under stable versions and just bumps release # For user clarity I have separated these into different packages -%global commit 89e18c2a8c09b97b79e1025fbf5e5b03f1182337 +%global commit 9e29aa7e2d8e84880aec741ed92eed35baa742ac %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 20250102 -%global commit_date 20250531 +%global commit_date 20250613 Name: winetricks-git Version: %{ver}^%{commit_date}git.%{shortcommit} diff --git a/anda/apps/woeusb-ng/WoeUSB-ng.spec b/anda/apps/woeusb-ng/WoeUSB-ng.spec index cdb0820207..ae716fe328 100644 --- a/anda/apps/woeusb-ng/WoeUSB-ng.spec +++ b/anda/apps/woeusb-ng/WoeUSB-ng.spec @@ -1,6 +1,6 @@ Name: WoeUSB-ng Version: 0.2.12 -Release: 1%?dist +Release: 2%?dist Summary: Simple tool that enable you to create your own usb stick with Windows installer License: GPL-3.0-only Requires: parted dosfstools ntfsprogs p7zip p7zip-plugins xdg-utils grub2-tools @@ -8,28 +8,44 @@ URL: https://github.com/WoeUSB/WoeUSB-ng Source: https://github.com/WoeUSB/WoeUSB-ng/archive/refs/tags/v%version.tar.gz Patch0: https://patch-diff.githubusercontent.com/raw/WoeUSB/WoeUSB-ng/pull/79.patch BuildArch: noarch -BuildRequires: python3-devel python3-installer +Requires: python3-%{name} = %{evr} +BuildRequires: anda-srpm-macros python3-devel python3-installer pyproject-rpm-macros python3dist(pip) python3dist(setuptools) python3dist(termcolor) python3dist(wxpython) python3dist(wheel) %global _description %{expand: WoeUSB-ng is a simple tool that enable you to create your own usb stick windows installer from an iso image or a real DVD. This is a rewrite of original WoeUSB.} %description %_description +%package -n python3-%{name} +Summary: Python files for %{name} +Requires: %{name} = %{evr} +BuildArch: noarch + +%description -n python3-%{name} +Python files needed for %{name}. + %prep %autosetup -p1 - +%if 0%{?fedora} > 41 %generate_buildrequires %pyproject_buildrequires - +%endif %build +%if 0%{?fedora} <= 41 +%py3_build +%else %pyproject_wheel - +%endif %install +%if 0%{?fedora} <= 41 +%py3_install +%else %pyproject_install %pyproject_save_files WoeUSB +%endif install -Dpm644 miscellaneous/WoeUSB-ng.desktop %buildroot%_datadir/applications/WoeUSB-ng.desktop install -Dpm644 miscellaneous/com.github.woeusb.woeusb-ng.policy %buildroot%_datadir/polkit-1/actions/com.github.woeusb.woeusb-ng.policy @@ -37,14 +53,21 @@ install -Dpm644 miscellaneous/com.github.woeusb.woeusb-ng.policy %buildroot%_dat %check #pyproject_check_import - -%files -f %{pyproject_files} +%files %_bindir/woeusb %_bindir/woeusbgui %_datadir/applications/WoeUSB-ng.desktop %_iconsdir/hicolor/scalable/apps/woeusb-logo.png %_datadir/polkit-1/actions/com.github.woeusb.woeusb-ng.policy +%if 0%{?fedora} <= 41 +%files -n python3-%{name} +%{python3_sitelib}/WoeUSB/ +%{python3_sitelib}/woeusb_ng-%{version}-py%{python3_version}.egg-info/ +%else +%files -n python3-%{name} -f %{pyproject_files} +%endif + %changelog %autochangelog diff --git a/anda/apps/woeusb-ng/anda.hcl b/anda/apps/woeusb-ng/anda.hcl index f729a2237e..33d5f43947 100644 --- a/anda/apps/woeusb-ng/anda.hcl +++ b/anda/apps/woeusb-ng/anda.hcl @@ -1,4 +1,5 @@ project pkg { + arches = ["x86_64"] rpm { spec = "WoeUSB-ng.spec" } diff --git a/anda/desktops/gnome/gnome-shell/gnome-shell.spec b/anda/desktops/gnome/gnome-shell/gnome-shell.spec index 96adf2db24..be6afac342 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: 3%{?dist}.switcheroo Summary: Window management and application launching for GNOME Provides: gnome-shell.switcheroo = %version-%release diff --git a/anda/desktops/gnome/nautilus-open-any-terminal/anda.hcl b/anda/desktops/gnome/nautilus-open-any-terminal/anda.hcl index c6cfc726be..9a04b951e5 100644 --- a/anda/desktops/gnome/nautilus-open-any-terminal/anda.hcl +++ b/anda/desktops/gnome/nautilus-open-any-terminal/anda.hcl @@ -1,4 +1,5 @@ project pkg { + arches = ["x86_64"] rpm { spec = "nautilus-open-any-terminal.spec" } diff --git a/anda/desktops/gnome/nautilus-open-any-terminal/nautilus-open-any-terminal.spec b/anda/desktops/gnome/nautilus-open-any-terminal/nautilus-open-any-terminal.spec index e64c877ab4..62b31839ba 100644 --- a/anda/desktops/gnome/nautilus-open-any-terminal/nautilus-open-any-terminal.spec +++ b/anda/desktops/gnome/nautilus-open-any-terminal/nautilus-open-any-terminal.spec @@ -1,10 +1,12 @@ -Name: python-nautilus-open-any-terminal +%global pypi_name nautilus_open_any_terminal + +Name: nautilus-open-any-terminal Version: 0.6.1 -Release: 1%?dist +Release: 2%?dist Summary: Context-menu entry for opening other terminal in Nautilus License: GPL-3.0-only URL: https://github.com/Stunkymonkey/nautilus-open-any-terminal -Source0: %{pypi_source nautilus_open_any_terminal} +Source0: %{pypi_source} Source1: https://raw.githubusercontent.com/Stunkymonkey/nautilus-open-any-terminal/refs/tags/%version/README.md Source2: https://raw.githubusercontent.com/Stunkymonkey/nautilus-open-any-terminal/refs/tags/%version/LICENSE Packager: madonuko @@ -14,6 +16,9 @@ BuildRequires: python3-devel BuildRequires: python3dist(setuptools-scm) BuildRequires: python3dist(pip) BuildRequires: gettext +Requires: python3-%{name} = %{version}-%{release} +Requires: %{name}-caja = %{version}-%{release} +Obsoletes: python3-%{name} < 0.6.1-2 %global _description %{expand: @@ -21,11 +26,22 @@ nautilus-open-any-terminal is an extension for nautilus, which adds an context-e %description %_description -%package -n python3-nautilus-open-any-terminal -Summary: %{summary} -Provides: nautilus-open-any-terminal = %evr +%package -n %{name}-caja +Summary: Caja files for %{name} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch -%description -n python3-nautilus-open-any-terminal %_description +%description -n nautilus-open-any-terminal-caja +Python-caja files for %{name}. + + +%package -n python3-nautilus-open-any-terminal +Summary: Python files for %{name} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description -n python3-nautilus-open-any-terminal +Python files for %{name}. %prep @@ -38,24 +54,48 @@ cp %{S:1} %{S:2} . %build +%if 0%{?fedora} <= 41 +%py3_build +%else %pyproject_wheel +%endif %install +%if 0%{?fedora} <= 41 +%py3_install +%else %pyproject_install -%pyproject_save_files -l nautilus_open_any_terminal +%pyproject_save_files -l %{pypi_name} +%endif #check #pyproject_check_import - -%files -n python3-nautilus-open-any-terminal -f %{pyproject_files} +%files %doc README.md %license LICENSE -%_datadir/caja-python/extensions/__pycache__/nautilus_open_any_terminal.cpython-*.pyc -%_datadir/caja-python/extensions/nautilus_open_any_terminal.py +# These are GNOME config files %_datadir/glib-2.0/schemas/com.github.stunkymonkey.nautilus-open-any-terminal.gschema.xml %_datadir/locale/*/LC_MESSAGES/nautilus-open-any-terminal.mo -%_datadir/nautilus-python/extensions/__pycache__/nautilus_open_any_terminal.cpython-*.pyc -%_datadir/nautilus-python/extensions/nautilus_open_any_terminal.py +# As asinine as it is these don't belong in a Python subpackage because they're Nautilus files +%_datadir/nautilus-python/extensions/%{pypi_name}.py +%if 0%{?fedora} > 41 +%_datadir/nautilus-python/extensions/__pycache__/%{pypi_name}.cpython-*.pyc +%endif + +%files -n %{name}-caja +# Congratulations! You have discovered a -caja subpackage +%_datadir/caja-python/extensions/nautilus_open_any_terminal.py +%if 0%{?fedora} > 41 +%_datadir/caja-python/extensions/__pycache__/%{pypi_name}.cpython-*.pyc +%endif + +%if 0%{?fedora} <= 41 +%files -n python3-nautilus-open-any-terminal +%{python3_sitelib}/%{pypi_name}/ +%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info/ +%else +%files -n python3-nautilus-open-any-terminal -f %{pyproject_files} +%endif diff --git a/anda/desktops/kde/kf6-kio/kf6-kio.spec b/anda/desktops/kde/kf6-kio/kf6-kio.spec index 6f8a8e9d29..67c88e6b0b 100644 --- a/anda/desktops/kde/kf6-kio/kf6-kio.spec +++ b/anda/desktops/kde/kf6-kio/kf6-kio.spec @@ -8,8 +8,7 @@ Version: %{majmin_ver_kf6}.0 Release: 3%{?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 +Obsoletes: kf6-%{framework}.switcheroo < 6.14.0-4 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} @@ -102,7 +101,7 @@ Requires: cmake(KF6Solid) Requires: cmake(KF6XmlGui) Requires: cmake(KF6WindowSystem) Requires: qt6-qtbase-devel -Provides: kf6-kio-devel = %version-%release +Obsoletes: kf6-kio.switcheroo-devel < 6.14.0-4 %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. @@ -111,8 +110,7 @@ developing applications that use %{name}. Summary: Documentation files for %{name} Requires: %{name}-core = %{version}-%{release} BuildArch: noarch -Provides: kf6-kio-doc = %version-%release -Obsoletes: kf6-kio-doc <= %version-%release +Obsoletes: kf6-kio.switcheroo-doc < 6.14.0-4 %description doc Documentation for %{name}. @@ -123,16 +121,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 -Obsoletes: kf6-kio-core <= %version-%release +Obsoletes: kf6-kio.switcheroo-core < 6.14.0-4 %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 -Obsoletes: kf6-kio-core-libs <= %version-%release +Obsoletes: kf6-kio.switcheroo-core-libs < 6.14.0-4 %description core-libs %{summary}. @@ -142,8 +138,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 -Obsoletes: kf6-kio-widgets <= %version-%release +Obsoletes: kf6-kio.switcheroo-widgets < 6.14.0-4 %description widgets KIOWidgets contains classes that provide generic job control, progress reporting, etc. @@ -151,16 +146,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 -Obsoletes: kf6-kio-widgets-libs <= %version-%release +Obsoletes: kf6-kio.switcheroo-widgets-libs < 6.14.0-4 %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 -Obsoletes: kf6-kio-file-widgets <= %version-%release +Obsoletes: kf6-kio.switcheroo-file-widgets < 6.14.0-4 %description file-widgets The KIOFileWidgets library provides the file selection dialog and its components. @@ -169,15 +162,14 @@ 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 +Obsoletes: kf6-kio.switcheroo-gui < 6.14.0-4 %description gui %{summary}. %package qch-doc Summary: Developer Documentation files for %{name} BuildArch: noarch -Provides: kf6-kio-qch-doc = %version-%release -Obsoletes: kf6-kio-qch-doc <= %version-%release +Obsoletes: kf6-kio.switcheroo-qch-doc < 6.14.0-4 %description qch-doc Developer Documentation files for %{name} for use with KDevelop or QtCreator. 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 a022d19a34..a87fa78889 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 4be7393425a18bf911cf137cd86cf06589157cb0 +%global commit f16f9c336f54f3da72604cb5e8703b416c3726b6 %forgemeta Name: lomiri-system-settings @@ -9,8 +9,10 @@ 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.3.1-2/debian/patches/2002_use-Noto-font-instead-of-Ubuntu-font.patch -Patch1: https://sources.debian.org/data/main/l/lomiri-system-settings/1.3.1-2/debian/patches/2011_build-without-trust-store.patch +Patch0: https://sources.debian.org/data/main/l/lomiri-system-settings/1.3.1-4/debian/patches/0001_lib-LomiriSystemSettingsPrivate-accountsservice.cpp-Register-missing-D-Bus-types.patch +Patch1: https://sources.debian.org/data/main/l/lomiri-system-settings/1.3.1-4/debian/patches/2002_use-Noto-font-instead-of-Ubuntu-font.patch +Patch2: https://sources.debian.org/data/main/l/lomiri-system-settings/1.3.1-4/debian/patches/2011_build-without-trust-store.patch +Patch3: https://sources.debian.org/data/main/l/lomiri-system-settings/1.3.1-4/debian/patches/2013_show-hotspot-on-desktop.patch BuildRequires: cmake BuildRequires: gcc-c++ @@ -73,10 +75,10 @@ developing applications that use %{name}. %dir %{_datadir}/lomiri-system-settings %{_datadir}/lomiri-system-settings/*.settings %{_datadir}/lomiri-system-settings/*.svg -%{_datadir}/lomiri-system-settings/*.png +%dnl %{_datadir}/lomiri-system-settings/*.png %{_datadir}/lomiri-system-settings/url-map.ini -%dir %{_datadir}/lomiri-system-settings/icons -%{_datadir}/lomiri-system-settings/icons/*.svg +%dnl %dir %{_datadir}/lomiri-system-settings/icons +%dnl %{_datadir}/lomiri-system-settings/icons/*.svg %{_datadir}/lomiri-system-settings/qml-plugins/ %{_datadir}/lomiri-url-dispatcher/urls/lomiri-system-settings.url-dispatcher diff --git a/anda/desktops/swayfx/swayfx.spec b/anda/desktops/swayfx/swayfx.spec index ebfac78da7..a0c8aabc63 100644 --- a/anda/desktops/swayfx/swayfx.spec +++ b/anda/desktops/swayfx/swayfx.spec @@ -1,8 +1,8 @@ %global swayVersion 1.10.1 Name: swayfx -Version: 0.5 -Release: 2%?dist +Version: 0.5.1 +Release: 1%?dist Summary: SwayFX: Sway, but with eye candy! URL: https://github.com/WillPower3309/swayfx diff --git a/anda/desktops/waylands/hyprgraphics/anda.hcl b/anda/desktops/waylands/hyprgraphics/anda.hcl new file mode 100644 index 0000000000..58781b3836 --- /dev/null +++ b/anda/desktops/waylands/hyprgraphics/anda.hcl @@ -0,0 +1,9 @@ +project pkg { + rpm { + spec = "hyprgraphics.nightly.spec" + } + labels { + nightly = 1 + subrepo = "extras" + } +} diff --git a/anda/desktops/waylands/hyprgraphics/hyprgraphics.nightly.spec b/anda/desktops/waylands/hyprgraphics/hyprgraphics.nightly.spec new file mode 100644 index 0000000000..9da245a38e --- /dev/null +++ b/anda/desktops/waylands/hyprgraphics/hyprgraphics.nightly.spec @@ -0,0 +1,67 @@ +#? https://src.fedoraproject.org/rpms/hyprgraphics/blob/rawhide/f/hyprgraphics.spec + +%global realname hyprgraphics +%global ver 0.1.3 +%global commit c7225d73755a6c4c7c72f4d4f3925ea426e325a8 +%global commit_date 20250607 +%global shortcommit %{sub %commit 1 7} + +%bcond libjxl 1 +Name: %realname.nightly +Version: %ver^%{commit_date}git.%shortcommit +Release: 1%?dist +Summary: Graphics library for Hyprland + +License: BSD-3-Clause +URL: https://github.com/hyprwm/hyprgraphics +Source0: %url/archive/%commit.tar.gz +Packager: madonuko + +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: (pkgconfig(hyprlang) with hyprlang.nightly-devel) +BuildRequires: pkgconfig(cairo) +BuildRequires: (pkgconfig(hyprutils) with hyprutils.nightly-devel) +BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(libwebp) +BuildRequires: pkgconfig(libmagic) +BuildRequires: pkgconfig(spng) + +%if %{with libjxl} +BuildRequires: pkgconfig(libjxl) +BuildRequires: pkgconfig(libjxl_cms) +BuildRequires: pkgconfig(libjxl_threads) +%endif + +%description +%{summary}. + +%package devel +Requires: %{name}%{?_isa} = %{version}-%{release} +%pkg_devel_files + + +%prep +%autosetup -p1 -n %realname-%commit + +%build +%cmake +%cmake_build + +%install +%cmake_install + +%check +%ifarch s390x +rm tests/resource/images/hyprland.jpg +%endif +%ctest + +%files +%license LICENSE +%doc README.md +%{_libdir}/libhyprgraphics.so.0 +%{_libdir}/libhyprgraphics.so.%{ver} diff --git a/anda/desktops/waylands/hyprgraphics/update.rhai b/anda/desktops/waylands/hyprgraphics/update.rhai new file mode 100644 index 0000000000..6a9cc301c7 --- /dev/null +++ b/anda/desktops/waylands/hyprgraphics/update.rhai @@ -0,0 +1,5 @@ +rpm.global("commit", gh_commit("hyprwm/hyprgraphics")); +if rpm.changed() { + rpm.global("ver", gh_rawfile("hyprwm/hyprgraphics", "main", "VERSION")); + rpm.global("commit_date", date()); +} diff --git a/anda/desktops/waylands/hypridle/anda.hcl b/anda/desktops/waylands/hypridle/anda.hcl new file mode 100644 index 0000000000..40774e84d7 --- /dev/null +++ b/anda/desktops/waylands/hypridle/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "hypridle.spec" + } +} diff --git a/anda/desktops/waylands/hypridle/ci_setup.rhai b/anda/desktops/waylands/hypridle/ci_setup.rhai new file mode 100644 index 0000000000..8d5329cfb4 --- /dev/null +++ b/anda/desktops/waylands/hypridle/ci_setup.rhai @@ -0,0 +1 @@ +sh("dnf swap sdbus-cpp sdbus-cpp.terra -y --allowerasing", #{}); diff --git a/anda/desktops/waylands/hypridle/hypridle.spec b/anda/desktops/waylands/hypridle/hypridle.spec new file mode 100644 index 0000000000..bf0639fa61 --- /dev/null +++ b/anda/desktops/waylands/hypridle/hypridle.spec @@ -0,0 +1,45 @@ +Name: hypridle +Version: 0.1.6 +Release: 1%?dist +Summary: Hyprland's idle daemon +License: BSD-3-Clause +URL: https://github.com/hyprwm/hypridle +Source0: %url/archive/refs/tags/v%version.tar.gz +Packager: madonuko +BuildRequires: cmake gcc gcc-c++ +BuildRequires: pkgconfig(wayland-client) +BuildRequires: pkgconfig(wayland-protocols) +BuildRequires: (pkgconfig(hyprland-protocols) with hyprland-protocols.nightly-devel) +BuildRequires: (pkgconfig(hyprlang) with hyprlang.nightly-devel) +BuildRequires: (pkgconfig(sdbus-c++) with sdbus-cpp.terra-devel) +BuildRequires: (pkgconfig(hyprwayland-scanner) with hyprwayland-scanner.nightly-devel) +BuildRequires: (pkgconfig(hyprutils) with hyprutils.nightly-devel) + +%description +%summary. + +%prep +%autosetup + +%build +%cmake -DCMAKE_BUILD_TYPE:STRING=Release +%cmake_build + +%install +%cmake_install + +%post +%systemd_user_post %name.service + +%preun +%systemd_user_preun %name.service + +%postun +%systemd_user_postun_with_restart %name.service + +%files +%doc README.md +%license LICENSE +%_bindir/hypridle +%_datadir/hypr/hypridle.conf +%_userunitdir/%name.service diff --git a/anda/desktops/waylands/hypridle/update.rhai b/anda/desktops/waylands/hypridle/update.rhai new file mode 100644 index 0000000000..2c18c969ae --- /dev/null +++ b/anda/desktops/waylands/hypridle/update.rhai @@ -0,0 +1,3 @@ +let v = gh_rawfile("hyprwm/hypridle", "main", "VERSION"); +v.trim(); +rpm.version(v); diff --git a/anda/desktops/waylands/hyprland-protocols/anda.hcl b/anda/desktops/waylands/hyprland-protocols/anda.hcl new file mode 100644 index 0000000000..9c18ee2a54 --- /dev/null +++ b/anda/desktops/waylands/hyprland-protocols/anda.hcl @@ -0,0 +1,10 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "hyprland-protocols.nightly.spec" + } + labels { + nightly = 1 + subrepo = "extras" + } +} diff --git a/anda/desktops/waylands/hyprland-protocols/hyprland-protocols.nightly.spec b/anda/desktops/waylands/hyprland-protocols/hyprland-protocols.nightly.spec new file mode 100644 index 0000000000..d142180c7a --- /dev/null +++ b/anda/desktops/waylands/hyprland-protocols/hyprland-protocols.nightly.spec @@ -0,0 +1,53 @@ +#? https://src.fedoraproject.org/rpms/hyprland-protocols/blob/rawhide/f/hyprland-protocols.spec + +%global realname hyprland-protocols +%global ver 0.6.4 +%global commit 613878cb6f459c5e323aaafe1e6f388ac8a36330 +%global commit_date 20250604 +%global shortcommit %{sub %commit 1 7} + +Name: %realname.nightly +Version: %ver^%{commit_date}git.%shortcommit +Release: 1%?dist +Summary: Wayland protocol extensions for Hyprland +BuildArch: noarch + +License: BSD-3-Clause +URL: https://github.com/hyprwm/hyprland-protocols +Source0: %url/archive/%commit.tar.gz + +BuildRequires: meson +Packager: madonuko +Provides: %realname = %evr +Conflicts: %realname + +%description +%{summary}. + +%package devel +Summary: Wayland protocol extensions for Hyprland +Provides: %realname-devel = %evr +Conflicts: %realname-devel + +%description devel +%{summary}. + + +%prep +%autosetup -p1 -n %realname-%commit + + +%build +%meson +%meson_build + + +%install +%meson_install + + +%files devel +%license LICENSE +%doc README.md +%{_datadir}/pkgconfig/%{realname}.pc +%{_datadir}/%{realname}/ diff --git a/anda/desktops/waylands/hyprland-protocols/update.rhai b/anda/desktops/waylands/hyprland-protocols/update.rhai new file mode 100644 index 0000000000..c198b9f394 --- /dev/null +++ b/anda/desktops/waylands/hyprland-protocols/update.rhai @@ -0,0 +1,5 @@ +rpm.global("commit", gh_commit("hyprwm/hyprlang-protocols")); +if rpm.changed() { + rpm.global("ver", gh_rawfile("hyprwm/hyprlang-protocols", "main", "VERSION")); + rpm.global("commit_date", date()); +} diff --git a/anda/desktops/waylands/hyprlang/anda.hcl b/anda/desktops/waylands/hyprlang/anda.hcl new file mode 100644 index 0000000000..155ff3d3dd --- /dev/null +++ b/anda/desktops/waylands/hyprlang/anda.hcl @@ -0,0 +1,9 @@ +project pkg { + rpm { + spec = "hyprlang.nightly.spec" + } + labels { + nightly = 1 + subrepo = "extras" + } +} diff --git a/anda/desktops/waylands/hyprlang/hyprlang.nightly.spec b/anda/desktops/waylands/hyprlang/hyprlang.nightly.spec new file mode 100644 index 0000000000..a3f4eaf85e --- /dev/null +++ b/anda/desktops/waylands/hyprlang/hyprlang.nightly.spec @@ -0,0 +1,57 @@ +#? https://src.fedoraproject.org/rpms/hyprlang/blob/rawhide/f/hyprlang.spec + +%global realname hyprlang +%global ver 0.6.3 +%global commit 1bfb84f54d50c7ae6558c794d3cfd5f6a7e6e676 +%global commit_date 20250606 +%global shortcommit %{sub %commit 1 7} + +Name: %realname.nightly +Version: %ver^%{commit_date}git.%shortcommit +Release: 1%?dist +Summary: The official implementation library for the hypr config language + +License: LGPL-3.0-only +URL: https://github.com/hyprwm/hyprlang +Source0: %url/archive/%commit.tar.gz + +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: (pkgconfig(hyprutils) with hyprutils.nightly-devel) + +Provides: %realname = %evr +Conflicts: %realname + +%description +%{summary}. + +%package devel +Requires: %{name}%{?_isa} = %{version}-%{release} +Provides: %realname-devel = %evr +Conflicts: %realname-devel +%pkg_devel_files + +%prep +%autosetup -p1 -n %realname-%commit + +%build +%cmake +%cmake_build + +%install +%cmake_install + +%check +%ctest + +%files +%license LICENSE +%doc README.md +%{_libdir}/libhyprlang.so.2 +%{_libdir}/libhyprlang.so.%{ver} + +%changelog +%autochangelog diff --git a/anda/desktops/waylands/hyprlang/update.rhai b/anda/desktops/waylands/hyprlang/update.rhai new file mode 100644 index 0000000000..bc8ee477cb --- /dev/null +++ b/anda/desktops/waylands/hyprlang/update.rhai @@ -0,0 +1,5 @@ +rpm.global("commit", gh_commit("hyprwm/hyprlang")); +if rpm.changed() { + rpm.global("ver", gh_rawfile("hyprwm/hyprlang", "main", "VERSION")); + rpm.global("commit_date", date()); +} diff --git a/anda/desktops/waylands/hyprlock/anda.hcl b/anda/desktops/waylands/hyprlock/anda.hcl new file mode 100644 index 0000000000..20e01b64f6 --- /dev/null +++ b/anda/desktops/waylands/hyprlock/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "hyprlock.spec" + } +} diff --git a/anda/desktops/waylands/hyprlock/ci_setup.rhai b/anda/desktops/waylands/hyprlock/ci_setup.rhai new file mode 100644 index 0000000000..8d5329cfb4 --- /dev/null +++ b/anda/desktops/waylands/hyprlock/ci_setup.rhai @@ -0,0 +1 @@ +sh("dnf swap sdbus-cpp sdbus-cpp.terra -y --allowerasing", #{}); diff --git a/anda/desktops/waylands/hyprlock/hyprlock.spec b/anda/desktops/waylands/hyprlock/hyprlock.spec new file mode 100644 index 0000000000..7bfcc27042 --- /dev/null +++ b/anda/desktops/waylands/hyprlock/hyprlock.spec @@ -0,0 +1,46 @@ +Name: hyprlock +Version: 0.8.2 +Release: 1%?dist +Summary: Hyprland's GPU-accelerated screen locking utility +License: BSD-3-Clause +URL: https://github.com/hyprwm/%name +Source0: %url/archive/refs/tags/v%version.tar.gz +Packager: madonuko +BuildRequires: cmake gcc gcc-c++ +BuildRequires: pkgconfig(cairo) +BuildRequires: (pkgconfig(hyprgraphics) with hyprgraphics.nightly-devel) +BuildRequires: pkgconfig(hyprland-protocols) +BuildRequires: (pkgconfig(hyprlang) with hyprlang.nightly-devel) +BuildRequires: (pkgconfig(hyprutils) with hyprutils.nightly-devel) +BuildRequires: (pkgconfig(hyprwayland-scanner) with hyprwayland-scanner.nightly-devel) +BuildRequires: mesa-libgbm-devel +BuildRequires: mesa-libGL-devel +BuildRequires: pkgconfig(pam) +BuildRequires: pkgconfig(pango) +BuildRequires: pkgconfig(wayland-client) +BuildRequires: pkgconfig(wayland-protocols) +BuildRequires: pkgconfig(xkbcommon) +BuildRequires: pkgconfig(sdbus-c++) >= 2.1.0 +BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(libwebp) +BuildRequires: pkgconfig(libmagic) + +%description +%summary. + +%prep +%autosetup + +%build +%cmake -DCMAKE_BUILD_TYPE:STRING=Release +%cmake_build + +%install +%cmake_install + +%files +%doc README.md +%license LICENSE +%_bindir/%name +%_pam_confdir/%name +%_datadir/hypr/%name.conf diff --git a/anda/desktops/waylands/hyprlock/update.rhai b/anda/desktops/waylands/hyprlock/update.rhai new file mode 100644 index 0000000000..05b9c25c0c --- /dev/null +++ b/anda/desktops/waylands/hyprlock/update.rhai @@ -0,0 +1,3 @@ +let v = gh_rawfile("hyprwm/hyprlock", "main", "VERSION"); +v.trim(); +rpm.version(v); diff --git a/anda/desktops/waylands/hyprutils/anda.hcl b/anda/desktops/waylands/hyprutils/anda.hcl new file mode 100644 index 0000000000..e60df70391 --- /dev/null +++ b/anda/desktops/waylands/hyprutils/anda.hcl @@ -0,0 +1,9 @@ +project pkg { + rpm { + spec = "hyprutils.nightly.spec" + } + labels { + nightly = 1 + subrepo = "extras" + } +} diff --git a/anda/desktops/waylands/hyprutils/hyprutils.nightly.spec b/anda/desktops/waylands/hyprutils/hyprutils.nightly.spec new file mode 100644 index 0000000000..c81076e9fa --- /dev/null +++ b/anda/desktops/waylands/hyprutils/hyprutils.nightly.spec @@ -0,0 +1,54 @@ +#? https://src.fedoraproject.org/rpms/hyprutils/blob/rawhide/f/hyprutils.spec + +%global realname hyprutils +%global ver 0.7.1 +%global commit 57ab2a867d8b554ad89f29060c15efd11631db91 +%global commit_date 20250613 +%global shortcommit %{sub %commit 1 7} + +Name: %realname.nightly +Version: %ver^%{commit_date}git.%shortcommit +Release: 1%?dist +Summary: Hyprland utilities library used across the ecosystem + +License: BSD-3-Clause +URL: https://github.com/hyprwm/hyprutils +Source0: %url/archive/%commit.tar.gz + +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: pkgconfig(pixman-1) + +Provides: %realname = %evr +Conflicts: %realname + +%description +%{summary}. + +%package devel +Requires: %{name}%{?_isa} = %{version}-%{release} +Provides: %realname-devel = %evr +Conflicts: %realname-devel +%pkg_devel_files + +%prep +%autosetup -p1 -n %realname-%commit + +%build +%cmake +%cmake_build + +%install +%cmake_install + +%check +%ctest + +%files +%license LICENSE +%doc README.md +%{_libdir}/lib%{realname}.so.%{ver} +%{_libdir}/lib%{realname}.so.6 diff --git a/anda/desktops/waylands/hyprutils/update.rhai b/anda/desktops/waylands/hyprutils/update.rhai new file mode 100644 index 0000000000..44759f192b --- /dev/null +++ b/anda/desktops/waylands/hyprutils/update.rhai @@ -0,0 +1,5 @@ +rpm.global("commit", gh_commit("hyprwm/hyprutils")); +if rpm.changed() { + rpm.global("ver", gh_rawfile("hyprwm/hyprutils", "main", "VERSION")); + rpm.global("commit_date", date()); +} diff --git a/anda/desktops/waylands/hyprwayland-scanner/anda.hcl b/anda/desktops/waylands/hyprwayland-scanner/anda.hcl new file mode 100644 index 0000000000..5bf8800d86 --- /dev/null +++ b/anda/desktops/waylands/hyprwayland-scanner/anda.hcl @@ -0,0 +1,9 @@ +project pkg { + rpm { + spec = "hyprwayland-scanner.nightly.spec" + } + labels { + nightly = 1 + subrepo = "extras" + } +} diff --git a/anda/desktops/waylands/hyprwayland-scanner/hyprwayland-scanner.nightly.spec b/anda/desktops/waylands/hyprwayland-scanner/hyprwayland-scanner.nightly.spec new file mode 100644 index 0000000000..60dd077ca0 --- /dev/null +++ b/anda/desktops/waylands/hyprwayland-scanner/hyprwayland-scanner.nightly.spec @@ -0,0 +1,55 @@ +#? https://src.fedoraproject.org/rpms/hyprwayland-scanner/blob/rawhide/f/hyprwayland-scanner.spec + +%global realname hyprwayland-scanner +%global ver 0.4.4 +%global commit 817918315ea016cc2d94004bfb3223b5fd9dfcc6 +%global shortcommit %{sub %commit 1 7} +%global commit_date 20250614 + +Name: %realname.nightly +Version: %ver^%{commit_date}git.%shortcommit +Release: 1%?dist +Summary: A Hyprland implementation of wayland-scanner, in and for C++ + +License: BSD-3-Clause +URL: https://github.com/hyprwm/hyprwayland-scanner +Source0: %url/archive/%commit.tar.gz + +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + +BuildRequires: cmake +BuildRequires: cmake(pugixml) +BuildRequires: gcc-c++ + +Provides: %realname = %evr +Conflicts: %realname +Packager: madonuko + +%description +%{summary}. + +%package devel +Summary: A Hyprland implementation of wayland-scanner, in and for C++ +Provides: %realname-devel = %evr +Conflicts: %realname-devel + +%description devel +%{summary}. + +%prep +%autosetup -p1 -n %realname-%commit + +%build +%cmake +%cmake_build + +%install +%cmake_install + +%files devel +%license LICENSE +%doc README.md +%{_bindir}/%{realname} +%{_libdir}/pkgconfig/%{realname}.pc +%{_libdir}/cmake/%{realname}/ diff --git a/anda/desktops/waylands/hyprwayland-scanner/update.rhai b/anda/desktops/waylands/hyprwayland-scanner/update.rhai new file mode 100644 index 0000000000..4d28ecb91b --- /dev/null +++ b/anda/desktops/waylands/hyprwayland-scanner/update.rhai @@ -0,0 +1,5 @@ +rpm.global("commit", gh_commit("hyprwm/hyprwayland-scanner")); +if rpm.changed() { + rpm.global("ver", gh_rawfile("hyprwm/hyprwayland-scanner", "main", "VERSION")); + rpm.global("commit_date", date()); +} diff --git a/anda/desktops/waylands/swaylock-effects/swaylock-effects.spec b/anda/desktops/waylands/swaylock-effects/swaylock-effects.spec index c816be8f6c..e159f77edf 100644 --- a/anda/desktops/waylands/swaylock-effects/swaylock-effects.spec +++ b/anda/desktops/waylands/swaylock-effects/swaylock-effects.spec @@ -3,7 +3,7 @@ Name: swaylock-effects Version: 1.7.0.0^1.%{shortcommit} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Swaylock, with fancy effects License: MIT @@ -31,32 +31,7 @@ Conflicts: swaylock swaylock-effects is a fork of swaylock which adds built-in screenshots and image manipulation effects like blurring. -%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 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}. - -%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}. +%pkg_completion -Bfz %binary_name %prep @@ -79,15 +54,6 @@ Fish command-line completion support for %{name}. %{_mandir}/man1/%{binary_name}.1.gz %config(noreplace) %{_sysconfdir}/pam.d/%{binary_name} -%files bash-completion -%{bash_completions_dir}/%{binary_name} - -%files zsh-completion -%{zsh_completions_dir}/_%{binary_name} - -%files fish-completion -%{fish_completions_dir}/%{binary_name}.fish - %changelog * Tue Feb 04 2025 sadlerm diff --git a/anda/desktops/waylands/swww/swww.spec b/anda/desktops/waylands/swww/swww.spec index 05f314c6c4..31a49d129b 100644 --- a/anda/desktops/waylands/swww/swww.spec +++ b/anda/desktops/waylands/swww/swww.spec @@ -1,5 +1,5 @@ Name: swww -Version: 0.10.1 +Version: 0.10.3 Release: 1%?dist Summary: Wallpaper daemon for Wayland SourceLicense: GPL-3.0-only diff --git a/anda/desktops/waylands/wpaperd/wpaperd.spec b/anda/desktops/waylands/wpaperd/wpaperd.spec index 8764f380e9..88e02a43a1 100644 --- a/anda/desktops/waylands/wpaperd/wpaperd.spec +++ b/anda/desktops/waylands/wpaperd/wpaperd.spec @@ -1,9 +1,8 @@ -%global elvish_completions_dir %_datadir/elvish/lib/completions -%bcond check 1 +%bcond check 0 Name: wpaperd Version: 1.2.2 -Release: 1%?dist +Release: 2%?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) SourceLicense: GPL-3.0-or-later @@ -32,41 +31,7 @@ Supplements: wpaperd %description doc Man papes for %name. -%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 elvish-completion -Summary: Elvish completion for %name -Requires: %{name} = %{version}-%{release} -Requires: elvish -Supplements: (%{name} and elvish-completion) - -%description elvish-completion -Elvish 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}. +%pkg_completion -befz wpaperctl wpaperd %prep @@ -111,22 +76,6 @@ install -Dpm644 -t %buildroot%zsh_completions_dir target/rpm/completions/_* %_mandir/man1/wpaperd.1.gz %_mandir/man5/wpaperd-output.5.gz -%files bash-completion -%bash_completions_dir/wpaperctl.bash -%bash_completions_dir/wpaperd.bash - -%files elvish-completion -%elvish_completions_dir/wpaperctl.elv -%elvish_completions_dir/wpaperd.elv - -%files fish-completion -%fish_completions_dir/wpaperctl.fish -%fish_completions_dir/wpaperd.fish - -%files zsh-completion -%zsh_completions_dir/_wpaperctl -%zsh_completions_dir/_wpaperd - %changelog * Fri Dec 20 2024 madonuko - 1.1.1-1 - Initial package diff --git a/anda/devs/atac/atac.spec b/anda/devs/atac/atac.spec index 98029c3cf0..cd96f54a61 100644 --- a/anda/devs/atac/atac.spec +++ b/anda/devs/atac/atac.spec @@ -37,6 +37,7 @@ and account-less.} %build %{cargo_license_summary_online} %{cargo_license_online} > LICENSE.dependencies +%{cargo_build} --locked %install -%cargo_install +%crate_install_bin diff --git a/anda/devs/bun/bun-bin.spec b/anda/devs/bun/bun-bin.spec index 2eaf13b3b7..93f33a35c7 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.15 +Version: 1.2.16 Release: 1%?dist Summary: Incredibly fast JavaScript runtime, bundler, test runner, and package manager – all in one License: MIT @@ -17,34 +17,7 @@ BuildRequires: unzip %description %summary. - -%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}. - +%pkg_completion -bfz bun %prep %autosetup -n bun-linux-%a @@ -88,12 +61,3 @@ ln -s bun %buildroot%_bindir/bunx %license LICENSE %_bindir/bun %_bindir/bunx - -%files bash-completion -%bash_completions_dir/bun.bash - -%files fish-completion -%fish_completions_dir/bun.fish - -%files zsh-completion -%zsh_completions_dir/_bun diff --git a/anda/devs/codium/codium.spec b/anda/devs/codium/codium.spec index 5065273fe3..071362fa60 100644 --- a/anda/devs/codium/codium.spec +++ b/anda/devs/codium/codium.spec @@ -12,7 +12,7 @@ %endif Name: codium -Version: 1.100.23258 +Version: 1.101.03933 Release: 1%?dist Summary: Code editing. Redefined. License: MIT diff --git a/anda/devs/edit/edit.spec b/anda/devs/edit/edit.spec index b895954cbd..fae483f397 100644 --- a/anda/devs/edit/edit.spec +++ b/anda/devs/edit/edit.spec @@ -9,7 +9,7 @@ An editor that pays homage to the classic MS-DOS Editor, but with a modern inter %endif Name: %{crate} -Version: 1.1.0 +Version: 1.2.0 Release: 1%?dist Summary: A simple editor for simple needs. SourceLicense: MIT diff --git a/anda/devs/flutter/flutter.spec b/anda/devs/flutter/flutter.spec index 08d4296a67..f41163b6a1 100644 --- a/anda/devs/flutter/flutter.spec +++ b/anda/devs/flutter/flutter.spec @@ -1,5 +1,5 @@ Name: flutter -Version: 3.32.1 +Version: 3.32.4 Release: 1%?dist Summary: SDK for crafting beautiful, fast user experiences from a single codebase License: BSD-3-Clause diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 7c9a728952..8ad570f657 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,16 +1,11 @@ -%global commit 5667b83328be6818c77521152e7e3ab42a9a9160 +%global commit d0f116da3554c151c63fd3a11e90661cb8489359 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-05-30 +%global fulldate 2025-06-15 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global ver 1.1.4 %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: %{base_name}-nightly Version: %{ver}~tip^%{commit_date}git%{shortcommit} @@ -23,6 +18,7 @@ License: MIT AND MPL-2.0 AND OFL-1.1 AND (WTFPL OR CC0-1.0) AND Apache-2. 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: anda-srpm-macros >= 0.2.15 BuildRequires: gettext BuildRequires: gtk4-devel BuildRequires: libadwaita-devel @@ -31,7 +27,8 @@ BuildRequires: minisign BuildRequires: ncurses BuildRequires: ncurses-devel BuildRequires: pandoc-cli -BuildRequires: zig +BuildRequires: zig >= 0.14.0 +BuildRequires: zig-rpm-macros BuildRequires: pkgconfig(blueprint-compiler) BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(freetype2) @@ -44,8 +41,8 @@ BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(oniguruma) BuildRequires: pkgconfig(zlib) -Requires: %{name}-terminfo -Requires: %{name}-shell-integration +Requires: %{name}-terminfo = %{evr} +Requires: %{name}-shell-integration = %{evr} Requires: gtk4 Requires: gtk4-layer-shell Requires: libadwaita @@ -112,55 +109,40 @@ This package contains files allowing Ghostty to integrate with various shells. %package terminfo Summary: Ghostty terminfo +%if 0%{?fedora} >= 42 +Requires: ncurses-term >= 6.5-5.20250125 +%endif 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 +Obsoletes: %{name}-terminfo-source < %{evr} BuildArch: noarch %description terminfo Ghostty's terminfo. Needed for basic terminal function. -%package terminfo-source -Summary: Source files for Ghostty's terminfo -Requires: %{name} -Requires: %{name}-terminfo -BuildArch: noarch - -%description terminfo-source -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}-%{ver}-main+%{shortcommit} -ZIG_GLOBAL_CACHE_DIR="%{cache_dir}" ./nix/build-support/fetch-zig-cache.sh +ZIG_GLOBAL_CACHE_DIR="%{_zig_cache_dir}" ./nix/build-support/fetch-zig-cache.sh %build %install DESTDIR="%{buildroot}" \ -zig build \ - --summary all \ - --release=fast \ - --system "%{cache_dir}/p" \ +%{zig_build_target -r fast} \ --prefix "%{_prefix}" --prefix-lib-dir "%{_libdir}" \ --prefix-exe-dir "%{_bindir}" --prefix-include-dir "%{_includedir}" \ - --verbose \ -Dversion-string="%{ver}-dev+%{shortcommit}" \ - -Dcpu=baseline \ -Dstrip=false \ -Dpie=true \ - -Demit-docs \ - -Demit-termcap \ - -Demit-terminfo + -Demit-docs -#Don't conflict with ncurses-term on F42 and up +# Don't conflict with ncurses-term on F42 and up %if 0%{?fedora} >= 42 -rm -rf %{buildroot}%{_datadir}/terminfo/g/ghostty +rm -rf %{buildroot}%{_datadir}/terminfo/g/%{base_name} %endif %find_lang %{reverse_dns} @@ -175,6 +157,7 @@ rm -rf %{buildroot}%{_datadir}/terminfo/g/ghostty %{_datadir}/%{base_name}/doc %{_datadir}/%{base_name}/themes %{_datadir}/kio/servicemenus/%{reverse_dns}.desktop +%{_datadir}/metainfo/%{reverse_dns}.metainfo.xml %{_datadir}/nautilus-python/extensions/%{base_name}.py %{_datadir}/nvim/site/compiler/%{base_name}.vim %{_datadir}/nvim/site/ftdetect/%{base_name}.vim @@ -221,11 +204,10 @@ rm -rf %{buildroot}%{_datadir}/terminfo/g/ghostty %endif %{_datadir}/terminfo/x/xterm-%{base_name} -%files terminfo-source -%{_datadir}/terminfo/%{base_name}.termcap -%{_datadir}/terminfo/%{base_name}.terminfo - %changelog +* Sat May 31 2025 Gilver E. - 1.1.4~tip^20250531git1ff9162 +- Updated for Zig 0.14.0 +- Updated for ncurses-term compatibility in Fedora 42 and Rawhide * 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 diff --git a/anda/devs/rio/rio.spec b/anda/devs/rio/rio.spec index 8ec5c54948..0c337287de 100644 --- a/anda/devs/rio/rio.spec +++ b/anda/devs/rio/rio.spec @@ -4,12 +4,12 @@ A hardware-accelerated terminal emulator focusing to run in desktops and browser %bcond docs 1 Name: rio -Version: 0.2.16 +Version: 0.2.18 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 +URL: https://rioterm.com/ Source0: https://github.com/raphamorim/%{name}/archive/refs/tags/v%{version}.tar.gz BuildRequires: anda-srpm-macros BuildRequires: cargo-rpm-macros diff --git a/anda/devs/tracy/tracy.spec b/anda/devs/tracy/tracy.spec index 0d34002c08..e6a293429f 100644 --- a/anda/devs/tracy/tracy.spec +++ b/anda/devs/tracy/tracy.spec @@ -1,7 +1,7 @@ %global _desc Tracy is a real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications. Name: tracy -Version: 0.12.0 +Version: 0.12.1 Release: 1%?dist Summary: A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications. License: BSD-3-Clause diff --git a/anda/devs/yadm/yadm.spec b/anda/devs/yadm/yadm.spec index c063388855..081b8ba1e2 100644 --- a/anda/devs/yadm/yadm.spec +++ b/anda/devs/yadm/yadm.spec @@ -1,6 +1,6 @@ Name: yadm Version: 3.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Yet Another Dotfiles Manager License: GPL-3.0-only @@ -19,32 +19,7 @@ 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}. +%pkg_completion -Bfz %prep @@ -64,15 +39,6 @@ install -Dpm644 -t %buildroot%zsh_completions_dir completion/zsh/_yadm %_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. diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index c4ee4a2a28..0a84d05cdd 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,7 +1,7 @@ -%global commit 40c91d5df06b6d3f213c9cfda3ceb243ed0b2f12 +%global commit 3595dbb155d692a000d1f556e2e49c8b05ff5c2d %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250531 -%global ver 0.190.0 +%global commit_date 20250616 +%global ver 0.192.0 %bcond_with check @@ -37,7 +37,10 @@ BuildRequires: alsa-lib-devel BuildRequires: fontconfig-devel BuildRequires: wayland-devel BuildRequires: libxkbcommon-x11-devel +BuildRequires: openssl-devel +%if 0%{?fedora} BuildRequires: openssl-devel-engine +%endif BuildRequires: libzstd-devel BuildRequires: perl-FindBin BuildRequires: perl-IPC-Cmd diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index ffd05b7e72..06d2232eec 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.189.3-pre +%global ver 0.191.2-pre # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ @@ -33,7 +33,10 @@ BuildRequires: alsa-lib-devel BuildRequires: fontconfig-devel BuildRequires: wayland-devel BuildRequires: libxkbcommon-x11-devel +BuildRequires: openssl-devel +%if 0%{?fedora} BuildRequires: openssl-devel-engine +%endif BuildRequires: libzstd-devel BuildRequires: perl-FindBin BuildRequires: perl-IPC-Cmd diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 24b07deae6..b65232f632 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.188.5 +Version: 0.190.6 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 @@ -32,7 +32,10 @@ BuildRequires: alsa-lib-devel BuildRequires: fontconfig-devel BuildRequires: wayland-devel BuildRequires: libxkbcommon-x11-devel +BuildRequires: openssl-devel +%if 0%{?fedora} BuildRequires: openssl-devel-engine +%endif BuildRequires: libzstd-devel BuildRequires: perl-FindBin BuildRequires: perl-IPC-Cmd diff --git a/anda/fonts/geist/anda.hcl b/anda/fonts/geist/anda.hcl new file mode 100644 index 0000000000..0f62482d3b --- /dev/null +++ b/anda/fonts/geist/anda.hcl @@ -0,0 +1,6 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "geist.spec" + } +} diff --git a/anda/fonts/geist/geist.spec b/anda/fonts/geist/geist.spec new file mode 100644 index 0000000000..54d8d27bae --- /dev/null +++ b/anda/fonts/geist/geist.spec @@ -0,0 +1,52 @@ +Name: geist-font +Version: 1.5.0 +Release: 1%?dist +URL: https://vercel.com/font +Source0: https://github.com/vercel/geist-font/archive/refs/tags/%version.tar.gz +License: OFL-1.1 +Summary: Geist is a new font family for Vercel, created by Vercel in collaboration with Basement Studio +BuildRequires: make python3 python3.10 python3.10-devel meson cairo cairo-devel gcc +BuildArch: noarch +Provides: geist = %evr +Packager: Owen Zimmerman + +%description +Geist is a new font family for Vercel, created by Vercel in collaboration with Basement Studio. + +Geist Sans is a sans-serif typeface designed for legibility and simplicity. It is a modern, geometric typeface +that is based on the principles of classic Swiss typography. It is designed to be used in +headlines, logos, posters, and other large display sizes. + +%package mono +Requires: %{name} = %{version}-%{release} +Summary: Geist Mono is a monospaced typeface that has been crafted to be the perfect partner to Geist Sans +Provides: geist-mono = %evr +Provides: geist-mono-fonts = %evr + +%description mono +Geist Mono is a monospaced typeface that has been crafted to be the perfect partner to Geist Sans. +It is designed to be used in code editors, diagrams, terminals, and other textbased interfaces where code is represented. + +%prep +%autosetup -n %name-%version + +%build +%make_build + +%install +mkdir -p %{buildroot}/usr/share/fonts/Geist/ +mkdir -p %{buildroot}/usr/share/fonts/GeistMono/ +install -Dm644 fonts/Geist/ttf/*.ttf %{buildroot}%{_datadir}/fonts/Geist/ +install -Dm644 fonts/GeistMono/ttf/*.ttf %{buildroot}%{_datadir}/fonts/GeistMono/ + +%files +%doc readme.md AUTHORS.txt CONTRIBUTORS.txt requirements-test.txt requirements.txt OFL.txt +%license LICENSE.txt +%{_datadir}/fonts/Geist/* + +%files mono +%{_datadir}/fonts/GeistMono/* + +%changelog +* Wed Jun 04 2025 Owen Zimmerman +- Package Geist fonts diff --git a/anda/fonts/geist/update.rhai b/anda/fonts/geist/update.rhai new file mode 100644 index 0000000000..0740bc084d --- /dev/null +++ b/anda/fonts/geist/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("vercel/geist-font")); diff --git a/anda/games/heroic-games-launcher/heroic-games-launcher.spec b/anda/games/heroic-games-launcher/heroic-games-launcher.spec index a852054de3..a7c1d5feb4 100644 --- a/anda/games/heroic-games-launcher/heroic-games-launcher.spec +++ b/anda/games/heroic-games-launcher/heroic-games-launcher.spec @@ -5,7 +5,6 @@ %elifarch aarch64 %global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*)|(.*\\x86_64*\\.so.*)|(.*\\x86-64*\\.so.*))$ %endif -%define _build_id_links none %global org_name Heroic-Games-Launcher %global git_name %(echo %{org_name} | sed 's/-//g') %global reverse_dns com.heroicgameslauncher.hgl @@ -16,14 +15,14 @@ %global comet_version 0.2.0 Name: %{shortname}-games-launcher -Version: 2.17.0 +Version: 2.17.2 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 BuildRequires: anda-srpm-macros BuildRequires: desktop-file-utils -### Electron builder builds some things with GCC(++), Git, and Make +# Electron builder builds some things with GCC(++), Git, and Make BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: git @@ -57,6 +56,7 @@ Heroic is a Free and Open Source Epic, GOG, and Amazon Prime Games launcher for pnpm install pnpm run download-helper-binaries pnpm dist:linux +wait %install mkdir -p %{buildroot}%{_datadir}/%{shortname} diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index c743fa9591..c279e84266 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.58.2 +Version: 0.58.6 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index 92fa855ec1..ab6a18d377 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -1,9 +1,9 @@ -%define osuresver 2025.530.0 +%define osuresver 2025.605.0 %global debug_package %{nil} %define __strip /bin/true Name: osu-lazer -Version: 2025.424.0 +Version: 2025.607.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 diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 5370ff336b..c29f3a2863 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 77057267d2987c1fe243a05f04e535e7291b683d +%global commit a2681b5704f4ec0f84b5830091b15ec89b70a7e1 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250531 +%global commit_date 20250616 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/games/rpcs3/anda.hcl b/anda/games/rpcs3/anda.hcl index 392781de39..f17fc5aed0 100644 --- a/anda/games/rpcs3/anda.hcl +++ b/anda/games/rpcs3/anda.hcl @@ -2,4 +2,7 @@ project pkg { rpm { spec = "rpcs3.spec" } + labels { + mock = 1 + } } diff --git a/anda/games/rpcs3/rpcs3.spec b/anda/games/rpcs3/rpcs3.spec index 2f224c4b93..5b9b5e7ffa 100644 --- a/anda/games/rpcs3/rpcs3.spec +++ b/anda/games/rpcs3/rpcs3.spec @@ -1,4 +1,3 @@ -%global __requires_exclude ^((libwolfssl\\.so.*)|(libFusion\\.so.*)|(libasmjit\\.so.*)|(libcubeb\\.so.*)|(libdiscord-rpc\\.so.*)|(libglslang\\.so.*)|(librtmidi\\.so.*))$ %global _distro_extra_cflags -Wno-uninitialized %global _distro_extra_cxxflags -include %_includedir/c++/*/cstdint # GLIBCXX_ASSERTIONS is known to break RPCS3 @@ -7,12 +6,12 @@ # Need to get rid of everything Clang can't use and undefine -Wunused-command-line-argument where possible due to the project's build flags %global build_cflags %(echo %{build_cflags} | sed 's:-Werror ::g' | sed 's:-Wunused-command-line-argument ::g' | sed 's:-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 ::g' | sed 's:-specs=/usr/lib/rpm/redhat/redhat-hardened-ld ::g' | sed 's:-specs=/usr/lib/rpm/redhat/redhat-hardened-ld-errors ::g' | sed 's:-specs=/usr/lib/rpm/redhat/redhat-package-notes ::g') -Wno-unused-command-line-argument %global build_cxxflags %(echo %{build_cxxflags} | sed 's:-Werror ::g' | sed 's:-Wunused-command-line-argument ::g' | sed 's:-specs\=/usr/lib/rpm/redhat/redhat-annobin-cc1 ::g' | sed 's:-specs=/usr/lib/rpm/redhat/redhat-hardened-ld ::g' | sed 's:-specs=/usr/lib/rpm/redhat/redhat-hardened-ld-errors ::g' | sed 's:-specs=/usr/lib/rpm/redhat/redhat-package-notes ::g') -Wno-unused-command-line-argument -%global commit 382e62c7d8755fbd1bbeb1b70c44e211f2d5cdfa -%global ver 0.0.36-17979 +%global commit 9634e58f0a5b21469282c44dceeee9e5b902a03b +%global ver 0.0.37-18009 Name: rpcs3 Version: %(echo %{ver} | sed 's/-/^/g') -Release: 2%?dist +Release: 1%?dist Summary: PlayStation 3 emulator and debugger License: GPL-2.0-only URL: https://github.com/RPCS3/rpcs3 @@ -63,12 +62,10 @@ BuildRequires: qt6-qtbase-private-devel vulkan-devel jack-audio-connection-kit- %build # Looking at the CMakeLists.txt, this is the intended compiler and there are no fixes for GCC on aarch64 -export CC=clang -export CXX=clang++ %cmake -DDISABLE_LTO=TRUE \ - -DZSTD_BUILD_SHARED=OFF \ -DZSTD_BUILD_STATIC=ON \ -DCMAKE_SKIP_RPATH=ON \ + -DBUILD_SHARED_LIBS:BOOL=OFF \ -DUSE_NATIVE_INSTRUCTIONS=OFF \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ @@ -87,6 +84,8 @@ export CXX=clang++ -DUSE_SYSTEM_FLATBUFFERS=OFF \ -DUSE_SYSTEM_PUGIXML=OFF \ -DUSE_SYSTEM_WOLFSSL=OFF \ + -DCMAKE_C_COMPILER=clang \ + -DCMAKE_CXX_COMPILER=clang++ \ -DCMAKE_LINKER=mold \ -DCMAKE_SHARED_LINKER_FLAGS="$LDFLAGS -fuse-ld=mold" \ -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS -fuse-ld=mold" diff --git a/anda/games/rpcs3/update.rhai b/anda/games/rpcs3/update.rhai index b0a43bfae8..9387eb5f79 100644 --- a/anda/games/rpcs3/update.rhai +++ b/anda/games/rpcs3/update.rhai @@ -5,4 +5,5 @@ rpm.global("ver", v); if rpm.changed () { let c = find("Commit +BuildRequires: nim + +%description +GrabNim is a simple tool to install, manage and switch between different versions of the Nim compiler. + +%prep +%autosetup -n %name + +%build +%nim_c %name + +%install +install -Dm755 %name -t %buildroot%_bindir + +%files +%doc README.md +%license LICENSE +%_bindir/%name diff --git a/anda/langs/nim/grabnim/update.rhai b/anda/langs/nim/grabnim/update.rhai new file mode 100644 index 0000000000..75f215ef43 --- /dev/null +++ b/anda/langs/nim/grabnim/update.rhai @@ -0,0 +1,6 @@ +import "andax/bump_extras.rhai" as bump; + +rpm.global("commit", bump::codeberg_commit("janAkali/grabnim")); +if rpm.changed() { + rpm.global("commit_date", date()); +} diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 360bc3ffef..0996ca3591 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 db5973361f3387bf3d559f101e44196df246d7d7 +%global commit 7701b3c7e6f6c640a89cc445b40f466834ab4fcf %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250528 +%global commit_date 20250613 %global debug_package %nil Name: nim-nightly @@ -14,7 +14,6 @@ URL: https://nim-lang.org Source0: https://github.com/nim-lang/Nim/archive/%commit.tar.gz Source1: nim.1 Source2: nimgrep.1 -Source3: nimble.1 Source4: nimsuggest.1 BuildRequires: gcc mold git gcc-c++ nodejs openssl-devel pkgconfig(bash-completion) gc-devel pcre pcre-devel Requires: redhat-rpm-config gcc @@ -104,7 +103,7 @@ mkdir -p %buildroot/%_bindir %buildroot/%_datadir/bash-completion/completions %b install -Dpm755 bin/nim{grep,suggest,pretty} %buildroot/%_bindir install -Dpm644 tools/nim.bash-completion %buildroot/%_datadir/bash-completion/completions/nim install -Dpm644 dist/nimble/nimble.bash-completion %buildroot/%_datadir/bash-completion/completions/nimble -install -Dpm644 -t%buildroot/%_mandir/man1 %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 +install -Dpm644 -t%buildroot/%_mandir/man1 %SOURCE1 %SOURCE2 %SOURCE4 mv %buildroot%_bindir/nim %buildroot%_datadir/ ln -s %_datadir/nim/bin/nim %buildroot%_bindir/nim @@ -133,7 +132,7 @@ cp -r %buildroot%_prefix/lib/nim/dist %buildroot%_datadir/nim/ %license copying.txt dist/nimble/license.txt %doc doc/readme.txt %_bindir/nim{,ble} -%_mandir/man1/nim{,ble}.1* +%_mandir/man1/nim.1.* %_datadir/bash-completion/completions/nim{,ble} %_datadir/nim/ %_prefix/lib/nim/ diff --git a/anda/langs/nim/nim/nim.spec b/anda/langs/nim/nim/nim.spec index 2b4be8494f..8c2d352718 100644 --- a/anda/langs/nim/nim/nim.spec +++ b/anda/langs/nim/nim/nim.spec @@ -3,7 +3,7 @@ Name: nim Version: 2.2.4 -Release: 1%?dist +Release: 2%?dist Summary: Imperative, multi-paradigm, compiled programming language License: MIT and BSD URL: https://nim-lang.org @@ -22,6 +22,8 @@ design that focuses on efficiency, expressiveness, and elegance (in that order of priority). +%pkg_completion -B nim nimble + %package tools Summary: Tools for Nim programming language %description tools @@ -138,8 +140,6 @@ cp -r %buildroot%_prefix/lib/nim/dist %buildroot%_datadir/nim/ %_includedir/cycle.h %_includedir/nimbase.h %_datadir/nim -%bash_completions_dir/nim -%bash_completions_dir/nimble %files tools %license copying.txt diff --git a/anda/langs/nim/nimble/anda.hcl b/anda/langs/nim/nimble/anda.hcl new file mode 100644 index 0000000000..02159784ac --- /dev/null +++ b/anda/langs/nim/nimble/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "nimble.spec" + } +} diff --git a/anda/langs/nim/nim-nightly/nimble.1 b/anda/langs/nim/nimble/nimble.1 similarity index 100% rename from anda/langs/nim/nim-nightly/nimble.1 rename to anda/langs/nim/nimble/nimble.1 diff --git a/anda/langs/nim/nimble/nimble.spec b/anda/langs/nim/nimble/nimble.spec new file mode 100644 index 0000000000..5032a57dd2 --- /dev/null +++ b/anda/langs/nim/nimble/nimble.spec @@ -0,0 +1,35 @@ +Name: nimble +Version: 0.18.2 +Release: 1%?dist +Summary: Package manager for the Nim programming language +License: BSD +URL: https://github.com/nim-lang/nimble +Source0: %url/archive/refs/tags/v%version.tar.gz +Source1: nimble.1 +# We use `nim` to get `nimble`… to build `nimble` +BuildRequires: nim anda-srpm-macros git-core rpm_macro(bash_completions_dir) +Conflicts: nim + +%description +%summary. + +%prep +%autosetup +%nim_prep + +%build +%nim_build src/nimble + +%install +install -Dpm755 src/nimble %buildroot%_bindir/nimble +install -Dpm644 -t%buildroot%_mandir/man1 %SOURCE1 +install -Dpm644 nimble.bash-completion %buildroot%bash_completions_dir/nimble +install -Dpm644 nimble.zsh-completion %buildroot%zsh_completions_dir/_nimble.zsh + +%files +%doc readme.markdown +%license license.txt +%_bindir/nimble +%_mandir/man1/nimble.1.gz +%bash_completions_dir/nimble +%zsh_completions_dir/_nimble.zsh diff --git a/anda/langs/nim/nimble/update.rhai b/anda/langs/nim/nimble/update.rhai new file mode 100644 index 0000000000..e32050a122 --- /dev/null +++ b/anda/langs/nim/nimble/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("nim-lang/nimble")); diff --git a/anda/langs/python/pip-system-certs/python-pip-system-certs.spec b/anda/langs/python/pip-system-certs/python-pip-system-certs.spec index 6dfc694f2c..bd92b04d80 100644 --- a/anda/langs/python/pip-system-certs/python-pip-system-certs.spec +++ b/anda/langs/python/pip-system-certs/python-pip-system-certs.spec @@ -1,6 +1,6 @@ # Created by pyp2rpm-3.3.10 %global pypi_name pip-system-certs -%global pypi_version 4.0 +%global pypi_version 5.0 Name: python-%{pypi_name} Version: %{pypi_version} diff --git a/anda/langs/python/pywal16/python-pywal16.spec b/anda/langs/python/pywal16/python-pywal16.spec index 73226891aa..1393fb3ef7 100644 --- a/anda/langs/python/pywal16/python-pywal16.spec +++ b/anda/langs/python/pywal16/python-pywal16.spec @@ -3,7 +3,7 @@ Pywal is a tool that generates a color palette from the dominant colors in an image. It then applies the colors system-wide and on-the-fly in all of your favourite programs.} Name: python-%{pypi_name} -Version: 3.8.8 +Version: 3.8.9 Release: 1%?dist Summary: 16 color fork of the original Pywal License: MIT diff --git a/anda/langs/rust/eza/rust-eza.spec b/anda/langs/rust/eza/rust-eza.spec index 4965c1b63b..4b62c1110c 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.3 +Version: 0.21.4 Release: 1%?dist Summary: Modern replacement for ls diff --git a/anda/langs/rust/typst/rust-typst.spec b/anda/langs/rust/typst/rust-typst.spec index d6b435d967..d8633cc5e6 100644 --- a/anda/langs/rust/typst/rust-typst.spec +++ b/anda/langs/rust/typst/rust-typst.spec @@ -5,7 +5,7 @@ Name: rust-typst Version: 0.13.1 -Release: %autorelease +Release: 2%?dist Summary: New markup-based typesetting system that is powerful and easy to learn License: Apache-2.0 @@ -43,42 +43,7 @@ Provides: %crate-cli = %version-%release %_mandir/man1/typst.1.gz -%package bash-completion -Summary: Bash completion for %{crate} -Requires: %{crate} = %{version}-%{release} -Requires: bash-completion -Supplements: (%{crate} and bash-completion) - -%description bash-completion -Bash command line completion support for %{crate}. - -%package fish-completion -Summary: Fish completion for %{crate} -Requires: %{crate} = %{version}-%{release} -Requires: fish -Supplements: (%{crate} and fish) - -%description fish-completion -Fish command line completion support for %{crate}. - -%package zsh-completion -Summary: Zsh completion for %{crate} -Requires: %{crate} = %{version}-%{release} -Requires: zsh -Supplements: (%{crate} and zsh) - -%description zsh-completion -Zsh command line completion support for %{crate}. - - -%files bash-completion -%{bash_completions_dir}/%{crate} - -%files fish-completion -%{fish_completions_dir}/%{crate}.fish - -%files zsh-completion -%{zsh_completions_dir}/_%{crate} +%pkg_completion -Bfzn %crate %prep diff --git a/anda/langs/vala/vala-language-server-nightly/vala-language-server-nightly.spec b/anda/langs/vala/vala-language-server-nightly/vala-language-server-nightly.spec index e2ad4311e8..df48184a9f 100644 --- a/anda/langs/vala/vala-language-server-nightly/vala-language-server-nightly.spec +++ b/anda/langs/vala/vala-language-server-nightly/vala-language-server-nightly.spec @@ -1,9 +1,9 @@ %global real_name vala-language-server -%global commit 31cb5116a4a138365feb709ebb7b8670db604991 +%global commit a5d24a8cf7b61d0d2082234034905f0f8ed96726 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20240605 +%global commit_date 20250606 %global snapshot_info %{commit_date}.%{shortcommit} %global verrel 0.48.7 diff --git a/anda/langs/vala/vala-nightly/vala-nightly.spec b/anda/langs/vala/vala-nightly/vala-nightly.spec index 85a69cedec..ecf5932ac2 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 6054231d4e756a8184bf7cbd11125b1d9b608582 +%global commit 0e39d2dae386e40bf2d7be8d299b3560d8fdb50e %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global repo https://gitlab.gnome.org/GNOME/%{real_name}.git -%global commit_date 20250512 +%global commit_date 20250612 %global snapshot_info %{commit_date}.%{shortcommit} Name: vala-nightly diff --git a/anda/langs/zig/bootstrap/0001-increase-upper-bounds-of-main-zig-executable-to-10G.patch b/anda/langs/zig/bootstrap/0001-increase-upper-bounds-of-main-zig-executable-to-10G.patch deleted file mode 100644 index f2e22e1bf0..0000000000 --- a/anda/langs/zig/bootstrap/0001-increase-upper-bounds-of-main-zig-executable-to-10G.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/build.zig 2025-05-21 00:23:29.485933582 -0500 -+++ b/build.zig 2025-05-21 00:25:06.001631897 -0500 -@@ -690,7 +690,7 @@ - fn addCompilerStep(b: *std.Build, options: AddCompilerModOptions) *std.Build.Step.Compile { - const exe = b.addExecutable(.{ - .name = "zig", -- .max_rss = 7_800_000_000, -+ .max_rss = 10_000_000_000, - .root_module = addCompilerMod(b, options), - }); - exe.stack_size = stack_size; diff --git a/anda/langs/zig/bootstrap/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 deleted file mode 100644 index 21438943cc..0000000000 --- a/anda/langs/zig/bootstrap/0002-build-pass-zig-lib-dir-as-directory-instead-of-as-st.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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/bootstrap/0005-link.Elf-add-root-directory-of-libraries-to-linker-p.patch b/anda/langs/zig/bootstrap/0005-link.Elf-add-root-directory-of-libraries-to-linker-p.patch new file mode 100644 index 0000000000..4bfc87db0e --- /dev/null +++ b/anda/langs/zig/bootstrap/0005-link.Elf-add-root-directory-of-libraries-to-linker-p.patch @@ -0,0 +1,40 @@ +From 48aa23307d1a47b444854fc09478da6d4ee8e624 Mon Sep 17 00:00:00 2001 +From: Jan200101 +Date: Sun, 11 May 2025 01:09:41 +0200 +Subject: [PATCH 5/5] link.Elf: add root directory of libraries to linker path + +all the given dynamic shared objects will be linked with an absolute path however they may link to other dynamic shared objects which won't have an absolute path, for this we need to add the library path so that lld can resolve it + +Signed-off-by: Jan200101 +--- + src/link/Elf.zig | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/src/link/Elf.zig b/src/link/Elf.zig +index 53f88101b1..fe2b7abd48 100644 +--- a/src/link/Elf.zig ++++ b/src/link/Elf.zig +@@ -1938,9 +1938,19 @@ fn linkWithLLD(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_node: s + // Positional arguments to the linker such as object files. + var whole_archive = false; + ++ var lib_directories = std.StringArrayHashMap(void).init(gpa); ++ defer lib_directories.deinit(); ++ + for (self.base.comp.link_inputs) |link_input| switch (link_input) { + .res => unreachable, // Windows-only +- .dso => continue, ++ .dso => |dso| { ++ if (dso.path.root_dir.path) |root_dir| { ++ const lib_dir = try lib_directories.getOrPut(root_dir); ++ if (lib_dir.found_existing) continue; ++ try argv.append("-L"); ++ try argv.append(root_dir); ++ } ++ }, + .object, .archive => |obj| { + if (obj.must_link and !whole_archive) { + try argv.append("-whole-archive"); +-- +2.49.0 + diff --git a/anda/langs/zig/bootstrap/zig-master-bootstrap.spec b/anda/langs/zig/bootstrap/zig-master-bootstrap.spec index 734940f23c..5733917627 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.670+1a08c83eb +%global ver 0.15.0-dev.828+3ce8d19f7 %bcond bootstrap 1 %bcond docs %{without bootstrap} %bcond test 1 @@ -46,9 +46,7 @@ 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-10G.patch -Patch2: 0002-build-pass-zig-lib-dir-as-directory-instead-of-as-st.patch -Patch3: https://src.fedoraproject.org/rpms/zig/raw/rawhide/f/0005-link.Elf-add-root-directory-of-libraries-to-linker-p.patch +Patch3: 0005-link.Elf-add-root-directory-of-libraries-to-linker-p.patch BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ diff --git a/anda/langs/zig/master/0001-increase-upper-bounds-of-main-zig-executable-to-10G.patch b/anda/langs/zig/master/0001-increase-upper-bounds-of-main-zig-executable-to-10G.patch deleted file mode 100644 index f2e22e1bf0..0000000000 --- a/anda/langs/zig/master/0001-increase-upper-bounds-of-main-zig-executable-to-10G.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/build.zig 2025-05-21 00:23:29.485933582 -0500 -+++ b/build.zig 2025-05-21 00:25:06.001631897 -0500 -@@ -690,7 +690,7 @@ - fn addCompilerStep(b: *std.Build, options: AddCompilerModOptions) *std.Build.Step.Compile { - const exe = b.addExecutable(.{ - .name = "zig", -- .max_rss = 7_800_000_000, -+ .max_rss = 10_000_000_000, - .root_module = addCompilerMod(b, options), - }); - 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 deleted file mode 100644 index 21438943cc..0000000000 --- a/anda/langs/zig/master/0002-build-pass-zig-lib-dir-as-directory-instead-of-as-st.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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/master/0005-link.Elf-add-root-directory-of-libraries-to-linker-p.patch b/anda/langs/zig/master/0005-link.Elf-add-root-directory-of-libraries-to-linker-p.patch new file mode 100644 index 0000000000..4bfc87db0e --- /dev/null +++ b/anda/langs/zig/master/0005-link.Elf-add-root-directory-of-libraries-to-linker-p.patch @@ -0,0 +1,40 @@ +From 48aa23307d1a47b444854fc09478da6d4ee8e624 Mon Sep 17 00:00:00 2001 +From: Jan200101 +Date: Sun, 11 May 2025 01:09:41 +0200 +Subject: [PATCH 5/5] link.Elf: add root directory of libraries to linker path + +all the given dynamic shared objects will be linked with an absolute path however they may link to other dynamic shared objects which won't have an absolute path, for this we need to add the library path so that lld can resolve it + +Signed-off-by: Jan200101 +--- + src/link/Elf.zig | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/src/link/Elf.zig b/src/link/Elf.zig +index 53f88101b1..fe2b7abd48 100644 +--- a/src/link/Elf.zig ++++ b/src/link/Elf.zig +@@ -1938,9 +1938,19 @@ fn linkWithLLD(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_node: s + // Positional arguments to the linker such as object files. + var whole_archive = false; + ++ var lib_directories = std.StringArrayHashMap(void).init(gpa); ++ defer lib_directories.deinit(); ++ + for (self.base.comp.link_inputs) |link_input| switch (link_input) { + .res => unreachable, // Windows-only +- .dso => continue, ++ .dso => |dso| { ++ if (dso.path.root_dir.path) |root_dir| { ++ const lib_dir = try lib_directories.getOrPut(root_dir); ++ if (lib_dir.found_existing) continue; ++ try argv.append("-L"); ++ try argv.append(root_dir); ++ } ++ }, + .object, .archive => |obj| { + if (obj.must_link and !whole_archive) { + try argv.append("-whole-archive"); +-- +2.49.0 + diff --git a/anda/langs/zig/master/zig-master.spec b/anda/langs/zig/master/zig-master.spec index c44691d2ca..cefab182b5 100644 --- a/anda/langs/zig/master/zig-master.spec +++ b/anda/langs/zig/master/zig-master.spec @@ -13,7 +13,7 @@ %global zig_cache_dir %{builddir}/zig-cache Name: zig-master -Version: 0.15.0~dev.670+1a08c83eb +Version: 0.15.0~dev.784+4a02e080d 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 @@ -21,9 +21,7 @@ URL: https://ziglang.org Source0: %{url}/builds/zig-%{version_no_tilde}.tar.xz Source1: %{url}/builds/zig-%{version_no_tilde}.tar.xz.minisig Patch0: 0000-remove-native-lib-directories-from-rpath.patch -Patch1: 0001-increase-upper-bounds-of-main-zig-executable-to-10G.patch -Patch2: 0002-build-pass-zig-lib-dir-as-directory-instead-of-as-st.patch -Patch3: https://src.fedoraproject.org/rpms/zig/raw/rawhide/f/0005-link.Elf-add-root-directory-of-libraries-to-linker-p.patch +Patch3: 0005-link.Elf-add-root-directory-of-libraries-to-linker-p.patch BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ diff --git a/anda/lib/apparmor/apparmor.spec b/anda/lib/apparmor/apparmor.spec index 50286362a1..df36e1515c 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 +Version: 4.1.1 Release: 1%?dist Summary: AppArmor userspace components diff --git a/anda/lib/astal/astal-gtk/astal-gtk.spec b/anda/lib/astal/astal-gtk/astal-gtk.spec index bf58ed6423..2c645df8a6 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 7d28889 -%global commit_date 20250531 +%global commit ca3190d +%global commit_date 20250616 Name: astal Version: 0^%commit_date.%commit diff --git a/anda/lib/astal/astal/astal.spec b/anda/lib/astal/astal/astal.spec index 1170939e23..d3f2987089 100644 --- a/anda/lib/astal/astal/astal.spec +++ b/anda/lib/astal/astal/astal.spec @@ -1,7 +1,7 @@ -%global commit 7d28889727b80e0a68c20c2f0f1926ddc96a7be6 +%global commit ca3190d077d09b9597e7de471a8e388a08f112e9 %global shortcommit %{sub %commit 1 7} -%global commit_date 20250531 +%global commit_date 20250616 Name: astal Version: 0^%commit_date.%shortcommit diff --git a/anda/lib/libhelium/libhelium.spec b/anda/lib/libhelium/libhelium.spec index f43aa71bd2..6048fbdbf1 100644 --- a/anda/lib/libhelium/libhelium.spec +++ b/anda/lib/libhelium/libhelium.spec @@ -1,4 +1,4 @@ -%global ver 1.8.31 +%global ver 1.8.54 %global sanitized_ver %(echo %{ver} | sed -E 's/-/~/g') Summary: The Application Framework for tauOS apps Name: libhelium diff --git a/anda/lib/lovely-injector/lovely-injector.spec b/anda/lib/lovely-injector/lovely-injector.spec index a5e3e6761e..a8a8a05a51 100644 --- a/anda/lib/lovely-injector/lovely-injector.spec +++ b/anda/lib/lovely-injector/lovely-injector.spec @@ -1,5 +1,5 @@ # Generated by rust2rpm 27 -%bcond check 1 +%bcond check 0 %bcond rust_nightly 1 %global debug_package %{nil} %if %{with rust_nightly} @@ -8,11 +8,8 @@ %define __rustdoc $HOME/.cargo/bin/rustdoc %endif -# todo: update for 0.8 because dobby-sys is now a submodule -# I'm going to git clone the repo to prepare for 0.8 - Name: lovely-injector -Version: 0.7.1 +Version: 0.8.0 Release: 1%?dist Summary: A runtime lua injector for games built with LÖVE @@ -21,6 +18,8 @@ License: MIT URL: https://github.com/ethangreen-dev/lovely-injector Requires: love +BuildRequires: cmake +BuildRequires: gcc-c++ Packager: Cappy Ishihara BuildRequires: mold anda-srpm-macros cargo-rpm-macros >= 24 @@ -67,7 +66,7 @@ popd %license LICENSE.md # Only include dobby-sys license for versions >= 0.8 # Manually uncomment the next line when updating to 0.8 or later -# %license crates/dobby-sys/LICENSE +%license crates/dobby-sys/LICENSE %license LICENSE.dependencies %{_libdir}/liblovely.so %doc README.md diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index 0e2fc940eb..744f030a9f 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -79,7 +79,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.1.1 +Version: 25.1.3 Release: 1%?dist License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org diff --git a/anda/lib/nvidia/cuda-cudart/cuda-cudart.spec b/anda/lib/nvidia/cuda-cudart/cuda-cudart.spec index b9a474b9a2..26d2cfc211 100644 --- a/anda/lib/nvidia/cuda-cudart/cuda-cudart.spec +++ b/anda/lib/nvidia/cuda-cudart/cuda-cudart.spec @@ -8,7 +8,7 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.9.37 +Version: 12.9.79 Release: 1%?dist Summary: CUDA Runtime API library License: CUDA Toolkit diff --git a/anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec b/anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec index 27878c42c9..49d506ebd6 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.10.1.4 +Version: 9.10.2.21 Release: 1%?dist Epoch: 1 Summary: NVIDIA CUDA Deep Neural Network library (cuDNN) diff --git a/anda/lib/nvidia/cuda-cuobjdump/cuda-cuobjdump.spec b/anda/lib/nvidia/cuda-cuobjdump/cuda-cuobjdump.spec index 569e2e090b..bedd15dd9d 100644 --- a/anda/lib/nvidia/cuda-cuobjdump/cuda-cuobjdump.spec +++ b/anda/lib/nvidia/cuda-cuobjdump/cuda-cuobjdump.spec @@ -8,7 +8,7 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.9.26 +Version: 12.9.82 Release: 1%?dist Summary: Utility to extract information from CUDA binary files License: CUDA Toolkit diff --git a/anda/lib/nvidia/cuda-cupti/cuda-cupti.spec b/anda/lib/nvidia/cuda-cupti/cuda-cupti.spec index e372036e0c..03c01687f6 100644 --- a/anda/lib/nvidia/cuda-cupti/cuda-cupti.spec +++ b/anda/lib/nvidia/cuda-cupti/cuda-cupti.spec @@ -8,7 +8,7 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.9.19 +Version: 12.9.79 Release: 1%?dist Summary: NVIDIA CUDA Profiling Tools Interface (CUPTI) library License: CUDA Toolkit diff --git a/anda/lib/nvidia/cuda-cuxxfilt/cuda-cuxxfilt.spec b/anda/lib/nvidia/cuda-cuxxfilt/cuda-cuxxfilt.spec index b2fbca0e99..8ed096a1df 100644 --- a/anda/lib/nvidia/cuda-cuxxfilt/cuda-cuxxfilt.spec +++ b/anda/lib/nvidia/cuda-cuxxfilt/cuda-cuxxfilt.spec @@ -8,7 +8,7 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.9.19 +Version: 12.9.82 Release: 1%?dist Summary: CUDA cuxxfilt (demangler) License: CUDA Toolkit diff --git a/anda/lib/nvidia/cuda-gdb/cuda-gdb.spec b/anda/lib/nvidia/cuda-gdb/cuda-gdb.spec index 4482b77b4e..98d421a718 100644 --- a/anda/lib/nvidia/cuda-gdb/cuda-gdb.spec +++ b/anda/lib/nvidia/cuda-gdb/cuda-gdb.spec @@ -7,7 +7,7 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.9.19 +Version: 12.9.79 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 diff --git a/anda/lib/nvidia/cuda-nvdisasm/cuda-nvdisasm.spec b/anda/lib/nvidia/cuda-nvdisasm/cuda-nvdisasm.spec index 5ee401cee2..0daa448195 100644 --- a/anda/lib/nvidia/cuda-nvdisasm/cuda-nvdisasm.spec +++ b/anda/lib/nvidia/cuda-nvdisasm/cuda-nvdisasm.spec @@ -8,7 +8,7 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.9.19 +Version: 12.9.88 Release: 1%?dist Summary: Utility to extract information from CUDA binary files License: CUDA Toolkit diff --git a/anda/lib/nvidia/cuda-nvml/cuda-nvml.spec b/anda/lib/nvidia/cuda-nvml/cuda-nvml.spec index 270e96380e..c4b6802ad3 100644 --- a/anda/lib/nvidia/cuda-nvml/cuda-nvml.spec +++ b/anda/lib/nvidia/cuda-nvml/cuda-nvml.spec @@ -8,7 +8,7 @@ Name: cuda-nvml Epoch: 1 -Version: 12.9.40 +Version: 12.9.79 Release: 1%?dist Summary: NVIDIA Management library (NVML) License: CUDA Toolkit diff --git a/anda/lib/nvidia/cuda-nvprof/cuda-nvprof.spec b/anda/lib/nvidia/cuda-nvprof/cuda-nvprof.spec index 51e8d665ba..eca7a2bea8 100644 --- a/anda/lib/nvidia/cuda-nvprof/cuda-nvprof.spec +++ b/anda/lib/nvidia/cuda-nvprof/cuda-nvprof.spec @@ -8,7 +8,7 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.9.19 +Version: 12.9.79 Release: 1%?dist Summary: CUDA command line profiling tool License: CUDA Toolkit diff --git a/anda/lib/nvidia/cuda-nvprune/cuda-nvprune.spec b/anda/lib/nvidia/cuda-nvprune/cuda-nvprune.spec index 0a31cb1f56..65dd4f475d 100644 --- a/anda/lib/nvidia/cuda-nvprune/cuda-nvprune.spec +++ b/anda/lib/nvidia/cuda-nvprune/cuda-nvprune.spec @@ -8,7 +8,7 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.9.19 +Version: 12.9.82 Release: 1%?dist Summary: CUDA nvprune License: CUDA Toolkit diff --git a/anda/lib/nvidia/cuda-nvrtc/cuda-nvrtc.spec b/anda/lib/nvidia/cuda-nvrtc/cuda-nvrtc.spec index 12ca44aa46..70ff2af15b 100644 --- a/anda/lib/nvidia/cuda-nvrtc/cuda-nvrtc.spec +++ b/anda/lib/nvidia/cuda-nvrtc/cuda-nvrtc.spec @@ -8,7 +8,7 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.9.41 +Version: 12.9.86 Release: 1%?dist Summary: CUDA runtime compilation library (NVRTC) License: CUDA Toolkit diff --git a/anda/lib/nvidia/cuda-nvtx/cuda-nvtx.spec b/anda/lib/nvidia/cuda-nvtx/cuda-nvtx.spec index ce7e0e774c..cb1efa6a2d 100644 --- a/anda/lib/nvidia/cuda-nvtx/cuda-nvtx.spec +++ b/anda/lib/nvidia/cuda-nvtx/cuda-nvtx.spec @@ -8,7 +8,7 @@ Name: %(echo %real_name | tr '_' '-') Epoch: 1 -Version: 12.9.19 +Version: 12.9.79 Release: 1%?dist Summary: NVIDIA Tools Extension (NVTX) library License: CUDA Toolkit diff --git a/anda/lib/nvidia/cuda-profiler/cuda-profiler.spec b/anda/lib/nvidia/cuda-profiler/cuda-profiler.spec index ab3d320aba..0b9afc99b5 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.9.19 +Version: 12.9.79 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 c4198bba74..272918e894 100644 --- a/anda/lib/nvidia/cuda-sanitizer/cuda-sanitizer.spec +++ b/anda/lib/nvidia/cuda-sanitizer/cuda-sanitizer.spec @@ -8,7 +8,7 @@ Name: cuda-sanitizer Epoch: 1 -Version: 12.9.27 +Version: 12.9.79 Release: 1%?dist Summary: CUDA Compute Sanitizer API License: CUDA Toolkit diff --git a/anda/lib/nvidia/cuda/cuda.spec b/anda/lib/nvidia/cuda/cuda.spec index 559148bbcb..1cfe0ab422 100644 --- a/anda/lib/nvidia/cuda/cuda.spec +++ b/anda/lib/nvidia/cuda/cuda.spec @@ -2,7 +2,7 @@ %global major_package_version 12-8 Name: cuda -Version: 12.9.43 +Version: 12.9.88 Release: 1%?dist Summary: NVIDIA Compute Unified Device Architecture Toolkit Epoch: 1 diff --git a/anda/lib/nvidia/libcublas/libcublas.spec b/anda/lib/nvidia/libcublas/libcublas.spec index 53578d5d67..504a3f8b48 100644 --- a/anda/lib/nvidia/libcublas/libcublas.spec +++ b/anda/lib/nvidia/libcublas/libcublas.spec @@ -6,7 +6,7 @@ Name: libcublas Epoch: 1 -Version: 12.9.0.13 +Version: 12.9.1.4 Release: 1%?dist Summary: NVIDIA CUDA Basic Linear Algebra Subroutines (cuBLAS) libraries License: CUDA Toolkit diff --git a/anda/lib/nvidia/libcufft/libcufft.spec b/anda/lib/nvidia/libcufft/libcufft.spec index 995f188bb4..7d76dcae6d 100644 --- a/anda/lib/nvidia/libcufft/libcufft.spec +++ b/anda/lib/nvidia/libcufft/libcufft.spec @@ -6,7 +6,7 @@ Name: libcufft Epoch: 2 -Version: 11.4.0.6 +Version: 11.4.1.4 Release: 1%?dist Summary: NVIDIA CUDA Fast Fourier Transform library (cuFFT) libraries License: CUDA Toolkit diff --git a/anda/lib/nvidia/libcufile/anda.hcl b/anda/lib/nvidia/libcufile/anda.hcl new file mode 100644 index 0000000000..fc66154818 --- /dev/null +++ b/anda/lib/nvidia/libcufile/anda.hcl @@ -0,0 +1,9 @@ +project pkg { + rpm { + spec = "libcufile.spec" + } + labels { + subrepo = "nvidia" + updbranch = 1 + } +} diff --git a/anda/lib/nvidia/libcufile/cufile.pc b/anda/lib/nvidia/libcufile/cufile.pc new file mode 100644 index 0000000000..e42bbbceb1 --- /dev/null +++ b/anda/lib/nvidia/libcufile/cufile.pc @@ -0,0 +1,8 @@ +libdir=LIBDIR +includedir=INCLUDE_DIR + +Name: cufile +Description: GPUDirect Storage Library +Version: CUDA_VERSION +Libs: -L${libdir} -lnvjpeg +Cflags: -I${includedir} diff --git a/anda/lib/nvidia/libcufile/libcufile.spec b/anda/lib/nvidia/libcufile/libcufile.spec new file mode 100644 index 0000000000..5ec4fa7b9f --- /dev/null +++ b/anda/lib/nvidia/libcufile/libcufile.spec @@ -0,0 +1,130 @@ +%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: libcufile +Epoch: 1 +Version: 1.14.1.1 +Release: 1%?dist +Summary: NVIDIA GPUDirect Storage library (cuFile) +License: CUDA Toolkit +URL: https://developer.nvidia.com/cuda-toolkit +ExclusiveArch: aarch64 x86_64 + +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 +Source2: cufile.pc + +Conflicts: %{name}-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release} + +%description +NVIDIA GPUDirect Storage library is used in applications and frameworks to +leverage GDS technology and describes the intent, context, and operation of +those APIs, which are part of the GDS technology. + +NVIDIA® Magnum IO GPUDirect® Storage (GDS) is part of the GPUDirect family. GDS +enables a direct data path for direct memory access (DMA) transfers between GPU +memory and storage, which avoids a bounce buffer through the CPU. This direct +path increases system bandwidth and decreases the latency and utilization load +on the CPU. + +%package devel +Summary: Development files for NVIDIA GPUDirect Storage library (cuFile) +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 NVIDIA GPUDirect Storage library +(cuFile). + +%package static +Summary: Static libraries for NVIDIA GPUDirect Storage library (cuFile) +Requires: %{name}-devel%{_isa} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description static +This package contains static libraries for NVIDIA GPUDirect Storage library +(cuFile). + +%package tools +Summary: NVIDIA GPUDirect Storage library (cuFile) tools and samples +Requires: %{name}%{_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: gds-tools-%{major_package_version} = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: gds-tools-%{major_package_version} < %{?epoch:%{epoch}:}%{version} + +%description tools +This package provides tools and samples for the NVIDIA GPUDirect Storage library +(cuFile). + +%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}%{_bindir} +mkdir -p %{buildroot}%{_includedir} +mkdir -p %{buildroot}%{_libdir} +mkdir -p %{buildroot}%{_libdir}/pkgconfig +mkdir -p %{buildroot}%{_mandir} +mkdir -p %{buildroot}%{_sysconfdir} + +cp -fr tools/gds* %{buildroot}%{_bindir}/ +cp -fr include/* %{buildroot}%{_includedir}/ +cp -fr lib/lib* %{buildroot}%{_libdir}/ +cp -fr %{SOURCE2} %{buildroot}/%{_libdir}/pkgconfig/ +cp -fr man/man3 %{buildroot}%{_mandir}/ +cp -fr etc/* %{buildroot}%{_sysconfdir}/ + +# 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 +%doc README +%config %{_sysconfdir}/cufile.json +%{_libdir}/libcufile_rdma.so.* +%{_libdir}/libcufile.so.* + +%files devel +%{_includedir}/cufile.h +%{_libdir}/libcufile_rdma.so +%{_libdir}/libcufile.so +%{_libdir}/pkgconfig/cufile.pc +%{_mandir}/man3/CUfileFSOps.3* +%{_mandir}/man3/cufileRDMAInfo.3* +%{_mandir}/man3/cufile.h.3* +%{_mandir}/man3/CUfileDrvProps.3* +%{_mandir}/man3/CUfileDescr_t.3* +%{_mandir}/man3/CUfileError.3* +%{_mandir}/man3/CUfileIOParams.3* +%{_mandir}/man3/CUfileIOEvents.3* +%{_mandir}/man3/CUfileOpError.h.3* + +%files static +%{_libdir}/libcufile_rdma_static.a +%{_libdir}/libcufile_static.a + +%files tools +%doc tools/README +%doc tools/*.gdsio tools/*.cfg +%{_bindir}/gdscheck +%{_bindir}/gdscheck.py +%{_bindir}/gdscp +%{_bindir}/gdsio +%{_bindir}/gdsio_verify +%{_bindir}/gds_log_collection.py +%{_bindir}/gds_perf.sh +%{_bindir}/gds_stats + +%changelog +%autochangelog diff --git a/anda/lib/nvidia/libcufile/update.rhai b/anda/lib/nvidia/libcufile/update.rhai new file mode 100644 index 0000000000..ef03766eb3 --- /dev/null +++ b/anda/lib/nvidia/libcufile/update.rhai @@ -0,0 +1,3 @@ +import "andax/nvidia.rhai" as nvidia; + +rpm.version(nvidia::nvidia_component_version("libcufile")); diff --git a/anda/lib/nvidia/libcusolver/anda.hcl b/anda/lib/nvidia/libcusolver/anda.hcl new file mode 100644 index 0000000000..e4337d48a1 --- /dev/null +++ b/anda/lib/nvidia/libcusolver/anda.hcl @@ -0,0 +1,9 @@ +project pkg { + rpm { + spec = "libcusolver.spec" + } + labels { + subrepo = "nvidia" + updbranch = 1 + } +} diff --git a/anda/lib/nvidia/libcusolver/cusolver.pc b/anda/lib/nvidia/libcusolver/cusolver.pc new file mode 100644 index 0000000000..38f65dac8d --- /dev/null +++ b/anda/lib/nvidia/libcusolver/cusolver.pc @@ -0,0 +1,8 @@ +libdir=LIBDIR +includedir=INCLUDE_DIR + +Name: cusolver +Description: A LAPACK-like library on dense and sparse linear algebra +Version: CUDA_VERSION +Libs: -L${libdir} -lcusolver +Cflags: -I${includedir} diff --git a/anda/lib/nvidia/libcusolver/libcusolver.spec b/anda/lib/nvidia/libcusolver/libcusolver.spec new file mode 100644 index 0000000000..881fc9c622 --- /dev/null +++ b/anda/lib/nvidia/libcusolver/libcusolver.spec @@ -0,0 +1,91 @@ +%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: libcusolver +Epoch: 2 +Version: 11.7.5.82 +Release: 1%?dist +Summary: NVIDIA cuSOLVER library +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: cusolver.pc + +Requires: libgomp%{_isa} +Conflicts: %{name}-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release} + +%description +The NVIDIA cuSOLVER library provides a collection of dense and sparse direct +solvers which deliver significant acceleration for Computer Vision, CFD, +Computational Chemistry, and Linear Optimization applications. + +%package devel +Summary: Development files for NVIDIA cuSOLVER library +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 NVIDIA cuSOLVER library. + +%package static +Summary: Static libraries for NVIDIA cuSOLVER +Requires: %{name}-devel%{_isa} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description static +This package contains static libraries for NVIDIA cuSOLVER. + +%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}/libcusolver.so.* +%{_libdir}/libcusolverMg.so.* + +%files devel +%{_includedir}/cusolver_common.h +%{_includedir}/cusolverDn.h +%{_includedir}/cusolverMg.h +%{_includedir}/cusolverRf.h +%{_includedir}/cusolverSp.h +%{_includedir}/cusolverSp_LOWLEVEL_PREVIEW.h +%{_libdir}/libcusolver.so +%{_libdir}/libcusolverMg.so +%{_libdir}/libcusolver_lapack_static.a +%{_libdir}/libcusolver_metis_static.a +%{_libdir}/libmetis_static.a +%{_libdir}/pkgconfig/cusolver.pc + +%files static +%{_libdir}/libcusolver_static.a + +%changelog +%autochangelog diff --git a/anda/lib/nvidia/libcusolver/update.rhai b/anda/lib/nvidia/libcusolver/update.rhai new file mode 100644 index 0000000000..871f8fba41 --- /dev/null +++ b/anda/lib/nvidia/libcusolver/update.rhai @@ -0,0 +1,3 @@ +import "andax/nvidia.rhai" as nvidia; + +rpm.version(nvidia::nvidia_component_version("libcusolver")); diff --git a/anda/lib/nvidia/libcusparse/libcusparse.spec b/anda/lib/nvidia/libcusparse/libcusparse.spec index dd84ac2325..deb4f6cfdf 100644 --- a/anda/lib/nvidia/libcusparse/libcusparse.spec +++ b/anda/lib/nvidia/libcusparse/libcusparse.spec @@ -6,7 +6,7 @@ Name: libcusparse Epoch: 1 -Version: 12.5.9.5 +Version: 12.5.10.65 Release: 1%?dist Summary: NVIDIA CUDA Sparse Matrix library (cuSPARSE) library License: CUDA Toolkit diff --git a/anda/lib/nvidia/libnpp/libnpp.spec b/anda/lib/nvidia/libnpp/libnpp.spec index 14df786c51..bd201d88e3 100644 --- a/anda/lib/nvidia/libnpp/libnpp.spec +++ b/anda/lib/nvidia/libnpp/libnpp.spec @@ -6,7 +6,7 @@ Name: libnpp Epoch: 1 -Version: 12.4.0.27 +Version: 12.4.1.87 Release: 1%?dist Summary: NVIDIA Performance Primitives libraries License: CUDA Toolkit diff --git a/anda/lib/nvidia/libnvfatbin/libnvfatbin.spec b/anda/lib/nvidia/libnvfatbin/libnvfatbin.spec index b07e62ca67..b7eea52848 100644 --- a/anda/lib/nvidia/libnvfatbin/libnvfatbin.spec +++ b/anda/lib/nvidia/libnvfatbin/libnvfatbin.spec @@ -6,7 +6,7 @@ Name: libnvfatbin Epoch: 1 -Version: 12.9.19 +Version: 12.9.82 Release: 1%?dist Summary: CUDA Fatbin Creator API License: CUDA Toolkit diff --git a/anda/lib/nvidia/libnvjitlink/libnvjitlink.spec b/anda/lib/nvidia/libnvjitlink/libnvjitlink.spec index 4d8cbcf500..cc5f406699 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.9.41 +Version: 12.9.86 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 38ddaf48ae..7626c3ac39 100644 --- a/anda/lib/nvidia/libnvjpeg/libnvjpeg.spec +++ b/anda/lib/nvidia/libnvjpeg/libnvjpeg.spec @@ -6,7 +6,7 @@ Name: libnvjpeg Epoch: 1 -Version: 12.4.0.16 +Version: 12.4.0.76 Release: 1%?dist Summary: CUDA NVIDIA JPEG decoder (nvJPEG) License: CUDA Toolkit diff --git a/anda/lib/scenefx/scenefx.spec b/anda/lib/scenefx/scenefx.spec index a1a8e75f50..dc8f9adb7a 100644 --- a/anda/lib/scenefx/scenefx.spec +++ b/anda/lib/scenefx/scenefx.spec @@ -1,5 +1,5 @@ Name: scenefx -Version: 0.2.1 +Version: 0.3 Release: 1%?dist Summary: A drop-in replacement for the wlroots scene API that allows wayland compositors to render surfaces with eye-candy effects diff --git a/anda/lib/sdbus-cpp/anda.hcl b/anda/lib/sdbus-cpp/anda.hcl new file mode 100644 index 0000000000..8ce731b654 --- /dev/null +++ b/anda/lib/sdbus-cpp/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "sdbus-cpp.terra.spec" + } + labels { + subrpeo = "extras" + } +} diff --git a/anda/lib/sdbus-cpp/sdbus-cpp.terra.spec b/anda/lib/sdbus-cpp/sdbus-cpp.terra.spec new file mode 100644 index 0000000000..833c05e25e --- /dev/null +++ b/anda/lib/sdbus-cpp/sdbus-cpp.terra.spec @@ -0,0 +1,231 @@ +#? https://src.fedoraproject.org/rpms/sdbus-cpp/blob/rawhide/f/sdbus-cpp.spec + +%global libso_major 2 +%global realname sdbus-cpp + +Name: %realname.terra +Version: 2.1.0 +Release: 3%{?dist} +Summary: High-level C++ D-Bus library + +License: LGPL-2.1-only +URL: https://github.com/Kistler-Group/sdbus-cpp +Source0: %{url}/archive/v%{version}/%{realname}-%{version}.tar.gz + +BuildRequires: cmake >= 3.14 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig(libsystemd) >= 238 +BuildRequires: pkgconfig(gmock) >= 1.10.0 + +# temporary bundle sdbus-cpp-1 to allow dnf5 rebuild +BuildRequires: sdbus-cpp + +Provides: %realname = %evr +Conflicts: %realname + +%description +High-level C++ D-Bus library for Linux designed to provide easy-to-use +yet powerful API in modern C++ + + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Provides: %realname-devel = %evr +Conflicts: %realname-devel + +%description devel +Development files for %{name}. + + +%package devel-doc +Summary: Developer documentation for %{name} +BuildArch: noarch +BuildRequires: doxygen +Provides: %realname-devel-doc = %evr +Conflicts: %realname-devel-doc + +%description devel-doc +Developer documentation for %{name} + + +%package tools +Summary: Stub code generator for sdbus-c++ +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: pkgconfig(expat) +Provides: %realname-tools = %evr +Conflicts: %realname-tools + +%description tools +The stub code generator for generating the adapter and proxy interfaces +out of the D-Bus IDL XML description. + + +%package tests +Summary: Tests for %{name} +Requires: %{name} +Provides: %realname-tests = %evr +Conflicts: %realname-tests + +%description tests +%{summary} + + +%prep +%autosetup -p1 -n %realname-%version + + +%build +%cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DSDBUSCPP_BUILD_CODEGEN=ON \ + -DSDBUSCPP_BUILD_DOCS=ON \ + -DSDBUSCPP_BUILD_DOXYGEN_DOCS=ON \ + -DSDBUSCPP_BUILD_TESTS=ON \ + -DSDBUSCPP_TESTS_INSTALL_PATH=%{_libexecdir}/installed-tests/ +%cmake_build +%cmake_build --target doc + + +%check +%ctest -E "sdbus-c\+\+-integration-tests" + + +%install +%cmake_install +mkdir -p %{buildroot}%{_datadir}/dbus-1/system.d/ +mv %{buildroot}%{_sysconfdir}/dbus-1/system.d/org.sdbuscpp.integrationtests.conf %{buildroot}%{_datadir}/dbus-1/system.d/ +rm -rf %{buildroot}%{_sysconfdir} + +# temporary bundle sdbus-cpp-1 to allow dnf5 rebuild +cp %{_libdir}/libsdbus-c++.so.1.* %{buildroot}%{_libdir} + + +%files +%license %{_docdir}/sdbus-c++/COPYING +%dir %{_docdir}/sdbus-c++ +%doc %{_docdir}/sdbus-c++/AUTHORS +%doc %{_docdir}/sdbus-c++/ChangeLog +%doc %{_docdir}/sdbus-c++/NEWS +%doc %{_docdir}/sdbus-c++/README.md +%{_libdir}/libsdbus-c++.so.%{libso_major}{,.*} + +# temporary bundle sdbus-cpp-1 to allow dnf5 rebuild +%{_libdir}/libsdbus-c++.so.1{,.*} + + +%files devel +%{_libdir}/pkgconfig/sdbus-c++.pc +%{_libdir}/pkgconfig/sdbus-c++-tools.pc +%{_libdir}/libsdbus-c++.so +%{_includedir}/sdbus-c++/ +%dir %{_libdir}/cmake/sdbus-c++ +%{_libdir}/cmake/sdbus-c++/*.cmake + + +%files devel-doc +%dir %{_docdir}/sdbus-c++ +%doc %{_docdir}/sdbus-c++/* + + +%files tools +%{_bindir}/sdbus-c++-xml2cpp +%dir %{_libdir}/cmake/sdbus-c++-tools +%{_libdir}/cmake/sdbus-c++-tools/*.cmake + + +%files tests +%{_datadir}/dbus-1/system.d/org.sdbuscpp.integrationtests.conf +%{_libexecdir}/installed-tests/sdbus* + + +%changelog +* Sat Jun 14 2025 madonuko - 2.1.0-3 +- Repackaged into Terra + +* Fri Apr 11 2025 Marek Blaha - 2.1.0-2 +- Temoporarily bundle libsdbus-c++.so.1 + +* Fri Apr 04 2025 Jonathan Wright - 2.1.0-1 +- update to 2.1.0 rhbz#2277126 +- include actual readme rhbz#2268443 + +* Sun Jan 19 2025 Fedora Release Engineering - 1.5.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 1.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Mar 12 2024 Marek Blaha - 1.5.0-2 +- Invoke unit tests after the build + +* Mon Feb 26 2024 Marek Blaha - 1.5.0-1 +- Update to release 1.5.0 + +* Sat Jan 27 2024 Fedora Release Engineering - 1.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Oct 11 2023 Marek Blaha - 1.4.0-1 +- Update to release 1.4.0 + +* Tue Sep 12 2023 Neal Gompa - 1.3.0-2 +- Move sdbus-c++ CMake module to devel package + +* Mon Aug 21 2023 Marek Blaha - 1.3.0-1 +- Update to release 1.3.0 + +* Sat Jul 22 2023 Fedora Release Engineering - 1.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Mar 30 2023 Marek Blaha - 1.2.0-3 +- migrated to SPDX license + +* Sat Jan 21 2023 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Aug 10 2022 Marek Blaha - 1.2.0-1 +- Update to release 1.2.0 + +* Sat Jul 23 2022 Fedora Release Engineering - 1.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 1.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Jan 04 2022 Marek Blaha - 1.1.0-1 +- Update to release 1.1.0 + +* Tue Oct 26 2021 Marek Blaha - 1.0.0-1 +- Update to release 1.0.0 +- Change source tarball name to -.tar.gz + +* Tue Oct 19 2021 Marek Blaha - 0.9.0-1 +- Update to release 0.9.0 + +* Fri Jul 23 2021 Fedora Release Engineering - 0.8.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 0.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Dec 17 2020 Marek Blaha - 0.8.3-1 +- Update to release 0.8.3 + +* Tue Oct 06 2020 Marek Blaha - 0.8.1-5 +- Switch from make_build to cmake_build + +* Tue Sep 22 2020 Jeff Law - 0.8.1-4 +- Use cmake_in_source_build to fix FTBFS due to recent cmake macro changes + +* Sat Aug 01 2020 Fedora Release Engineering - 0.8.1-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Feb 7 2020 Marek Blaha - 0.8.1-1 +- Update to release 0.8.1 + +* Fri Jan 24 2020 Marek Blaha - 0.7.8-1 +- Initial release 0.7.8 diff --git a/anda/lib/sdbus-cpp/update.rhai b/anda/lib/sdbus-cpp/update.rhai new file mode 100644 index 0000000000..484acc3ace --- /dev/null +++ b/anda/lib/sdbus-cpp/update.rhai @@ -0,0 +1 @@ +rpm.version(`(?m)^project\(sdbus-c\+\+ VERSION ([\d.]+) LANGUAGES CXX C\)$`.find(gh_rawfile("Kistler-Group/sdbus-cpp", "master", "CMakeLists.txt"), 1)); diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 8a0e77b0e1..95e0c42120 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,6 +1,6 @@ -%global commit e894536b2f46caad93f997448d2daff9431b19dd -%global ver 1.8.49 -%global commit_date 20250527 +%global commit 1b011986f5e08d863cc5bc31093a23a8ae3a7949 +%global ver 1.8.50 +%global commit_date 20250616 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: tdlib-nightly diff --git a/anda/misc/icoextract-thumbnailer/icoextract-thumbnailer.spec b/anda/misc/icoextract-thumbnailer/icoextract-thumbnailer.spec index 55a826f6bd..4b0a68fb24 100644 --- a/anda/misc/icoextract-thumbnailer/icoextract-thumbnailer.spec +++ b/anda/misc/icoextract-thumbnailer/icoextract-thumbnailer.spec @@ -1,5 +1,5 @@ Name: icoextract-thumbnailer -Version: 0.1.6 +Version: 0.2.0 Release: 1%?dist Summary: XDG-compatible thumbnailer for Windows PE executables diff --git a/anda/misc/openbangla-keyboard/openbangla-keyboard-nightly.spec b/anda/misc/openbangla-keyboard/openbangla-keyboard-nightly.spec index 168daa34f5..8fbb44641f 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 be784f67f78776745787bd7196792eafdccf2e48 -%global commit_date 20250420 +%global commit 0cc91abe97f98da356bd886c3cd6657e2c187478 +%global commit_date 20250602 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: openbangla-keyboard-nightly diff --git a/anda/misc/sass/sass.spec b/anda/misc/sass/sass.spec index f982c6e762..e23800ab8a 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.89.1 +Version: 1.89.2 Release: 1%?dist Summary: The reference implementation of Sass, written in Dart License: MIT diff --git a/anda/misc/zapret/zapret.spec b/anda/misc/zapret/zapret.spec index cfdc004c0a..663eecd2c8 100644 --- a/anda/misc/zapret/zapret.spec +++ b/anda/misc/zapret/zapret.spec @@ -1,6 +1,6 @@ Name: zapret -Version: 71 -Release: 1%{?dist} +Version: 71.1.1 +Release: 1%?dist Summary: A multi-platform Deep Packet Inspection (DPI) bypass tool License: MIT ExcludeArch: s390x diff --git a/anda/multimedia/faad2/anda.hcl b/anda/multimedia/faad2/anda.hcl deleted file mode 100644 index 7af0420ab8..0000000000 --- a/anda/multimedia/faad2/anda.hcl +++ /dev/null @@ -1,9 +0,0 @@ -project pkg { - arches = ["x86_64", "aarch64", "i386"] - rpm { - spec = "faad2.spec" - } - labels { - mock = 1 - } -} diff --git a/anda/multimedia/faad2/faad2.spec b/anda/multimedia/faad2/faad2.spec deleted file mode 100644 index e9d259b320..0000000000 --- a/anda/multimedia/faad2/faad2.spec +++ /dev/null @@ -1,322 +0,0 @@ -Summary: Library and frontend for decoding MPEG2/4 AAC -Name: faad2 -Epoch: 1 -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 - - -BuildRequires: gcc-c++ -BuildRequires: cmake -BuildRequires: libsysfs-devel - -Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} -Obsoletes: %{name}-xmms < %{version}-%{release} - -%description -FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely -written from scratch. - -%package libs -Summary: Shared libraries of the FAAD 2 AAC decoder - -%description libs -FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely -written from scratch. - -This package contains libfaad. - -%package devel -Summary: Development libraries of the FAAD 2 AAC decoder -Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} - -%description devel -FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely -written from scratch. - -This package contains development files and documentation for libfaad. - -%prep -%autosetup -p1 - -%build -%cmake - -%cmake_build - -%install -%cmake_install -install -m 0755 -d %{buildroot}%{_mandir}/man3 -install -D -m 644 docs/libfaad.3 -t %{buildroot}%{_mandir}/man3/ - -%ldconfig_scriptlets libs - - -%files -%doc AUTHORS ChangeLog README* -%license COPYING -%{_bindir}/faad -%{_mandir}/man1/faad.1* - -%files libs -%{_libdir}/libfaad*.so.* -%{_mandir}/man3/libfaad.3* - -%files devel -%{_includedir}/faad.h -%{_includedir}/neaacdec.h -%{_libdir}/pkgconfig/faad2.pc -%{_libdir}/libfaad*.so - -%changelog -* Thu Aug 01 2024 RPM Fusion Release Engineering - 1:2.11.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Feb 03 2024 RPM Fusion Release Engineering - 1:2.11.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Nov 16 2023 Leigh Scott - 1:2.11.1-1 -- Update to 2.11.1 - -* Tue Nov 07 2023 Leigh Scott - 1:2.11.0-1 -- Update to 2.11.0 - -* Wed Aug 02 2023 RPM Fusion Release Engineering - 1:2.10.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Oct 21 2022 Leigh Scott - 1:2.10.1-1 -- Update to 2.10.1 - -* Sun Aug 07 2022 RPM Fusion Release Engineering - 1:2.10.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg - 5.1 - -* Wed Feb 09 2022 RPM Fusion Release Engineering - 1:2.10.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Aug 02 2021 RPM Fusion Release Engineering - 1:2.10.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri May 21 2021 Sérgio Basto - 1:2.10.0-1 -- Update to 2.10.0 - -* Wed Feb 03 2021 RPM Fusion Release Engineering - 1:2.9.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Aug 18 2020 Leigh Scott - 1:2.9.2-3 -- Rebuilt for i686 - -* Mon Aug 17 2020 RPM Fusion Release Engineering - 1:2.9.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 05 2020 Leigh Scott - 1:2.9.2-1 -- Update to 2.9.2 - -* Thu Mar 12 2020 Leigh Scott - 1:2.9.1-3 -- Rebuilt for i686 - -* Tue Feb 04 2020 RPM Fusion Release Engineering - 1:2.9.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jan 01 2020 Leigh Scott - 1:2.9.1-1 -- Update to 2.9.1 - -* Fri Aug 09 2019 RPM Fusion Release Engineering - 1:2.8.8-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Jun 07 2019 Nicolas Chauvet - 1:2.8.8-6 -- Fix overflows -- Conditionalize xmms - -* Mon Mar 04 2019 RPM Fusion Release Engineering - 1:2.8.8-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Feb 26 2019 Nicolas Chauvet - 1:2.8.8-4 -- Group Clean-up - -* Tue Jan 29 2019 Nicolas Chauvet - 1:2.8.8-3 -- Drop autoreconf - -* Thu Jul 26 2018 RPM Fusion Release Engineering - 1:2.8.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sat Apr 14 2018 Leigh Scott - 1:2.8.8-1 -- Update to 2.8.8 - -* Wed Feb 28 2018 RPM Fusion Release Engineering - 1:2.8.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 31 2017 RPM Fusion Release Engineering - 1:2.8.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Jul 28 2017 Leigh Scott - 1:2.8.1-1 -- update to 2.8.1 - -* Sun Mar 19 2017 RPM Fusion Release Engineering - 1:2.7-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Aug 23 2016 Nicolas Chauvet - 1:2.7-8 -- Bump for dist - -* Thu Aug 18 2016 Sérgio Basto - 1:2.7-7 -- Clean spec, Vascom patches series, rfbz #4200, add license tag - -* Mon Sep 01 2014 Sérgio Basto - 1:2.7-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Mon Dec 30 2013 Nicolas Chauvet - 1:2.7-5 -- Rebuilt for F-20 - -* Wed Mar 27 2013 Nicolas Chauvet - 1:2.7-4 -- Change the escaping space hack - rhbz#928110 - -* Sun Mar 03 2013 Nicolas Chauvet - 1:2.7-3 -- Mass rebuilt for Fedora 19 Features - -* Wed Jan 25 2012 Nicolas Chauvet - 1:2.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri Mar 13 2009 Dominik Mierzejewski 1:2.7-1 -- update to 2.7 -- don't install internal libmp4ff -- include manpage -- fix build on x86_64 (non-PIC objects in libmp4ff.a) -- fix rpaths -- make xmms plugin depend on -libs, not the frontend -- preserve docs timestamps - -* Mon Nov 10 2008 Dominik Mierzejewski 1:2.6.1-6 -- fix CVE-2008-4201 - -* Sat Oct 18 2008 Dominik Mierzejewski 1:2.6.1-5 -- add Obsoletes: for xmms-aac to ensure smooth upgrade from Freshrpms -- add some additional docs for xmms-faad2 - -* Sun Aug 03 2008 Thorsten Leemhuis 1:2.6.1-3 -- split off libs to avoid multilib conflicts - -* Sun Nov 11 2007 Dominik Mierzejewski 1:2.6.1-2 -- bring back the XMMS plugin -- move EOL fixup to prep -- fix URLs - -* Thu Nov 01 2007 Dominik Mierzejewski 1:2.6.1-1 -- remerge freshrpms specfile -- update to latest upstream, fixes licensing issues! - -* Thu Oct 18 2007 Dominik Mierzejewski 1:2.0-21 -- fix missing epochs in dependencies - -* Tue Oct 16 2007 Dominik Mierzejewski 1:2.0-20 -- revert from 2.5 - -* Wed Sep 26 2007 Dominik Mierzejewski 2.5-4 -- disable drm, fixes playback of many AAC streams (bug #1465) - -* Sun Sep 23 2007 Dominik Mierzejewski 2.5-3 -- remove redundant BRs -- don't disable backward compatibility (breaks ffmpeg) -- silence tar in setup -- use disttag -- fix source file permissions and other rpmlint warnings - -* Sat Sep 15 2007 Thorsten Leemhuis 2.5-2 -- import faad2 from freshrpms as discussed on on repomerge-list - -* Fri Oct 06 2006 Thorsten Leemhuis 2.0-19 -- rebuilt for unwind info generation, broken in gcc-4.1.1-21 - -* Tue Sep 26 2006 Ville Skyttä - 2.0-18.20050131 -- Rebuild. - -* Sat Jun 17 2006 Ville Skyttä - 2.0-17.20050131 -- Let soname based autogenerated deps take care of xmms-libs (#1018). -- Revert x86_64 patch to the correct one again (#1017). - -* Thu Jun 15 2006 Noa Resare - 2.0-16.20050131 -- reverted to obviously broken x86_64 patch to preserve binary compatibility - and prevent slow motion bug (#1017) -- fixed xmms-libs regression (#1018) - -* Wed May 24 2006 Noa Resare - 2.0-15.20050131 -- added patch to fix apple trailer playback problem - -* Tue May 23 2006 Noa Resare - 2.0-14.20050131 -- reverted to older cvs to avoid a GPL violating extra redistribution - requirement in README -- changed the bogus uint8_t to correct uin32_t in the x86_64 patch - -* Sun May 21 2006 Ville Skyttä - 2.0-13.20060505 -- Avoid aclocal >= 1.8 warnings. - -* Sun May 21 2006 Noa Resare - 2.0-12.20060505 -- re-introduce the x86_64 patch to restore binary compatibility - -* Sat May 20 2006 Noa Resare - 2.0-10.20060505 -- patch the sources to be binary compatible with old faad2 -- remove library major version bump -- add symbol versioning script for new symbols - -* Fri May 05 2006 Noa Resare - 2.0-9.20060505 -- upgrade to cvs version -- mp4v2 is no longer included (now a separate package) -- bump libary major version -- drop static library -- remove mp4ff headers from -devel - -* Mon Mar 13 2006 Thorsten Leemhuis - 2.0-8 -- Drop Epoch completely - -* Thu Mar 09 2006 Andreas Bierfert -- switch to new release field - -* Tue Feb 28 2006 Andreas Bierfert -- add dist - -* Tue Jan 17 2006 Adrian Reber - 2.0-0.lvn.7 -- Removed change of ownership to root:root during %%install -- Droped Epoch - -* Sat Oct 01 2005 Thorsten Leemhuis - 0:2.0-0.lvn.5 -- Included some hand install lines because make install did not place some required header files - -* Wed Apr 27 2005 Dams - 0:2.0-0.lvn.4 -- Fixed gcc4 build - -* Fri Nov 12 2004 Dams 0:2.0-0.lvn.3 -- Fixing gcc34 build - -* Wed Oct 13 2004 Ville Skyttä - 0:2.0-0.lvn.2 -- libsndfile is no longer required since 2.0rc1. - -* Wed Mar 10 2004 Dams 0:2.0-0.lvn.1 -- Updated to 2.0 final release -- Added missing defattr -- Added xmms-aac provides to xmms-{name} -- Fixed makefile (patch) - -* Sun Sep 28 2003 Dams 0:2.0-0.fdr.0.1.rc1 -- Updated to 2.0 rc1 -- Added xmms-faad2 subpackage - -* Sun Sep 28 2003 Dams 0:1.1-0.fdr.4 -- Added missing scriplets -- buildroot -> RPM_BUILD_ROOT - -* Tue Apr 15 2003 Dams 0:1.1-0.fdr.3 -- turned bootstrap into ./bootstrap to prevent build to fail with - people who dont have "." in their PATH. - -* Sat Apr 12 2003 Dams 0:1.1-0.fdr.2 -- Typo in devel Requires. - -* Sat Apr 12 2003 Dams -- Initial build. diff --git a/anda/multimedia/faad2/update.rhai b/anda/multimedia/faad2/update.rhai deleted file mode 100644 index 86ceb8dbfd..0000000000 --- a/anda/multimedia/faad2/update.rhai +++ /dev/null @@ -1 +0,0 @@ -rpm.version(gh("knik0/faad2")); diff --git a/anda/multimedia/ffmpeg/ffmpeg.spec b/anda/multimedia/ffmpeg/ffmpeg.spec index 7f84b7dd7f..7eb16d57f1 100644 --- a/anda/multimedia/ffmpeg/ffmpeg.spec +++ b/anda/multimedia/ffmpeg/ffmpeg.spec @@ -12,7 +12,7 @@ Summary: A complete solution to record, convert and stream audio and video Name: ffmpeg Version: 7.1.1 -Release: 3%{?dist} +Release: 3%?dist License: LGPL-3.0-or-later URL: http://%{name}.org/ Epoch: 1 diff --git a/anda/multimedia/ffmpeg/update.rhai b/anda/multimedia/ffmpeg/update.rhai index 873d39f0ca..27a45a0d4c 100644 --- a/anda/multimedia/ffmpeg/update.rhai +++ b/anda/multimedia/ffmpeg/update.rhai @@ -7,4 +7,8 @@ open_file("anda/multimedia/ffmpeg/VERSION_x265.txt", "w").write(bump::madoguchi( open_file("anda/multimedia/ffmpeg/VERSION_tesseract.txt", "w").write(bump::bodhi("tesseract", bump::as_bodhi_ver(labels.branch))); open_file("anda/multimedia/ffmpeg/VERSION_vvenc.txt", "w").write(bump::madoguchi("vvenc-libs", labels.branch)); -import "andax/ci/bump_release.rhai"; +let dir = sub(`/[^/]+`, "", __script_path); +if sh("[[ `git status " + dir + "--porcelain` ]] && exit 1", #{}).ctx.rc == 1 { + let rel = spec::get_release(rpm).parse_int(); + rpm.release(rel + 1); +} 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 4f8681b4c5..4660b79fae 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.2 -Release: 1%?dist +Release: 2%?dist Epoch: 2 Summary: GStreamer streaming media framework "bad" plugins License: LGPL-2.0-or-later and LGPL-2.0-only diff --git a/anda/multimedia/x264/x264.spec b/anda/multimedia/x264/x264.spec index 544683a41d..db33845824 100644 --- a/anda/multimedia/x264/x264.spec +++ b/anda/multimedia/x264/x264.spec @@ -36,7 +36,7 @@ Summary: H264/AVC video streams encoder Name: x264 Version: 0.%{api} -Release: 15%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist} +Release: 16%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist} License: GPLv2+ URL: https://www.videolan.org/developers/x264.html Source0: https://code.videolan.org/videolan/x264/-/archive/%gitversion.tar.bz2 @@ -93,6 +93,8 @@ scratch. This package contains the development files. +%pkg_completion -B x264 + %global x_configure \ ./configure \\\ --host=%{_host} \\\ @@ -177,9 +179,6 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/ %files %{_bindir}/x264 -%dir %{_datadir}/bash-completion -%dir %{_datadir}/bash-completion/completions -%{_datadir}/bash-completion/completions/x264 %files libs %dir %{_pkgdocdir} diff --git a/anda/multimedia/zrythm/zrythm.spec b/anda/multimedia/zrythm/zrythm.spec index 0693700124..40d41b235f 100644 --- a/anda/multimedia/zrythm/zrythm.spec +++ b/anda/multimedia/zrythm/zrythm.spec @@ -2,7 +2,7 @@ Name: zrythm Version: %(echo %v | sed 's@-@~@g' | sed 's@^v@@') -Release: 1%?dist +Release: 2%?dist Summary: Highly automated and intuitive digital audio workstation License: AGPL-3.0-or-later Packager: madonuko @@ -97,6 +97,8 @@ tools, limitless automation capabilities, powerful mixing features, chord assistance and support for various plugin and file formats. +%pkg_completion -Bf + %prep %autosetup -n %name-%v @@ -136,5 +138,3 @@ CXXFLAGS=$(echo "$CFLAGS -fuse-ld=mold" | sed -E "s@\b-Werror\b@@") %_datadir/mime/packages/org.zrythm.Zrythm-mime.xml %_datadir/metainfo/org.zrythm.Zrythm.appdata.xml %_mandir/man1/zrythm.1.* -%bash_completions_dir/zrythm -%fish_completions_dir/zrythm.fish diff --git a/anda/system/depthcharge-tools/depthcharge-tools.spec b/anda/system/depthcharge-tools/depthcharge-tools.spec index 02f2cf57b0..13d9fd7be5 100644 --- a/anda/system/depthcharge-tools/depthcharge-tools.spec +++ b/anda/system/depthcharge-tools/depthcharge-tools.spec @@ -1,6 +1,6 @@ Name: depthcharge-tools Version: 0.6.2 -Release: 1%?dist +Release: 2%?dist Summary: Tools to manage the Chrome OS bootloader License: GPL-2.0-or-later URL: https://github.com/alpernebbi/depthcharge-tools @@ -13,6 +13,8 @@ BuildArch: noarch depthcharge-tools is a collection of tools that ease and automate interacting with depthcharge, the Chrome OS bootloader. +%pkg_completion -Bz mkdepthcharge depthchargectl + %prep %autosetup @@ -26,7 +28,8 @@ install -Dm644 systemd/*.install %buildroot/usr/lib/kernel/install.d/ install -Dm644 systemd/*.service %buildroot%_unitdir/ install -Dm644 completions/_mkdepthcharge.bash %buildroot%bash_completions_dir/mkdepthcharge install -Dm644 completions/_depthchargectl.bash %buildroot%bash_completions_dir/depthchargectl -install -Dm644 completions/_{mkdepthcharge,depthchargectl}.zsh %buildroot%zsh_completions_dir/ +install -Dm644 completions/_mkdepthcharge.zsh %buildroot%zsh_completions_dir/_mkdepthcharge +install -Dm644 completions/_depthchargectl.zsh %buildroot%zsh_completions_dir/_depthchargectl rst2man mkdepthcharge.rst | gzip > mkdepthcharge.1.gz rst2man depthchargectl.rst | gzip > depthchargectl.1.gz install -Dm644 *.1.gz %buildroot%_mandir/man1/ @@ -36,10 +39,8 @@ install -Dm644 *.1.gz %buildroot%_mandir/man1/ %license LICENSE %_bindir/{mkdepthcharge,depthchargectl} %_mandir/man1/{mkdepthcharge,depthchargectl}.1.gz -%bash_completions_dir/{mkdepthcharge,depthchargectl} /usr/lib/kernel/install.d/90-depthcharge-tools.install %_unitdir/depthchargectl-bless.service -%zsh_completions_dir/_{mkdepthcharge,depthchargectl}.zsh %_prefix/lib/python%python3_version/site-packages/depthcharge_tools-%version-py%python3_version.egg-info/ %_prefix/lib/python%python3_version/site-packages/depthcharge_tools/ diff --git a/anda/system/dracut-strip-trigger/LICENSE b/anda/system/dracut-strip-trigger/LICENSE new file mode 120000 index 0000000000..5853aaea53 --- /dev/null +++ b/anda/system/dracut-strip-trigger/LICENSE @@ -0,0 +1 @@ +../../../LICENSE \ No newline at end of file diff --git a/anda/system/dracut-strip-trigger/anda.hcl b/anda/system/dracut-strip-trigger/anda.hcl new file mode 100644 index 0000000000..d6b890bd3f --- /dev/null +++ b/anda/system/dracut-strip-trigger/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "dracut-strip-trigger.spec" + } +} diff --git a/anda/system/dracut-strip-trigger/dracut-strip-trigger.spec b/anda/system/dracut-strip-trigger/dracut-strip-trigger.spec new file mode 100644 index 0000000000..3d6efb4912 --- /dev/null +++ b/anda/system/dracut-strip-trigger/dracut-strip-trigger.spec @@ -0,0 +1,37 @@ +Name: dracut-strip-trigger +Version: 0 +Release: 1%?dist +Summary: Strip initramfs aggressively +License: GPL-3.0-only +Requires(post): dracut +Source0: LICENSE + +%global _desc %{expand: +Strip initramfs automatically for each kernel update using --hostonly --aggressive-strip. +Do not install this package if you plan to use the system on different devices (e.g. +raw images like Raspberry Pi images).} + +%description %_desc + +%prep +cat< README +%name %_desc +EOF +cp %{S:0} . + +%files +%doc README +%license LICENSE + +%post +echo 'Regenerating all initramfs…' +dracut --force --parallel --regenerate-all --hostonly --strip --aggressive-strip +echo 'All non-rescue initramfs have been regenerated.' +echo 'If you have problems booting up, use the rescue image, then uninstall `%name`.' + +%triggerin -- kernel +dracut --force --hostonly --strip --aggressive-strip + +%postun +echo 'Regenerating all initramfs…' +[ $1 = 0 ] && dracut --force --parallel --regenerate-all --no-hostonly --strip diff --git a/anda/system/intel-lpmd/anda.hcl b/anda/system/intel-lpmd/anda.hcl new file mode 100644 index 0000000000..f838f1d9ff --- /dev/null +++ b/anda/system/intel-lpmd/anda.hcl @@ -0,0 +1,6 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "intel-lpmd.spec" + } +} diff --git a/anda/system/intel-lpmd/intel-lpmd.spec b/anda/system/intel-lpmd/intel-lpmd.spec new file mode 100644 index 0000000000..5230bc8c80 --- /dev/null +++ b/anda/system/intel-lpmd/intel-lpmd.spec @@ -0,0 +1,47 @@ +%global _distro_extra_cflags -Wno-unused-variable -Wno-unused-function -Wno-switch -I/usr/lib/gcc/**/include/ + +Name: intel-lpmd +Version: 0.0.9 +Release: 1%?dist +Summary: Linux daemon designed to optimize active idle power +License: GPL-2.0-only +URL: https://github.com/intel/intel-lpmd +Packager: madonuko +Source0: %url/archive/refs/tags/v%version.tar.gz +ExclusiveArch: x86_64 +BuildRequires: automake autoconf-archive glib2-devel dbus-glib-devel libxml2-devel libnl3-devel systemd-devel gtk-doc upower-devel +BuildRequires: gcc + +%description +Intel Low Power Mode Daemon (lpmd) is a Linux daemon designed to optimize active idle power. It selects the most power-efficient CPUs based on a configuration file or CPU topology. Depending on system utilization and other hints, it puts the system into Low Power Mode by activating the power-efficient CPUs and disabling the rest, and restores the system from Low Power Mode by activating all CPUs. + +%prep +%autosetup +sed -i 's@mandb || true@@' Makefile.am + +%conf +./autogen.sh --prefix=%_usr + +%build +%make_build + +%install +%make_install + +mv %buildroot{%_usr%_sysconfdir/intel_lpmd,%_sysconfdir} +%if "%_sbindir" == "%_bindir" +mv %buildroot{%_usr/sbin/*,%_bindir} +%endif + +%files +%doc README.md ChangeLog AUTHORS NEWS security.md +%license COPYING +%_bindir/intel_lpmd_control +%_sbindir/intel_lpmd +%_datadir/dbus-1/system-services/org.freedesktop.intel_lpmd.service +%_mandir/man5/intel_lpmd_config.xml.5.gz +%_mandir/man8/intel_lpmd.8.* +%_mandir/man8/intel_lpmd_control.8.* +%_sysconfdir/intel_lpmd/ +%_sysconfdir/dbus-1/system.d/org.freedesktop.intel_lpmd.conf +%_unitdir/intel_lpmd.service diff --git a/anda/system/intel-lpmd/update.rhai b/anda/system/intel-lpmd/update.rhai new file mode 100644 index 0000000000..c7a632c5f3 --- /dev/null +++ b/anda/system/intel-lpmd/update.rhai @@ -0,0 +1 @@ +rpm.version(`(?m)^### Release ([\d.]+)$`.find(gh_rawfile("intel/intel-lpmd", "main", "README.md"), 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 deleted file mode 100644 index 52b0d88a03..0000000000 --- a/anda/system/ipu6-drivers/akmod/0005-media-ipu6-Fix-out-of-tree-builds.patch +++ /dev/null @@ -1,28 +0,0 @@ -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/0010-usbio-Fix-GPIO-and-I2C-driver-modaliases.patch b/anda/system/ipu6-drivers/akmod/0010-usbio-Fix-GPIO-and-I2C-driver-modaliases.patch deleted file mode 100644 index f4b784f3bd..0000000000 --- a/anda/system/ipu6-drivers/akmod/0010-usbio-Fix-GPIO-and-I2C-driver-modaliases.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 deleted file mode 100644 index e1c7d44bdc..0000000000 --- a/anda/system/ipu6-drivers/akmod/0011-psys-Use-cdev_device_add-for-dev-ipu-psys0.patch +++ /dev/null @@ -1,130 +0,0 @@ -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 deleted file mode 100644 index c922df2529..0000000000 --- a/anda/system/ipu6-drivers/akmod/0011-usbio-Fix-I2C-max-transfer-size.patch +++ /dev/null @@ -1,115 +0,0 @@ -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 deleted file mode 100644 index 07b8329497..0000000000 --- a/anda/system/ipu6-drivers/akmod/0012-usbio-Use-MAX_PAYLOAD_BSIZE-in-usbio_bulk_write.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index 4b0cb49893..0000000000 --- a/anda/system/ipu6-drivers/akmod/0101-Fedora-local-mod-integrate-usbio-drivers-within-ipu6.patch +++ /dev/null @@ -1,38 +0,0 @@ -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/akmod/intel-ipu6-kmod.spec b/anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec index c62473a1b7..965170668b 100644 --- a/anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec +++ b/anda/system/ipu6-drivers/akmod/intel-ipu6-kmod.spec @@ -1,42 +1,28 @@ -%if 0%{?fedora} %global buildforkernels akmod %global debug_package %{nil} -%endif -%global ipu6_commit e89983c628d046b2f77af3b6678cc49c2dd58332 -%global ipu6_commitdate 20250521 -%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 e89983c628d046b2f77af3b6678cc49c2dd58332 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commit_date 20250521 %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: 1%?dist +Version: 0^%{commit_date}git.%{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/321 -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 -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 +Source0: https://github.com/intel/ipu6-drivers/archive/%{commit}/ipu6-drivers-%{shortcommit}.tar.gz BuildRequires: elfutils-libelf-devel BuildRequires: gcc BuildRequires: kmodtool Requires: %{modulename}-kmod-common = %{?epoch:%{epoch}:}%{version} Requires: akmods +Requires: akmod-intel-usbio %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10 -Provides: %{name} = %{ipu6_commitdate}.%{ipu6_shortcommit}-%{release} -Provides: akmod-%{modulename} = %{ipu6_commitdate}.%{ipu6_shortcommit}-%{release} +Provides: %{name} = %{commitdate}.%{shortcommit}-%{release} +Provides: akmod-%{modulename} = %{commitdate}.%{shortcommit}-%{release} %endif %{expand:%(kmodtool --target %{_target_cpu} --repo terra --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } @@ -45,43 +31,36 @@ Provides: akmod-%{modulename} = %{ipu6_commitdate}.%{ipu6_shortcommit}-%{r This package enables the Intel IPU6 image processor. %prep -# error out if there was something wrong with kmodtool +# Error out if there was something wrong with kmodtool: %{?kmodtool_check} +# Print kmodtool output for debugging purposes: +kmodtool --target %{_target_cpu} --repo terra --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null -# print kmodtool output for debugging purposes: -kmodtool --target %{_target_cpu} --repo terra --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null +%autosetup -p1 -n ipu6-drivers-%{commit} +patch -p1 -i patches/*.patch +rm -fr dkms.conf .github -%setup -q -c -a 1 -(cd ipu6-drivers-%{ipu6_commit} -%patch 0 -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%%___*} +for kernel_version in %{?kernel_versions}; do + mkdir _kmod_build_${kernel_version%%___*} + cp -fr drivers include Makefile _kmod_build_${kernel_version%%___*} done %build -for kernel_version in %{?kernel_versions} ; do - make -C ${kernel_version##*___} M=${PWD}/_kmod_build_${kernel_version%%___*} modules +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}/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} + # Print out modules that are getting built: + find _kmod_build_${kernel_version%%___*} -name "*.ko" + mkdir -p %{buildroot}/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ + install -p -m 0755 \ + _kmod_build_${kernel_version%%___*}/drivers/media/i2c/*.ko \ + _kmod_build_${kernel_version%%___*}/drivers/media/pci/intel/ipu6/psys/*.ko \ + %{buildroot}/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ done %{?akmod_install} diff --git a/anda/system/ipu6-drivers/akmod/update.rhai b/anda/system/ipu6-drivers/akmod/update.rhai index b5fda8dfcb..a20505ac68 100644 --- a/anda/system/ipu6-drivers/akmod/update.rhai +++ b/anda/system/ipu6-drivers/akmod/update.rhai @@ -1,11 +1,11 @@ -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; +let c = sh("cat anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; c.pop(); -rpm.global("ipu6_commit", c); +rpm.global("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; + let d = sh("cat anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout; d.pop(); - rpm.global("ipu6_commitdate", d); + rpm.global("commit_date", 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/0005-media-ipu6-Fix-out-of-tree-builds.patch b/anda/system/ipu6-drivers/dkms/0005-media-ipu6-Fix-out-of-tree-builds.patch deleted file mode 100644 index 52b0d88a03..0000000000 --- a/anda/system/ipu6-drivers/dkms/0005-media-ipu6-Fix-out-of-tree-builds.patch +++ /dev/null @@ -1,28 +0,0 @@ -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/0010-usbio-Fix-GPIO-and-I2C-driver-modaliases.patch b/anda/system/ipu6-drivers/dkms/0010-usbio-Fix-GPIO-and-I2C-driver-modaliases.patch deleted file mode 100644 index f4b784f3bd..0000000000 --- a/anda/system/ipu6-drivers/dkms/0010-usbio-Fix-GPIO-and-I2C-driver-modaliases.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 deleted file mode 100644 index e1c7d44bdc..0000000000 --- a/anda/system/ipu6-drivers/dkms/0011-psys-Use-cdev_device_add-for-dev-ipu-psys0.patch +++ /dev/null @@ -1,130 +0,0 @@ -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 deleted file mode 100644 index c922df2529..0000000000 --- a/anda/system/ipu6-drivers/dkms/0011-usbio-Fix-I2C-max-transfer-size.patch +++ /dev/null @@ -1,115 +0,0 @@ -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 deleted file mode 100644 index 07b8329497..0000000000 --- a/anda/system/ipu6-drivers/dkms/0012-usbio-Use-MAX_PAYLOAD_BSIZE-in-usbio_bulk_write.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index 4b0cb49893..0000000000 --- a/anda/system/ipu6-drivers/dkms/0101-Fedora-local-mod-integrate-usbio-drivers-within-ipu6.patch +++ /dev/null @@ -1,38 +0,0 @@ -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/dkms-intel-ipu6.conf b/anda/system/ipu6-drivers/dkms/dkms-intel-ipu6.conf new file mode 100644 index 0000000000..6519d3b436 --- /dev/null +++ b/anda/system/ipu6-drivers/dkms/dkms-intel-ipu6.conf @@ -0,0 +1,40 @@ +PACKAGE_NAME=ipu6-drivers +PACKAGE_VERSION=0.1 +AUTOINSTALL="yes" +BUILD_EXCLUSIVE_CONFIG="CONFIG_VIDEO_V4L2_I2C CONFIG_V4L2_CCI_I2C" + +BUILT_MODULE_NAME[0]="hm11b1" +BUILT_MODULE_LOCATION[0]="drivers/media/i2c" +DEST_MODULE_LOCATION[0]="/extra" + +BUILT_MODULE_NAME[1]="ov01a1s" +BUILT_MODULE_LOCATION[1]="drivers/media/i2c" +DEST_MODULE_LOCATION[1]="/extra" + +BUILT_MODULE_NAME[2]="ov02c10" +BUILT_MODULE_LOCATION[2]="drivers/media/i2c" +DEST_MODULE_LOCATION[2]="/extra" + +BUILT_MODULE_NAME[3]="ov02e10" +BUILT_MODULE_LOCATION[3]="drivers/media/i2c" +DEST_MODULE_LOCATION[3]="/extra" + +BUILT_MODULE_NAME[4]="hm2170" +BUILT_MODULE_LOCATION[4]="drivers/media/i2c" +DEST_MODULE_LOCATION[4]="/extra" + +BUILT_MODULE_NAME[5]="hm2172" +BUILT_MODULE_LOCATION[5]="drivers/media/i2c" +DEST_MODULE_LOCATION[5]="/extra" + +BUILT_MODULE_NAME[6]="ov05c10" +BUILT_MODULE_LOCATION[6]="drivers/media/i2c" +DEST_MODULE_LOCATION[6]="/extra" + +BUILT_MODULE_NAME[7]="intel-ipu6-psys" +BUILT_MODULE_LOCATION[7]="drivers/media/pci/intel/ipu6/psys" +DEST_MODULE_LOCATION[7]="/extra" + +BUILT_MODULE_NAME[8]="imx471" +BUILT_MODULE_LOCATION[8]="drivers/media/i2c" +DEST_MODULE_LOCATION[8]="/extra" diff --git a/anda/system/ipu6-drivers/dkms/dkms-intel-ipu6.spec b/anda/system/ipu6-drivers/dkms/dkms-intel-ipu6.spec index b91390bea7..ca75138662 100644 --- a/anda/system/ipu6-drivers/dkms/dkms-intel-ipu6.spec +++ b/anda/system/ipu6-drivers/dkms/dkms-intel-ipu6.spec @@ -1,38 +1,26 @@ %global debug_package %{nil} -%global ipu6_commit e89983c628d046b2f77af3b6678cc49c2dd58332 -%global ipu6_commitdate 20250521 -%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 commit e89983c628d046b2f77af3b6678cc49c2dd58332 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commit_date 20250521 %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 +Version: 0^%{commit_date}git.%{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 -Source2: no-weak-modules.conf -# Patches -# https://github.com/intel/ipu6-drivers/pull/321 -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 -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 +Source0: %{url}/archive/%{commit}.tar.gz#/ipu6-drivers-%{shortcommit}.tar.gz +Source1: %{name}.conf BuildRequires: elfutils-libelf-devel BuildRequires: gcc BuildRequires: systemd-rpm-macros +Provides: %{modulename}-kmod Requires: %{modulename}-kmod-common = %{?epoch:%{epoch}:}%{version} Requires: dkms +Requires: dkms-usbio-drivers BuildArch: noarch Packager: Gilver E. @@ -40,47 +28,32 @@ Packager: Gilver E. This package enables the Intel IPU6 image processor. %prep -%setup -q -c -a 1 -(cd ipu6-drivers-%{ipu6_commit} -%patch 0 -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 -) +%autosetup -p1 -n ipu6-drivers-%{commit} +# Pre-apply patch listed in dkms.conf: +patch -p1 -i patches/*.patch +rm -fr patch* .github -cp -Rp usbio-drivers-%{usbio_commit}/drivers ipu6-drivers-%{ipu6_commit}/ -cp -Rp usbio-drivers-%{usbio_commit}/include ipu6-drivers-%{ipu6_commit}/ +cp -f %{SOURCE1} dkms.conf %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 +# Create empty tree: +mkdir -p %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/ +cp -fr * %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/ %post -dkms add -m %{modulename} -v %{version} -q --rpm_safe_upgrade || : +dkms add -m %{dkms_name} -v %{version} -q || : # Rebuild and make available for the currently running kernel: -dkms build -m %{modulename} -v %{version} -q || : -dkms install -m %{modulename} -v %{version} -q --force || : +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 %{modulename} -v %{version} -q --all --rpm_safe_upgrade || : +dkms remove -m %{dkms_name} -v %{version} -q --all || : %files -%{_usrsrc}/%{modulename}-%{version} -%if 0%{?fedora} -%{_sysconfdir}/dkms/%{modulename}.conf -%endif +%{_usrsrc}/%{dkms_name}-%{version} %changelog * Thu Apr 24 2025 Gilver E. diff --git a/anda/system/ipu6-drivers/dkms/no-weak-modules.conf b/anda/system/ipu6-drivers/dkms/no-weak-modules.conf deleted file mode 100644 index 24f6f95c96..0000000000 --- a/anda/system/ipu6-drivers/dkms/no-weak-modules.conf +++ /dev/null @@ -1 +0,0 @@ -NO_WEAK_MODULES="yes" diff --git a/anda/system/ipu6-drivers/dkms/update.rhai b/anda/system/ipu6-drivers/dkms/update.rhai index b5fda8dfcb..a20505ac68 100644 --- a/anda/system/ipu6-drivers/dkms/update.rhai +++ b/anda/system/ipu6-drivers/dkms/update.rhai @@ -1,11 +1,11 @@ -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; +let c = sh("cat anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout; c.pop(); -rpm.global("ipu6_commit", c); +rpm.global("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; + let d = sh("cat anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout; d.pop(); - rpm.global("ipu6_commitdate", d); + rpm.global("commit_date", 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/intel-ipu6-drivers.spec b/anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec index 23431ef65d..475652db64 100644 --- a/anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec +++ b/anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec @@ -1,24 +1,20 @@ %global debug_package %{nil} -%global ipu6_commit e89983c628d046b2f77af3b6678cc49c2dd58332 -%global ipu6_commitdate 20250521 -%global ipu6_shortcommit %(c=%{ipu6_commit}; echo ${c:0:7}) -%global usbio_commit 4fb690c6d15a81c492954636c2db396cb700a119 -%global usbio_commitdate 20241210 -%global usbio_shortcommit %(c=%{usbio_commit}; echo ${c:0:7}) +%global commit e89983c628d046b2f77af3b6678cc49c2dd58332 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commit_date 20250521 # 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 +Version: 0^%{commit_date}git.%{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 +Source0: https://github.com/intel/ipu6-drivers/archive/%{commit}/ipu6-drivers-%{shortcommit}.tar.gz Requires: ipu6-camera-bins -Requires: (intel-ipu6-kmod = %{?epoch:%{epoch}:}%{version} or dkms-intel-ipu6 = %{?epoch:%{epoch}:}%{version}) +Requires: intel-ipu6-kmod = %{?epoch:%{epoch}:}%{version} Provides: intel-ipu6-kmod-common = %{?epoch:%{epoch}:}%{version}-%{release} BuildArch: noarch Packager: Gilver E. @@ -27,20 +23,16 @@ Packager: Gilver E. Common files for the Intel IPU6 camera drivers. %prep -%setup -q -c -a 1 +%autosetup -n ipu6-drivers-%{commit} %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 +%license LICENSE +%doc README.md +%doc SECURITY.md %changelog * Thu Apr 24 2025 Gilver E. diff --git a/anda/system/ipu6-drivers/kmod-common/update.rhai b/anda/system/ipu6-drivers/kmod-common/update.rhai index ec836da3f2..71e742e661 100644 --- a/anda/system/ipu6-drivers/kmod-common/update.rhai +++ b/anda/system/ipu6-drivers/kmod-common/update.rhai @@ -1,6 +1,5 @@ -rpm.global("ipu6_commit", gh_commit("intel/ipu6-drivers")); +rpm.global("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()); + rpm.global("commit_date", date()); } diff --git a/anda/system/logiops/anda.hcl b/anda/system/logiops/anda.hcl new file mode 100644 index 0000000000..64e6e8555f --- /dev/null +++ b/anda/system/logiops/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "logiops.spec" + } +} diff --git a/anda/system/logiops/logiops.spec b/anda/system/logiops/logiops.spec new file mode 100644 index 0000000000..f93dcc1f91 --- /dev/null +++ b/anda/system/logiops/logiops.spec @@ -0,0 +1,44 @@ +Name: logiops +Version: 0.3.5 +Release: 1%?dist +Summary: An unofficial userspace driver for HID++ Logitech devices +License: GPL-3.0-only +URL: https://github.com/PixlOne/logiops +Packager: madonuko +BuildRequires: cmake libevdev-devel systemd-devel libconfig-devel gcc-c++ glib2-devel +Provides: logid = %evr + +%description +This is an unofficial driver for Logitech mice and keyboard. + +This is currently only compatible with HID++ >2.0 devices. + +%prep +%git_clone %url v%version + +%build +%cmake -DCMAKE_BUILD_TYPE=Release +%cmake_build + +%install +%cmake_install + +echo "enable logid.service" | install -Dm644 /dev/stdin %buildroot%_presetdir/96-%name.preset + +%post +%systemd_post logid.service + +%preun +%systemd_preun logid.service + +%postun +%systemd_postun_with_restart logid.service + +%files +%doc README.md +%license LICENSE +%_bindir/logid +%_datadir/dbus-1/system.d/pizza.pixl.LogiOps.conf +%_presetdir/96-%name.preset +%dnl %_sysconfdir/logid.cfg +%_unitdir/logid.service diff --git a/anda/system/logiops/update.rhai b/anda/system/logiops/update.rhai new file mode 100644 index 0000000000..e0077be403 --- /dev/null +++ b/anda/system/logiops/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("PixlOne/logiops")); diff --git a/anda/system/nvidia-patch/nvidia-patch.spec b/anda/system/nvidia-patch/nvidia-patch.spec index 62dc38f808..f0066bef66 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 6ba16ac373f12cd3973249d8513fb04f2404b464 +%global commit 54f37fd88fe791cb8df9a9cb7e19a16adde3f580 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250528 +%global commit_date 20250607 %global patches %{_datadir}/src/nvidia-patch diff --git a/anda/system/readymade/git/readymade-git.spec b/anda/system/readymade/git/readymade-git.spec index d15b343933..32519e7a47 100644 --- a/anda/system/readymade/git/readymade-git.spec +++ b/anda/system/readymade/git/readymade-git.spec @@ -1,5 +1,5 @@ -%global commit fbb329b160154a444998d5c6a669ca38db8ff908 -%global commit_date 20250519 +%global commit 695e6fb7c6873af6c8bec5b36a6a3e310513c0b1 +%global commit_date 20250611 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: readymade-git @@ -9,9 +9,9 @@ Summary: Install ready-made distribution images! License: GPL-3.0-or-later URL: https://github.com/FyraLabs/readymade Source0: %url/archive/%commit.tar.gz +Source1: https://github.com/FyraLabs/rdms_proc_macros/archive/HEAD.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 @@ -38,7 +38,8 @@ This package contains the configuration files for Readymade to install Ultramari %prep %autosetup -n readymade-%commit -ls -l +tar xf %{S:1} +rmdir taidan_proc_macros && mv rdms_proc_macros* taidan_proc_macros %cargo_prep_online %build diff --git a/anda/system/readymade/stable/readymade.spec b/anda/system/readymade/stable/readymade.spec index 2e82b23d5e..f09953aa99 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: 2%?dist +Version: 0.12.4 +Release: 1%?dist Summary: Install ready-made distribution images! License: GPL-3.0-or-later URL: https://github.com/FyraLabs/readymade diff --git a/anda/system/surface-dtx-daemon/surface-dtx-daemon.spec b/anda/system/surface-dtx-daemon/surface-dtx-daemon.spec index ef82a1a699..75d319178e 100644 --- a/anda/system/surface-dtx-daemon/surface-dtx-daemon.spec +++ b/anda/system/surface-dtx-daemon/surface-dtx-daemon.spec @@ -4,7 +4,7 @@ Name: terra-surface-dtx-daemon Version: %(echo %ver | sed 's/-/~/g') -Release: 3%{?dist} +Release: 4%{?dist} Summary: Surface Detachment System (DTX) Daemon License: MIT URL: https://github.com/linux-surface/surface-dtx-daemon @@ -18,6 +18,8 @@ Linux User-Space Detachment System (DTX) Daemon for the Surface ACPI Driver (and Surface Books). Currently only the Surface Book 2 is supported, due to lack of driver-support on the Surface Book 1. This may change in the future. +%pkg_completion -Bfz surface-dtx-daemon surface-dtx-userd + %prep %autosetup -n surface-dtx-daemon-%{ver2} %cargo_prep_online @@ -71,12 +73,6 @@ install -D -m644 "target/surface-dtx-userd.fish" "%{buildroot}/usr/share/fish/ve /usr/bin/surface-dtx-userd /usr/lib/systemd/system/surface-dtx-daemon.service /usr/lib/systemd/user/surface-dtx-userd.service -/usr/share/bash-completion/completions/surface-dtx-daemon -/usr/share/bash-completion/completions/surface-dtx-userd -/usr/share/zsh/site-functions/_surface-dtx-daemon -/usr/share/zsh/site-functions/_surface-dtx-userd -/usr/share/fish/vendor_completions.d/surface-dtx-daemon.fish -/usr/share/fish/vendor_completions.d/surface-dtx-userd.fish %changelog * Wed Feb 5 2025 Owen Zimmerman diff --git a/anda/system/usbio-drivers/akmod/anda.hcl b/anda/system/usbio-drivers/akmod/anda.hcl new file mode 100644 index 0000000000..7b35cc7a64 --- /dev/null +++ b/anda/system/usbio-drivers/akmod/anda.hcl @@ -0,0 +1,10 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "intel-usbio-kmod.spec" + } + labels { + mock = 1 + updbranch = 1 + } +} diff --git a/anda/system/usbio-drivers/akmod/intel-usbio-kmod.spec b/anda/system/usbio-drivers/akmod/intel-usbio-kmod.spec new file mode 100644 index 0000000000..827958604f --- /dev/null +++ b/anda/system/usbio-drivers/akmod/intel-usbio-kmod.spec @@ -0,0 +1,64 @@ +%global buildforkernels akmod +%global debug_package %{nil} +%global commit 4fb690c6d15a81c492954636c2db396cb700a119 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commit_date 20241210 +%global modulename intel-usbio + +Name: %{modulename}-kmod +Summary: Kernel drivers for the USBIO Extension +Version: 0^%{commit_date}git.%{shortcommit} +Release: 1%?dist +License: GPL-2.0-only +URL: https://github.com/intel/usbio-drivers +Source0: %{url}/archive/%{commit}.tar.gz#/usbio-drivers-%{shortcommit}.tar.gz +Patch0: https://github.com/jwrdegoede/usbio-drivers/commit/d5f08986936a7fda0cce543c73fb8d9bab76eae2.patch +Patch1: https://github.com/jwrdegoede/usbio-drivers/commit/47b34a6f467eebb4e9fc59f5e25618fe760fbf33.patch +Patch2: https://github.com/jwrdegoede/usbio-drivers/commit/0eae85556558b410635ad03ed5eccb9648e11fce.patch +BuildRequires: elfutils-libelf-devel +BuildRequires: gcc +BuildRequires: kmodtool +Requires: %{modulename}-kmod-common = %{?epoch:%{epoch}:}%{version} +Requires: akmods +Requires: akmod-intel-ipu6 +Packager: Gilver E. + +%{expand:%(kmodtool --target %{_target_cpu} --repo terra --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } + +%description +This package enables USBIO Extension drivers on Intel Alder Lake, Raptor Lake, Meteor Lake and Lunar Lake platforms. + +%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 + +%autosetup -p1 -n usbio-drivers-%{commit} +rm -fr .github + +for kernel_version in %{?kernel_versions} ; do + cp -a ./* _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/gpio/ + mkdir -p %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/drivers/i2c/busses/ + mkdir -p %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/drivers/mfd/ + install -m 755 _kmod_build_${kernel_version%%___*}/drivers/gpio/*.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/drivers/gpio/ + install -m 755 _kmod_build_${kernel_version%%___*}/drivers/i2c/busses/*.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/drivers/i2c/busses/ + install -m 755 _kmod_build_${kernel_version%%___*}/drivers/mfd/*.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/drivers/mfd/ + install -m 755 _kmod_build_${kernel_version%%___*}/*.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix} +done +%{?akmod_install} + +%changelog +* Mon Jun 16 2025 Gilver E. - 0^20250312git4fb690c +- Initial package diff --git a/anda/system/usbio-drivers/akmod/update.rhai b/anda/system/usbio-drivers/akmod/update.rhai new file mode 100644 index 0000000000..c62610c1f0 --- /dev/null +++ b/anda/system/usbio-drivers/akmod/update.rhai @@ -0,0 +1,10 @@ +let c = sh("cat anda/system/usbio-drivers/kmod-common/intel-usbio-drivers.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/usbio-drivers/kmod-common/intel-usbio-drivers.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout; + d.pop(); + rpm.global("commit_date", d); +} + diff --git a/anda/system/usbio-drivers/dkms/anda.hcl b/anda/system/usbio-drivers/dkms/anda.hcl new file mode 100644 index 0000000000..2a32b7cd0c --- /dev/null +++ b/anda/system/usbio-drivers/dkms/anda.hcl @@ -0,0 +1,9 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "dkms-intel-usbio.spec" + } + labels { + updbranch = 1 + } +} diff --git a/anda/system/usbio-drivers/dkms/dkms-intel-usbio.conf b/anda/system/usbio-drivers/dkms/dkms-intel-usbio.conf new file mode 100644 index 0000000000..457331f700 --- /dev/null +++ b/anda/system/usbio-drivers/dkms/dkms-intel-usbio.conf @@ -0,0 +1,12 @@ +PACKAGE_NAME="usbio-drivers" +PACKAGE_VERSION="0.1" +AUTOINSTALL="yes" + +BUILT_MODULE_NAME[0]="usbio" +DEST_MODULE_LOCATION[0]="/extra" + +BUILT_MODULE_NAME[1]="gpio-usbio" +DEST_MODULE_LOCATION[1]="/extra" + +BUILT_MODULE_NAME[2]="i2c-usbio" +DEST_MODULE_LOCATION[2]="/extra" diff --git a/anda/system/usbio-drivers/dkms/dkms-intel-usbio.spec b/anda/system/usbio-drivers/dkms/dkms-intel-usbio.spec new file mode 100644 index 0000000000..4996afbfa9 --- /dev/null +++ b/anda/system/usbio-drivers/dkms/dkms-intel-usbio.spec @@ -0,0 +1,56 @@ +%global commit 4fb690c6d15a81c492954636c2db396cb700a119 +%global shortcommit %{sub %{commit} 1 7} +%global commit_date 20250312 +%global debug_package %{nil} +%global modulename intel-usbio + +Name: dkms-%{modulename} +Version: 0^%{commit_date}git.%{shortcommit} +Release: 1%{?dist} +Summary: Kernel drivers for the USBIO Extension +License: GPL-2.0-only +URL: https://github.com/intel/usbio-drivers +Source0: %{url}/archive/%{commit}.tar.gz#/usbio-drivers-%{shortcommit}.tar.gz +Source2: %{name}.conf +Patch0: https://github.com/jwrdegoede/usbio-drivers/commit/d5f08986936a7fda0cce543c73fb8d9bab76eae2.patch +Patch1: https://github.com/jwrdegoede/usbio-drivers/commit/47b34a6f467eebb4e9fc59f5e25618fe760fbf33.patch +Patch2: https://github.com/jwrdegoede/usbio-drivers/commit/0eae85556558b410635ad03ed5eccb9648e11fce.patch +Provides: %{modulename}-kmod = %{version} +Requires: dkms +Requires: dkms-intel-ipu6 +BuildArch: noarch +Packager: Gilver E. + +%description +This package enables USBIO Extension drivers on Intel Alder Lake, Raptor Lake, Meteor Lake and Lunar Lake platforms. + +%prep +%autosetup -p1 -n usbio-drivers-%{commit} +rm -fr .github + +cp -f %{SOURCE2} dkms.conf + +%build + +%install +# Create empty tree: +mkdir -p %{buildroot}%{_usrsrc}/%{modulename}-%{version}/ +cp -fr * %{buildroot}%{_usrsrc}/%{modulename}-%{version}/ + +%post +dkms add -m %{modulename} -v %{version} -q || : +# 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 || : + +%files +%{_usrsrc}/%{modulename}-%{version} + +%changelog +* Mon Jun 16 2025 Gilver E. - 0^20250312git4fb690c +- Initial package + diff --git a/anda/system/usbio-drivers/dkms/update.rhai b/anda/system/usbio-drivers/dkms/update.rhai new file mode 100644 index 0000000000..c62610c1f0 --- /dev/null +++ b/anda/system/usbio-drivers/dkms/update.rhai @@ -0,0 +1,10 @@ +let c = sh("cat anda/system/usbio-drivers/kmod-common/intel-usbio-drivers.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/usbio-drivers/kmod-common/intel-usbio-drivers.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout; + d.pop(); + rpm.global("commit_date", d); +} + diff --git a/anda/system/usbio-drivers/kmod-common/anda.hcl b/anda/system/usbio-drivers/kmod-common/anda.hcl new file mode 100644 index 0000000000..ecd4675c91 --- /dev/null +++ b/anda/system/usbio-drivers/kmod-common/anda.hcl @@ -0,0 +1,9 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "intel-usbio-drivers.spec" + } + labels { + nightly = 1 + } +} diff --git a/anda/system/usbio-drivers/kmod-common/intel-usbio-drivers.spec b/anda/system/usbio-drivers/kmod-common/intel-usbio-drivers.spec new file mode 100644 index 0000000000..bb9a354cbc --- /dev/null +++ b/anda/system/usbio-drivers/kmod-common/intel-usbio-drivers.spec @@ -0,0 +1,40 @@ +%global commit 4fb690c6d15a81c492954636c2db396cb700a119 +%global shortcommit %{sub %{commit} 1 7} +%global commit_date 20250312 +%global debug_package %{nil} + +Name: dkms-%{modulename} +Version: 0^%{commit_date}git.%{shortcommit} +Release: 1%{?dist} +Summary: Common files for the USBIO drivers +License: GPL-2.0-only +URL: https://github.com/intel/usbio-drivers +Source0: %{url}/archive/%{commit}.tar.gz#/usbio-drivers-%{shortcommit}.tar.gz +BuildRequires: anda-srpm-macros +Provides: intel-usbio-kmod-common = %{evr} +Requires: intel-ipu6-kmod-common +BuildArch: noarch +Packager: Gilver E. + +%description +This package contains the common files for the UBSIO kernel modules. + +%prep +%autosetup -p1 -n usbio-drivers-%{commit} + +%build +# Hi, I'm empty. + +%install +# Hi, I'm also empty! + +%files +%doc CODE_OF_CONDUCT.md +%doc README.md +%doc SECURITY.md +%doc security.md +%license LICENSE.txt + +%changelog +* Mon Jun 16 2025 Gilver E. - 0^20250312git4fb690c +- Initial package diff --git a/anda/system/usbio-drivers/kmod-common/update.rhai b/anda/system/usbio-drivers/kmod-common/update.rhai new file mode 100644 index 0000000000..f9b29962bd --- /dev/null +++ b/anda/system/usbio-drivers/kmod-common/update.rhai @@ -0,0 +1,5 @@ +rpm.global("commit", gh_commit("intel/usbio-drivers")); +if rpm.changed() { + rpm.release(); + rpm.global("commit_date", date()); +} diff --git a/anda/system/v4l2-relayd/anda.hcl b/anda/system/v4l2-relayd/anda.hcl index febd3dbe1f..bc3f3adf60 100644 --- a/anda/system/v4l2-relayd/anda.hcl +++ b/anda/system/v4l2-relayd/anda.hcl @@ -3,6 +3,6 @@ project pkg { spec = "v4l2-relayd.spec" } labels { - weekly = 1 + nightly = 1 } } diff --git a/anda/system/v4l2-relayd/v4l2-relayd.spec b/anda/system/v4l2-relayd/v4l2-relayd.spec index a29e83df0f..b3e48a1f28 100644 --- a/anda/system/v4l2-relayd/v4l2-relayd.spec +++ b/anda/system/v4l2-relayd/v4l2-relayd.spec @@ -1,5 +1,5 @@ -%global commit 35a06d89747ff31fbaabf744b7dae585bfa86723 -%global commit_date 20220126 +%global commit fda071b434a9978c754f557474812aa5d48b24ba +%global commit_date 20250616 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: v4l2-relayd diff --git a/anda/system/wine-dxvk/wine-dxvk.spec b/anda/system/wine-dxvk/wine-dxvk.spec index 62a3b375ff..4808a2888a 100644 --- a/anda/system/wine-dxvk/wine-dxvk.spec +++ b/anda/system/wine-dxvk/wine-dxvk.spec @@ -23,8 +23,8 @@ %global wine_lib_dir %{_datadir}/wine-staging/lib64 Name: terra-wine-dxvk -Version: 2.6.1 -Release: 2%{?dist} +Version: 2.6.2 +Release: 1%?dist Summary: Vulkan-based implementation of D3D8, 9, 10 and 11 for Linux / Wine License: zlib AND MIT diff --git a/anda/system/wine/dev/wine-dev.spec b/anda/system/wine/dev/wine-dev.spec index abf8930123..e4e3ca790d 100644 --- a/anda/system/wine/dev/wine-dev.spec +++ b/anda/system/wine/dev/wine-dev.spec @@ -9,7 +9,7 @@ %global _prefix /usr/share/wine-dev %global srcmajor 10.x # Make this as a variable instead in case of WINE RCs -%global ver wine-10.8 +%global ver wine-10.10 %global cleanver %(echo %{ver} | sed 's/v//g;s/wine-//g') # This is unfortunate but a lot of Fedora's/SUSE's hardening flags break WINE @@ -19,7 +19,7 @@ # Also less confusing because it has a devel package Name: wine-dev Version: %(echo %{cleanver} | sed 's/-/~/g') -Release: 2%?dist +Release: 1%?dist Epoch: 1 Summary: WINE Is Not An Emulator - runs MS Windows programs License: LGPL-2.0-or-later diff --git a/anda/system/wine/staging/wine-staging.spec b/anda/system/wine/staging/wine-staging.spec index 6f522a9627..81045ea0a3 100644 --- a/anda/system/wine/staging/wine-staging.spec +++ b/anda/system/wine/staging/wine-staging.spec @@ -18,8 +18,8 @@ Name: wine-staging -Version: 10.8 -Release: 2%?dist +Version: 10.10 +Release: 1%?dist Epoch: 1 Summary: WINE Is Not An Emulator - runs MS Windows programs License: LGPL-2.0-or-later diff --git a/anda/terra/mock-configs/terra-mock-configs.spec b/anda/terra/mock-configs/terra-mock-configs.spec index d7d85b1981..7e6bc3d03a 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.5.0 -Release: 2%?dist +Version: 2.0.0 +Release: 1%?dist Epoch: 1 Summary: Mock configs for Terra repos diff --git a/anda/terra/srpm-macros/anda-srpm-macros.spec b/anda/terra/srpm-macros/anda-srpm-macros.spec index 286c63a806..d5dfbd841f 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.12 +Version: 0.2.17 Release: 1%?dist Summary: SRPM macros for extra Fedora packages @@ -25,13 +25,16 @@ BuildArch: noarch for file in ./macros.*; do install -Dpm644 -t %buildroot%_rpmmacrodir $file done +install -Dpm755 *.sh -t %buildroot%_libexecdir/%name/ %files +%attr(0755, root, root) %_libexecdir/%name/*.sh %{_rpmmacrodir}/macros.anda %{_rpmmacrodir}/macros.caching %{_rpmmacrodir}/macros.cargo_extra %{_rpmmacrodir}/macros.go_extra %{_rpmmacrodir}/macros.nim_extra +%{_rpmmacrodir}/macros.zig_extra %changelog diff --git a/anda/themes/helium-gtk-theme/helium-gtk-theme.spec b/anda/themes/helium-gtk-theme/helium-gtk-theme.spec index 0b475cbdb5..3c9031e68a 100644 --- a/anda/themes/helium-gtk-theme/helium-gtk-theme.spec +++ b/anda/themes/helium-gtk-theme/helium-gtk-theme.spec @@ -1,4 +1,4 @@ -%global ver 1.8.31 +%global ver 1.8.59 Summary: tauOS GTK/GNOME Shell Themes Name: helium-gtk-theme diff --git a/anda/tools/buildsys/anda/rust-anda.spec b/anda/tools/buildsys/anda/rust-anda.spec index 10ffb8430b..c414133ace 100644 --- a/anda/tools/buildsys/anda/rust-anda.spec +++ b/anda/tools/buildsys/anda/rust-anda.spec @@ -6,7 +6,7 @@ Name: rust-anda Version: 0.4.12 -Release: 1%?dist +Release: 5%?dist Summary: Andaman Build toolchain License: MIT @@ -26,13 +26,6 @@ BuildRequires: libgit2-devel BuildRequires: libssh2-devel BuildRequires: mold -Requires: mock-scm -Requires: rpm-build -Requires: createrepo_c -Requires: git-core -Requires: libgit2 -Requires: script - %global _description %{expand: Andaman Build toolchain.} @@ -40,6 +33,15 @@ Andaman Build toolchain.} %package -n %{crate} Summary: %{summary} +Requires: mock +Requires: rpm-build +Requires: createrepo_c +Requires: git-core +Requires: libgit2 +%if 0%{?fedora} >= 42 +Requires: mock-filesystem +Requires: util-linux-script +%endif %description -n %{crate} %{_description} diff --git a/anda/tools/buildsys/gradle/gradle.spec b/anda/tools/buildsys/gradle/gradle.spec index 64f520162f..2ef9cb0f6f 100644 --- a/anda/tools/buildsys/gradle/gradle.spec +++ b/anda/tools/buildsys/gradle/gradle.spec @@ -1,5 +1,5 @@ Name: gradle -Version: 8.14.1 +Version: 8.14.2 Release: 1%?dist Summary: Powerful build system for the JVM URL: https://gradle.org/ diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index 69658b2faa..b5d1c947c7 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.17 +Version: 2025.6.4 Release: 1%?dist Summary: Front-end to your dev env @@ -44,45 +44,7 @@ URL: https://mise.jdx.dev/ %_mandir/man1/mise.1.gz -%package -n %crate-bash-completion -Summary: Bash completion for %crate -Requires: %{crate} = %{version}-%{release} -Requires: bash-completion -Requires: usage -Supplements: (%{crate} and bash-completion) - -%description -n %crate-bash-completion -Bash command line completion support for %{crate}. - -%package -n %crate-fish-completion -Summary: Fish completion for %{crate} -Requires: %{crate} = %{version}-%{release} -Requires: fish -Requires: usage -Supplements: (%{crate} and fish) - -%description -n %crate-fish-completion -Fish command line completion support for %{crate}. - -%package -n %crate-zsh-completion -Summary: Zsh completion for %{crate} -Requires: %{crate} = %{version}-%{release} -Requires: zsh -Requires: usage -Supplements: (%{crate} and zsh) - -%description -n %crate-zsh-completion -Zsh command line completion support for %{crate}. - - -%files -n %crate-bash-completion -%bash_completions_dir/mise.bash - -%files -n %crate-fish-completion -%fish_completions_dir/mise.fish - -%files -n %crate-zsh-completion -%zsh_completions_dir/_mise +%pkg_completion -bfzn %crate %prep diff --git a/anda/tools/cbmem/anda.hcl b/anda/tools/cbmem/anda.hcl new file mode 100644 index 0000000000..09a390e7b6 --- /dev/null +++ b/anda/tools/cbmem/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "cbmem.spec" + } +} diff --git a/anda/tools/cbmem/cbmem.spec b/anda/tools/cbmem/cbmem.spec new file mode 100644 index 0000000000..6155f7be85 --- /dev/null +++ b/anda/tools/cbmem/cbmem.spec @@ -0,0 +1,32 @@ +%define debug_package %nil + +Name: cbmem +Version: 25.03 +Release: 1%?dist +Summary: Prints out coreboot mem table information +URL: https://review.coreboot.org +License: BSD-3-Clause AND Apache-2.0 AND CC-BY-SA-3.0 AND GPL-2.0-only AND GPL-3.0-or-later AND ISC AND BSD-2-Clause-Patent AND BSD-4-Clause-UC AND CC-PDDC AND GPL-2.0-or-later AND HPND-sell-varient AND LGPL-2.1-or-later AND BSD-2-Clause AND CC-BY-4.0 AND GPL-3.0-only AND HPND AND X11 AND MIT +BuildRequires: gcc g++ make cmake ncurses-devel iasl git anda-srpm-macros +Packager: Owen Zimmerman + +%description +Prints out coreboot mem table information in JSON by default, and also implements the basic cbmem -list and -console commands. + +%prep +%git_clone %url/coreboot %version + +%build +cd util/cbmem +%make_build CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" + +%install +install -Dm 755 util/cbmem/cbmem %buildroot%_bindir/cbmem + +%files +%doc util/cbmem/description.md +%license LICENSES/* +%{_bindir}/cbmem + +%changelog +* Sun Jun 15 2025 Owen Zimmerman +- Initial Package diff --git a/anda/tools/cbmem/update.rhai b/anda/tools/cbmem/update.rhai new file mode 100644 index 0000000000..7e27695ddc --- /dev/null +++ b/anda/tools/cbmem/update.rhai @@ -0,0 +1 @@ +rpm.version(gh_tag("coreboot/coreboot")); diff --git a/anda/tools/cuda-nvcc/cuda-nvcc.spec b/anda/tools/cuda-nvcc/cuda-nvcc.spec index 890d435b3f..ab266d540b 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.9.41 +Version: 12.9.86 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 b26123e639..c7369d118c 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.3.2 +Version: 36.4.0 Release: 1%?dist Summary: Build cross platform desktop apps with web technologies License: MIT diff --git a/anda/tools/flashprog/flashprog.spec b/anda/tools/flashprog/flashprog.spec index 050d880937..0de4d43398 100644 --- a/anda/tools/flashprog/flashprog.spec +++ b/anda/tools/flashprog/flashprog.spec @@ -5,11 +5,11 @@ It supports a wide range of flash chips (most commonly found in SOIC8, DIP8, SOI Name: flashprog Version: 1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utility for detecting, reading, writing, verifying and erasing flash chips -License: GPL-2.0 -URL: https://review.sourcearcade.org/flashprog +License: GPL-2.0-only +URL: https://flashprog.org Packager: sadlerm @@ -42,7 +42,7 @@ Summary: Development headers for flashprog %prep -%git_clone %{url} v%{version} +%git_clone https://review.sourcearcade.org/flashprog v%{version} %build %make_build PREFIX=%{_prefix} diff --git a/anda/tools/flashrom-cros/anda.hcl b/anda/tools/flashrom-cros/anda.hcl deleted file mode 100644 index aa5f4a7627..0000000000 --- a/anda/tools/flashrom-cros/anda.hcl +++ /dev/null @@ -1,5 +0,0 @@ -project pkg { - rpm { - spec = "flashrom-cros.spec" - } -} diff --git a/anda/tools/flashrom-cros/flashrom-cros.spec b/anda/tools/flashrom-cros/flashrom-cros.spec deleted file mode 100644 index 4d2030d3e1..0000000000 --- a/anda/tools/flashrom-cros/flashrom-cros.spec +++ /dev/null @@ -1,38 +0,0 @@ -%global commit_date 20240911 -%global commit c1ab7468d28d164a30d598eb3e42a5febaf73bbc -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -Name: flashrom-cros -Version: %shortcommit -Release: 1%{?dist} -Summary: Simple program for reading/writing flash chips content (ChromiumOS fork) -License: GPL-2.0-only -URL: https://chromium.googlesource.com/chromiumos/third_party/flashrom -Source0: %url/+archive/refs/heads/release-R130-16033.B.tar.gz -BuildRequires: gcc gnupg2 libusb1-devel meson pciutils-devel python3-sphinx systemd zlib-devel dmidecode -Requires: dmidecode udev -Packager: WeirdTreeThing - - -%description -flashrom is a utility for identifying, reading, writing, verifying and erasing -flash chips. It is designed to flash BIOS/EFI/coreboot/firmware/optionROM -images on mainboards, network/graphics/storage controller cards, and various -other programmer devices. - -%prep -%setup -c - -%build -%meson -Dtests=disabled -Ddocumentation=disabled -Duse_internal_dmi=false -%meson_build - -%install -install -Dm755 %{_vpath_builddir}/flashrom %{buildroot}%{_bindir}/%{name} - -%files -%{_bindir}/%{name} - -%changelog -* Fri Oct 25 2024 WeirdTreeThing -- initial release diff --git a/anda/tools/rpi-utils/rpi-utils.spec b/anda/tools/rpi-utils/rpi-utils.spec index dd782878ce..b604ce1312 100644 --- a/anda/tools/rpi-utils/rpi-utils.spec +++ b/anda/tools/rpi-utils/rpi-utils.spec @@ -1,5 +1,5 @@ -%global commit 71a596c8e62ff458e2760b558fb224bba41b3437 -%global commit_date 20250529 +%global commit b7651d86d71a172b2208c67b2e360cbcb4f9d98f +%global commit_date 20250612 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define _unpackaged_files_terminate_build 0 @@ -69,6 +69,8 @@ Summary: A more powerful replacement for raspi-gpio, a tool for displayin %description pinctrl %{summary}. +%pkg_completion -Bn %name-pinctrl pinctrl + %package piolib Summary: A library for accessing the Pi 5's PIO hardware %description piolib @@ -80,6 +82,8 @@ Summary: Query the VideoCore for information A command line utility that can get various pieces of information from the VideoCore GPU on the Raspberry Pi. +%pkg_completion -Bn %name-vcgencmd vcgencmd + %package vcmailbox Summary: Send messages to the VideoCore via the mailbox %description vcmailbox @@ -143,7 +147,6 @@ Summary: A tool to get VideoCore 'assert' or 'msg' logs with optional -f %doc pinctrl/README.md %license LICENCE %{_bindir}/pinctrl -%{_datadir}/bash-completion/completions/pinctrl %{_exec_prefix}/%{_lib}/libgpiolib.so.0 %{_exec_prefix}/%{_lib}/libgpiolib.so @@ -165,7 +168,6 @@ Summary: A tool to get VideoCore 'assert' or 'msg' logs with optional -f %license LICENCE %{_bindir}/vcgencmd %{_mandir}/man1/vcgencmd.1.gz -%{_datadir}/bash-completion/completions/vcgencmd %files vclog %doc vclog/README.md diff --git a/anda/tools/spotx-bash/spotx-bash.spec b/anda/tools/spotx-bash/spotx-bash.spec index 30ac7b8e79..9cc288dd5c 100644 --- a/anda/tools/spotx-bash/spotx-bash.spec +++ b/anda/tools/spotx-bash/spotx-bash.spec @@ -1,5 +1,5 @@ -%global commit 5e9b08f91e55c210bbc64715b4ad698186b3c06b -%global commit_date 20250525 +%global commit 27a3d20020803bbe8a9b7e78b013059dbe6e815b +%global commit_date 20250615 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: spotx-bash diff --git a/anda/tools/topgrade/topgrade.spec b/anda/tools/topgrade/topgrade.spec index 483f9d8cbf..28a1ae044c 100644 --- a/anda/tools/topgrade/topgrade.spec +++ b/anda/tools/topgrade/topgrade.spec @@ -3,7 +3,7 @@ Name: topgrade # renovate: datasource=github-releases depName=topgrade-rs/topgrade -Version: 16.0.3 +Version: 16.0.4 Release: 1%?dist Summary: Upgrade all the things diff --git a/anda/tools/umstellar/anda.hcl b/anda/tools/umstellar/anda.hcl index aa51dee858..7a7389b78b 100644 --- a/anda/tools/umstellar/anda.hcl +++ b/anda/tools/umstellar/anda.hcl @@ -1,5 +1,6 @@ project "pkg" { + arches = ["x86_64"] rpm { spec = "umstellar.spec" } -} \ No newline at end of file +} diff --git a/anda/tools/umstellar/umstellar.spec b/anda/tools/umstellar/umstellar.spec index 60a5ef3145..3f8e280a6c 100644 --- a/anda/tools/umstellar/umstellar.spec +++ b/anda/tools/umstellar/umstellar.spec @@ -2,13 +2,13 @@ %global pypi_name umstellar %global pypi_version 0.2.0 -Name: python-%{pypi_name} +Name: %{pypi_name} Version: %{pypi_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ultramarine Quickstart Tool -Provides: python3-%{pypi_name} = %{version}-%{release} -Provides: %{pypi_name} = %{version}-%{release} +Obsoletes: python3-%{pypi_name} < 0.2.0-2 +Requires: python3-%{pypi_name} = %{version}-%{release} License: GPL-3.0 URL: https://github.com/Ultramarine-Linux/stellar @@ -16,6 +16,7 @@ Source0: %{url}/archive/v%{version}.tar.gz BuildArch: noarch BuildRequires: python3-devel +BuildRequires: python3dist(pip) BuildRequires: python3dist(setuptools) %description @@ -33,31 +34,46 @@ Summary: %{summary} Requires: python3dist(requests) Requires: python3dist(pygobject) Requires: anaconda-core -%description -n python3-%{pypi_name} +Requires: %{pypi_name} = %{version}-%{release} +BuildArch: noarch +%description -n python3-%{pypi_name} Stellar is a quick-and-dirty GUI post-install menu for Ultramarine Linux - %prep %autosetup -n stellar-%{pypi_version} %build +%if 0%{?fedora} <= 41 %py3_build +%else +%pyproject_wheel +%endif %install +%if 0%{?fedora} <= 41 %py3_install +%else +%pyproject_install +%endif # install kickstart file install -D -m 644 example.ks %{buildroot}%{_datadir}/anaconda/post-scripts/stellar.ks -%files -n python3-%{pypi_name} +%files %license LICENSE %doc README.md -%{python3_sitelib}/%{pypi_name} -%{python3_sitelib}/%{pypi_name}-%{pypi_version}-py%{python3_version}.egg-info %{_datadir}/anaconda/post-scripts/stellar.ks +%files -n python3-%{pypi_name} +%{python3_sitelib}/%{pypi_name} +%if 0%{?fedora} <= 41 +%{python3_sitelib}/%{pypi_name}-%{pypi_version}-py%{python3_version}.egg-info/ +%else +%{python3_sitelib}/%{pypi_name}-%{version}.dist-info/ +%endif + %changelog * Mon Apr 1 2024 Lleyton Gray - 0.2.0-1 - Bump version with various fixes diff --git a/anda/tools/yt-dlp/yt-dlp-git.spec b/anda/tools/yt-dlp/yt-dlp-git.spec index 4fa1cff6f9..3e2dda17e5 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.30.232602 +Version: 2025.06.12.232741 Release: 1%?dist Summary: A command-line program to download videos from online video platforms diff --git a/andax/ci/bump_release.rhai b/andax/ci/bump_release.rhai deleted file mode 100644 index 1f6e2987d2..0000000000 --- a/andax/ci/bump_release.rhai +++ /dev/null @@ -1,7 +0,0 @@ -import "andax/spec.rhai" as spec; - -let dir = sub(`/[^/]+`, "", __script_path); - -if sh("[[ `git status " + dir + "--porcelain` ]] && exit 1", #{}).ctx.rc == 1 { - spec::bump_release(rpm); -} diff --git a/andax/spec.rhai b/andax/spec.rhai index ad74bba091..d2adf1652d 100644 --- a/andax/spec.rhai +++ b/andax/spec.rhai @@ -1,24 +1,25 @@ -fn get_version(rpm) { - return `(?m)^Version:\s*(.+)$`.find(rpm.f, 1); +fn get_version() { + return `(?m)^Version:\s*(.+)$`.find(this.f, 1); } -fn get_release(rpm) { - let r = `(?m)^Release:\s*(.+)$`.find(rpm.f, 1); +fn get_release() { + let r = `(?m)^Release:\s*(.+)$`.find(this.f, 1); r = sub(`(?m)(%\??dist|%\{\??dist\})\s*$`, "", r); r.replace("%autorelease", "1"); return r; } /// Only supports one-liner `%global`s! -fn get_global(rpm, macro) { - return `(?m)^%global\s+${macro}\s+(.+)$`.find(rpm.f, 1); +fn get_global(macro) { + return `(?m)^%global\s+${macro}\s+(.+)$`.find(this.f, 1); } /// Only supports one-liner `%define`s! -fn get_define(rpm, macro) { - return `(?m)^%define\s+${macro}\s+(.+)$`.find(rpm.f, 1); +fn get_define(macro) { + return `(?m)^%define\s+${macro}\s+(.+)$`.find(this.f, 1); } -fn bump_release(rpm) { - rpm.release(`${rpm.get_release().parse_int() + 1}`); -} +fn get_version(rpm) { rpm.get_version() } +fn get_release(rpm) { rpm.get_release() } +fn get_global(rpm, macro) { rpm.get_global(macro) } +fn get_define(rpm, macro) { rpm.get_define(macro) }