fix(mesa): remove broken patch (#4135 )

(cherry picked from commit dd25b41cc1)
fix(extest): Remove Mold linker argument (#4136 )
2026-05-31 09:01:55 +00:00 · 2025-03-24 16:41:56 +00:00 · 2025-03-25 00:40:50 +08:00 · 2025-03-25 00:40:27 +08:00 · 2025-03-24 14:18:34 +00:00 · 2025-03-24 14:42:59 +08:00
74 changed files with 91 additions and 590 deletions
@@ -1,17 +1,13 @@
 {
  "name": "Terra Devcontainer",
-  "image": "ghcr.io/terrapkg/builder:frawhide",
-  "runArgs": [
-    "--privileged"
-  ],
+  "image": "ghcr.io/terrapkg/builder:f42",
+  "runArgs": ["--privileged"],
  "features": {
    "ghcr.io/devcontainers/features/common-utils:2": {}
  },
  "customizations": {
    "vscode": {
-      "extensions": [
-        "rhaiscript.vscode-rhai"
-      ]
+      "extensions": ["rhaiscript.vscode-rhai"]
    }
  },
  "remoteUser": "vscode",
@@ -6,13 +6,13 @@ on:
    paths:
      - anda/**
    branches:
-      - frawhide
+      - f42
  pull_request:
    branches:
-      - frawhide
+      - f42
  merge_group:
    branches:
-      - frawhide
+      - f42
  workflow_dispatch:
  workflow_call:

@@ -22,7 +22,7 @@ jobs:
    outputs:
      build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f42
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Set workspace as safe
@@ -39,7 +39,7 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["rawhide"]
+        version: ["42"]
      fail-fast: false
    runs-on: ${{ (matrix.pkg.arch == 'aarch64' && matrix.pkg.labels['large']) && 'arm64-lg' || matrix.pkg.arch == 'aarch64' && 'ubuntu-22.04-arm' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-22.04' }}
    container:
@@ -7,7 +7,7 @@ jobs:
  bootstrap:
    strategy:
      matrix:
-        version: ["rawhide"]
+        version: ["42"]
        arch: ["x86_64", "aarch64"]
      fail-fast: true
    runs-on: ${{ matrix.arch == 'aarch64' && 'ubuntu-22.04-arm' || 'ubuntu-22.04' }}
@@ -44,7 +44,7 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["rawhide"]
+        version: ["42"]
        arch: ${{ fromJson(needs.parse.outputs.arch) }}
      fail-fast: false
    runs-on: ${{ matrix.arch == 'aarch64' && 'ubuntu-22.04-arm' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-22.04' }}
@@ -11,7 +11,7 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(inputs.packages) }}
-        version: ["rawhide"]
+        version: ["42"]
      fail-fast: false
    runs-on: ${{ (matrix.pkg.arch == 'aarch64' && matrix.pkg.labels['large']) && 'arm64-lg' || matrix.pkg.arch == 'aarch64' && 'ubuntu-22.04-arm' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-22.04' }}
    container:
@@ -16,7 +16,7 @@ jobs:
          - f42
          - el10
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f42
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -34,10 +34,7 @@ jobs:
          git config --global --add safe.directory "$GITHUB_WORKSPACE"

      - name: Run Update
-        run: |
-          nbranch="${{ matrix.branch }}"
-          [ "$nbranch" = 'frawhide' ] && nbranch='f42'
-          anda update --filters updbranch=1 --labels branch=${{ matrix.branch }},nbranch=$nbranch
+        run: anda update --filters updbranch=1 --labels branch=${{ matrix.branch }}
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          RUST_BACKTRACE: full
@@ -16,7 +16,7 @@ jobs:
  update-comps:
    runs-on: ubuntu-22.04
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f42
    steps:
      - uses: actions/checkout@v4
      - name: Push to subatomic
@@ -48,7 +48,6 @@ jobs:
            }
            copy_over f40 || true
            copy_over f41 || true
-            copy_over f42 || true
            copy_over el10 || true
            git push -u origin --all
          fi
@@ -48,7 +48,6 @@ jobs:
            }
            copy_over f40 || true
            copy_over f41 || true
-            copy_over f42 || true
            copy_over el10 || true
            git push -u origin --all
          fi
@@ -48,7 +48,6 @@ jobs:
            }
            copy_over f40 || true
            copy_over f41 || true
-            copy_over f42 || true
            copy_over el10 || true
            git push -u origin --all
          fi
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary-openasar
-Version:        0.0.621
+Version:        0.0.618
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary
-Version:        0.0.621
+Version:        0.0.618
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers
 URL:            discord.com
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-openasar
-Version:        0.0.89
+Version:        0.0.88
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-ptb-openasar
-Version:        0.0.136
+Version:        0.0.135
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-ptb
-Version:        0.0.136
+Version:        0.0.135
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers.
 URL:            https://discord.com
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			discord
-Version:		0.0.89
+Version:		0.0.88
 Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
@@ -1,27 +1,22 @@
-%global commit db45103d1bc23d56692571d652f56f8866dc956d
-%global commit_date 20250327
+%global commit e117986715e1e9ef955009ad7f03ec110aa14940
+%global commit_date 20250303
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

 Name:           envision-nightly
 Version:        %commit_date.%shortcommit
 Release:        1%?dist
 Summary:        UI for building, configuring and running Monado, the open source OpenXR runtime
-SourceLicense:  AGPL-3.0-or-later
-License:        ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND AGPL-3.0-or-later AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND Apache-2.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND ISC AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND Unicode-3.0 AND (Unlicense OR MIT) AND Zlib
+License:        AGPL-3.0-or-later
 URL:            https://gitlab.com/gabmus/envision/
 Source0:        %url/-/archive/%commit/envision-%commit.tar.gz
-BuildRequires:  anda-srpm-macros
-BuildRequires:  cargo
-BuildRequires:  cargo-rpm-macros
-BuildRequires:  meson
-BuildRequires:  ninja-build
+BuildRequires:  meson ninja-build cargo 
 BuildRequires:  pkgconfig(glib-2.0) >= 2.66
 BuildRequires:  pkgconfig(gio-2.0) >= 2.66
 BuildRequires:  pkgconfig(gtk4) >= 4.10.0
 BuildRequires:  pkgconfig(vte-2.91-gtk4) >= 0.72.0
 BuildRequires:  pkgconfig(libadwaita-1)
 BuildRequires:  pkgconfig(libusb-1.0)
-BuildRequires:  pkgconfig(openssl)
+BuildRequires:  openssl-devel-engine
 BuildRequires:  openxr-devel
 BuildRequires:  libappstream-glib
 BuildRequires:  desktop-file-utils
@@ -35,27 +30,17 @@ Conflicts:      envision

 %prep
 %autosetup -n envision-%commit
-%cargo_prep_online

 %build
-# generate constants.rs from constants.rs.in
 %meson
-
-# skip subdir
-sed -E "/^subdir\('src'\)/d" -i meson.build
-
-%meson --reconfigure
 %meson_build

 %install
 %meson_install
-%cargo_install
-%{cargo_license_online} > LICENSE.dependencies

 %files
 %doc README.md
 %license LICENSE
-%license LICENSE.dependencies
 %_bindir/envision
 %_datadir/applications/org.gabmus.envision.Devel.desktop
 %_datadir/envision/
@@ -3,19 +3,18 @@
 %global gtk4_version        4.14.4
 %global libadwaita_version  1.5.1
 %global pure_protobuf_version 2.0.0
-%global raw_ver v1.74.0

 Name:           komikku
-Version:        1.74.0
+Version:        1.73.0
 %forgemeta
-Release:        3%?dist
+Release:        2%?dist
 Summary:        A manga reader for GNOME

 BuildArch:      noarch

 License:        GPL-3.0-or-later
 URL:            https://valos.gitlab.io/Komikku
-Source0:        https://codeberg.org/valos/%{appname}/archive/%{raw_ver}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:        https://codeberg.org/valos/%{appname}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz

 BuildRequires:  desktop-file-utils
 BuildRequires:  intltool
@@ -23,7 +22,6 @@ BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.59.0
 BuildRequires:  python3-devel >= 3.8
 BuildRequires:  blueprint-compiler
-BuildRequires:  cmake

 BuildRequires:  pkgconfig(gobject-introspection-1.0) >= 1.35.9
 BuildRequires:  pkgconfig(gtk4) >= %{gtk4_version}
@@ -1,4 +1,3 @@
 let latest_tag = get("https://codeberg.org/api/v1/repos/valos/Komikku/tags").json_arr()[0].name;
 let new_version = find("([\\.\\d]+)", latest_tag, 1);
-rpm.global("raw_ver", latest_tag);
 rpm.version(new_version);
@@ -1,5 +1,5 @@
-%global commit 3dda27c303fe4fb1c2a6870ee4f68d2515ec6cd5
-%global commit_date 20250328
+%global commit d974d27fb6d424e9c50c95675fa56ae8d952b42b
+%global commit_date 20250317
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %define debug_package %nil

@@ -1,7 +1,7 @@
-%global commit 5ba7ee513751dd005379a06fb627303e6fe1b3dd
+%global commit b31c3d80ab0040cb02a54ee878cb2d95f6ed74e0
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20250329
-%global ver 0.40.0
+%global commit_date 20250324
+%global ver 0.39.0

 Name:           mpv-nightly
 Version:        %ver^%commit_date.%shortcommit
@@ -1,4 +1,4 @@
-%global ver 2025-03-30
+%global ver 2025-03-24
 %global goodver %(echo %ver | sed 's/-//g')
 %global __brp_mangle_shebangs %{nil}
 %bcond_without mold
@@ -12,8 +12,8 @@
 %global vendor_pnpm 1

 Name:           youtube-music
-Version:        3.8.0
-Release:        1%?dist
+Version:        3.7.5
+Release:        4%?dist
 Summary:        YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader)
 Source1:        youtube-music.desktop
 License:        MIT
@@ -5,7 +5,7 @@

 Name:    kf6-%{framework}.switcheroo
 Version: %{majmin_ver_kf6}.0
-Release: 2%{?dist}.switcheroo
+Release: 1%{?dist}.switcheroo
 Summary: KDE Frameworks 6 Tier 3 solution for filesystem abstraction

 License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT
@@ -1,15 +1,16 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit f84b3ca18b6dc92ca66edc3c8ad47f8475b6e705
+%global commit dfc840a2a4e0b0379b40cb6ec9309c5437c79d19
 %forgemeta

 Name:       lomiri-system-settings
 Version:    1.3.0
-Release:    2%?dist
+Release:    1%?dist
 Summary:    The system settings application for Lomiri
 License:    GPLv3
 URL:        https://gitlab.com/ubports/development/core/lomiri-system-settings
 Source0:    %{url}/-/archive/%commit/lomiri-system-settings-%commit.tar.gz
-Patch0:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.3.0-4/debian/patches/2011_build-without-trust-store.patch
+Patch0:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/1001_use-maliit-keyboard-for-language-plugin.patch
+Patch1:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/2001_disable-current-language-switching.patch

 BuildRequires: cmake
 BuildRequires: gcc-c++
@@ -1,9 +1,9 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri
-%global commit 248b88c17ebbe4d95808e505d8271f8d1ca9cbe7
+%global commit 0b85fddd0123c86fe6b3464143df86a6d0ad6bb9
 %forgemeta

 Name:          lomiri
-Version:       0.4.0
+Version:       0.3.0
 Release:       1%?dist
 Summary:       A convergent desktop environment by Ubports

@@ -1,7 +1,7 @@
 # Generated by rust2rpm 27
-%global commit a9aa0f96892f20e4741e94f4cd46ca31106e492c
+%global commit 5b4cc3e7a8055afb758421f4a114ef4032806e39
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20250325
+%global commit_date 20250216
 %global ver v0.6.0
 %bcond check 0

@@ -12,7 +12,7 @@

 # https://github.com/abenz1267/walker
 %global goipath         github.com/abenz1267/walker
-Version:                0.12.18
+Version:                0.12.16

 %gometa -f

@@ -6,7 +6,7 @@
 %endif

 Name:			bun-bin
-Version:		1.2.7
+Version:		1.2.5
 Release:		1%?dist
 Summary:		Incredibly fast JavaScript runtime, bundler, test runner, and package manager – all in one
 License:		MIT
@@ -1,9 +1,9 @@
-%global commit 1067cd3d8a061eb5b23bc1a4c46ca10af4481941
+%global commit c58fe676ad6212114455ac89a2703dcc3b8b67b7
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global fulldate 2025-03-28
+%global fulldate 2025-03-23
 %global commit_date %(echo %{fulldate} | sed 's/-//g')
 %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV
-%global ver 1.1.4
+%global ver 1.1.3
 %global base_name ghostty
 %global reverse_dns com.mitchellh.%{base_name}
 %if 0%{?fedora} <= 40
@@ -12,8 +12,8 @@

 # Naming variable as something other than "commit" is necessary
 # to stop %%gometa from putting commit hash in release
-%global commit_hash f4d62a498b204e73b8f084a5dc1ce82380b8c03a
-%global commit_date 20250326
+%global commit_hash 219fb12482055312b29aa35007d0bb33ef918f30
+%global commit_date 20250316
 %global shortcommit %{sub %{commit_hash} 1 7}
 %global ver 2.0.14

@@ -4,6 +4,5 @@ project pkg {
  }
  labels {
    nightly = 1
-    large = 1
  }
 }
@@ -1,7 +1,7 @@
-%global commit 548a8d75e6e93c41261bc24b227ca11bb3ba4b99
+%global commit f19e1e3b5f23ec7f64b692f4530825e0e50e5b95
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20250330
-%global ver 0.181.0
+%global commit_date 20250324
+%global ver 0.180.0

 %bcond_with check

@@ -1,6 +1,6 @@
 %bcond_with check

-%global ver 0.180.2-pre
+%global ver 0.179.2-pre
 # Exclude input files from mangling
 %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
 # Use Mold as the linker
@@ -9,7 +9,7 @@
 %global app_id dev.zed.Zed

 Name:           zed
-Version:        0.179.4
+Version:        0.178.5
 Release:        1%?dist
 Summary:        Zed is a high-performance, multiplayer code editor

@@ -1,7 +1,7 @@
 %global __brp_mangle_shebangs %{nil}

 Name:           inputplumber
-Version:        0.49.8
+Version:        0.49.6
 Release:        1%?dist
 Summary:        Open source input router and remapper daemon for Linux
 License:        GPL-3.0-or-later
@@ -1,5 +1,5 @@
 Name:           opengamepadui
-Version:        0.39.0
+Version:        0.38.0
 Release:        1%?dist
 Summary:        Open source gamepad-native game launcher and overlay

@@ -1,11 +1,11 @@
 %global real_name prismlauncher
 %global nice_name PrismLauncher

-%global commit 6b93e7aa62dcd2c0447388cbd65580a7a79ec5c8
+%global commit 9fe78fa86a1a8c6ff1cb43ee940d09e2ac358552
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad

-%global commit_date 20250330
+%global commit_date 20250324
 %global snapshot_info %{commit_date}.%{shortcommit}

 %bcond_without qt6
@@ -1,9 +0,0 @@
-project pkg {
-        arches = ["x86_64"]
-    rpm {
-        spec = "steamtinkerlaunch-git.spec"
-    }
-    labels {
-        nightly = 1
-    }
-}
@@ -1,82 +0,0 @@
-%global commit 36e917c383a333caa43e187c06c0aed0c30c0421
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20250221
-%global ver 12.12
-%global base_name steamtinkerlaunch
-%global _description %{expand:
-Steam Tinker Launch is a Linux wrapper tool for use with the Steam client which allows customizing and start tools and options for games quickly on the fly.}
-
-Name:           %{base_name}-git
-Version:        %{ver}^%{commit_date}git.%{shortcommit}
-Release:        1%{?dist}
-Summary:        Wrapper tool for use with the Steam client for custom launch options
-License:        GPL-3.0-or-later
-URL:            https://github.com/sonic2kk/steamtinkerlaunch
-Source0:        %{url}/archive/%{commit}/%{base_name}-%{commit}.tar.gz
-BuildRequires:  make
-BuildRequires:  sed
-Requires:       bash
-Requires:       gawk
-Requires:       git
-Requires:       procps-ng
-Requires:       tar
-Requires:       unzip
-Requires:       vim-common
-Requires:       wget
-Requires:       xdotool
-Requires:       xprop
-Requires:       xrandr
-Requires:       xwininfo
-Requires:       xxd
-Requires:       yad >= 7.2
-# Weak deps for various optional features
-Recommends:     gamemode
-Recommends:     gameconqueror
-# Default to terra-gamescope if available as Fedora's Gamescope package is notoriously broken, otherwise recommend Fedora's
-Recommends:     (terra-gamescope or gamescope)
-Recommends:     ImageMagick
-Recommends:     innoextract
-Recommends:     jq
-Recommends:     mangohud
-Recommends:     net-toolsa
-Recommends:     p7zip
-Recommends:     rsync
-Recommends:     scummvm
-Recommends:     strace
-Recommends:     usbutils
-Recommends:     vkBasalt
-# Default to whatever WINE source the user has
-Recommends:     (winehq-staging or wine)
-Recommends:     winetricks
-Recommends:     xdg-utils
-# Terra tag policy
-Provides:       %{base_name}.git
-Conflicts:      %{base_name}
-BuildArch:      noarch
-Packager:       Gilver E. <rockgrub@disroot.org>
-
-%description %_description
-
-%prep
-%autosetup -p1 -n %{base_name}-%{commit}
-# We only want the install commands from the Makefile
-sed -i 's/.*sed.*//g' Makefile
-# Let RPM handle the doc files
-sed -i 's/.*doc.*//g' Makefile
-
-%build
-
-%install
-%make_install PREFIX=%{buildroot}%{_prefix}
-
-%files
-%license LICENSE
-%doc README.md
-%{_bindir}/steamtinkerlaunch
-%{_datadir}/steamtinkerlaunch
-%{_datadir}/applications/steamtinkerlaunch.desktop
-%{_datadir}/icons/hicolor/scalable/apps/steamtinkerlaunch.svg
-
-%changelog
-* Wed Mar 26 2025 Gilver E. <rockgrub@disroot.org> - 12.12
- Initial package
@@ -1,8 +0,0 @@
-rpm.global("commit", gh_commit("sonic2kk/steamtinkerlaunch"));
-if rpm.changed() {
-   rpm.release();
-   rpm.global("commit_date", date());
-   let v = gh("sonic2kk/steamtinkerlaunch");
-   v.crop(1);
-   rpm.global("ver", v);
-}
@@ -1,6 +0,0 @@
-project pkg {
-        arches = ["x86_64"]
-    rpm {
-        spec = "steamtinkerlaunch.spec"
-    }
-}
@@ -1,75 +0,0 @@
-%global _description %{expand:
-Steam Tinker Launch is a Linux wrapper tool for use with the Steam client which allows customizing and start tools and options for games quickly on the fly.}
-
-Name:           steamtinkerlaunch
-Version:        12.12
-Release:        1%{?dist}
-Summary:        Wrapper tool for use with the Steam client for custom launch options
-License:        GPL-3.0-or-later
-URL:            https://github.com/sonic2kk/steamtinkerlaunch
-Source0:        %{url}/archive/refs/tags/v%{version}.tar.gz
-BuildRequires:  make
-BuildRequires:  sed
-Requires:       bash
-Requires:       gawk
-Requires:       git
-Requires:       procps-ng
-Requires:       tar
-Requires:       unzip
-Requires:       vim-common
-Requires:       wget
-Requires:       xdotool
-Requires:       xprop
-Requires:       xrandr
-Requires:       xwininfo
-Requires:       xxd
-Requires:       yad >= 7.2
-# Weak deps for various optional features
-Recommends:     gamemode
-Recommends:     gameconqueror
-# Default to terra-gamescope if available as Fedora's Gamescope package is notoriously broken, otherwise recommend Fedora's
-Recommends:     (terra-gamescope or gamescope)
-Recommends:     ImageMagick
-Recommends:     innoextract
-Recommends:     jq
-Recommends:     mangohud
-Recommends:     net-toolsa
-Recommends:     p7zip
-Recommends:     rsync
-Recommends:     scummvm
-Recommends:     strace
-Recommends:     usbutils
-Recommends:     vkBasalt
-# Default to whatever WINE source the user has
-Recommends:     (winehq-staging or wine)
-Recommends:     winetricks
-Recommends:     xdg-utils
-Conflicts:      %{name}-git
-BuildArch:      noarch
-Packager:       Gilver E. <rockgrub@disroot.org>
-
-%description %_description
-
-%prep
-%autosetup -p1 -n %{name}-%{version}
-# We only want the install commands from the Makefile
-sed -i 's/.*sed.*//g' Makefile
-# Let RPM handle the doc files
-sed -i 's/.*doc.*//g' Makefile
-
-%build
-
-%install
-%make_install PREFIX=%{buildroot}%{_prefix}
-
-%files
-%license LICENSE
-%doc README.md
-%{_bindir}/steamtinkerlaunch
-%{_datadir}/steamtinkerlaunch
-%{_datadir}/applications/steamtinkerlaunch.desktop
-%{_datadir}/icons/hicolor/scalable/apps/steamtinkerlaunch.svg
-
-%changelog
-* Wed Mar 26 2025 Gilver E. <rockgrub@disroot.org> - 12.12
- Initial package
@@ -1 +0,0 @@
-rpm.version(gh("sonic2kk/steamtinkerlaunch"));
@@ -1,8 +1,8 @@
 %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
-%global commit 0f5732bc8c35b8f11b55d34da1cbd3b3937b6f4d
+%global commit fcba14707a06271f6e14b6c5641d6d5fbc96ff0d
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global ver 2.3.1
-%global commit_date 20250330
+%global commit_date 20250324
 %global debug_package %nil

 Name:			nim-nightly
@@ -71,6 +71,10 @@ koch tools -t:-fPIE -l:-pie &
 nim c -d:danger -t:-fPIE -l:-pie nimsuggest/nimsuggest.nim &
 wait

+%ifarch x86_64
+sed -i '/<link.*fonts.googleapis.com/d' doc/html/*.html
+%endif
+

 %install
 export CFLAGS="${CFLAGS} -Ofast -fuse-ld=mold"
@@ -2,8 +2,8 @@
 %global pypi_name protobuf

 Name:           python-%{pypi_name}
-Version:        6.30.2
-Release:        1%?dist
+Version:        6.30.1
+Release:        2%?dist
 Summary:        Protocol Buffers

 License:        BSD-3-Clause
@@ -1,12 +1,14 @@
 %global commit dc0e5d3
+%global shortcommit %{sub %commit 1 7}
 %global commit_date 20250322

 Name:			astal
-Version:		0^%commit_date.%commit
+Version:		0^%commit_date.%shortcommit
 Release:		1%?dist
 Summary:		Building blocks for creating custom desktop shells
 License:		LGPL-2.1-only
 URL:			https://aylur.github.io/astal
+Source0:		https://github.com/Aylur/astal/archive/%commit.tar.gz
 Packager:		madonuko <mado@fyralabs.com>
 BuildRequires:	meson gobject-introspection vala valadoc cmake
 BuildRequires:	pkgconfig(astal-io-0.1)
@@ -57,7 +59,7 @@ This package contains development files and documentation for astal-gtk4.


 %prep
-%git_clone https://github.com/Aylur/astal
+%autosetup -n astal-%commit

 %build
 my_build() {
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "dwarfs.spec"
-	}
-}
@@ -1,120 +0,0 @@
-%global _description %{expand:
-The Deduplicating Warp-speed Advanced Read-only File System.
-
-A fast high compression read-only file system for Linux and Windows.}
-
-Name:          dwarfs
-Version:       0.11.2
-Release:       1%{?dist}
-Summary:       A fast high compression read-only file system for Linux, Windows and macOS
-License:       GPL-3.0-or-later
-URL:           https://github.com/mhx/%{name}
-Source0:       https://github.com/mhx/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
-BuildRequires: binutils-devel
-BuildRequires: bison
-BuildRequires: boost-chrono
-BuildRequires: boost-context
-BuildRequires: boost-devel
-BuildRequires: boost-filesystem
-BuildRequires: boost-iostreams
-BuildRequires: boost-program-options
-BuildRequires: boost-regex
-BuildRequires: boost-system
-BuildRequires: boost-thread
-BuildRequires: brotli-devel
-BuildRequires: ccache
-BuildRequires: clang
-BuildRequires: cmake
-BuildRequires: date-devel
-BuildRequires: double-conversion-devel
-BuildRequires: elfutils-devel
-BuildRequires: file-devel
-BuildRequires: flac-devel
-BuildRequires: flex
-BuildRequires: fmt-devel
-BuildRequires: fuse3
-BuildRequires: fuse3-devel
-BuildRequires: gcc
-BuildRequires: gcc-c++
-BuildRequires: git
-BuildRequires: glog-devel
-BuildRequires: gmock-devel
-BuildRequires: google-benchmark-devel
-BuildRequires: gtest-devel 
-BuildRequires: jemalloc-devel
-BuildRequires: json-devel
-BuildRequires: libacl-devel
-BuildRequires: libarchive-devel
-BuildRequires: libdwarf-devel
-BuildRequires: libevent-devel
-BuildRequires: libunwind-devel
-BuildRequires: lz4-devel
-BuildRequires: make
-BuildRequires: ninja-build
-BuildRequires: openssl-devel
-BuildRequires: pkgconf
-BuildRequires: range-v3-devel
-BuildRequires: rubygem-ronn-ng
-BuildRequires: utf8cpp-devel
-BuildRequires: xxhash-devel
-BuildRequires: xz-devel
-Requires:      bzip2-libs
-Requires:      gflags
-Requires:      libattr
-Requires:      libxml2
-Requires:      libzstd
-Requires:      zlib-ng-compat
-Packager:      Gilver E. <rockgrub@disroot.org>
-
-%description %_description
-
-%package       devel
-Summary:       Development files for DWARFS.
-Requires:      %{name}
-
-%description devel
-This package contains the development files for DWARFS.
-
-%prep
-%autosetup
-
-%build
-%cmake -DWITH_TESTS=ON \
-DWITH_LIBDWARFS=ON \
-DWITH_TOOLS=ON \
-DWITH_FUSE_DRIVER=ON \
-DBUILD_SHARED_LIBS=ON \
-DWITH_MAN_OPTION=OFF \
-DCMAKE_INSTALL_SBINDIR=%{_sbindir} \
-%cmake_build 
-%ctest -j
-
-%install
-%cmake_install
-
-%files
-%doc README.md
-%doc CHANGES.md
-%license LICENSE
-%{_bindir}/dwarfsck
-%{_bindir}/dwarfsextract
-%{_bindir}/mkdwarfs
-%{_sbindir}/dwarfs
-%{_sbindir}/mount.dwarfs
-%{_libdir}/libdwarfs_*.so.*
-%{_mandir}/man1/dwarfs.1*
-%{_mandir}/man1/dwarfsck.1*
-%{_mandir}/man1/dwarfsextract.1*
-%{_mandir}/man1/mkdwarfs.1*
-%{_mandir}/man5/dwarfs-format.5*
-
-%files devel
-%dir %{_libdir}/cmake/dwarfs
-%{_libdir}/cmake/dwarfs/*.cmake
-%{_libdir}/libdwarfs_*.so
-%{_includedir}/dwarfs/*.h
-%{_includedir}/dwarfs/*/*.h
-
-%changelog
-* Thu Mar 20 2025 Gilver E. <rockgrub@disroot.org>
- Initial package
@@ -1 +0,0 @@
-rpm.version(gh("mhx/dwarfs"));
@@ -256,74 +256,3 @@ Subject: [BEGIN] Our Mesa backports
 -- 
 2.49.0

-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Maarten Lankhorst <maarten.lankhorst@intel.com>
-Date: Mon, 17 Feb 2025 14:55:29 -0800
-Subject: anv: Mark images with format modifiers set as scanout.
-
-We currently use the presence of struct WSI_IMAGE_CREATE_INFO_MESA.scanout to mark the BO as scanout,
-but this only handles the linear case, and fails when drm format modifiers are used.
-
-Also handle the case of exportable BO with tiling set to VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT.
-This fixes the gamescope handling of using vulkan allocated images for scanout.
-
-Link: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12633
-Signed-off-by: Maarten Lankhorst <dev@lankhorst.se>
-Signed-off-by: Matthew Schwartz <matthew.schwartz@linux.dev>
-
-Normalspeak: fixes battlemage iGPUs in gamescope
---
- src/intel/vulkan/anv_device.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
-index 1884932bbc7..cbc1b4aad87 100644
--- a/src/intel/vulkan/anv_device.c
-+++ b/src/intel/vulkan/anv_device.c
-@@ -1533,6 +1533,9 @@ VkResult anv_AllocateMemory(
-           dedicated_info->image != VK_NULL_HANDLE) {
-          ANV_FROM_HANDLE(anv_image, image, dedicated_info->image);
- 
-+         if (image->vk.tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT)
-+            alloc_flags |= ANV_BO_ALLOC_SCANOUT;
-+
-          /* Apply implicit sync to be compatible with clients relying on
-           * implicit fencing. This matches the behavior in iris i915_batch
-           * submit. An example client is VA-API (iHD), so only dedicated
-- 
-2.49.0
-
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Antheas Kapenekakis <git@antheas.dev>
-Date: Mon, 24 Mar 2025 19:50:51 +0100
-Subject: Revert "winsys/amdgpu: use VM_ALWAYS_VALID for all VRAM and GTT
- allocations"
-
-This reverts commit 8c91624614c1f939974fe0d2d1a3baf83335cecb.
-
-Messes with AutoVRAM, who would have thought?
---
- src/gallium/winsys/amdgpu/drm/amdgpu_bo.c | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c
-index 24ba28827f8..46461f8ee59 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c
-+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c
-@@ -618,11 +618,6 @@ static struct amdgpu_winsys_bo *amdgpu_create_bo(struct amdgpu_winsys *aws,
-    if (flags & RADEON_FLAG_GTT_WC)
-       request.flags |= AMDGPU_GEM_CREATE_CPU_GTT_USWC;
- 
-   if (aws->info.has_local_buffers &&
-       initial_domain & (RADEON_DOMAIN_VRAM_GTT | RADEON_DOMAIN_DOORBELL) &&
-       flags & RADEON_FLAG_NO_INTERPROCESS_SHARING)
-      request.flags |= AMDGPU_GEM_CREATE_VM_ALWAYS_VALID;
-
-    if (flags & RADEON_FLAG_DISCARDABLE &&
-        aws->info.drm_minor >= 47)
-       request.flags |= AMDGPU_GEM_CREATE_DISCARDABLE;
-- 
-2.49.0
-
@@ -76,7 +76,7 @@ Summary:        Mesa graphics libraries
 # disabled by default, and has to be enabled manually. See `terra/release/terra-mesa.repo` for details.
 Epoch:          1
 Version:        25.0.2
-Release:        4%?dist
+Release:        3%?dist
 License:        MIT AND BSD-3-Clause AND SGI-B-2.0
 URL:            http://www.mesa3d.org

@@ -23,7 +23,7 @@ Release:        2%?dist
 Summary:        X11 XTEST reimplementation primarily for Steam Controller on Wayland

 License:        MIT
-URL:            https://github.com/KyleGospo/extest
+URL:            https://github.com/bazzite-org/extest

 Source0:        %{url}/archive/%{commit}.tar.gz

@@ -104,8 +104,8 @@ ExclusiveArch: armv7hnl

 Summary:        Digital VCR and streaming server
 Name:           ffmpeg%{?flavor}
-Version:        7.1
-Release:        1%{?dist}
+Version:        7.1.1
+Release:        1%?dist
 License:        %{ffmpeg_license}
 URL:            https://ffmpeg.org/
 %if 0%{?date}
@@ -1,5 +1,5 @@
-%global commit 11f6a53130182a85908505b9120313f8b817f32c
-%global commit_date 20250328
+%global commit e1176e63ccbee51ab59fdb8afaed2bf5af8427d1
+%global commit_date 20240711
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global debug_package %{nil}
 %define __os_install_post %{nil}
@@ -1,5 +1,4 @@
 project pkg {
-        arches = ["x86_64"]
    rpm {
        spec = "intel-ipu6-kmod.spec"
    }
@@ -1,5 +1,4 @@
 project pkg {
-    arches = ["x86_64"]
  rpm {
    spec = "ivsc-firmware.spec"
  }
@@ -1,5 +1,5 @@
 Name:		limine
-Version:	9.2.1
+Version:	9.2.0
 Release:	1%?dist
 Summary:	Modern, advanced, portable, multiprotocol bootloader
 License:	BSD-2-Clause
@@ -1,8 +0,0 @@
-project pkg {
-	rpm {
-		spec = "dkms-nvidia.spec"
-	}
-	labels {
-		subrepo = "nvidia"
-	}
-}
@@ -1,29 +0,0 @@
-PACKAGE_NAME="nvidia"
-PACKAGE_VERSION="__VERSION_STRING"
-AUTOINSTALL="yes"
-
-. /etc/nvidia/kernel.conf
-
-# Quote make to avoid DKMS replacing it with "make -j$parallel_jobs KERNELRELEASE=$kernelver"
-CLEAN="'make' -j$(nproc) -C ${MODULE_VARIANT} clean"
-MAKE[0]="'make' -j$(nproc) -C ${MODULE_VARIANT} KERNEL_UNAME=${kernelver} modules"
-
-BUILT_MODULE_NAME[0]="nvidia"
-BUILT_MODULE_LOCATION[0]="${MODULE_VARIANT}"
-DEST_MODULE_LOCATION[0]="/extra"
-
-BUILT_MODULE_NAME[1]="nvidia-modeset"
-BUILT_MODULE_LOCATION[1]="${MODULE_VARIANT}"
-DEST_MODULE_LOCATION[1]="/extra"
-
-BUILT_MODULE_NAME[2]="nvidia-drm"
-BUILT_MODULE_LOCATION[2]="${MODULE_VARIANT}"
-DEST_MODULE_LOCATION[2]="/extra"
-
-BUILT_MODULE_NAME[3]="nvidia-uvm"
-BUILT_MODULE_LOCATION[3]="${MODULE_VARIANT}"
-DEST_MODULE_LOCATION[3]="/extra"
-
-BUILT_MODULE_NAME[4]="nvidia-peermem"
-BUILT_MODULE_LOCATION[4]="${MODULE_VARIANT}"
-DEST_MODULE_LOCATION[4]="/extra"
@@ -1,55 +0,0 @@
-## NVIDIA DKMS package, based on the work of Negativo17 with tweaks for Terra.
-
-%global debug_package %{nil}
-%global modulename nvidia
-
-Name:           dkms-%{modulename}
-Version:        570.133.07
-Release:        1%{?dist}
-Summary:        NVIDIA display driver kernel module
-Epoch:          3
-License:        NVIDIA License
-URL:            https://www.nvidia.com/object/unix.html
-Source0:        https://download.nvidia.com/XFree86/Linux-%{_arch}/%{version}/NVIDIA-Linux-%{_arch}-%{version}.run
-Source1:        %{name}.conf
-BuildRequires:  sed
-Provides:       %{modulename}-kmod = %{?epoch:%{epoch}:}%{version}
-Requires:       %{modulename}-kmod-common = %{?epoch:%{epoch}:}%{version}
-Requires:       dkms
-Conflicts:      akmod-nvidia
-# Unlike most DKMS packages, this package is NOT noarch!
-ExclusiveArch:  x86_64 aarch64
-
-%description
-This package provides the proprietary NVIDIA kernel driver modules.
-
-%prep
-sh %{SOURCE0} -x --target dkms-nvidia-%{version}-%{_arch}
-%setup -T -D -n dkms-nvidia-%{version}-%{_arch}
-
-cp -f %{SOURCE1} dkms.conf
-
-sed -i -e 's/__VERSION_STRING/%{version}/g' dkms.conf
-
-%build
-
-%install
-mkdir -p %{buildroot}%{_usrsrc}/%{modulename}-%{version}/
-cp -fr * %{buildroot}%{_usrsrc}/%{modulename}-%{version}/
-rm -f %{buildroot}%{_usrsrc}/%{modulename}-%{version}/*/dkms.conf
-
-%post
-dkms add -m %{modulename} -v %{version} -q --rpm_safe_upgrade || :
-# Rebuild and make available for the currently running kernel:
-dkms build -m %{modulename} -v %{version} -q || :
-dkms install -m %{modulename} -v %{version} -q --force || :
-
-%preun
-# Remove all versions from DKMS registry:
-dkms remove -m %{modulename} -v %{version} -q --all --rpm_safe_upgrade || :
-
-%files
-%{_usrsrc}/%{modulename}-%{version}
-
-%changelog
-%autochangelog
@@ -1 +0,0 @@
-NO_WEAK_MODULES="yes"
@@ -1,3 +0,0 @@
-import "andax/nvidia.rhai" as nvidia;
-
-rpm.version(nvidia::nvidia_driver_version());
@@ -6,7 +6,7 @@
 Name:           v4l2loopback
 Summary:        Utils for V4L2 loopback devices
 Version:        0.14.0
-Release:        4%?dist
+Release:        3%?dist
 License:        GPL-2.0-or-later
 URL:            https://github.com/v4l2loopback/v4l2loopback
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -16,7 +16,7 @@ BuildRequires:  make
 BuildRequires:  help2man
 BuildRequires:  sed
 BuildRequires:  systemd-rpm-macros
-Requires:       (%{name}-kmod = %{?epoch:%{epoch}:}%{version} or dkms-%{name} = %{?epoch:%{epoch}:}%{version})
+Requires:       (akmod-%{name} = %{?epoch:%{epoch}:}%{version} or dkms-%{name} = %{?epoch:%{epoch}:}%{version})
 Provides:       %{name}-kmod-common = %{?epoch:%{epoch}:}%{version}
 ### For compatibility with older names
 Provides:       %{name}-utils = %{version}-%{release}
@@ -1,5 +1,5 @@
 Name:           anda-srpm-macros
-Version:        0.2.9
+Version:        0.2.8
 Release:        1%?dist
 Summary:        SRPM macros for extra Fedora packages

@@ -1,5 +1,5 @@
 Name:           abuild
-Version:        25.03
+Version:        24.12
 Release:        1%?dist
 Summary:        coreboot autobuild script builds coreboot images for all available targets.
 URL:            https://doc.coreboot.org/util/abuild/index.html
@@ -5,7 +5,7 @@
 %global crate anda

 Name:           rust-anda
-Version:        0.4.11
+Version:        0.4.9
 Release:        1%?dist
 Summary:        Andaman Build toolchain

@@ -5,7 +5,7 @@
 %global crate mise

 Name:           rust-mise
-Version:        2025.3.11
+Version:        2025.3.8
 Release:        1%?dist
 Summary:        Front-end to your dev env

@@ -1,5 +1,5 @@
 Name:           cbfstool
-Version:        25.03
+Version:        24.12
 Release:        1%?dist
 Summary:        Management utility for CBFS formatted ROM images
 URL:            https://doc.coreboot.org/lib/fw_config.html#cbfs
@@ -12,7 +12,7 @@
 %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so

 Name:			electron
-Version:		35.1.2
+Version:		35.0.1
 Release:		1%?dist
 Summary:		Build cross platform desktop apps with web technologies
 License:		MIT
@@ -7,7 +7,6 @@

 Name:           gcm-core
 Version:        2.6.1
-
 Release:        1%?dist
 Summary:        Secure, cross-platform Git credential storage

@@ -1,7 +1,7 @@
 %define debug_package %nil

-%global commit bb117f13b1a39b646f6ebebdbb5193bee4a24855
-%global commit_date 20250326
+%global commit 7ce981c2125b2dd780f4e88dc320e1570dc4c51e
+%global commit_date 20240910
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

 Name:           rpi-update
@@ -2,7 +2,7 @@
 %global oldpkgname yt-dlp-nightly

 Name:           yt-dlp-git
-Version:        2025.03.28.221325
+Version:        2025.03.23.163602
 Release:        1%?dist
 Summary:        A command-line program to download videos from online video platforms
				`@@ -1 +0,0 @@`
				`rpm.version(gh("sonic2kk/steamtinkerlaunch"));`