Skip to content

Commit

Permalink
chore(sync): frawhide -> f41
Browse files Browse the repository at this point in the history
  • Loading branch information
madonuko committed Aug 29, 2024
1 parent e9248b6 commit e5af4eb
Show file tree
Hide file tree
Showing 49 changed files with 787 additions and 338 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

Name: discord-canary-openasar
Version: 0.0.471
Version: 0.0.477
Release: 1%?dist
Summary: A snappier Discord rewrite with features like further customization and theming
License: MIT AND https://discord.com/terms
Expand Down
2 changes: 1 addition & 1 deletion anda/apps/discord-canary/discord-canary.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

Name: discord-canary
Version: 0.0.471
Version: 0.0.477
Release: 1%?dist
Summary: Free Voice and Text Chat for Gamers
URL: discord.com
Expand Down
2 changes: 1 addition & 1 deletion anda/apps/discord-openasar/discord-openasar.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

Name: discord-openasar
Version: 0.0.64
Version: 0.0.66
Release: 1%?dist
Summary: A snappier Discord rewrite with features like further customization and theming
License: MIT AND https://discord.com/terms
Expand Down
2 changes: 1 addition & 1 deletion anda/apps/discord/discord.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

Name: discord
Version: 0.0.64
Version: 0.0.66
Release: 1%?dist
Summary: Free Voice and Text Chat for Gamers
URL: https://discord.com
Expand Down
6 changes: 3 additions & 3 deletions anda/apps/envision/envision.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%global commit 56f2e0b0d6378fcf31d43d349c1e5ff57b6eb985
%global commit_date 20240729
%global commit 17554fa2dcd15adaf9f0554df83e956e969ee747
%global commit_date 20240829
%global shortcommit %(c=%{commit}; echo ${c:0:7})

Name: envision
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions anda/apps/mpv/mpv-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%global commit 3c7b6db205c027d3c4f12285719367792e471b57
%global commit e8d14cd3142b117eabf23df026ee946cfded6424
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20240725
%global commit_date 20240829
%global ver 0.38.0

Name: mpv-nightly
Expand Down
4 changes: 4 additions & 0 deletions anda/apps/voicevox/voicevox.spec
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
# 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
Expand Down
4 changes: 2 additions & 2 deletions anda/devs/flow/flow-control-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%global commit fb1d91585f8b7e72bc5776085a36205652a0adec
%global commit 1caf2aa0f6f98d24acf6a6e00ba7ecf0ad1eb3aa
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20240724
%global commit_date 20240829

Name: flow-control-nightly
Version: %commit_date.%shortcommit
Expand Down
6 changes: 3 additions & 3 deletions anda/devs/zed/nightly/zed-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%global commit 479ffbbd51516c7741e2948e048ab13e5b010064
%global commit 1eec601afb8cb0b2eafe111de1a505049202e19f
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20240726
%global ver 0.147.0
%global commit_date 20240829
%global ver 0.152.0

%bcond_with check

Expand Down
4 changes: 0 additions & 4 deletions anda/devs/zed/preview/update.rhai
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
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;
Expand Down
8 changes: 4 additions & 4 deletions anda/devs/zed/preview/zed-preview.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%bcond_with check

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

Name: zed-preview
Version: %ver
Version: %(echo %ver | sed 's/-/~/')
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}-pre.tar.gz
Source0: https://github.com/zed-industries/zed/archive/refs/tags/v%{ver}.tar.gz

Conflicts: zed
Provides: zed
Expand Down Expand Up @@ -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}-pre -p1
%autosetup -n %{crate}-%{ver} -p1
%cargo_prep_online

export DO_STARTUP_NOTIFY="true"
Expand Down
2 changes: 1 addition & 1 deletion anda/devs/zed/stable/zed.spec
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
%global app_id dev.zed.Zed

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

Expand Down
36 changes: 36 additions & 0 deletions anda/games/gamescope-legacy/0001-cstdint.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
From 5529e8ac8f3232ec6233e33286834548e1d8018d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <[email protected]>
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
8 changes: 8 additions & 0 deletions anda/games/gamescope-legacy/anda.hcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
project pkg {
rpm {
spec = "gamescope-legacy.spec"
}
labels {
multilib = 1
}
}
129 changes: 129 additions & 0 deletions anda/games/gamescope-legacy/gamescope-legacy.spec
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
%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 <[email protected]>
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

33 changes: 33 additions & 0 deletions anda/games/gamescope-legacy/legacy-720p.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
From 072ebb67cd4a88fd0f5db22a92a46f8316f28a46 Mon Sep 17 00:00:00 2001
From: Matthew Anderson <[email protected]>
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 )
7 changes: 7 additions & 0 deletions anda/games/gamescope-legacy/stb.pc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
prefix=/usr
includedir=${prefix}/include/stb

Name: stb
Description: Single-file public domain libraries for C/C++
Version: 0.1.0
Cflags: -I${includedir}
Loading

0 comments on commit e5af4eb

Please sign in to comment.