fix gamescope for older GPUs (#1930 )

* gamescope: make the SDL backend the default backend for all builds * add back funny patches * Obsolete gamescope-legacy with wrapper script, fix multiarch subpackage * fix dependency issue * terra downstream script patches * add the ctrl patch properly * revert * update to 3.15.0 * simplify wrapper script * handle calling gamescope-legacy from non-gamescope session * Use my PR patch for gamescope fallback * format patch from github * update patch --------- Signed-off-by: Cappy Ishihara <cappy@cappuchino.xyz> (cherry picked from commit e334d5d927)
bump: ruffle
2026-06-09 21:27:37 +00:00 · 2024-08-25 10:45:27 +00:00 · 2024-08-25 01:46:21 +00:00 · 2024-08-24 22:17:55 +00:00 · 2024-08-24 21:37:41 +00:00 · 2024-08-24 19:38:08 +00:00
91 changed files with 180 additions and 653 deletions
@@ -6,13 +6,13 @@ on:
    paths:
      - anda/**
    branches:
-      - frawhide
+      - f41
  pull_request:
    branches:
-      - frawhide
+      - f41
  merge_group:
    branches:
-      - frawhide
+      - f41
  workflow_dispatch:
  workflow_call:

@@ -23,7 +23,7 @@ jobs:
    outputs:
      build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f41
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Set workspace as safe
@@ -40,11 +40,11 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["rawhide"]
+        version: ["41"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version}}
+      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -7,7 +7,7 @@ jobs:
  bootstrap:
    strategy:
      matrix:
-        version: ["rawhide"]
+        version: ["41"]
        arch: ["x86_64", "aarch64"]
      fail-fast: true
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
@@ -16,7 +16,7 @@ jobs:
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Install repositories
-        run: dnf5 install -y --setopt=install_weak_deps=False mock curl wget git-core openssl-devel cargo podman fuse-overlayfs
+        run: dnf5 install -y --setopt=install_weak_deps=False mock curl wget git-core openssl-devel-engine cargo podman fuse-overlayfs

      - name: Install Anda
        run: cargo install anda
@@ -44,7 +44,7 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["rawhide"]
+        version: ["41"]
        arch: ${{ fromJson(needs.parse.outputs.arch) }}
      fail-fast: false
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-latest' }}
@@ -11,7 +11,7 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(inputs.packages) }}
-        version: ["rawhide"]
+        version: ["41"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
@@ -1,52 +0,0 @@
-name: Update per branch
-on:
-  schedule:
-    - cron: "*/30 * * * *"
-  workflow_dispatch:
-
-jobs:
-  autoupdate:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        branch:
-          - frawhide
-          - f39
-          - f40
-          - f41
-          - el9
-    container:
-      image: ghcr.io/terrapkg/builder:frawhide
-      options: --cap-add=SYS_ADMIN --privileged
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ matrix.branch }}
-          fetch-depth: 0
-          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
-
-      - name: Install SSH signing key & Set up git repository
-        run: |
-          mkdir -p ${{ runner.temp }}
-          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
-          chmod 0700 ${{ runner.temp }}/signing_key
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
-
-      - name: Run Update
-        run: anda update -vv --filters updbranch=1 --labels branch=${{ matrix.branch }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RUST_BACKTRACE: full
-
-      - name: Save
-        run: |
-          if [[ `git status --porcelain` ]]; then
-            git config user.name "Raboneko"
-            git config user.email "raboneko@fyralabs.com"
-            git config gpg.format "ssh"
-            git config user.signingkey "${{ runner.temp }}/signing_key"
-            msg="bump(branch): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
-            git commit -S -a -m "$msg"
-            git push -u origin --all
-          fi
@@ -4,8 +4,8 @@ on:
  push:
    branches:
      - frawhide
+      - f41
      - f40
-      - f39
    paths:
      - comps.xml
  workflow_dispatch:
@@ -48,6 +48,5 @@ jobs:
            }
            copy_over f39 || true
            copy_over f40 || true
-            copy_over f41 || true
            git push -u origin --all
          fi
@@ -25,7 +25,7 @@ jobs:
          git config --global --add safe.directory "$GITHUB_WORKSPACE"

      - name: Run Update
-        run: anda update -vv --excludes nightly=1 --excludes updbranch=1
+        run: anda update -vv --filters nightly=0
        env:
          GITHUB_TOKEN: ${{ secrets.AUTOUPDATE_GH_TOKEN }}
          RUST_BACKTRACE: full
@@ -49,6 +49,5 @@ jobs:
            }
            copy_over f39 || true
            copy_over f40 || true
-            copy_over f41 || true
            git push -u origin --all
          fi
@@ -1,7 +1,9 @@
 # Contributing

