add back cstdint patch

attempt to fix gamescope-legacy on rawhide
2026-05-31 17:11:56 +00:00 · 2024-08-16 00:52:18 +07:00 · 2024-08-16 00:47:35 +07:00
132 changed files with 1129 additions and 1066 deletions
@@ -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
@@ -14,7 +14,7 @@
 %global __provides_exclude_from %{_datadir}/armcord/.*\\.so

 Name:			armcord-bin
-Version:		3.3.0
+Version:		3.2.8
 Release:		1%?dist
 License:		OSL-3.0
 Summary:		Custom lightweight Discord client designed to enhance your experience
@@ -1,16 +1,15 @@
 %define debug_package %nil

 Name:		armcord
-Version:	3.3.0
+Version:	3.2.8
 Release:	1%?dist
 License:	OSL-3.0
 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-ptb-openasar
-Version:        0.0.101
+Version:        0.0.99
 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.101
+Version:        0.0.99
 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.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 58ceb44984ffbace79ed5eddf5c426362ad23ae7
+%global commit_date 20240814
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

 Name:           envision
@@ -5,7 +5,7 @@
 %global pure_protobuf_version 2.0.0

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

 Name:           mpv-nightly
@@ -1,4 +1,4 @@
-%global ver 2024-08-31
+%global ver 2024-08-15
 %global goodver %(echo %ver | sed 's/-//g')
 %global __brp_mangle_shebangs %{nil}
 %bcond_without mold
@@ -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

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

 Name:           gala
 Summary:        Gala window manager
-Version:        8.0.0
-Release:        1%?dist
+Version:        7.1.3
+Release:        2%{?dist}
 License:        GPL-3.0-or-later
 Epoch:          1

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

 Name:           switchboard-plug-display
 Summary:        Switchboard Display plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        7.0.0
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-display
@@ -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,7 +8,7 @@

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

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

 Name:           wingpanel-applications-menu
 Summary:        Lightweight and stylish app launcher
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.11.1
+Release:        2%?dist
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/applications-menu
@@ -5,8 +5,8 @@

 Name:           wingpanel-indicator-bluetooth
 Summary:        Bluetooth Indicator for wingpanel
-Version:        8.0.0
-Release:        1%?dist
+Version:        7.0.1
+Release:        1%{?dist}
 License:        LGPL-2.0-or-later

 URL:            https://github.com/elementary/%{name}
@@ -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-network
 Summary:        Network Indicator for wingpanel
-Version:        7.1.1
-Release:        1%?dist
+Version:        7.1.0
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/wingpanel-indicator-network
@@ -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
@@ -5,8 +5,8 @@

 Name:           wingpanel-indicator-power
 Summary:        Power indicator for wingpanel
-Version:        8.0.0
-Release:        1%?dist
+Version:        6.2.1
+Release:        1%{?dist}
 License:        GPL-2.0-or-later

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

 Name:           wingpanel-indicator-sound
 Summary:        Sound Indicator for wingpanel
-Version:        8.0.0
-Release:        1%?dist
+Version:        7.0.0
+Release:        1%{?dist}
 License:        GPL-3.0

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

 Name:           wingpanel
 Summary:        Stylish top panel
-Version:        8.0.0
-Release:        1%?dist
+Version:        3.0.5
+Release:        1%{?dist}
 License:        GPL-2.0-or-later
 Epoch:          1

@@ -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 31a6135fd9942a492fefecc69339b0802ecdce3b
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commit_date %(date '+%Y%m%d')
 %global snapshot_info %{commit_date}.%{shortcommit}
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch
-%global commit a057a37b56b96efddc7f42577407a3a08a0575cf
+%global commit af441bdb31bb76b207119a8c91eef3fa93c0c078
 %forgemeta

 Name:           lomiri-app-launch
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit 849214f4bb1a40fae692e18fed5d599e0d8c7af1
+%global commit 8d7e90d1e1e4f807584834ab2448618d0b67c860
 %forgemeta

 Name:       lomiri-system-settings
@@ -1,4 +1,4 @@
-%define _ubuntu_rel 7ubuntu1
+%define _ubuntu_rel 1ubuntu4

 Name:    unity-session
 Summary: Lightdm profile for Unity 7
@@ -1,5 +1,5 @@
 Name:			terra-blueprint-compiler
-Version:		0.14.0
+Version:		0.12.0
 Release:		1%?dist
 License:		LGPL-3.0-or-later
 Summary:		Markup language for GTK user interfaces
@@ -12,7 +12,7 @@
 %endif

 Name:			codium
-Version:		1.92.2.24228
+Version:		1.92.1.24225
 Release:		1%?dist
 Summary:		Code editing. Redefined.
 License:		MIT
@@ -1,6 +1,6 @@
-%global commit 267ccdd069df388d0cfd80146c03fe13e1491c5d
+%global commit 3dd9efa66e7f745cd57920361a892aa4a4411387
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240831
+%global commit_date 20240815

 Name:           flow-control-nightly
 Version:        %commit_date.%shortcommit
@@ -1,5 +1,5 @@
 Name:			flutter
-Version:		3.24.1
+Version:		3.24.0
 Release:		1%?dist
 Summary:		SDK for crafting beautiful, fast user experiences from a single codebase
 License:		BSD-3-Clause
@@ -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.11.1
+Version:		0.11.0
 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
@@ -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 4c390b82fbe1c512932cce4d65ddb0fdc0d985b0
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240831
-%global ver 0.152.0
+%global commit_date 20240815
+%global ver 0.150.0

 %bcond_with check

@@ -1,6 +1,7 @@
 let releases = "https://api.github.com/repos/zed-industries/zed/releases".get().json_arr();
 for release in releases {
  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.1
 # 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.148.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,7 +1,7 @@
 %define debug_package %{nil}

 Name:           moby-compose
-Version:        2.29.2
+Version:        2.29.1
 Release:        1%?dist
 Summary:        Define and run multi-container applications with Docker

@@ -1,5 +1,5 @@
 Name:		sarasa-gothic-fonts
-Version:	1.0.20
+Version:	1.0.18
 Release:	1%?dist
 URL:		https://github.com/be5invis/Sarasa-Gothic
 Source0:	%url/releases/download/v%version/Sarasa-TTC-%version.7z
@@ -33,4 +33,4 @@ index 072d439..e4bb633 100644
 #include <vector>
 
 -- 
-2.41.0
+2.41.0
@@ -1,4 +1,8 @@
+%if 0%{?fedora} >= 41
+%global libliftoff_minver 0.5.0
+%else
 %global libliftoff_minver 0.4.1
+%endif
 %global reshade_commit 4245743a8c41abbe3dc73980c1810fe449359bf1
 %global reshade_shortcommit %(c=%{reshade_commit}; echo ${c:0:7})
 %global _default_patch_fuzz 2
@@ -22,7 +26,7 @@ Summary:        Legacy builds of gamescope, a micro-compositor for video games o
 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
@@ -35,6 +39,9 @@ Patch1:         v2-0001-always-send-ctrl-1-2-to-steam-s-wayland-session.patch
 # ChimeraOS
 Patch2:         legacy-720p.patch

+# System wlroots
+Patch4:         wlroots-pc.patch
+BuildRequires:  git-core
 BuildRequires:  meson >= 0.54.0
 BuildRequires:  ninja-build
 BuildRequires:  cmake
@@ -64,7 +71,7 @@ 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(libliftoff) >= %{libliftoff_minver} with pkgconfig(libliftoff) < 0.6)
 BuildRequires:  pkgconfig(libcap)
 BuildRequires:  pkgconfig(hwdata)
 BuildRequires:  spirv-headers-devel