-First of all, thanks for being interested in contributing to Terra! If you have any questions about contributing, please [join our chats](https://wiki.ultramarine-linux.org/en/community/community/).
+First of all, thanks for being interested in contributing to Terra! If you have any questions about contributing, please contact us on [Discord](https://discord.gg/5fdPuxTg5Q).

- [Contribution Guide](https://developer.fyralabs.com/terra/contributing)
- [FAQ](https://developer.fyralabs.com/terra/faq)
- [Policy](https://developer.fyralabs.com/terra/policy)
+## Documentations
+
+* [Contribution Guide](https://developer.fyralabs.com/terra/contributing)
+* [FAQ](https://developer.fyralabs.com/terra/faq)
+* [Policy](https://developer.fyralabs.com/terra/policy)
@@ -7,31 +7,16 @@
 Terra is a rolling-release Fedora repository for all the software you need.
 With Terra, you can install the latest packages knowing that quality and security are assured.

-See the introduction at [our website](https://terra.fyralabs.com).
-
 This monorepo contains the package manifests for all packages in Terra.

 ## Installation
-
 ```bash
 sudo dnf install --repofrompath 'terra,https://repos.fyralabs.com/terra$releasever' --setopt='terra.gpgkey=https://repos.fyralabs.com/terra$releasever/key.asc' terra-release
 ```
-
-If you are using immutable/atomic editions of Fedora, run the following commands instead:
-
-```bash
-curl -fsSL https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo | pkexec tee /etc/yum.repos.d/terra.repo
-sudo rpm-ostree install terra-release
-```
+You should also install the `terra-release` package so that when our infrastructure has any migrations, you can be assured that your Terra installation will still work as-is.

 ## Documentation
-
-Our documentation can be found on our [Devdocs](https://developer.fyralabs.com/terra/).
+Our documentation can be found on our [Devdocs](https://developer.fyralabs.com/terra/). Alternatively, the GitHub Wiki contains older versions of the documentations.

 ## Questions?
-
-Feel free to reach out by [joining our community](https://wiki.ultramarine-linux.org/en/community/community/). We're always happy to help!
-
- [Contribution Guide](https://developer.fyralabs.com/terra/contributing)
- [FAQ](https://developer.fyralabs.com/terra/faq)
- [Policy](https://developer.fyralabs.com/terra/policy)
+Feel free to reach out on [Discord](https://discord.gg/5fdPuxTg5Q). We're always happy to help!
@@ -2,11 +2,11 @@
 %global _build_id_links none

 %ifarch x86_64
-%global src ArmCord-%version-linux-x64
+%global src ArmCord-%version
 %elifarch aarch64
-%global src ArmCord-%version-linux-arm64
+%global src ArmCord-%version-arm64
 %elifarch armv7l
-%global src ArmCord-%version-linux-armv7l
+%global src ArmCord-%version-armv7l
 %endif

 # Exclude private libraries
@@ -8,9 +8,8 @@ Summary:	Custom lightweight Discord client designed to enhance your experience
 URL:		https://github.com/ArmCord/ArmCord
 Group:		Applications/Internet
 Source1:	launch.sh
-Packager:	madonuko <mado@fyralabs.com>
 Requires:	electron xdg-utils
-BuildRequires:	git-core add-determinism pnpm
+BuildRequires:	nodejs-npm git add-determinism
 Conflicts:	armcord-bin
 BuildArch:	noarch

@@ -38,8 +37,8 @@ EOF


 %build
-pnpm install --no-frozen-lockfile
-pnpm run packageQuick
+npx pnpm@7 install --no-frozen-lockfile
+npm run packageQuick


 %install
@@ -51,16 +50,13 @@ install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/armcord.png

 %files
 %doc README.md
-%license license.txt
+%license LICENSE
 /usr/bin/armcord
 /usr/share/applications/ArmCord.desktop
 /usr/share/pixmaps/armcord.png
 /usr/share/armcord/app.asar

 %changelog
-* Mon Aug 26 2024 madonuko <mado@fyralabs.com> - 3.3.0-1
- Update to license.txt
-
 * Sat Jun 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.2.0-2
 - Remove libnotify dependency.
 - Fix desktop entry.
@@ -68,3 +64,4 @@ install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/armcord.png

 * Sat May 6 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.1.7-1
 - Initial package
+
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary-openasar
-Version:        0.0.479
+Version:        0.0.471
 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.479
+Version:        0.0.471
 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.66
+Version:        0.0.64
 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
-Version:		0.0.66
+Version:		0.0.64
 Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
@@ -1,5 +1,5 @@
-%global commit 943fc151f7c1927cb450456de9bb838311d9cc24
-%global commit_date 20240831
+%global commit 56f2e0b0d6378fcf31d43d349c1e5ff57b6eb985
+%global commit_date 20240729
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

 Name:           envision
@@ -9,7 +9,7 @@ Summary:        UI for building, configuring and running Monado, the open source
 License:        AGPL-3.0-or-later
 URL:            https://gitlab.com/gabmus/envision/
 Source0:        %url/-/archive/%commit/envision-%commit.tar.gz
-BuildRequires:  meson ninja-build cargo 
+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
@@ -5,7 +5,7 @@
 %global pure_protobuf_version 2.0.0

 Name:           komikku
-Version:        1.56.0
+Version:        1.55.0
 %forgemeta
 Release:        1%?dist
 Summary:        A manga reader for GNOME
@@ -1,6 +1,6 @@
-%global commit 7c672e33a5eab0564383127c8837b1034a84357b
+%global commit 3c7b6db205c027d3c4f12285719367792e471b57
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240831
+%global commit_date 20240725
 %global ver 0.38.0

 Name:           mpv-nightly
@@ -1,4 +1,4 @@
-%global ver 2024-08-31
+%global ver 2024-08-25
 %global goodver %(echo %ver | sed 's/-//g')
 %global __brp_mangle_shebangs %{nil}
 %bcond_without mold
@@ -4,10 +4,6 @@
 # do not strip binaries
 %define __strip /bin/true

-# do not perform compression in cpio
-%define _source_payload w0.ufdio
-%define _binary_payload w0.gzdio
-
 # Exclude private libraries
 %global __requires_exclude libffmpeg.so
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
@@ -2,8 +2,8 @@

 Name:           elementary-appcenter
 Summary:        Software Center from elementary
-Version:        8.0.0
-Release:        1%?dist
+Version:        7.4.0
+Release:        2%{?dist}
 License:        GPL-3.0

 Provides:       appcenter = %{version}-%{release}
@@ -3,8 +3,8 @@

 Name:           elementary-camera
 Summary:        Camera app designed for elementary
-Version:        8.0.0
-Release:        1%?dist
+Version:        6.2.2
+Release:        2%{?dist}
 License:        GPL-3.0

 URL:            https://github.com/elementary/camera
@@ -20,7 +20,7 @@ BuildRequires:  fdupes
 BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(granite-7)
+BuildRequires:  pkgconfig(granite) >= 6.0.0
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gstreamer-pbutils-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
@@ -3,7 +3,7 @@
 %global iface   io.elementary.SettingsDaemon.AccountsService

 Name:           elementary-settings-daemon
-Version:        8.1.0
+Version:        8.0.0
 Release:        1%?dist
 Summary:        Settings Daemon and Portal for Pantheon
 License:        GPL-3.0-or-later
@@ -3,7 +3,7 @@

 Name:           elementary-shortcut-overlay
 Summary:        Native, OS-wide shortcut overlay
-Version:        8.0.1
+Version:        8.0.0
 Release:        1%?dist
 License:        GPL-3.0

@@ -3,7 +3,7 @@

 Name:           elementary-theme
 Summary:        Elementary GTK+ Stylesheet
-Version:        8.1.0
+Version:        8.0.0
 Release:        1%?dist
 License:        GPL-3.0

@@ -8,7 +8,7 @@

 Name:           switchboard-plug-keyboard
 Summary:        Switchboard Keyboard plug
-Version:        8.0.1
+Version:        8.0.0
 Release:        1%?dist
 License:        GPL-3.0-or-later

@@ -8,7 +8,7 @@

 Name:           switchboard-plug-mouse-touchpad
 Summary:        Switchboard Mouse and Touchpad plug
-Version:        8.0.1
+Version:        8.0.0
 Release:        1%?dist
 License:        GPL-3.0-or-later

@@ -8,8 +8,8 @@

 Name:           switchboard-plug-pantheon-shell
 Summary:        Switchboard Pantheon Shell plug
-Version:        8.0.1
-Release:        1%?dist
+Version:        6.5.0
+Release:        1%{?dist}
 License:        GPL-3.0

 URL:            https://github.com/elementary/switchboard-plug-pantheon-shell
@@ -5,8 +5,8 @@

 Name:           wingpanel-indicator-datetime
 Summary:        Datetime Indicator for wingpanel
-Version:        2.4.2
-Release:        1%?dist
+Version:        2.4.1
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/wingpanel-indicator-datetime
@@ -5,8 +5,8 @@

 Name:           wingpanel-indicator-keyboard
 Summary:        Keyboard Indicator for wingpanel
-Version:        2.4.2
-Release:        1%?dist
+Version:        2.4.1
+Release:        2%{?dist}
 License:        LGPL-2.0-or-later

 URL:            https://github.com/elementary/%{name}
@@ -5,8 +5,8 @@

 Name:           wingpanel-indicator-nightlight
 Summary:        Night Light Indicator for wingpanel
-Version:        2.1.3
-Release:        1%?dist
+Version:        2.1.2
+Release:        1%{?dist}
 License:        GPL-2.0-or-later

 URL:            https://github.com/elementary/wingpanel-indicator-nightlight
@@ -5,8 +5,8 @@

 Name:           wingpanel-indicator-notifications
 Summary:        Notifications Indicator for wingpanel
-Version:        7.1.1
-Release:        1%?dist
+Version:        7.1.0
+Release:        1%{?dist}
 License:        LGPL-2.0-or-later

 URL:            https://github.com/elementary/wingpanel-indicator-notifications
@@ -11,16 +11,15 @@ URL:            https://github.com/fthx/appmenu-is-back
 BuildArch:      noarch

 Source0:        https://github.com/fthx/appmenu-is-back/archive/refs/tags/v%{version}.tar.gz
-Patch0:         https://github.com/fthx/appmenu-is-back/compare/v2..703a31acf900eb7bcab3462baeefa815ec7f13ab.patch

-Requires:       (gnome-shell >= 46~ with gnome-shell < 48~)
+Requires:       (gnome-shell >= 45~ with gnome-shell < 46~)
 Recommends:     gnome-extensions-app

 %description
 This extension brings back the app menu in the top panel, for GNOME 45 and later.

 %prep
-%autosetup -n appmenu-is-back-%{version} -p1
+%autosetup -n appmenu-is-back-%{version}

 %install
 install -Dm644 metadata.json %{buildroot}%{_datadir}/gnome-shell/extensions/%{uuid}/metadata.json
@@ -1,6 +1,6 @@
 %global forgeurl https://github.com/KDE/latte-dock/

-%global commit 3f43a2ec5e6ef3d1c28636b420f49fd96f5d83a0
+%global commit 4f1c08054b1f975176375f615cf9d2470f7ec7ed
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commit_date %(date '+%Y%m%d')
 %global snapshot_info %{commit_date}.%{shortcommit}
@@ -1,6 +1,6 @@
-%global commit 267ccdd069df388d0cfd80146c03fe13e1491c5d
+%global commit fb1d91585f8b7e72bc5776085a36205652a0adec
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240831
+%global commit_date 20240724

 Name:           flow-control-nightly
 Version:        %commit_date.%shortcommit
@@ -27,7 +27,7 @@ This package contains the development files for the tracy package.
 %meson
 %meson_build

-for project in capture csvexport import update profiler
+for project in capture csvexport import-chrome import-fuchsia update profiler
 do
    pushd $project
    %cmake -DDOWNLOAD_CAPSTONE=0
@@ -41,8 +41,8 @@ done
 # NOTE: the subprojects don't have install targets so we do it manually
 install -Dm755 capture/%__cmake_builddir/tracy-capture %buildroot%_bindir/tracy-capture
 install -Dm755 csvexport/%__cmake_builddir/tracy-csvexport %buildroot%_bindir/tracy-csvexport
-install -Dm755 import/%__cmake_builddir/tracy-import-chrome %buildroot%_bindir/tracy-import-chrome
-install -Dm755 import/%__cmake_builddir/tracy-import-fuchsia %buildroot%_bindir/tracy-import-fuchsia
+install -Dm755 import-chrome/%__cmake_builddir/tracy-import-chrome %buildroot%_bindir/tracy-import-chrome
+install -Dm755 import-fuchsia/%__cmake_builddir/tracy-import-fuchsia %buildroot%_bindir/tracy-import-fuchsia
 install -Dm755 update/%__cmake_builddir/tracy-update %buildroot%_bindir/tracy-update
 install -Dm755 profiler/%__cmake_builddir/tracy-profiler %buildroot%_bindir/tracy

@@ -1,7 +1,7 @@
-%global commit a850731b0ed61b0ef2a0173843b6daedf45327e8
+%global commit 479ffbbd51516c7741e2948e048ab13e5b010064
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240831
-%global ver 0.152.0
+%global commit_date 20240726
+%global ver 0.147.0

 %bcond_with check

@@ -1,6 +1,10 @@
 let releases = "https://api.github.com/repos/zed-industries/zed/releases".get().json_arr();
 for release in releases {
+  if !release.prerelease {
+    continue;
+  }
  let tag = release.tag_name;
+  tag.pop(4); // remove the "-pre" suffix
  tag.crop(1); // remove "v"
  rpm.global("ver", tag);
  break;
@@ -1,6 +1,6 @@
 %bcond_with check

-%global ver 0.151.1-pre
+%global ver 0.146.2
 # Exclude input files from mangling
 %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
 # Use Mold as the linker
@@ -10,13 +10,13 @@
 %global app_id dev.zed.Zed-Preview

 Name:           zed-preview
-Version:        %(echo %ver | sed 's/-/~/')
+Version:        %ver
 Release:        pre1%?dist
 Summary:        Zed is a high-performance, multiplayer code editor

 License:        MIT
 URL:            https://zed.dev/
-Source0:        https://github.com/zed-industries/zed/archive/refs/tags/v%{ver}.tar.gz
+Source0:        https://github.com/zed-industries/zed/archive/refs/tags/v%{ver}-pre.tar.gz

 Conflicts:      zed
 Provides:       zed
@@ -44,7 +44,7 @@ BuildRequires:  vulkan-loader
 Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

 %prep
-%autosetup -n %{crate}-%{ver} -p1
+%autosetup -n %{crate}-%{ver}-pre -p1
 %cargo_prep_online

 export DO_STARTUP_NOTIFY="true"
@@ -9,7 +9,7 @@
 %global app_id dev.zed.Zed

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

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

 # https://github.com/containerd/containerd
 %global goipath         github.com/containerd/containerd
-Version:                1.7.21
+Version:                1.7.20

 %gometa

@@ -1,36 +0,0 @@
-From 5529e8ac8f3232ec6233e33286834548e1d8018d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Sun, 8 Oct 2023 22:10:33 +0200
-Subject: [PATCH] <cstdint>
-
---
- src/reshade/source/effect_parser_stmt.cpp | 1 +
- src/reshade/source/effect_token.hpp       | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/reshade/source/effect_parser_stmt.cpp b/src/reshade/source/effect_parser_stmt.cpp
-index 7829729..f126be2 100644
--- a/src/reshade/source/effect_parser_stmt.cpp
-+++ b/src/reshade/source/effect_parser_stmt.cpp
-@@ -9,6 +9,7 @@
- #include <cctype> // std::toupper
- #include <cassert>
- #include <functional>
-+#include <limits>
- #include <string_view>
- 
- struct on_scope_exit
-diff --git a/src/reshade/source/effect_token.hpp b/src/reshade/source/effect_token.hpp
-index 072d439..e4bb633 100644
--- a/src/reshade/source/effect_token.hpp
-+++ b/src/reshade/source/effect_token.hpp
-@@ -5,6 +5,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
-- 
-2.41.0
@@ -1,8 +0,0 @@
-project pkg {
-    rpm {
-        spec = "gamescope-legacy.spec"
-    }
-    labels {
-        multilib = 1
-    }
-}
@@ -1,129 +0,0 @@
-%global libliftoff_minver 0.4.1
-%global reshade_commit 4245743a8c41abbe3dc73980c1810fe449359bf1
-%global reshade_shortcommit %(c=%{reshade_commit}; echo ${c:0:7})
-%global _default_patch_fuzz 2
-
-
-# =============================================================================
-# IMPORTANT: This package should *not* have an update script, at least not one that
-# tracks upstream Gamescope from Valve. This package is intended to be a legacy
-# build for Polaris and older GPUs from AMD, and should not be updated to the
-# latest version.
-# 
-# This package however, should be obsoleted once https://github.com/ValveSoftware/gamescope/issues/1218
-# is finally resolved, and Gamescope's Wayland backend has a fallback for GPUs without Vulkan DRM modifiers.
-# =============================================================================
-
-
-Name:           gamescope-legacy
-Version:        3.14.2
-Release:        1%{?dist}
-Summary:        Legacy builds of gamescope, a micro-compositor for video games on Wayland
-Packager:       Cappy Ishihara <cappy@fyralabs.com>
-License:        BSD
-URL:            https://github.com/ValveSoftware/gamescope
-Source0:        %{url}/archive/%{version}/gamescope-%{version}.tar.gz
-# Create stb.pc to satisfy dependency('stb')
-Source1:        stb.pc
-Source2:        https://github.com/Joshua-Ashton/reshade/archive/%{reshade_commit}/reshade-%{reshade_shortcommit}.tar.gz
-
-Patch0:         0001-cstdint.patch
-
-# https://hhd.dev/
-Patch1:         v2-0001-always-send-ctrl-1-2-to-steam-s-wayland-session.patch
-
-# ChimeraOS
-Patch2:         legacy-720p.patch
-
-BuildRequires:  meson >= 0.54.0
-BuildRequires:  ninja-build
-BuildRequires:  cmake
-BuildRequires:  gcc
-BuildRequires:  gcc-c++
-BuildRequires:  glm-devel
-BuildRequires:  google-benchmark-devel
-BuildRequires:  libXmu-devel
-BuildRequires:  libXcursor-devel
-BuildRequires:  pkgconfig(libdisplay-info)
-BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xdamage)
-BuildRequires:  pkgconfig(xcomposite)
-BuildRequires:  pkgconfig(xrender)
-BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(xfixes)
-BuildRequires:  pkgconfig(xxf86vm)
-BuildRequires:  pkgconfig(xtst)
-BuildRequires:  pkgconfig(xres)
-BuildRequires:  pkgconfig(libdrm)
-BuildRequires:  pkgconfig(vulkan)
-BuildRequires:  pkgconfig(wayland-scanner)
-BuildRequires:  pkgconfig(wayland-server)
-BuildRequires:  pkgconfig(wayland-protocols) >= 1.17
-BuildRequires:  pkgconfig(xkbcommon)
-BuildRequires:  pkgconfig(sdl2)
-BuildRequires:  pkgconfig(libpipewire-0.3)
-BuildRequires:  pkgconfig(libavif)
-BuildRequires:  (pkgconfig(wlroots) >= 0.17.0 with pkgconfig(wlroots) < 0.18)
-BuildRequires:  (pkgconfig(libliftoff) >= 0.4.1 with pkgconfig(libliftoff) < 0.5)
-BuildRequires:  pkgconfig(libcap)
-BuildRequires:  pkgconfig(hwdata)
-BuildRequires:  spirv-headers-devel
-# Enforce the the minimum EVR to contain fixes for all of:
-# CVE-2021-28021 CVE-2021-42715 CVE-2021-42716 CVE-2022-28041 CVE-2023-43898
-# CVE-2023-45661 CVE-2023-45662 CVE-2023-45663 CVE-2023-45664 CVE-2023-45666
-# CVE-2023-45667
-BuildRequires:  stb_image-devel >= 2.28^20231011gitbeebb24-12
-# Header-only library: -static is for tracking per guidelines
-BuildRequires:  stb_image-static
-BuildRequires:  stb_image_resize-devel
-BuildRequires:  stb_image_resize-static
-BuildRequires:  stb_image_write-devel
-BuildRequires:  stb_image_write-static
-BuildRequires:  vkroots-devel
-BuildRequires:  /usr/bin/glslangValidator
-
-# libliftoff hasn't bumped soname, but API/ABI has changed for 0.2.0 release
-Requires:       libliftoff%{?_isa} >= %{libliftoff_minver}
-Requires:       xorg-x11-server-Xwayland
-
-Requires:       terra-gamescope-libs
-Requires:       terra-gamescope-libs(x86-32)
-
-Recommends:     mesa-dri-drivers
-Recommends:     mesa-vulkan-drivers
-
-%description
-%{name} is the micro-compositor optimized for running video games on Wayland. This is a legacy build primarily intended for use by Polaris GPUs.
-
-%prep
-%autosetup -p1 -a2 -N -n gamescope-%{version}
-# Install stub pkgconfig file
-mkdir -p pkgconfig
-cp %{SOURCE1} pkgconfig/stb.pc
-
-# Replace spirv-headers include with the system directory
-sed -i 's^../thirdparty/SPIRV-Headers/include/spirv/^/usr/include/spirv/^' src/meson.build
-
-# Push in reshade from sources instead of submodule
-rm -rf src/reshade && mv reshade-%{reshade_commit} src/reshade
-
-%autopatch -p1
-
-%build
-export PKG_CONFIG_PATH=pkgconfig
-%meson -Dpipewire=enabled -Denable_gamescope_wsi_layer=false -Denable_openvr_support=false -Dforce_fallback_for=[]
-%meson_build
-
-%install
-%meson_install
-# Rename to not conflict with the base package
-mv %{buildroot}%{_bindir}/gamescope %{buildroot}%{_bindir}/gamescope-legacy
-
-%files
-%license LICENSE
-%doc README.md
-%{_bindir}/gamescope-legacy
-
-%changelog
-%autochangelog
-
@@ -1,33 +0,0 @@
-From 072ebb67cd4a88fd0f5db22a92a46f8316f28a46 Mon Sep 17 00:00:00 2001
-From: Matthew Anderson <ruinairas1992@gmail.com>
-Date: Tue, 25 Jul 2023 18:05:05 -0500
-Subject: [PATCH] Set default to native resolution of display if Steam tries to
- force 720p/800p
-
-You can select 720p/800p still in game or via Steam's resolution setting
-Steam > Settings > Display > Resolution
-
-This effectively reverts the changes Valve made a year ago forcing us to
-720p.
---
- src/steamcompmgr.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp
-index 52dd8d1cf..5b0fa6e52 100644
--- a/src/steamcompmgr.cpp
-+++ b/src/steamcompmgr.cpp
-@@ -5202,6 +5202,13 @@ handle_property_notify(xwayland_ctx_t *ctx, XPropertyEvent *ev)
- 			size_t server_idx = size_t{ xwayland_mode_ctl[ 0 ] };
- 			int width = xwayland_mode_ctl[ 1 ];
- 			int height = xwayland_mode_ctl[ 2 ];
-+
-+			if ( g_nOutputWidth != 1280 && width == 1280 )
-+			{
-+				width = g_nOutputWidth;
-+				height = g_nOutputHeight;
-+			}
-+
- 			bool allowSuperRes = !!xwayland_mode_ctl[ 3 ];
- 
- 			if ( !allowSuperRes )
@@ -1,7 +0,0 @@
-prefix=/usr
-includedir=${prefix}/include/stb
-
-Name: stb
-Description: Single-file public domain libraries for C/C++
-Version: 0.1.0
-Cflags: -I${includedir}
@@ -1,39 +0,0 @@
-From 35e001dc59a44227d670c667a85a6ef5472eee58 Mon Sep 17 00:00:00 2001
-From: antheas <git@antheas.dev>
-Date: Sat, 20 Jul 2024 01:23:19 +0300
-Subject: [PATCH v2] always send ctrl+1/2 to steam's wayland session
-
---
- src/wlserver.cpp | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/wlserver.cpp b/src/wlserver.cpp
-index 1852be9..7de737d 100644
--- a/src/wlserver.cpp
-+++ b/src/wlserver.cpp
-@@ -369,7 +369,12 @@ static void wlserver_handle_key(struct wl_listener *listener, void *data)
- 		keysym == XKB_KEY_XF86AudioLowerVolume ||
- 		keysym == XKB_KEY_XF86AudioRaiseVolume ||
- 		keysym == XKB_KEY_XF86PowerOff;
-	if ( ( event->state == WL_KEYBOARD_KEY_STATE_PRESSED || event->state == WL_KEYBOARD_KEY_STATE_RELEASED ) && forbidden_key )
-+
-+	// Check for steam keys (ctrl + 1/2)
-+	bool is_steamshortcut = (keyboard->wlr->modifiers.depressed & WLR_MODIFIER_CTRL) && (keysym == XKB_KEY_1 ||
-+																						 keysym == XKB_KEY_2);
-+
-+	if ( ( event->state == WL_KEYBOARD_KEY_STATE_PRESSED || event->state == WL_KEYBOARD_KEY_STATE_RELEASED ) && (forbidden_key || is_steamshortcut) )
- 	{
- 		// Always send volume+/- to root server only, to avoid it reaching the game.
- 		struct wlr_surface *old_kb_surf = wlserver.kb_focus_surface;
-@@ -378,6 +383,9 @@ static void wlserver_handle_key(struct wl_listener *listener, void *data)
- 		{
- 			wlserver_keyboardfocus( new_kb_surf, false );
- 			wlr_seat_set_keyboard( wlserver.wlr.seat, keyboard->wlr );
-+			// Send modifiers to steam for it to work
-+			if (is_steamshortcut)
-+				wlr_seat_keyboard_notify_modifiers(wlserver.wlr.seat, &keyboard->wlr->modifiers);
- 			wlr_seat_keyboard_notify_key( wlserver.wlr.seat, event->time_msec, event->keycode, event->state );
- 			wlserver_keyboardfocus( old_kb_surf, false );
- 			return;
-- 
-2.45.2
@@ -1,8 +1,8 @@
 %define debug_package %nil

-%global commit aa57bda3f17f660064c1e63f9497fa0a46df1e86
+%global commit c9a2b14de1831edf45207610289a439a50c55485
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240821
+%global commit_date 20240724

 Name:           gamescope-session
 Version:        %commit_date.%shortcommit
@@ -6,7 +6,7 @@

 %global toolchain clang
 %global _default_patch_fuzz 2
-%global gamescope_tag 3.15.4-beta-for-steamos-main
+%global gamescope_tag 3.14.24

 Name:           terra-gamescope
 Version:        100.%{gamescope_tag}
@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "modrinth.spec"
-    }
-}
@@ -1,37 +0,0 @@
-Name:           modrinth
-Version:        1.2.3
-Release:        1%?dist
-Summary:        Desktop app for managing mods and modpacks from Modrinth
-URL:            https://github.com/modrinth/code
-License:        GPL-3.0-or-later
-BuildRequires:  git-core rust tauri
-Packager:       Willow Reed <willow@willowidk.dev>
- 
-%description
-Desktop app for managing mods and modpacks from Modrinth
- 
-%prep
-rm -rf ./*
-git clone --recursive %{url} .
-git checkout v%{version}
- 
-%build
-# Vendor PNPM directly instead of installing from packages, because we need to somehow force PNPM to use Node.js 20
-# We are not using Fedora's PNPM because we need to use `pnpm env`, which PNPM does not support when not vendored directly from upstream
-curl -fsSL https://get.pnpm.io/install.sh | sh -
-source /builddir/.bashrc
-pnpm env use --global 20
-pnpm install
-pnpm build
-pnpm electron-builder --linux --dir
- 
-%install
-echo "this will also run when building pkg but for installing it into %{buildroot} so that anda (mock) can package it"
- 
-%files
-/usr/bin/pkgname-binary
-/path/to/more/files/*/package
- 
-%changelog
-* Wed Jan 11 2006 your-username-here <your_email@idk.xyz>
- Description on what you've done
@@ -1 +0,0 @@
-rpm.version(find(`https://launcher-files.modrinth.com/versions/([/d/.]+)/linux/Modrinth%20App_.+?_amd64.AppImage`, get("https://modrinth.com/app"), 1));
@@ -1,11 +1,11 @@
 %global real_name prismlauncher
 %global nice_name PrismLauncher

-%global commit 828acef7e938800a693343a0bb51e5fcd7349680
+%global commit 6352362907149d297684473f3d606b08ce1b93f5
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f

-%global commit_date 20240830
+%global commit_date 20240721
 %global snapshot_info %{commit_date}.%{shortcommit}

 %bcond_without qt6
@@ -1,7 +1,7 @@
 %define debug_package %{nil}

 Name: dart
-Version: 3.5.2
+Version: 3.5.1
 Release: 1%?dist
 Summary: The Dart Language
 License: BSD-3-Clause
@@ -1,6 +1,6 @@
 %define debug_package %nil
-%global commit f7a1c8106dbc70020aa9e9df27efef81ed394139
-%global commit_date 20240811
+%global commit cee36c6db378c380900fc7b901e2f7d0ea596cc0
+%global commit_date 20240724
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

 Name:           albius
@@ -4,7 +4,7 @@

 # https://github.com/xyproto/env
 %global goipath         github.com/xyproto/env
-Version:                2.5.0
+Version:                2.2.5

 %gometa -f

@@ -15,7 +15,7 @@ Provide default values when fetching environment variables.}
 %global godocs          README.md

 Name:           golang-%{goname}
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        Provide default values when fetching environment variables

 License:        BSD-3-Clause
@@ -1,8 +1,8 @@
 %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
-%global commit fc853cb7268b74d87932fb08553dfbd5864d8f81
+%global commit 469a6044c00ce657d2f543f292678b3c71e0b037
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global ver 2.1.99
-%global commit_date 20240831
+%global ver 2.1.9
+%global commit_date 20240726
 %global debug_package %nil

 Name:			nim-nightly
@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "nph.spec"
-    }
-}
@@ -1,31 +0,0 @@
-%define debug_package %nil
-
-Name:           nph
-Version:        0.6.0
-Release:        1%?dist
-Summary:        An opinionated code formatter for Nim
-License:        MIT
-URL:            https://github.com/arnetheduck/nph
-Source0:        %url/archive/refs/tags/v%version.tar.gz
-SourceLicense:  MIT
-Packager:       madonuko <mado@fyralabs.com>
-BuildRequires:  anda-srpm-macros
-BuildRequires:  nim
-
-%description
-nph is an opinionated source code formatter for the Nim language, aiming to take the drudgery of manual formatting out of your coding day.
-
-%prep
-%autosetup
-%nim_prep -t:"%nim_tflags" -l:"%nim_lflags"
-
-%build
-nimble c -d:release -t:"%nim_tflags" -l:"%nim_lflags" src/nph
-
-%install
-install -Dpm755 src/nph %buildroot%_bindir/nph
-
-%files
-%_bindir/nph
-%license copying.txt
-%doc README.md
@@ -1 +0,0 @@
-rpm.version(gh("arnetheduck/nph"));
@@ -2,7 +2,7 @@
 %global pypi_name protobuf

 Name:           python-%{pypi_name}
-Version:        5.28.0
+Version:        5.27.3
 Release:        1%?dist
 Summary:        Protocol Buffers

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

 Name:			python3-ruff
-Version:		0.6.3
+Version:		0.5.7
 Release:		1%?dist
 Summary:		An extremely fast Python linter, written in Rust
 License:		MIT
@@ -1,5 +1,3 @@
-%global build_rustflags %build_rustflags -C link-arg=-fuse-ld=mold
-
 Name:           rnote
 Version:        0.11.0
 Release:        1%?dist
@@ -8,7 +6,7 @@ License:        GPL-3.0
 URL:            https://github.com/flxzt/rnote
 Source0:        %{url}/archive/refs/tags/v%version.tar.gz
 Requires:       gtk4
-BuildRequires:  cargo meson cmake libappstream-glib gcc-c++ pkgconfig(alsa) alsa-lib clang-devel python desktop-file-utils mold
+BuildRequires:  cargo meson cmake libappstream-glib gcc-c++ pkgconfig(alsa) alsa-lib clang-devel python desktop-file-utils
 BuildRequires:  pkgconfig(glib-2.0) >= 2.66
 BuildRequires:  pkgconfig(gtk4) >= 4.7
 BuildRequires:  pkgconfig(libadwaita-1) >= 1.2
@@ -1,9 +1,9 @@
 %global real_name vala-lint

-%global commit 4ed1443c35a8a84445fb59292d539358365d8263
+%global commit 8ae2bb65fe66458263d94711ae4ddd978faece00
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

-%global commit_date 20240829
+%global commit_date 20240218
 %global snapshot_info %{commit_date}.%{shortcommit}

 Name:			vala-lint-nightly
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/vala-panel-project/vala-panel-appmenu
-%global commit 89767e372a2fdc67b03c98f11e3c4161a2ef6bcc
+%global commit 7631683adb35cd4fae387abf7ff1552aab4d2249
 %forgemeta

 Name:    vala-panel-appmenu
@@ -1,4 +1,4 @@
-%global ver 1.8.17
+%global ver 1.8.16
 %global sanitized_ver %(echo %{ver} | sed -E 's/-/~/g')
 Summary:        The Application Framework for tauOS apps
 Name:           libhelium
@@ -3,7 +3,7 @@
 %forgemeta

 Name:          process-cpp
-Version:       3.0.2
+Version:       3.0.1
 Release:       %autorelease
 Summary:       A simple convenience library for handling processes in C++

@@ -1,5 +1,5 @@
-%global commit 9b6ff5863e5d0b2a07b50f4aa1a3344a51a1f80f
-%global ver 1.8.35
+%global commit 97ded01095246a3a693bc85bef4bca5d1af177dd
+%global ver 1.8.33
 %global commit_date 20240219
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

@@ -1,10 +1,10 @@
 %define debug_package %nil
 %define __strip /bin/true
-%global commit 5aadc307cb9bf4479f0a12364a253b07a77ace22
+%global commit cca93db585dedf8acc1423f5e2db215de95c4c3b

 Name:			arrpc
-Version:		3.5.0
-Release:		1%?dist
+Version:		3.4.0
+Release:		2%?dist
 Summary:		Open Discord RPC server for atypical setups
 License:		MIT
 URL:			https://arrpc.openasar.dev
@@ -1,6 +1,6 @@
 %global ver 2.0.0
-%global commit c036b843513ead56c37463c7fde5875271751f22
-%global commit_date 20240817
+%global commit c7aeeda40f528d647af0a019984897543ebb6d5e
+%global commit_date 20240505
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

 Name:           openbangla-keyboard-nightly
@@ -1,45 +1,69 @@
-%global commit_date 20240824
-
-%global tree_commit b2e69368f96bdf7562dc1a95a0d863c794756842
-%global tree_shortcommit %(c=%{tree_commit}; echo ${c:0:7})
-
-%global um_commit 46892acafb2fff3f3ace425d4694382c92645feb
-%global um_shortcommit %(c=%{um_commit}; echo ${c:0:7})
-
+%global commit 5f56dd60b256061a036e5f5b494da570a299cdee
+%global commit_date 20240708
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global debug_package %{nil}
 %define __os_install_post %{nil}

 Name:           cros-keyboard-map
-Version:        %commit_date.%tree_shortcommit.%um_shortcommit
+Version:        %commit_date.%shortcommit
 Release:        1%?dist

-License:        BSD-3-Clause and GPLv3
+License:        BSD-3-Clause
 Summary:        Utility to generate keyd configurations for use on Chromebooks
-URL:            https://github.com/Ultramarine-Linux/cros-keyboard-map
-Source0:        https://github.com/WeirdTreeThing/cros-keyboard-map/archive/%{tree_commit}/cros-keyboard-map-%{tree_commit}.tar.gz
-Source1:        https://github.com/Ultramarine-Linux/cros-keyboard-map/archive/%{um_commit}/cros-keyboard-map-%{um_commit}.tar.gz
+URL:            https://github.com/WeirdTreeThing/cros-keyboard-map
+Source0:        https://github.com/WeirdTreeThing/cros-keyboard-map/archive/%commit/cros-keyboard-map-%commit.tar.gz

 %{?systemd_requires}
 BuildRequires:  systemd-rpm-macros
 Requires:       keyd python3 python3-libfdt

 %description
-Bash script and systemd service to apply WeirdTreeThing's Chromebook keyboard maps.
+Set of tools designed to help develop and debug software and firmware on Intel platforms with AudioDSP onboard.
+
+Related to alsa-utils which is also set of utilities but targets AdvancedLinuxSoundArchitecture (ALSA) audience in more general fashion.

 %prep
-%autosetup -n cros-keyboard-map-%tree_commit
-tar --strip-components=1 -zxvf %{SOURCE1}
+%autosetup -n cros-keyboard-map-%commit

 %install
-mkdir -p %buildroot%{_sysconfdir}/cros-keyboard-map/configs
-install -Dm755 cros-keyboard-map.py %buildroot%{_sysconfdir}/cros-keyboard-map/cros-keyboard-map.py
-cp configs/* %buildroot%{_sysconfdir}/cros-keyboard-map/configs
+mkdir -p %buildroot/etc/cros-keyboard-map/configs
+install -Dm755 cros-keyboard-map.py %buildroot/etc/cros-keyboard-map/cros-keyboard-map.py
+cp configs/* %buildroot/etc/cros-keyboard-map/configs

-mkdir -p %buildroot%{_bindir}
-install -Dm755 um-generate-cros-keymap %{buildroot}%{_bindir}/um-generate-cros-keymap
-mkdir -p %buildroot%{_unitdir}
-install -Dm644 cros-keyboard-map.service %{buildroot}%{_unitdir}/cros-keyboard-map.service
-chmod +x %buildroot%{_bindir}/um-generate-cros-keymap
+mkdir -p %buildroot/usr/bin
+tee %buildroot/usr/bin/um-generate-cros-keymap <<EOF
+if (grep -E "^(Nocturne|Atlas|Eve)$" /sys/class/dmi/id/product_name &> /dev/null)
+then
+	cp /etc/cros-keyboard-map/configs/cros-pixel.conf /etc/cros-keyboard-map/current.config
+elif (grep -E "^(Sarien|Arcada)$" /sys/class/dmi/id/product_name &> /dev/null)
+then
+	cp /etc/cros-keyboard-map/configs/cros-sarien.conf /etc/cros-keyboard-map/current.config
+else
+	python3 /etc/cros-keyboard-map/cros-keyboard-map.py --file /etc/cros-keyboard-map/current.config
+fi
+
+mkdir -p /etc/keyd
+if [[ -f /etc/keyd/default.conf ]]; then
+	rm /etc/keyd/default.conf
+fi
+ln -s /etc/cros-keyboard-map/current.config /etc/keyd/default.conf
+EOF
+
+mkdir -p %buildroot/etc/systemd/system
+tee %buildroot/etc/systemd/system/cros-keyboard-map.service <<EOF
+[Unit]
+Description=Generate chromebook keyboard layout
+Before=keyd.service
+After=tmp.mount
+
+[Service]
+Type=oneshot
+ExecStart=/bin/bash /usr/bin/um-generate-cros-keymap
+
+[Install]
+WantedBy=sysinit.target
+EOF
+chmod +x %buildroot/usr/bin/um-generate-cros-keymap

 %post
 %systemd_post cros-keyboard-map.service
@@ -56,12 +80,10 @@ chmod +x %buildroot%{_bindir}/um-generate-cros-keymap
 %files
 %doc README.md
 %license LICENSE
-%{_sysconfdir}/cros-keyboard-map/*
-%{_unitdir}/cros-keyboard-map.service
-%{_bindir}/um-generate-cros-keymap
+/etc/cros-keyboard-map/*
+/etc/systemd/system/cros-keyboard-map.service
+/usr/bin/um-generate-cros-keymap

 %changelog
-* Sat Aug 24 2024 junefish <june@fyralabs.com>
- Split off into seperate git repo.
 * Sat May 4 2024 Owen-sz <owen@fyralabs.com>
 - Initial package.
@@ -1,5 +1,4 @@
 if filters.contains("nightly") {
-  rpm.global("tree_commit", gh_commit("WeirdTreeThing/cros-keyboard-map"));
  rpm.global("commit", gh_commit("WeirdTreeThing/cros-keyboard-map"));
  if rpm.changed() {
    rpm.release();
@@ -1,8 +0,0 @@
-project pkg {
-	rpm {
-		spec = "duet-quirks.spec"
-	}
-	labels {
-	   nightly = "1"
-	}
-}
@@ -1,39 +0,0 @@
-%global commit_date 20240824
-%global commit d22b585a81b8645f1d660b4db22c95231c4301cf
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global debug_package %{nil}
-%define __os_install_post %{nil}
-
-Name:           duet-quirks
-Version:        %commit_date.%shortcommit
-Release:        1%?dist
-
-License:        CC-BY-SA-4.0
-Summary:        Quirks for the Lenovo Duet Chromebooks on Ultramarine Linux
-URL:            https://github.com/Ultramarine-Linux/duet-quirks
-Source0:        https://github.com/Ultramarine-Linux/duet-quirks/archive/%{commit}/duet-quirks-%{commit}.tar.gz
-
-Requires:       udev libinput
-
-BuildArch:      noarch
-
-%description
-Quirks for the Lenovo Duet Chromebooks on Ultramarine Linux.
-Including a libinput rule for trackpad configuration and a udev rule for display rotation.
-
-%prep
-%autosetup -n duet-quirks-%commit
-
-%install
-install -Dm644 udev/61-cros-ec-accel.rules %buildroot%{_sysconfdir}/udev/61-cros-ec-accel.rules
-install -Dm644 libinput/local-overrides.quirks %buildroot%{_sysconfdir}/libinput/local-overrides.quirks
-
-%files
-%doc README.md
-%license LICENSE
-%{_sysconfdir}/udev/61-cros-ec-accel.rules
-%{_sysconfdir}/libinput/local-overrides.quirks
-
-%changelog
-* Sat Aug 25 2024 junefish <june@fyralabs.com>
- Initial package
@@ -1,7 +0,0 @@
-if filters.contains("nightly") {
-  rpm.global("commit", gh_commit("Ultramarine-Linux/duet-quirks"));
-  if rpm.changed() {
-    rpm.release();
-    rpm.global("commit_date", date());
-  }
-}
@@ -1,5 +1,5 @@
 Name:		limine
-Version:	8.0.6
+Version:	8.0.5
 Release:	1%?dist
 Summary:	Modern, advanced, portable, multiprotocol bootloader
 License:	BSD-2-Clause
@@ -68,11 +68,12 @@ algorithms and decoding only VC1 algorithm.
 # todo: set to 1 when mesa 24.2 gets in the repos
 %global with_gallium_video 1

+
 #%%global vulkan_drivers swrast%%{?base_vulkan}%%{?intel_platform_vulkan}%%{?extra_platform_vulkan}%%{?with_nvk:,nouveau}

 Name:           %{srcname}-freeworld
 Summary:        Mesa graphics libraries
-%global ver 24.2.1
+%global ver 24.2.0
 Version:        %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
 Release:        1%{?dist}
 License:        MIT AND BSD-3-Clause AND SGI-B-2.0
@@ -1,7 +1,7 @@
 %global debug_package %{nil}
-%global commit d3a5414eff8acb3246ccf1014a81ba4bf4237a98
+%global commit c7221dd770279275a06f34e68b39b8d237ea9b7b
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240831
+%global commit_date 20240719


 %global patches %{_datadir}/src/nvidia-patch
@@ -1,7 +1,7 @@
-%global commit 61495b1de79419c76e10b7b6685318f2a6396ac8
+%global commit a60fa0cfd06148fc0c62c12fc11d9b55e15cb656
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240824
-%global ver v0.6.4.0
+%global commit_date 20240819
+%global ver 0.6.4.0

 # We aren't using Mono but RPM expected Mono
 %global __requires_exclude_from ^/usr/lib/opentabletdriver/.*$
@@ -1,3 +1,3 @@
-// todo: Check latest .NET runtime version from Fedora repos and set macros accordingly
+# todo: Check latest .NET runtime version from Fedora repos and set macros accordingly

 rpm.version(gh("OpenTabletDriver/OpenTabletDriver"));
@@ -1,5 +1,5 @@
 Name:           terra-mock-configs
-Version:        1.2.6
+Version:        1.2.2
 Release:        1%?dist
 Epoch:          1
 Summary:        Mock configs for Terra repos
@@ -1,6 +1,6 @@
 Name:           terra-release
-Version:        42
-Release:        1
+Version:        41
+Release:        2
 Summary:        Release package for Terra

 License:        MIT
@@ -8,8 +8,7 @@ URL:            https://terra.fyralabs.com
 Source0:        terra.repo
 BuildArch:      noarch

-%dnl We probably shouldn't do this in Rawhide!
-%dnl Requires:       system-release(%{version})
+Requires:       system-release(%{version})

 %description
 Release package for Terra, containing the Terra repository configuration.
@@ -1,5 +1,5 @@
 Name:           anda-srpm-macros
-Version:        0.2.0
+Version:        0.1.9
 Release:        1%?dist
 Summary:        SRPM macros for extra Fedora packages

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

 Name:           subatomic
-Version:        0.9.2
+Version:        0.9.0
 Release:        1%?dist
 Summary:        A modern package delivery system

@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "cbfstool.spec"
-	}
-}
@@ -1,28 +0,0 @@
-Name:           cbfstool
-Version:        24.08
-Release:        1%?dist
-Summary:        Management utility for CBFS formatted ROM images
-URL:            https://doc.coreboot.org/lib/fw_config.html#cbfs
-License:        GPLv2
-BuildRequires:  gcc g++ gcc-gnat make cmake ncurses-devel iasl git
-Requires:       glibc
-Packager:       Owen Zimmerman <owen@fyralabs.com>
-
-%description
-Management utility for CBFS formatted ROM images.
-
-%prep
-git clone https://review.coreboot.org/coreboot.git -b %version
-
-%build
-make -C coreboot/util/cbfstool
-
-%install
-install -Dm 777 coreboot/util/cbfstool/cbfstool %buildroot%_bindir/cbfstool
-
-%files
-/usr/bin/cbfstool
-
-%changelog
-* Sun Aug 25 2024 Owen Zimmerman <owen@fyralabs.com>
- Initial Package
@@ -1 +0,0 @@
-rpm.version(gh("coreboot/coreboot"));
@@ -1,5 +1,5 @@
 Name:			keyd
-Version:		2.4.3
+Version:		2.5.0
 Release:		1%?dist
 Summary:		Key remapping daemon for linux
 URL:			https://github.com/rvaiya/keyd
@@ -21,7 +21,6 @@ git clone --depth 1 -b v%version %url .
 %install
 %make_install PREFIX=%_prefix
 install -Dm644 keyd.service %buildroot%_unitdir/keyd.service
-sed -i 's@local/@@g' %buildroot%_unitdir/keyd.service

 %post
 %systemd_post keyd.service
@@ -1,7 +1,7 @@
 #%global debug_package %{nil}

 Name:           open-in-mpv
-Version:        2.3.0
+Version:        2.2.2
 Release:        1%?dist
 Summary:        CLI component of open-in-mpv browser extension

@@ -1,8 +1,8 @@
 #bcond_without tests
-%global commit ad9a8115aa29a1a95c961b16fcf129a228d98f50
+%global commit 28d485714fef88937c82635438afba5db81f9089
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240829
-%global ver 2024.08.06
+%global commit_date 20240726
+%global ver 2024.07.25

 Name:           yt-dlp-nightly
 Version:        %ver^%commit_date.%shortcommit
				`@@ -1 +0,0 @@`
				rpm.version(find(`https://launcher-files.modrinth.com/versions/([/d/.]+)/linux/Modrinth%20App_.+?_amd64.AppImage`, get("https://modrinth.com/app"), 1));