@@ -96,7 +103,9 @@ Recommends:     mesa-vulkan-drivers
 %{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}
+git clone --depth 1 --branch %{version} %{url}.git gamescope
+cd gamescope
+git submodule update --init --recursive
 # Install stub pkgconfig file
 mkdir -p pkgconfig
 cp %{SOURCE1} pkgconfig/stb.pc
@@ -104,17 +113,21 @@ 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

+tar -xvf %{SOURCE2}
+
 # Push in reshade from sources instead of submodule
 rm -rf src/reshade && mv reshade-%{reshade_commit} src/reshade

 %autopatch -p1

 %build
+cd gamescope
 export PKG_CONFIG_PATH=pkgconfig
 %meson -Dpipewire=enabled -Denable_gamescope_wsi_layer=false -Denable_openvr_support=false -Dforce_fallback_for=[]
 %meson_build

 %install
+cd gamescope
 %meson_install
 # Rename to not conflict with the base package
 mv %{buildroot}%{_bindir}/gamescope %{buildroot}%{_bindir}/gamescope-legacy
@@ -1,8 +1,8 @@
 %define debug_package %nil

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

 Name:           gamescope-session
 Version:        %commit_date.%shortcommit
@@ -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,21 +0,0 @@
-From 88ce1e5de62886aa14c74421cde6130e16e70d7d Mon Sep 17 00:00:00 2001
-From: psykose <alice@ayaya.dev>
-Date: Sat, 6 Jul 2024 20:52:50 +0200
-Subject: [PATCH] utils: include limits.h for PATH_MAX
-
---
- src/Utils/Process.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Utils/Process.cpp b/src/Utils/Process.cpp
-index e71786f75..3e748e0d3 100644
--- a/src/Utils/Process.cpp
-+++ b/src/Utils/Process.cpp
-@@ -21,6 +21,7 @@
- #include <pthread.h>
- #include <stdlib.h>
- #include <dirent.h>
-+#include <limits.h>
- #include <unistd.h>
- #include <sys/types.h>
- #include <signal.h>
@@ -0,0 +1,239 @@
+From ab115896be1a448bde0eb7673c26300ea4ca5040 Mon Sep 17 00:00:00 2001
+From: sharkautarch <128002472+sharkautarch@users.noreply.github.com>
+Date: Sun, 19 May 2024 20:15:36 -0400
+Subject: [PATCH 1/2] QueuePresent: canBypassXWayland(): fetch multiple xcb
+ cookies initially before waiting on any of them
+
+---
+ layer/VkLayer_FROG_gamescope_wsi.cpp |   1 +
+ layer/xcb_helpers.hpp                | 105 +++++++++++++++++++++++----
+ 2 files changed, 93 insertions(+), 13 deletions(-)
+
+diff --git a/layer/VkLayer_FROG_gamescope_wsi.cpp b/layer/VkLayer_FROG_gamescope_wsi.cpp
+index 5844c2a63..ca44849f2 100644
+--- a/layer/VkLayer_FROG_gamescope_wsi.cpp
+++ b/layer/VkLayer_FROG_gamescope_wsi.cpp
+@@ -975,6 +975,7 @@ namespace GamescopeWSILayer {
+             continue;
+           }
+ 
+          xcb::Prefetcher prefetcher(gamescopeSurface->connection, gamescopeSurface->window);
+           const bool canBypass = gamescopeSurface->canBypassXWayland();
+           if (canBypass != gamescopeSwapchain->isBypassingXWayland)
+             UpdateSwapchainResult(canBypass ? VK_SUBOPTIMAL_KHR : VK_ERROR_OUT_OF_DATE_KHR);
+diff --git a/layer/xcb_helpers.hpp b/layer/xcb_helpers.hpp
+index 8fac5635b..72d0ec092 100644
+--- a/layer/xcb_helpers.hpp
+++ b/layer/xcb_helpers.hpp
+@@ -4,22 +4,106 @@
+ #include <xcb/composite.h>
+ #include <cstdio>
+ #include <optional>
+#include <pthread.h>
+ 
+ namespace xcb {
+  inline static constinit pthread_t g_cache_tid; //incase g_cache could otherwise be accessed by one thread, while it is being deleted by another thread
+  inline static constinit struct cookie_cache_t {
+    xcb_window_t window;
+    std::tuple<xcb_get_geometry_cookie_t, xcb_query_tree_cookie_t> cached_cookies;
+    std::tuple<xcb_get_geometry_reply_t*, xcb_query_tree_reply_t*> cached_replies;
+  } g_cache = {};
+  
+  //Note: this class is currently only meant to be used within GamescopeWSILayer::VkDeviceOverrides::QueuePresentKHR:
+  struct Prefetcher {
+    explicit Prefetcher(xcb_connection_t* connection, const xcb_window_t window) {
+        g_cache = {
+            .window = window,
+            .cached_cookies = {
+                xcb_get_geometry(connection, window),
+                xcb_query_tree(connection, window)
+            }
+        };
+        g_cache_tid = pthread_self();
+    }
+ 
+    ~Prefetcher() {
+        g_cache_tid = {};
+        free(std::get<0>(g_cache.cached_replies));
+        free(std::get<1>(g_cache.cached_replies));
+        g_cache.cached_replies = {nullptr,nullptr};
+    }
+  };
+  
+   struct ReplyDeleter {
+    const bool m_bOwning = true;
+    consteval ReplyDeleter(bool bOwning = true) : m_bOwning{bOwning} {}
+     template <typename T>
+     void operator()(T* ptr) const {
+-      free(const_cast<std::remove_const_t<T>*>(ptr));
+      if (m_bOwning)
+        free(const_cast<std::remove_const_t<T>*>(ptr));
+     }
+   };
+ 
+   template <typename T>
+   using Reply = std::unique_ptr<T, ReplyDeleter>;
+  
+  template <typename Cookie_RetType, typename Reply_RetType, typename XcbConn=xcb_connection_t*, typename... Args>
+  class XcbFetch {
+    using cookie_f_ptr_t = Cookie_RetType (*)(XcbConn, Args...);
+    using reply_f_ptr_t = Reply_RetType* (*)(XcbConn, Cookie_RetType, xcb_generic_error_t**);
+    
+    const cookie_f_ptr_t m_cookieFunc;
+    const reply_f_ptr_t m_replyFunc;
+    
+    public:
+        consteval XcbFetch(cookie_f_ptr_t cookieFunc, reply_f_ptr_t replyFunc) : m_cookieFunc{cookieFunc}, m_replyFunc{replyFunc} {}
+        
+        inline Reply<Reply_RetType> operator()(XcbConn conn, auto... args) { //have to use auto for argsTwo, since otherwise there'd be a type deduction conflict
+            return Reply<Reply_RetType> { m_replyFunc(conn, m_cookieFunc(conn, args...), nullptr) };
+        }
+  };
+  
+  template <typename CookieType>
+  concept CacheableCookie = std::is_same<CookieType, xcb_get_geometry_cookie_t>::value 
+                            || std::is_same<CookieType, xcb_query_tree_cookie_t>::value;
+  
+  template <CacheableCookie Cookie_RetType, typename Reply_RetType>
+  class XcbFetch<Cookie_RetType, Reply_RetType, xcb_connection_t*, xcb_window_t> {
+    using cookie_f_ptr_t = Cookie_RetType (*)(xcb_connection_t*, xcb_window_t);
+    using reply_f_ptr_t = Reply_RetType* (*)(xcb_connection_t*, Cookie_RetType, xcb_generic_error_t**);
+    
+    const cookie_f_ptr_t m_cookieFunc;
+    const reply_f_ptr_t m_replyFunc;
+    
+    inline Reply<Reply_RetType> getCachedReply(xcb_connection_t* connection) {
+        if (std::get<Reply_RetType*>(g_cache.cached_replies) == nullptr) {
+            std::get<Reply_RetType*>(g_cache.cached_replies) = m_replyFunc(connection, std::get<Cookie_RetType>(g_cache.cached_cookies), nullptr);
+        }
+ 
+        return Reply<Reply_RetType>{std::get<Reply_RetType*>(g_cache.cached_replies), ReplyDeleter{false}}; // return 'non-owning' unique_ptr
+    }
+    
+    public:
+        consteval XcbFetch(cookie_f_ptr_t cookieFunc, reply_f_ptr_t replyFunc) : m_cookieFunc{cookieFunc}, m_replyFunc{replyFunc} {}
+        
+        inline Reply<Reply_RetType> operator()(xcb_connection_t* conn, xcb_window_t window) {
+            const bool tryCached = pthread_equal(g_cache_tid, pthread_self())
+                                   && g_cache.window == window;
+            if (!tryCached) [[unlikely]]
+                return Reply<Reply_RetType> { m_replyFunc(conn, m_cookieFunc(conn, window), nullptr) };
+            
+            auto ret = getCachedReply(conn);
+            #if !defined(NDEBUG) || NDEBUG == 0
+            if (!ret)
+                fprintf(stderr, "[Gamescope WSI] getCachedReply() failed.\n");
+            #endif
+            return ret;
+        }
+  };
+ 
+   static std::optional<xcb_atom_t> getAtom(xcb_connection_t* connection, std::string_view name) {
+-    xcb_intern_atom_cookie_t cookie = xcb_intern_atom(connection, false, name.length(), name.data());
+-    auto reply = Reply<xcb_intern_atom_reply_t>{ xcb_intern_atom_reply(connection, cookie, nullptr) };
+    auto reply = XcbFetch{xcb_intern_atom, xcb_intern_atom_reply}(connection, false, name.length(), name.data());
+     if (!reply) {
+       fprintf(stderr, "[Gamescope WSI] Failed to get xcb atom.\n");
+       return std::nullopt;
+@@ -34,8 +118,7 @@ namespace xcb {
+ 
+     xcb_screen_t* screen = xcb_setup_roots_iterator(xcb_get_setup(connection)).data;
+ 
+-    xcb_get_property_cookie_t cookie = xcb_get_property(connection, false, screen->root, atom, XCB_ATOM_CARDINAL, 0, sizeof(T) / sizeof(uint32_t));
+-    auto reply = Reply<xcb_get_property_reply_t>{ xcb_get_property_reply(connection, cookie, nullptr) };
+    auto reply = XcbFetch{xcb_get_property, xcb_get_property_reply}(connection, false, screen->root, atom, XCB_ATOM_CARDINAL, 0, sizeof(T) / sizeof(uint32_t));
+     if (!reply) {
+       fprintf(stderr, "[Gamescope WSI] Failed to read T root window property.\n");
+       return std::nullopt;
+@@ -61,8 +144,7 @@ namespace xcb {
+ 
+   static std::optional<xcb_window_t> getToplevelWindow(xcb_connection_t* connection, xcb_window_t window) {
+     for (;;) {
+-      xcb_query_tree_cookie_t cookie = xcb_query_tree(connection, window);
+-      auto reply = Reply<xcb_query_tree_reply_t>{ xcb_query_tree_reply(connection, cookie, nullptr) };
+      auto reply = XcbFetch{xcb_query_tree, xcb_query_tree_reply}(connection, window);
+ 
+       if (!reply) {
+         fprintf(stderr, "[Gamescope WSI] getToplevelWindow: xcb_query_tree failed for window 0x%x.\n", window);
+@@ -77,8 +159,7 @@ namespace xcb {
+   }
+ 
+   static std::optional<VkRect2D> getWindowRect(xcb_connection_t* connection, xcb_window_t window) {
+-    xcb_get_geometry_cookie_t cookie = xcb_get_geometry(connection, window);
+-    auto reply = Reply<xcb_get_geometry_reply_t>{ xcb_get_geometry_reply(connection, cookie, nullptr) };
+    auto reply = XcbFetch{xcb_get_geometry, xcb_get_geometry_reply}(connection, window);
+     if (!reply) {
+       fprintf(stderr, "[Gamescope WSI] getWindowRect: xcb_get_geometry failed for window 0x%x.\n", window);
+       return std::nullopt;
+@@ -112,8 +193,7 @@ namespace xcb {
+   static std::optional<VkExtent2D> getLargestObscuringChildWindowSize(xcb_connection_t* connection, xcb_window_t window) {
+     VkExtent2D largestExtent = {};
+ 
+-    xcb_query_tree_cookie_t cookie = xcb_query_tree(connection, window);
+-    auto reply = Reply<xcb_query_tree_reply_t>{ xcb_query_tree_reply(connection, cookie, nullptr) };
+    auto reply = XcbFetch{xcb_query_tree, xcb_query_tree_reply}(connection, window);
+ 
+     if (!reply) {
+       fprintf(stderr, "[Gamescope WSI] getLargestObscuringWindowSize: xcb_query_tree failed for window 0x%x.\n", window);
+@@ -130,8 +210,7 @@ namespace xcb {
+     for (uint32_t i = 0; i < reply->children_len; i++) {
+       xcb_window_t child = children[i];
+ 
+-      xcb_get_window_attributes_cookie_t attributeCookie = xcb_get_window_attributes(connection, child);
+-      auto attributeReply = Reply<xcb_get_window_attributes_reply_t>{ xcb_get_window_attributes_reply(connection, attributeCookie, nullptr) };
+      auto attributeReply = XcbFetch{xcb_get_window_attributes, xcb_get_window_attributes_reply}(connection, child);
+ 
+       const bool obscuring =
+         attributeReply &&
+
+From 1b59621f4de5c05096d1f279cba2e04264124154 Mon Sep 17 00:00:00 2001
+From: sharkautarch <128002472+sharkautarch@users.noreply.github.com>
+Date: Tue, 18 Jun 2024 22:21:23 -0400
+Subject: [PATCH 2/2] WSI: prefetcher: fix issue w/ attempting to prefetch xcb
+ stuff for pure wayland surfaces
+
+---
+ layer/VkLayer_FROG_gamescope_wsi.cpp | 2 +-
+ layer/xcb_helpers.hpp                | 9 ++++++++-
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/layer/VkLayer_FROG_gamescope_wsi.cpp b/layer/VkLayer_FROG_gamescope_wsi.cpp
+index f26819a60..ce011dcd7 100644
+--- a/layer/VkLayer_FROG_gamescope_wsi.cpp
+++ b/layer/VkLayer_FROG_gamescope_wsi.cpp
+@@ -1234,7 +1234,7 @@ namespace GamescopeWSILayer {
+             continue;
+           }
+ 
+-          xcb::Prefetcher prefetcher(gamescopeSurface->connection, gamescopeSurface->window);
+          auto prefetcher = xcb::Prefetcher::GetPrefetcherIf(!gamescopeSurface->isWayland(), gamescopeSurface->connection, gamescopeSurface->window);
+           const bool canBypass = gamescopeSurface->canBypassXWayland();
+           if (canBypass != gamescopeSwapchain->isBypassingXWayland)
+             UpdateSwapchainResult(canBypass ? VK_SUBOPTIMAL_KHR : VK_ERROR_OUT_OF_DATE_KHR);
+diff --git a/layer/xcb_helpers.hpp b/layer/xcb_helpers.hpp
+index 72d0ec092..f26aef38b 100644
+--- a/layer/xcb_helpers.hpp
+++ b/layer/xcb_helpers.hpp
+@@ -16,6 +16,13 @@ namespace xcb {
+   
+   //Note: this class is currently only meant to be used within GamescopeWSILayer::VkDeviceOverrides::QueuePresentKHR:
+   struct Prefetcher {
+    static std::optional<Prefetcher> GetPrefetcherIf(bool bCond, xcb_connection_t* connection, const xcb_window_t window) {
+       if (bCond)
+         return std::optional<Prefetcher>(std::in_place_t{}, connection, window);
+       
+       return std::nullopt;
+    }
+    
+     explicit Prefetcher(xcb_connection_t* connection, const xcb_window_t window) {
+         g_cache = {
+             .window = window,
+@@ -90,7 +97,7 @@ namespace xcb {
+         inline Reply<Reply_RetType> operator()(xcb_connection_t* conn, xcb_window_t window) {
+             const bool tryCached = pthread_equal(g_cache_tid, pthread_self())
+                                    && g_cache.window == window;
+-            if (!tryCached) [[unlikely]]
+            if (!tryCached)
+                 return Reply<Reply_RetType> { m_replyFunc(conn, m_cookieFunc(conn, window), nullptr) };
+             
+             auto ret = getCachedReply(conn);
@@ -1,34 +0,0 @@
-From ca58cb2453e6d9ef44d799e394ee9950b7a35b30 Mon Sep 17 00:00:00 2001
-From: Cappy Ishihara <cappy@cappuchino.xyz>
-Date: Wed, 21 Aug 2024 03:56:53 +0700
-Subject: [PATCH] Check if current GPU supports Vulkan DRM modifiers when
- `--backend=auto` is used.
-
-This works around #1218 by making use of the new backend option added in #1321,
-but adds a check to automatically fall back to the SDL backend if the current
-GPU does not support Vulkan DRM modifiers.
---
- src/main.cpp | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/main.cpp b/src/main.cpp
-index ca4001249..bc6b16904 100644
--- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -817,9 +817,13 @@ int main(int argc, char **argv)
- 	if ( eCurrentBackend == gamescope::GamescopeBackend::Auto )
- 	{
- 		if ( g_pOriginalWaylandDisplay != NULL )
-			eCurrentBackend = gamescope::GamescopeBackend::Wayland;
-		else if ( g_pOriginalDisplay != NULL )
-			eCurrentBackend = gamescope::GamescopeBackend::SDL;
-+			// Additional check if the current GPU supports Vulkan DRM modifiers
-+			// Fallback to SDL if not supported (e.g Older AMD GPUs like Polaris 10/20)
-+			if ( vulkan_supports_modifiers() ) 
-+				eCurrentBackend = gamescope::GamescopeBackend::Wayland;
-+			else
-+				eCurrentBackend = gamescope::GamescopeBackend::SDL;
-+
- 		else
- 			eCurrentBackend = gamescope::GamescopeBackend::DRM;
- 	}
@@ -0,0 +1,136 @@
+diff --git a/src/Backends/DRMBackend.cpp b/src/Backends/DRMBackend.cpp
+index 85e5126..be418b4 100644
+--- a/src/Backends/DRMBackend.cpp
+++ b/src/Backends/DRMBackend.cpp
+@@ -2149,6 +2149,7 @@ namespace gamescope
+ 			( m_Mutable.szMakePNP == "WLC"sv && m_Mutable.szModel == "ANX7530 U"sv ) ||
+ 			( m_Mutable.szMakePNP == "ANX"sv && m_Mutable.szModel == "ANX7530 U"sv ) ||
+ 			( m_Mutable.szMakePNP == "VLV"sv && m_Mutable.szModel == "ANX7530 U"sv ) ||
+			( m_Mutable.szMakePNP == "DHD"sv && m_Mutable.szModel == "DeckHD-1200p"sv ) ||
+ 			( m_Mutable.szMakePNP == "VLV"sv && m_Mutable.szModel == "Jupiter"sv ) ||
+ 			( m_Mutable.szMakePNP == "VLV"sv && m_Mutable.szModel == "Galileo"sv );
+ 
+@@ -2160,6 +2161,7 @@ namespace gamescope
+ 		{
+ 			static constexpr uint32_t kPIDGalileoSDC = 0x3003;
+ 			static constexpr uint32_t kPIDGalileoBOE = 0x3004;
+			static constexpr uint32_t kPIDJupiterDHD = 0x4001;
+ 
+ 			if ( pProduct->product == kPIDGalileoSDC )
+ 			{
+@@ -2171,6 +2173,10 @@ namespace gamescope
+ 				m_Mutable.eKnownDisplay = GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_BOE;
+ 				m_Mutable.ValidDynamicRefreshRates = std::span( s_kSteamDeckOLEDRates );
+ 			}
+			else if (pProduct-> product == kPIDJupiterDHD ) {
+				m_Mutable.eKnownDisplay = GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD_DHD;
+				m_Mutable.ValidDynamicRefreshRates = std::span( s_kSteamDeckLCDRates );
+			}
+ 			else
+ 			{
+ 				m_Mutable.eKnownDisplay = GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD;
+@@ -2200,7 +2206,8 @@ namespace gamescope
+ 			drm_log.infof( "[colorimetry]: Steam Deck LCD detected. Using known colorimetry" );
+ 			m_Mutable.DisplayColorimetry = displaycolorimetry_steamdeck_measured;
+ 		}
+-		else
+		else if (m_Mutable.eKnownDisplay == GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_BOE ||
+				 m_Mutable.eKnownDisplay == GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_SDC )
+ 		{
+ 			// Steam Deck OLED has calibrated chromaticity coordinates in the EDID
+ 			// for each unit.
+@@ -2330,7 +2337,7 @@ namespace gamescope
+ 				.uMinContentLightLevel = nits_to_u16_dark( 0 ),
+ 			};
+ 		}
+-		else if ( eKnownDisplay == GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD )
+		else if ( eKnownDisplay == GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD || eKnownDisplay == GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD_DHD )
+ 		{
+ 			// Set up some HDR fallbacks for undocking
+ 			return BackendConnectorHDRInfo
+diff --git a/src/gamescope_shared.h b/src/gamescope_shared.h
+index ed30d8c..3b60774 100644
+--- a/src/gamescope_shared.h
+++ b/src/gamescope_shared.h
+@@ -8,6 +8,7 @@ namespace gamescope
+ 	{
+ 		GAMESCOPE_KNOWN_DISPLAY_UNKNOWN,
+ 		GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD,      // Jupiter
+		GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD_DHD,  // Jupiter Deck HD
+ 		GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_SDC, // Galileo SDC
+ 		GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_BOE, // Galileo BOE
+ 	};
+diff --git a/src/modegen.cpp b/src/modegen.cpp
+index d174c2d..5dd1136 100644
+--- a/src/modegen.cpp
+++ b/src/modegen.cpp
+@@ -293,13 +293,32 @@ unsigned int galileo_boe_vfp[] =
+ 	172,152,136,120,100,84,68,52,36,20,8
+ };
+ 
+-#define GALILEO_MIN_REFRESH 45
+//SD LCD Stock Timings
+#define JUPITER_BOE_PID     0x3001
+#define JUPITER_B_PID       0x3002
+#define JUPITER_HFP         40
+#define JUPITER_HSYNC       4
+#define JUPITER_HBP         40
+#define JUPITER_VFP         30
+#define JUPITER_VSYNC       4
+#define JUPITER_VBP         8
+//SD LCD DeckHD Timings
+#define JUPITER_DHD_PID     0x4001
+#define JUPITER_DHD_HFP     40
+#define JUPITER_DHD_HSYNC   20
+#define JUPITER_DHD_HBP     40
+#define JUPITER_DHD_VFP     18
+#define JUPITER_DHD_VSYNC   2
+#define JUPITER_DHD_VBP     20
+//SD OLED SDC Timings
+ #define GALILEO_SDC_PID     0x3003
+ #define GALILEO_SDC_VSYNC   1
+ #define GALILEO_SDC_VBP     22
+//SD OLED BOE Timings
+ #define GALILEO_BOE_PID     0x3004
+ #define GALILEO_BOE_VSYNC   2
+ #define GALILEO_BOE_VBP     30
+#define GALILEO_MIN_REFRESH 45
+ #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
+ 
+ unsigned int get_galileo_vfp( int vrefresh, unsigned int * vfp_array, unsigned int num_rates )
+@@ -344,17 +363,28 @@ void generate_fixed_mode(drmModeModeInfo *mode, const drmModeModeInfo *base, int
+ 		mode->vsync_end = mode->vsync_start + vsync;
+ 		mode->vtotal = mode->vsync_end + vbp;
+ 	} else {
+-		if ( eKnownDisplay == gamescope::GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD )
+		if ( eKnownDisplay == gamescope::GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD_DHD ) {
+			mode->hdisplay = 1200;
+			mode->hsync_start = mode->hdisplay + JUPITER_DHD_HFP;
+			mode->hsync_end = mode->hsync_start + JUPITER_DHD_HSYNC;
+			mode->htotal = mode->hsync_end + JUPITER_DHD_HBP;
+
+			mode->vdisplay = 1920;
+			mode->vsync_start = mode->vdisplay + JUPITER_DHD_VFP;
+			mode->vsync_end = mode->vsync_start + JUPITER_DHD_VSYNC;
+			mode->vtotal = mode->vsync_end + JUPITER_DHD_VBP;
+		}
+		else if ( eKnownDisplay == gamescope::GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD )
+ 		{
+ 			mode->hdisplay = 800;
+-			mode->hsync_start = 840;
+-			mode->hsync_end = 844;
+-			mode->htotal = 884;
+			mode->hsync_start = mode->hdisplay + JUPITER_HFP;
+			mode->hsync_end = mode->hsync_start + JUPITER_HSYNC;
+			mode->htotal = mode->hsync_end + JUPITER_HBP;
+ 
+ 			mode->vdisplay = 1280;
+-			mode->vsync_start = 1310;
+-			mode->vsync_end = 1314;
+-			mode->vtotal = 1322;
+			mode->vsync_start = mode->vdisplay + JUPITER_VFP;
+			mode->vsync_end = mode->vsync_start + JUPITER_VSYNC;
+			mode->vtotal = mode->vsync_end + JUPITER_VBP;
+ 		}
+ 
+ 		mode->clock = ( ( mode->htotal * mode->vtotal * vrefresh ) + 999 ) / 1000;
@@ -48,4 +48,4 @@ index 92bf617..d7498e5 100644
 +					cv_disable_touch_click = true;
 				}
 				break;
- 			case '?':
+ 			case '?':
@@ -0,0 +1,63 @@
+From 2e4d7ad1bf2cb98eb67ff8f9385cf6657cf2e912 Mon Sep 17 00:00:00 2001
+From: Matthew Schwartz <njtransit215@gmail.com>
+Date: Wed, 3 Jul 2024 15:20:08 -0700
+Subject: [PATCH] drm: Separate BOE and SDC OLED Deck panel valid refresh rates
+
+OLED Decks with BOE panels seem to struggle with a few different
+specific modesets (51hz/55hz/65hz) that SDC panels have no issues with.
+To work around this, let's make use of Gamescope recognizing each
+display manufacturer to correct the bad modesets while leaving
+SDC panel units alone. This can be reverted if an underlying cause can
+be found in the kernel in the future.
+---
+ src/Backends/DRMBackend.cpp | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/src/Backends/DRMBackend.cpp b/src/Backends/DRMBackend.cpp
+index 97ef446..9f93c7f 100644
+--- a/src/Backends/DRMBackend.cpp
+++ b/src/Backends/DRMBackend.cpp
+@@ -554,7 +554,7 @@ static constexpr uint32_t s_kSteamDeckLCDRates[] =
+ 	60,
+ };
+ 
+-static constexpr uint32_t s_kSteamDeckOLEDRates[] =
+static constexpr uint32_t s_kSteamDeckOLEDSDCRates[] =
+ {
+ 	45, 47, 48, 49, 
+ 	50, 51, 53, 55, 56, 59, 
+@@ -564,6 +564,16 @@ static constexpr uint32_t s_kSteamDeckOLEDRates[] =
+ 	90, 
+ };
+ 
+static constexpr uint32_t s_kSteamDeckOLEDBOERates[] =
+{
+	45, 47, 48, 49, 
+	50, 53, 56, 59, 
+	60, 62, 64, 66, 68, 
+	72, 73, 76, 77, 78, 
+	80, 81, 82, 84, 85, 86, 87, 88, 
+	90, 
+};
+
+ static void update_connector_display_info_wl(struct drm_t *drm)
+ {
+ 	wlserver_lock();
+@@ -2128,12 +2138,12 @@ namespace gamescope
+ 			if ( pProduct->product == kPIDGalileoSDC )
+ 			{
+ 				m_Mutable.eKnownDisplay = GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_SDC;
+-				m_Mutable.ValidDynamicRefreshRates = std::span( s_kSteamDeckOLEDRates );
+				m_Mutable.ValidDynamicRefreshRates = std::span( s_kSteamDeckOLEDSDCRates );
+ 			}
+ 			else if ( pProduct->product == kPIDGalileoBOE )
+ 			{
+ 				m_Mutable.eKnownDisplay = GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_BOE;
+-				m_Mutable.ValidDynamicRefreshRates = std::span( s_kSteamDeckOLEDRates );
+				m_Mutable.ValidDynamicRefreshRates = std::span( s_kSteamDeckOLEDBOERates );
+ 			}
+ 			else
+ 			{
+-- 
+2.45.2
+
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# Wrapper script to run Gamescope with legacy options for older GPUs
-
-gamescope_path="/usr/bin/gamescope"
-
-
-# check if $BACKEND is already defined
-# todo: Probably want to patch gamescope-session-plus for this instead meow
-
-# For compatibility, let's add the argument for nested backends too
-
-LEGACY_BACKEND_ARGS=""
-NESTED_BACKEND_ARGS=""
-if [ -z "$BACKEND" ]; then
-    LEGACY_BACKEND_ARGS="--backend=sdl"
-    NESTED_BACKEND_ARGS="--backend=sdl"
-else
-    # Only added for nested sessions, as $BACKEND should be defined only for legacy
-    NESTED_BACKEND_ARGS="--backend=$BACKEND"
-fi
-
-
-if [ -z "$DISPLAY" ]; then
-    $gamescope_path $LEGACY_BACKEND_ARGS $@
-else
-    $gamescope_path $NESTED_BACKEND_ARGS $@
-fi
-
@@ -4,4 +4,4 @@ includedir=${prefix}/include/stb
 Name: stb
 Description: Single-file public domain libraries for C/C++
 Version: 0.1.0
-Cflags: -I${includedir}
+Cflags: -I${includedir}
@@ -1,43 +1,37 @@
-%if 0%{?fedora} >= 41
-%global libliftoff_minver 0.5.0
-%else
 %global libliftoff_minver 0.4.1
-%endif

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

 Name:           terra-gamescope
 Version:        100.%{gamescope_tag}
 Release:        1%?dist
-Summary:        Micro-compositor for video games on Wayland - Terra patch, please read the full description
+Summary:        Micro-compositor for video games on Wayland

 License:        BSD
 URL:            https://github.com/ValveSoftware/gamescope

 # Create stb.pc to satisfy dependency('stb')
 Source0:        stb.pc
-Source1:        gamescope-legacy.sh
-
-Patch0:         0001-cstdint.patch

 # https://github.com/ChimeraOS/gamescope
-Patch1:         chimeraos.patch
+#Patch0:         chimeraos.patch
 # https://hhd.dev/
-Patch2:         disable-steam-touch-click-atom.patch
-Patch3:         v2-0001-always-send-ctrl-1-2-to-steam-s-wayland-session.patch
-
-# Set default backend to SDL instead of Wayland, to avoid issues with GPUs that do not support
-# Vulkan DRM modifiers.
-# See also: gamescope-legacy package
-# https://github.com/ValveSoftware/gamescope/issues/1218#issuecomment-2123801764
-Patch6:         1483.patch
+#Patch1:         disable-steam-touch-click-atom.patch
+# https://github.com/ValveSoftware/gamescope/pull/1281
+# Patch2:         deckhd.patch
+# https://github.com/ValveSoftware/gamescope/issues/1398
+Patch3:         drm-Separate-BOE-and-SDC-OLED-Deck-panel-rates.patch
+# https://github.com/ValveSoftware/gamescope/issues/1369
+Patch4:         revert-299bc34.patch
+# https://github.com/ValveSoftware/gamescope/pull/1231
+Patch5:         1231.patch

 BuildRequires:  meson >= 0.54.0
 BuildRequires:  ninja-build
 BuildRequires:  cmake
-BuildRequires:  clang
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
 BuildRequires:  glm-devel
 BuildRequires:  google-benchmark-devel
 BuildRequires:  libXmu-devel
@@ -58,16 +52,22 @@ BuildRequires:  pkgconfig(xres)
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(vulkan)
 BuildRequires:  pkgconfig(wayland-scanner)
-BuildRequires:  pkgconfig(wayland-server) >= 1.23.0
+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)
-BuildRequires:  pkgconfig(libliftoff) >= 0.4.1
+#BuildRequires:  (pkgconfig(wlroots) >= 0.18.0 with pkgconfig(wlroots) < 0.19.0)
+#BuildRequires:  (pkgconfig(libliftoff) >= 0.4.1 with pkgconfig(libliftoff) < 0.5)
+BuildRequires:  pkgconfig(libliftoff)
 BuildRequires:  pkgconfig(libcap)
 BuildRequires:  pkgconfig(hwdata)
+BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(libseat)
+BuildRequires:  pkgconfig(libinput)
+BuildRequires:  xcb-util-wm-devel
+BuildRequires:  pkgconfig(xcb-errors)
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  spirv-headers-devel
 # Enforce the the minimum EVR to contain fixes for all of:
@@ -90,21 +90,16 @@ BuildRequires:  git
 # 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 = %{version}-%{release}
-Requires:       terra-gamescope-libs(x86-32) = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
+%ifarch %{ix86}
+Requires:       %{name}-libs(x86-32) = %{version}-%{release}
+%endif
 Recommends:     mesa-dri-drivers
 Recommends:     mesa-vulkan-drivers

-Provides:       gamescope-legacy
-Obsoletes:      gamescope-legacy < 3.14.2
-
 %description
 Gamescope is the micro-compositor optimized for running video games on Wayland.

-This specific build of Gamescope is patched to use SDL as the default backend instead of Wayland, and
-includes a legacy wrapper script for older GPUs and extra configuration options. Please see
-https://developer.fyralabs.com/terra/gamescope for more information.
-
 %package libs
 Summary:	libs for Gamescope
 %description libs
@@ -125,35 +120,21 @@ sed -i 's^../thirdparty/SPIRV-Headers/include/spirv/^/usr/include/spirv/^' src/m
 %build
 cd gamescope
 export PKG_CONFIG_PATH=pkgconfig
-%if %{__isa_bits} == 64
-%meson --auto-features=enabled -Dforce_fallback_for=vkroots,wlroots,libliftoff
-%else
-%meson -Denable_gamescope=false -Denable_gamescope_wsi_layer=true
-%endif
+%meson -Dpipewire=enabled -Dinput_emulation=enabled -Ddrm_backend=enabled -Drt_cap=enabled -Davif_screenshots=enabled -Dsdl2_backend=enabled
 %meson_build

 %install
 cd gamescope
 %meson_install --skip-subprojects

-%if %{__isa_bits} == 64
-install -Dm755 %{SOURCE1} %{buildroot}%{_bindir}/gamescope-legacy
-%endif
-
 %files
 %license gamescope/LICENSE
 %doc gamescope/README.md
-%if %{__isa_bits} == 64
 %caps(cap_sys_nice=eip) %{_bindir}/gamescope
 %{_bindir}/gamescopectl
 %{_bindir}/gamescopestream
 %{_bindir}/gamescopereaper
-%{_bindir}/gamescope-legacy
-%endif

 %files libs
 %{_libdir}/libVkLayer_FROG_gamescope_wsi_*.so
 %{_datadir}/vulkan/implicit_layer.d/VkLayer_FROG_gamescope_wsi.*.json
-
-%changelog
-%autochangelog
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-curl -o ./1483.patch https://patch-diff.githubusercontent.com/raw/ValveSoftware/gamescope/pull/1483.patch
@@ -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,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));
@@ -3,7 +3,7 @@
 %define __strip /bin/true

 Name:			osu-lazer
-Version:		2024.817.0
+Version:		2024.731.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
@@ -1,11 +1,11 @@
 %global real_name prismlauncher
 %global nice_name PrismLauncher

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

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

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

 Name:			crystal
-Version:		1.13.2
+Version:		1.13.1
 Release:		1%?dist
 Summary:		The Crystal Programming Language
 License:		Apache-2.0
@@ -1,7 +1,7 @@
 %define debug_package %{nil}

 Name: dart
-Version: 3.5.2
+Version: 3.5.0
 Release: 1%?dist
 Summary: The Dart Language
 License: BSD-3-Clause
@@ -3,7 +3,7 @@

 # https://github.com/charmbracelet/glow
 %global goipath         github.com/charmbracelet/glow
-Version:                2.0.0
+Version:                1.5.1

 %gometa -f

@@ -15,7 +15,7 @@ Render markdown on the CLI, with pizzazz! 💅🏻.}
 %global godocs          README.md

 Name:           %{goname}
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        Render markdown on the CLI, with pizzazz! 💅🏻

 License:        MIT
@@ -4,7 +4,7 @@

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

 %gometa -f

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

 # https://github.com/xyproto/textoutput
 %global goipath         github.com/xyproto/textoutput
-Version:                1.16.6
+Version:                1.16.4

 %gometa -f

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

 # https://github.com/xyproto/vt100
 %global goipath         github.com/xyproto/vt100
-Version:                1.14.5
+Version:                1.14.4

 %gometa -f

@@ -2,14 +2,14 @@

 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Name:           kotlin-native
-Version:        2.0.20
+Version:        2.0.10
 Release:        1%?dist
 Summary:        LLVM backend for the Kotlin compiler
 ExclusiveArch:  x86_64

 License:        ASL 2.0
 URL:            https://kotlinlang.org/docs/reference/native-overview.html
-Source0:        https://github.com/JetBrains/kotlin/releases/download/v%version/kotlin-native-prebuilt-linux-x86_64-%version.tar.gz
+Source0:        https://github.com/JetBrains/kotlin/releases/download/v%version/kotlin-native-linux-x86_64-%version.tar.gz

 BuildRequires:  tar
 BuildRequires:  sed
@@ -28,7 +28,7 @@ Kotlin compiler and native implementation of the Kotlin standard library.


 %prep
-tar -xf %{SOURCE0} && cd kotlin-native-prebuilt-linux-x86_64-%{version}
+tar -xf %{SOURCE0} && cd kotlin-native-linux-x86_64-%{version}
 sed -i "s|\(DIR *= *\).*|\1%{_bindir}|" bin/*
 sed -i "s|\(KONAN_HOME *= *\).*|\1%{_datadir}/%{name}|" bin/*

@@ -36,7 +36,7 @@ sed -i "s|\(KONAN_HOME *= *\).*|\1%{_datadir}/%{name}|" bin/*
 %build

 %install
-rm -rf %{buildroot} && mkdir -p %{buildroot}%{_bindir}/ && cd kotlin-native-prebuilt-linux-x86_64-%{version}
+rm -rf %{buildroot} && mkdir -p %{buildroot}%{_bindir}/ && cd kotlin-native-linux-x86_64-%{version}
 install -m 0755 bin/cinterop %{buildroot}%{_bindir}/
 install -m 0755 bin/generate-platform %{buildroot}%{_bindir}/
 install -m 0755 bin/jsinterop %{buildroot}%{_bindir}/
@@ -1,7 +1,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 Name:           kotlin
-Version:        2.0.20
+Version:        2.0.10
 Release:        1%?dist
 Summary:        Statically typed programming language

@@ -1,8 +1,8 @@
 %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
-%global commit fc853cb7268b74d87932fb08553dfbd5864d8f81
+%global commit 2a046e648756b6a36acf580c9c0289319cd697d7
 %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 20240815
 %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.6.0
 Release:		1%?dist
 Summary:		An extremely fast Python linter, written in Rust
 License:		MIT
@@ -1,20 +1,23 @@
--- bandwhich-0.23.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ bandwhich-0.23.0/Cargo.toml	2024-08-18T04:14:50.797745+00:00
-@@ -165,17 +165,3 @@
- [target.'cfg(any(target_os = "android", target_os = "linux"))'.dependencies.procfs]
+--- bandwhich-0.22.2/Cargo.toml	1970-01-01T00:00:01+00:00
+++ bandwhich-0.22.2/Cargo.toml	2024-02-02T05:59:38.855816+00:00
+@@ -149,20 +149,6 @@
+ version = "0.25.0"
+ features = ["derive"]
+ 
+-[target."cfg(any(target_os = \"macos\", target_os = \"freebsd\"))".dependencies.regex]
+-version = "1.10.3"
+-
+ [target."cfg(target_os = \"linux\")".dependencies.procfs]
 version = "0.16.0"
 
-[target.'cfg(any(target_os = "macos", target_os = "freebsd"))'.dependencies.regex]
-version = "1.10.5"
-
-[target.'cfg(target_os = "windows")'.dependencies.netstat2]
+-[target."cfg(target_os = \"windows\")".dependencies.netstat2]
 -version = "0.9.1"
 -
-[target.'cfg(target_os = "windows")'.dependencies.sysinfo]
-version = "0.31.0"
+-[target."cfg(target_os = \"windows\")".dependencies.sysinfo]
+-version = "0.30.5"
 -
-[target.'cfg(target_os = "windows")'.build-dependencies.http_req]
-version = "0.11.1"
+-[target."cfg(target_os = \"windows\")".build-dependencies.http_req]
+-version = "0.10.2"
 -
-[target.'cfg(target_os = "windows")'.build-dependencies.zip]
-version = "2.1.6"
+-[target."cfg(target_os = \"windows\")".build-dependencies.zip]
+-version = "0.6.6"
@@ -1,12 +1,11 @@
-# Generated by rust2rpm 26
+# Generated by rust2rpm 25
 #bcond_without check
-%bcond_without mold

 %global crate bandwhich

 Name:           rust-bandwhich
-Version:        0.23.0
-Release:        1%?dist
+Version:        0.22.2
+Release:        1%{?dist}
 Summary:        Display current network utilization by process, connection and remote IP/hostname

 License:        MIT
@@ -15,7 +14,7 @@ Source:         %{crates_source}
 # Automatically generated patch to strip dependencies and normalize metadata
 Patch:          bandwhich-fix-metadata-auto.diff

-BuildRequires:  anda-srpm-macros mold cargo-rpm-macros >= 24
+BuildRequires:  anda-srpm-macros cargo-rpm-macros >= 24

 %global _description %{expand:
 Display current network utilization by process, connection and remote
@@ -31,11 +30,10 @@ License:        MIT

 %files       -n %{crate}
 %license LICENSE.md
-%license LICENSE.dependencies
+#license LICENSE.dependencies
 %doc CHANGELOG.md
 %doc CODE_OF_CONDUCT.md
 %doc CONTRIBUTING.md
-%doc INSTALL.md
 %doc README.md
 %{_bindir}/bandwhich

@@ -44,9 +42,9 @@ License:        MIT
 %cargo_prep_online

 %build
-#cargo_build
-%{cargo_license_summary_online}
-%{cargo_license_online} > LICENSE.dependencies
+%cargo_build
+#{cargo_license_summary}
+#{cargo_license} > LICENSE.dependencies

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

 Name:           bat-extras
-Version:        2024.08.24
+Version:        2024.07.10
 Release:        1%?dist
 Summary:        Bash scripts that integrate bat with various command line tools

@@ -1,5 +0,0 @@
-project pkg {
-  rpm {
-	spec = "rust-bottom.spec"
-  }
-}
@@ -1,48 +0,0 @@
--- bottom-0.10.2/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ bottom-0.10.2/Cargo.toml	2024-08-18T14:28:49.594610+00:00
-@@ -354,15 +354,6 @@
- [target.'cfg(all(target_arch = "x86_64", target_os = "linux"))'.dev-dependencies.portable-pty]
- version = "0.8.1"
- 
-[target.'cfg(target_os = "freebsd")'.dependencies.filedescriptor]
-version = "0.8.2"
-
-[target.'cfg(target_os = "freebsd")'.dependencies.serde_json]
-version = "1.0.120"
-
-[target.'cfg(target_os = "freebsd")'.dependencies.sysctl]
-version = "0.5.5"
-
- [target.'cfg(target_os = "linux")'.dependencies.rustix]
- version = "0.38.34"
- features = [
-@@ -370,24 +361,6 @@
-     "param",
- ]
- 
-[target.'cfg(target_os = "macos")'.dependencies.core-foundation]
-version = "0.9.4"
-
-[target.'cfg(target_os = "macos")'.dependencies.mach2]
-version = "0.4.2"
-
-[target.'cfg(target_os = "windows")'.dependencies.windows]
-version = "0.58.0"
-features = [
-    "Win32_Foundation",
-    "Win32_Security",
-    "Win32_Storage_FileSystem",
-    "Win32_System_IO",
-    "Win32_System_Ioctl",
-    "Win32_System_ProcessStatus",
-    "Win32_System_Threading",
-]
-
- [target."cfg(unix)".dependencies.libc]
- version = "0.2.155"
- 
-@@ -402,3 +375,4 @@
- [lints.rustdoc]
- broken_intra_doc_links = "deny"
- missing_crate_level_docs = "deny"
-+
@@ -1,68 +0,0 @@
-# Generated by rust2rpm 26
-%bcond_without check
-
-%global crate bottom
-
-Name:           rust-bottom
-Version:        0.10.2
-Release:        %autorelease
-Summary:        Customizable cross-platform graphical process/system monitor for the terminal
-
-License:        MIT
-URL:            https://crates.io/crates/bottom
-Source:         %{crates_source}
-# Automatically generated patch to strip dependencies and normalize metadata
-Patch:          bottom-fix-metadata-auto.diff
-
-BuildRequires:  anda-srpm-macros
-BuildRequires:  cargo-rpm-macros >= 24
-
-%global _description %{expand:
-A customizable cross-platform graphical process/system monitor for the
-terminal. Supports Linux, macOS, and Windows.}
-
-%description %{_description}
-
-%package     -n %{crate}
-Summary:        %{summary}
-License:        MIT
-Packager:       Ben Woods <git@ben.woods.am>
-
-%description -n %{crate} %{_description}
-
-%files       -n %{crate}
-%license LICENSE
-%license LICENSE.dependencies
-%doc README.md
-%{_bindir}/btm
-%{_datadir}/bash-completion/completions/btm
-%{_datadir}/fish/vendor_completions.d/btm.fish
-%{_datadir}/zsh/site-functions/_btm
-%{_mandir}/man1/btm.1*
-
-%prep
-%autosetup -n %{crate}-%{version} -p1
-%cargo_prep_online
-
-%build
-#cargo_build
-%{cargo_license_summary_online}
-%{cargo_license_online} > LICENSE.dependencies
-
-%install
-# https://github.com/ClementTsang/bottom/blob/main/docs/content/contribution/packaging-and-distribution.md#manpage-and-completion-generation
-export BTM_GENERATE=true
-%cargo_install
-# Completions
-install -Dpm 0644 target/tmp/bottom/completion/btm.bash %{buildroot}%{_datadir}/bash-completion/completions/btm
-install -Dpm 0644 target/tmp/bottom/completion/btm.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/btm.fish
-install -Dpm 0644 target/tmp/bottom/completion/_btm %{buildroot}%{_datadir}/zsh/site-functions/_btm
-install -Dpm 0644 target/tmp/bottom/manpage/btm.1 %{buildroot}%{_mandir}/man1/btm.1
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%changelog
-%autochangelog
@@ -1 +0,0 @@
-rpm.version(crates("bottom"));
@@ -2,7 +2,7 @@
 %global crate maturin

 Name:           rust-terra-maturin
-Version:        1.7.1
+Version:        1.7.0
 Release:        1%?dist
 Summary:        Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages

@@ -1,5 +1,5 @@
 Name:			nushell
-Version:		0.97.1
+Version:		0.96.1
 Release:		1%?dist
 Summary:		A new type of shell
 License:		MIT
@@ -1,5 +1,5 @@
 Name:           youki
-Version:        0.4.0
+Version:        0.3.3
 Release:        1%?dist
 Summary:        A container runtime written in Rust

@@ -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.15-2
 %global sanitized_ver %(echo %{ver} | sed -E 's/-/~/g')
 Summary:        The Application Framework for tauOS apps
 Name:           libhelium
@@ -1,5 +1,5 @@
 Name:       libusermetrics
-Version:    1.3.3
+Version:    1.3.2
 Release:    1%?dist
 Summary:    library for retrieving anonymous metrics about users
 License:    GPLv3 AND LGPLv3 AND LGPLv2
@@ -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,4 +1,4 @@
-%global commit 9b6ff5863e5d0b2a07b50f4aa1a3344a51a1f80f
+%global commit 8d08b34e22a08e58db8341839c4e18ee06c516c5
 %global ver 1.8.35
 %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
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Cappy Ishihara	8069f85679	add back cstdint patch	2024-08-16 00:52:18 +07:00
Cappy Ishihara	1b346af4da	attempt to fix gamescope-legacy on rawhide	2024-08-16 00:47:35 +07:00
				`@@ -1 +0,0 @@`
				rpm.version(find(`https://launcher-files.modrinth.com/versions/([/d/.]+)/linux/Modrinth%20App_.+?_amd64.AppImage`, get("https://modrinth.com/app"), 1));