bump(branch): ffmpeg

2026-05-31 17:11:56 +00:00 · 2025-06-17 05:14:39 +00:00 · 2025-06-17 04:33:18 +00:00 · 2025-06-17 03:59:52 +00:00 · 2025-06-17 03:01:17 +00:00 · 2025-06-17 01:54:51 +00:00
166 changed files with 764 additions and 1985 deletions
@@ -1,13 +1,17 @@
 {
  "name": "Terra Devcontainer",
-  "image": "ghcr.io/terrapkg/builder:f42",
-  "runArgs": ["--privileged"],
+  "image": "ghcr.io/terrapkg/builder:frawhide",
+  "runArgs": [
+    "--privileged"
+  ],
  "features": {
    "ghcr.io/devcontainers/features/common-utils:2": {}
  },
  "customizations": {
    "vscode": {
-      "extensions": ["rhaiscript.vscode-rhai"]
+      "extensions": [
+        "rhaiscript.vscode-rhai"
+      ]
    }
  },
  "remoteUser": "vscode",
@@ -6,13 +6,13 @@ on:
    paths:
      - anda/**
    branches:
-      - f42
+      - frawhide
  pull_request:
    branches:
-      - f42
+      - frawhide
  merge_group:
    branches:
-      - f42
+      - frawhide
  workflow_dispatch:
  workflow_call:

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

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

 Name:           discord-canary-openasar
-Version:        0.0.706
+Version:        0.0.700
 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.706
+Version:        0.0.700
 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-ptb-openasar
-Version:        0.0.150
+Version:        0.0.148
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-ptb
-Version:        0.0.150
+Version:        0.0.148
 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:			feishin
-Version:		0.16.0
+Version:		0.14.0
 Release:		1%?dist
 Summary:		A modern self-hosted music player
 License:		GPL-3.0
@@ -1,10 +1,9 @@
 #? https://github.com/flameshot-org/flameshot/blob/master/packaging/rpm/fedora/flameshot.spec

-%global ver 12.1.0
-%global commit 4edfb2ac1d71e7f75fcdcb850ff6bce5fb148a7b
+%global ver v12.1.0
+%global commit d420a53a4a61cb39842ee632fb8183ab07b58879
 %global shortcommit %{sub %{commit} 1 7}
-#global commit_date 20250608
-%global commit_date 20250618
+%global commit_date 20250617
 %global devel_name QtColorWidgets

 Name:			flameshot.nightly
@@ -1,8 +1,5 @@
-terminate();
 rpm.global("commit", gh_commit("flameshot-org/flameshot"));
 if rpm.changed() {
-    let v = gh("flameshot-org/flameshot");
-    v.crop(1);
-    rpm.global("ver", v);
+    rpm.global("ver", gh("flameshot-org/flameshot"));
    rpm.global("commit_date", date());
 }
@@ -1,6 +1,6 @@
 Name:           fontviewer
 Epoch:          1
-Version:        1.1.0
+Version:        1.2.0
 Release:        1%?dist
 Summary:        View and install fonts

@@ -1,8 +1,7 @@
-%global commit 0b1a005936552abd5aed144bdc0ca5a82f2fa682
-%global commit_date 20250622
+%global commit 774311e9473dbf7741f0daced1bad98ddac17de8
+%global commit_date 20250614
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global debug_package %nil
-%global __strip /bin/true
+%define debug_package %nil
 %global __provides_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$
 %ifnarch aarch64 
 %global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*)|(.*\\aarch64*\\.so.*))$
@@ -1,6 +1,6 @@
-%global commit ed8954e8cf2d92d7f2df22aeeb9b6087f76ef89e
+%global commit e8ade130faef6a18971325d49213b8d166935d50
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20250628
+%global commit_date 20250613
 %global ver 0.40.0

 Name:           mpv-nightly
@@ -1 +1 @@
-v1.11.14
+v1.11.13
@@ -1,9 +0,0 @@
-project pkg {
-    arches = ["x86_64"]
-    rpm {
-        spec = "protontricks.spec"
-    }
-    labels {
-        subrepo = "extras"
-    }
-}
@@ -1,92 +0,0 @@
-%bcond_with tests
-%global pypi_name protontricks
-
-Name:       terra-%{pypi_name}
-Version:    1.12.1
-Release:    1%{?dist}
-Summary:    Simple wrapper that does winetricks things for Proton enabled games
-BuildArch:  noarch
-
-License:    GPL-3.0-or-later
-URL:        https://github.com/Matoking/protontricks
-
-# GitHub tarball won't work for setuptools-scm
-Source0:    %{pypi_source}
-
-BuildRequires: desktop-file-utils
-BuildRequires: python3-devel
-BuildRequires: python3dist(pip)
-BuildRequires: python3dist(setuptools)
-BuildRequires: python3dist(setuptools-scm)
-# BuildRequires: python3dist(vdf) >= 3.4
-%if %{with tests}
-BuildRequires: python3dist(pytest-cov) >= 2.10
-BuildRequires: python3dist(pytest) >= 6.0
-%endif
-
-Requires:   (terra-winetricks or winetricks-git)
-Conflicts:  protontricks
-
-Recommends: yad
-
-Suggests:   zenity
-# https://github.com/Matoking/protontricks/blob/master/CHANGELOG.md#1120---2024-09-16
-Provides:   bundled(python3-vdf)
-
-
-%description
-A simple wrapper that does winetricks things for Proton enabled games,
-requires Winetricks.
-
-This is a fork of the original project created by sirmentio. The original
-repository is available at Sirmentio/protontricks.
-
-
-%prep
-%autosetup -n %{pypi_name}-%{version}
-
-
-%build
-%if 0%{?fedora} <= 41
-%py3_build
-%else
-%pyproject_wheel
-%endif
-
-
-%install
-%if 0%{?fedora} <= 41
-%py3_install
-%else
-%pyproject_install
-%endif
-
-# Remove `protontricks-desktop-install`, since we already install .desktop
-# files properly
-# https://bugzilla.redhat.com/show_bug.cgi?id=1991684
-rm %{buildroot}%{_bindir}/%{pypi_name}-desktop-install
-
-
-%if %{with tests}
-%check
-%{py3_test_envvars} %{python3} -m pytest -v
-desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
-%endif
-
-
-%files
-%license LICENSE
-%doc README.md CHANGELOG.md
-%{_bindir}/%{pypi_name}-launch
-%{_bindir}/%{pypi_name}
-%{_datadir}/applications/*.desktop
-%{python3_sitelib}/%{pypi_name}/
-%if 0%{?fedora} <= 41
-%{python3_sitelib}/%{pypi_name}-%{version}*.egg-info/
-%else
-%{python3_sitelib}/%{pypi_name}-%{version}*.dist-info/
-%endif
-
-
-%changelog
-%autochangelog
@@ -1 +0,0 @@
-rpm.version(pypi("protontricks"));
@@ -1,4 +1,4 @@
-%global ver 2025-06-27
+%global ver 2025-06-16
 %global goodver %(echo %ver | sed 's/-//g')
 %global __brp_mangle_shebangs %{nil}
 %bcond_without mold
@@ -13,7 +13,7 @@
 %global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$

 Name:			voicevox
-Version:		0.24.0
+Version:		0.23.1
 Release:		1%?dist
 Summary:		Free Japanese text-to-speech editor
 License:		LGPL-3.0
@@ -1,9 +1,9 @@
 # Fedora sometimes sources the snapshots under stable versions and just bumps release
 # For user clarity I have separated these into different packages
-%global commit  50417b23b5d3e79c6c8fa4d1af69167dfa3de719
+%global commit  9e29aa7e2d8e84880aec741ed92eed35baa742ac
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global ver 20250102
-%global commit_date 20250621
+%global commit_date 20250613

 Name:           winetricks-git
 Version:        %{ver}^%{commit_date}git.%{shortcommit}
@@ -10,10 +10,9 @@

 Name:           gnome-shell
 Version:        %{major_version}.%{minor_version}
-Release:        1%{?dist}.switcheroo
+Release:        3%{?dist}.switcheroo
 Summary:        Window management and application launching for GNOME

-Provides:       gnome-shell = %version-%release
 Provides:       gnome-shell.switcheroo = %version-%release
 Obsoletes:      gnome-shell.switcheroo <= 47.3-2
 License:        GPL-2.0-or-later
@@ -5,6 +5,5 @@ project pkg {
 	labels {
 		subrepo = "extras"
 		updbranch = 1
-                mock = 1
 	}
 }
@@ -14,7 +14,6 @@ License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-
 URL:     https://invent.kde.org/frameworks/%{framework}

 Source0: https://download.kde.org/%{stable_kf6}/frameworks/%{majmin_ver_kf6}/%{framework}-%{version}.tar.xz
-Source1: https://download.kde.org/%{stable_kf6}/frameworks/%{majmin_ver_kf6}/%{framework}-%{version}.tar.xz.sig

 # https://invent.kde.org/frameworks/kio/-/issues/26
 # I'm not sending this upstream because I'm not sure it's really
@@ -174,12 +173,6 @@ Obsoletes:      kf6-kio.switcheroo-qch-doc < 6.14.0-4
 %description    qch-doc
 Developer Documentation files for %{name} for use with KDevelop or QtCreator.

-%package        html
-Summary:        Developer Documentation files for %{name}
-BuildArch:      noarch
-%description    html
-Developer Documentation files for %{name} in HTML format 
-

 %prep
 %autosetup -n %{framework}-%{version} -p1
@@ -187,11 +180,11 @@ Developer Documentation files for %{name} in HTML format

 %build
 %cmake_kf6
-%cmake_build_kf6
+%cmake_build


 %install
-%cmake_install_kf6
+%cmake_install
 %find_lang kf6-kio --all-name --with-man --with-html

 %files
@@ -238,17 +231,11 @@ Developer Documentation files for %{name} in HTML format
 %{_kf6_libdir}/cmake/KF6KIO/
 %{_kf6_datadir}/kdevappwizard/templates/kioworker6.tar.bz2
 %{_kf6_qtplugindir}/designer/kio6widgets.so
-%{_qt6_docdir}/*/*.tags
-%{_qt6_docdir}/*/*.index 
+%{_qt6_docdir}/*.tags
 
 %files qch-doc
 %{_qt6_docdir}/*.qch

-%files html
-%{_qt6_docdir}/*/*
-%exclude %{_qt6_docdir}/*/*.tags
-%exclude %{_qt6_docdir}/*/*.index 
-
 %changelog
 * Fri Feb 07 2025 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 6.11.0-1
 - 6.11.0
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit fcc7fe7570da28147906b6779d2f0587ae4ee854
+%global commit f16f9c336f54f3da72604cb5e8703b416c3726b6
 %forgemeta

 Name:       lomiri-system-settings
@@ -21,7 +21,7 @@ BuildRequires:	pkgconfig(zeitgeist-2.0)
 BuildRequires:	libappstream-glib-devel
 BuildRequires:	libdbusmenu-devel
 BuildRequires:	bamf-devel
-BuildRequires:	libindicator-gtk3-devel
+BuildRequires:	terra-libindicator-gtk3-devel
 BuildRequires:	json-glib-devel
 BuildRequires:	libnotify-devel
 BuildRequires:	libsigc++20-devel
@@ -30,7 +30,6 @@ BuildRequires:	doxygen
 BuildRequires:	pam-devel
 BuildRequires:	boost-devel
 BuildRequires:	python3-devel
-BuildRequires:  python3-pip
 BuildRequires:	python3-setuptools
 BuildRequires:	pkgconfig(libstartup-notification-1.0)
 BuildRequires:	pkgconfig(nux-4.0)
@@ -48,7 +47,7 @@ Requires:	pam
 Requires:	bamf-daemon
 Requires:	unity-gtk-module-common
 Requires:	compiz9
-Requires:	libindicator-gtk3
+Requires:	terra-libindicator-gtk3
 Recommends:	unity-greeter
 Recommends:	unity-scope-home

@@ -116,20 +115,12 @@ sed -i '/libgeis/d' CMakeLists.txt
 %cmake_build

 pushd uwidgets/
-%if 0%{?fedora} <= 41
 %py3_build
-%else
-%pyproject_wheel
-%endif
 popd

 %install
 pushd uwidgets/
-%if 0%{?fedora} <= 41
 %py3_install
-%else
-%pyproject_install
-%endif
 popd

 %cmake_install
@@ -231,11 +222,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %doc README
 %license uwidgets/LICENCE
 %{_bindir}/uwidgets-runner
-%if 0%{?fedora} <= 41
 %{python3_sitearch}/uwidgets-*.egg-info/
-%else
-%{python3_sitearch}/uwidgets-*.dist-info/
-%endif
 %{python3_sitearch}/uwidgets/

 %changelog
@@ -8,7 +8,7 @@ License:	GPL-2.0
 URL:		https://github.com/ubuntu-mate/mate-tweak
 Source0:	%url/archive/refs/tags/%version.tar.gz
 Requires:	python3
-BuildRequires:	python3dist(setuptools) python3-devel python3dist(pip) intltool desktop-file-utils
+BuildRequires:	python3dist(setuptools) rpm_macro(py3_build) intltool desktop-file-utils

 %description
 This is MATE Tweak, a fork of mintDesktop.
@@ -19,21 +19,10 @@ python3 -m ensurepip
 python3 -m pip install distutils-extra-python

 %build
-%if 0%{?fedora} <= 41
 %py3_build
-%else
-%pyproject_wheel
-%endif

 %install
-%if 0%{?fedora} <= 41
 %py3_install
-%else
-%pyproject_install
-desktop-file-install data/*.desktop
-cp -r %{buildroot}%{python3_sitelib}%{_prefix} -t %{buildroot} --preserve=all
-rm -rf %{buildroot}%{python3_sitelib}%{_prefix}
-%endif

 %check
 desktop-file-validate %buildroot%_datadir/applications/*.desktop
@@ -50,13 +39,9 @@ desktop-file-validate %buildroot%_datadir/applications/*.desktop
 %_datadir/applications/%name.desktop
 %_datadir/applications/marco-{glx,no-composite,xr_glx_hybrid,xrender}.desktop
 %_datadir/polkit-1/actions/org.mate.%name.policy
-%{python3_sitelib}/__pycache__/
-%{python3_sitelib}/setup.py
-%if 0%{?fedora} <= 41
-%{python3_sitelib}/mate_tweak-%version-py3.*.egg-info/
-%else
-%{python3_sitelib}/mate_tweak-%{version}.dist-info/
-%endif
+%ghost %_prefix/lib/python3.*/site-packages/__pycache__
+%ghost %_prefix/lib/python3.*/site-packages/setup.py
+%ghost %_prefix/lib/python3.*/site-packages/mate_tweak-%version-py3.*.egg-info/

 %changelog
 %autochangelog
@@ -1,7 +1,7 @@
 %global swayVersion 1.10.1

 Name:           swayfx
-Version:        0.5.2
+Version:        0.5.1
 Release:        1%?dist

 Summary:        SwayFX: Sway, but with eye candy!
@@ -33,8 +33,8 @@ BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-cursor)
 BuildRequires:  pkgconfig(wayland-server) >= 1.21.0
 BuildRequires:  pkgconfig(wayland-protocols) >= 1.24
-BuildRequires:  pkgconfig(scenefx-0.4)
-BuildRequires:  pkgconfig(wlroots-0.19)
+BuildRequires:  pkgconfig(scenefx-0.2)
+BuildRequires:  pkgconfig(wlroots-0.18)
 BuildRequires:  pkgconfig(xcb)
 BuildRequires:  pkgconfig(xcb-icccm)
 BuildRequires:  pkgconfig(xkbcommon) >= 1.5.0
@@ -149,4 +149,4 @@ install -d -m755 -pv %{buildroot}%{_sysconfdir}/sway/config.d

 %files wallpapers
 %license assets/LICENSE
-%{_datadir}/backgrounds/sway
+%{_datadir}/backgrounds/sway
@@ -1,7 +1,7 @@
 # Generated by rust2rpm 27
-%global commit 0e409d4a52bd3d37d0aa0ad4e2d7f3b9a8adcdb7
+%global commit 98c220126d912b935987766f56650b55f3e226eb
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20250617
+%global commit_date 20250518
 %global ver v0.6.0
 %bcond check 0

@@ -1,9 +1,9 @@
 #? https://src.fedoraproject.org/rpms/hyprgraphics/blob/rawhide/f/hyprgraphics.spec

 %global realname hyprgraphics
-%global ver 0.1.4
-%global commit b3d628d01693fb9bb0a6690cd4e7b80abda04310
-%global commit_date 20250623
+%global ver 0.1.3
+%global commit c7225d73755a6c4c7c72f4d4f3925ea426e325a8
+%global commit_date 20250607
 %global shortcommit %{sub %commit 1 7}

 %bcond libjxl 1
@@ -2,8 +2,8 @@

 %global realname hyprlang
 %global ver 0.6.3
-%global commit cee01452bca58d6cadb3224e21e370de8bc20f0b
-%global commit_date 20250620
+%global commit 1bfb84f54d50c7ae6558c794d3cfd5f6a7e6e676
+%global commit_date 20250606
 %global shortcommit %{sub %commit 1 7}

 Name:           %realname.nightly
@@ -1,10 +1,10 @@
 #? https://src.fedoraproject.org/rpms/hyprutils/blob/rawhide/f/hyprutils.spec

 %global realname hyprutils
-%global ver 0.8.0
+%global ver 0.7.1

-%global commit 4737241eaf8a1e51671a2a088518071f9a265cf4
-%global commit_date 20250628
+%global commit c9cd5f153c090005437b5fac504bb4f7172a7cc1
+%global commit_date 20250617
 %global shortcommit %{sub %commit 1 7}

 Name:           %realname.nightly
@@ -52,4 +52,4 @@ Conflicts:		%realname-devel
 %license LICENSE
 %doc README.md
 %{_libdir}/lib%{realname}.so.%{ver}
-%{_libdir}/lib%{realname}.so.*
+%{_libdir}/lib%{realname}.so.6
@@ -2,9 +2,9 @@

 %global realname hyprwayland-scanner
 %global ver 0.4.4
-%global commit aa38edd6e3e277ae6a97ea83a69261a5c3aab9fd
+%global commit 817918315ea016cc2d94004bfb3223b5fd9dfcc6
 %global shortcommit %{sub %commit 1 7}
-%global commit_date 20250620
+%global commit_date 20250614

 Name:           %realname.nightly
 Version:        %ver^%{commit_date}git.%shortcommit
@@ -6,7 +6,7 @@
 %endif

 Name:			bun-bin
-Version:		1.2.17
+Version:		1.2.16
 Release:		1%?dist
 Summary:		Incredibly fast JavaScript runtime, bundler, test runner, and package manager – all in one
 License:		MIT
@@ -12,7 +12,7 @@
 %endif

 Name:			codium
-Version:		1.101.24242
+Version:		1.101.03933
 Release:		1%?dist
 Summary:		Code editing. Redefined.
 License:		MIT
@@ -1,5 +1,5 @@
 Name:			flutter
-Version:		3.32.5
+Version:		3.32.4
 Release:		1%?dist
 Summary:		SDK for crafting beautiful, fast user experiences from a single codebase
 License:		BSD-3-Clause
@@ -1,11 +1,11 @@
-%global commit 206d41844e88176a398f149e8e2c8f6e2fdbd28a
+%global commit d0f116da3554c151c63fd3a11e90661cb8489359
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global fulldate 2025-06-27
+%global fulldate 2025-06-15
 %global commit_date %(echo %{fulldate} | sed 's/-//g')
 %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV
 %global ver 1.1.4
 %global base_name ghostty
-%global appid com.mitchellh.%{base_name}
+%global reverse_dns com.mitchellh.%{base_name}

 Name:           %{base_name}-nightly
 Version:        %{ver}~tip^%{commit_date}git%{shortcommit}
@@ -27,7 +27,6 @@ BuildRequires:  minisign
 BuildRequires:  ncurses
 BuildRequires:  ncurses-devel
 BuildRequires:  pandoc-cli
-BuildRequires:  systemd-rpm-macros
 BuildRequires:  zig >= 0.14.0
 BuildRequires:  zig-rpm-macros
 BuildRequires:  pkgconfig(blueprint-compiler)
@@ -44,7 +43,6 @@ BuildRequires:  pkgconfig(oniguruma)
 BuildRequires:  pkgconfig(zlib)
 Requires:       %{name}-terminfo = %{evr}
 Requires:       %{name}-shell-integration = %{evr}
-Requires:       (%{name}-kio = %{evr} if kf6-kio)
 Requires:       gtk4
 Requires:       gtk4-layer-shell
 Requires:       libadwaita
@@ -98,53 +96,6 @@ BuildArch:      noarch
 %description    zsh-completion
 Zsh shell completion for Ghostty.

-%package        kio
-Summary:        KIO support for Ghostty
-Requires:       %{name} = %{evr}
-BuildArch:      noarch
-
-%description    kio
-This package allows Ghostty to interact with KIO.
-
-%package        nautilus
-Summary:        Nautilus menu support for Ghostty
-Supplements:    (%{name} and nautilus)
-Requires:       %{name} = %{evr}
-BuildArch:      noarch
-
-%description    nautilus
-This package enables Nautilus integration for Ghostty.
-
-%package        vim
-Summary:        Vim plugins for Ghostty
-Supplements:    (%{name} and vim)
-Requires:       %{name} = %{evr}
-Requires:       vim
-BuildArch:      noarch
-
-%description    vim
-This package provides the Ghostty Vim plugins.
-
-%package        neovim
-Summary:        Neovim plugins for Ghostty
-Supplements:    (%{name} and neovim)
-Requires:       %{name} = %{evr}
-Requires:       neovim
-BuildArch:      noarch
-
-%description    neovim
-This package provides the Neovim plugins for Ghostty.
-
-%package        bat-syntax
-Summary:        Bat syntax for Ghostty
-Supplements:    (%{name} and bat)
-Requires:       %{name} = %{evr}
-Requires:       bat
-BuildArch:      noarch
-
-%description    bat-syntax
-This package provides the Bat syntax files for Ghostty.
-
 %package        shell-integration
 Summary:        Ghostty shell integration
 Supplements:    %{name}
@@ -194,31 +145,40 @@ DESTDIR="%{buildroot}" \
 rm -rf %{buildroot}%{_datadir}/terminfo/g/%{base_name}
 %endif

-%find_lang %{appid}
+%find_lang %{reverse_dns}

-%files -f %{appid}.lang
+%files -f %{reverse_dns}.lang
 %doc README.md
 %license LICENSE
 %{_bindir}/%{base_name}
-%{_datadir}/applications/%{appid}.desktop
+%{_datadir}/applications/%{reverse_dns}.desktop
+%{_datadir}/bat/syntaxes/%{base_name}.sublime-syntax
 %dir %{_datadir}/%{base_name}
 %{_datadir}/%{base_name}/doc
 %{_datadir}/%{base_name}/themes
-%{_datadir}/metainfo/%{appid}.metainfo.xml
-%{_datadir}/dbus-1/services/%{appid}.service
-%{_iconsdir}/hicolor/16x16/apps/%{appid}.png
-%{_iconsdir}/hicolor/16x16@2/apps/%{appid}.png
-%{_iconsdir}/hicolor/32x32/apps/%{appid}.png
-%{_iconsdir}/hicolor/32x32@2/apps/%{appid}.png
-%{_iconsdir}/hicolor/128x128/apps/%{appid}.png
-%{_iconsdir}/hicolor/128x128@2/apps/%{appid}.png
-%{_iconsdir}/hicolor/256x256/apps/%{appid}.png
-%{_iconsdir}/hicolor/256x256@2/apps/%{appid}.png
-%{_iconsdir}/hicolor/512x512/apps/%{appid}.png
-%{_iconsdir}/hicolor/1024x1024/apps/%{appid}.png
+%{_datadir}/kio/servicemenus/%{reverse_dns}.desktop
+%{_datadir}/metainfo/%{reverse_dns}.metainfo.xml
+%{_datadir}/nautilus-python/extensions/%{base_name}.py
+%{_datadir}/nvim/site/compiler/%{base_name}.vim
+%{_datadir}/nvim/site/ftdetect/%{base_name}.vim
+%{_datadir}/nvim/site/ftplugin/%{base_name}.vim
+%{_datadir}/nvim/site/syntax/%{base_name}.vim
+%{_datadir}/vim/vimfiles/compiler/%{base_name}.vim
+%{_datadir}/vim/vimfiles/ftdetect/%{base_name}.vim
+%{_datadir}/vim/vimfiles/ftplugin/%{base_name}.vim
+%{_datadir}/vim/vimfiles/syntax/%{base_name}.vim
+%{_iconsdir}/hicolor/16x16/apps/%{reverse_dns}.png
+%{_iconsdir}/hicolor/16x16@2/apps/%{reverse_dns}.png
+%{_iconsdir}/hicolor/32x32/apps/%{reverse_dns}.png
+%{_iconsdir}/hicolor/32x32@2/apps/%{reverse_dns}.png
+%{_iconsdir}/hicolor/128x128/apps/%{reverse_dns}.png
+%{_iconsdir}/hicolor/128x128@2/apps/%{reverse_dns}.png
+%{_iconsdir}/hicolor/256x256/apps/%{reverse_dns}.png
+%{_iconsdir}/hicolor/256x256@2/apps/%{reverse_dns}.png
+%{_iconsdir}/hicolor/512x512/apps/%{reverse_dns}.png
+%{_iconsdir}/hicolor/1024x1024/apps/%{reverse_dns}.png
 %{_mandir}/man1/%{base_name}.1.gz
 %{_mandir}/man5/%{base_name}.5.gz
-%{_userunitdir}/%{appid}.service

 %files bash-completion
 %{bash_completions_dir}/%{base_name}.bash
@@ -229,27 +189,6 @@ rm -rf %{buildroot}%{_datadir}/terminfo/g/%{base_name}
 %files zsh-completion
 %{zsh_completions_dir}/_%{base_name}

-%files kio
-%{_datadir}/kio/servicemenus/%{appid}.desktop
-
-%files nautilus
-%{_datadir}/nautilus-python/extensions/%{base_name}.py
-
-%files vim
-%{_datadir}/vim/vimfiles/compiler/%{base_name}.vim
-%{_datadir}/vim/vimfiles/ftdetect/%{base_name}.vim
-%{_datadir}/vim/vimfiles/ftplugin/%{base_name}.vim
-%{_datadir}/vim/vimfiles/syntax/%{base_name}.vim
-
-%files neovim
-%{_datadir}/nvim/site/compiler/%{base_name}.vim
-%{_datadir}/nvim/site/ftdetect/%{base_name}.vim
-%{_datadir}/nvim/site/ftplugin/%{base_name}.vim
-%{_datadir}/nvim/site/syntax/%{base_name}.vim
-
-%files bat-syntax
-%{_datadir}/bat/syntaxes/%{base_name}.sublime-syntax
-
 %files shell-integration
 %dir %{_datadir}/%{base_name}/shell-integration
 %{_datadir}/%{base_name}/shell-integration/bash/bash-preexec.sh
@@ -265,15 +204,6 @@ rm -rf %{buildroot}%{_datadir}/terminfo/g/%{base_name}
 %endif
 %{_datadir}/terminfo/x/xterm-%{base_name}

-%post
-%systemd_user_post %{appid}.service
-
-%preun
-%systemd_user_preun %{appid}.service
-
-%postun
-%systemd_user_postun %{appid}.service
-
 %changelog
 * Sat May 31 2025 Gilver E. <rockgrub@disroot.org> - 1.1.4~tip^20250531git1ff9162
 - Updated for Zig 0.14.0
@@ -1,16 +1,19 @@
 # Signing key from https://github.com/ghostty-org/ghostty/blob/main/PACKAGING.md
 %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV
-%global appid com.mitchellh.ghostty
+%if 0%{?fedora} <= 40
+%global cache_dir %{_builddir}/zig-cache
+%else
+%global cache_dir %{builddir}/zig-cache
+%endif

 Name:           ghostty
 Version:        1.1.3
-Release:        2%?dist
+Release:        1%?dist
 Summary:        A fast, native terminal emulator written in Zig.
 License:        MIT AND MPL-2.0 AND OFL-1.1 AND (WTFPL OR CC0-1.0) AND Apache-2.0
 URL:            https://ghostty.org/
 Source0:        https://release.files.ghostty.org/%{version}/ghostty-%{version}.tar.gz
 Source1:        https://release.files.ghostty.org/%{version}/ghostty-%{version}.tar.gz.minisig
-BuildRequires:  anda-srpm-macros >= 0.2.15
 BuildRequires:  gtk4-devel
 BuildRequires:  libadwaita-devel
 BuildRequires:  libX11-devel
@@ -18,8 +21,7 @@ BuildRequires:  minisign
 BuildRequires:  ncurses
 BuildRequires:  ncurses-devel
 BuildRequires:  pandoc-cli
-BuildRequires:  zig >= 0.14.0
-BuildRequires:  zig-rpm-macros
+BuildRequires:  zig
 BuildRequires:  pkgconfig(bzip2)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(fontconfig)
@@ -32,7 +34,6 @@ BuildRequires:  pkgconfig(oniguruma)
 BuildRequires:  pkgconfig(zlib)
 Requires:       %{name}-terminfo = %{version}-%{release}
 Requires:       %{name}-shell-integration = %{version}-%{release}
-Requires:       (%{name}-kio = %{evr} if kf6-kio)
 Requires:       gtk4
 Requires:       libadwaita
 Conflicts:      ghostty-nightly
@@ -71,53 +72,6 @@ BuildArch:      noarch
 %description    zsh-completion
 Zsh shell completion for Ghostty.

-%package        kio
-Summary:        KIO support for Ghostty
-Requires:       %{name} = %{evr}
-BuildArch:      noarch
-
-%description    kio
-This package allows Ghostty to interact with KIO.
-
-%package        nautilus
-Summary:        Nautilus menu support for Ghostty
-Supplements:    (%{name} and nautilus)
-Requires:       %{name} = %{evr}
-BuildArch:      noarch
-
-%description    nautilus
-This package enables Nautilus integration for Ghostty.
-
-%package        vim
-Summary:        Vim plugins for Ghostty
-Supplements:    (%{name} and vim)
-Requires:       %{name} = %{evr}
-Requires:       vim
-BuildArch:      noarch
-
-%description    vim
-This package provides the Ghostty Vim plugins.
-
-%package        neovim
-Summary:        Neovim plugins for Ghostty
-Supplements:    (%{name} and neovim)
-Requires:       %{name} = %{evr}
-Requires:       neovim
-BuildArch:      noarch
-
-%description    neovim
-This package provides the Neovim plugins for Ghostty.
-
-%package        bat-syntax
-Summary:        Bat syntax for Ghostty
-Supplements:    (%{name} and bat)
-Requires:       %{name} = %{evr}
-Requires:       bat
-BuildArch:      noarch
-
-%description    bat-syntax
-This package provides the Bat syntax files for Ghostty.
-
 %package        shell-integration
 Summary:        Ghostty shell integration
 Supplements:    %{name}
@@ -132,7 +86,6 @@ Supplements:    %{name}
 %if 0%{?fedora} >= 42
 Requires:       ncurses-term >= 6.5-5.20250125%{?dist}
 %endif
-Obsoletes:      %{name}-terminfo-source < %{evr}
 BuildArch:      noarch

 %description    terminfo
@@ -151,7 +104,7 @@ Source files for Ghostty's terminfo. Available for debugging use.
 /usr/bin/minisign -V -m %{SOURCE0} -x %{SOURCE1} -P %{public_key}
 %autosetup

-export ZIG_GLOBAL_CACHE_DIR="%{_zig_cache_dir}"
+export ZIG_GLOBAL_CACHE_DIR="%{cache_dir}"
 zig build --fetch
 zig fetch git+https://github.com/zigimg/zigimg#3a667bdb3d7f0955a5a51c8468eac83210c1439e
 zig fetch git+https://github.com/mitchellh/libxev#f6a672a78436d8efee1aa847a43a900ad773618b
@@ -160,13 +113,20 @@ zig fetch git+https://github.com/mitchellh/libxev#f6a672a78436d8efee1aa847a43a90

 %install
 DESTDIR="%{buildroot}" \
-%{zig_build_target -r fast} \
+zig build \
+    --summary all \
+    --release=fast \
+    --system "%{cache_dir}/p" \
    --prefix "%{_prefix}" --prefix-lib-dir "%{_libdir}" \
    --prefix-exe-dir "%{_bindir}" --prefix-include-dir "%{_includedir}" \
-    -Dversion-string="%{version}" \
+    --verbose \
+    -Dversion-string=%{version} \
+    -Dcpu=baseline \
    -Dstrip=false \
    -Dpie=true \
-    -Demit-docs
+    -Demit-docs \
+    -Demit-termcap \
+    -Demit-terminfo

 #Don't conflict with ncurses-term on F42 and up
 %if 0%{?fedora} >= 42
@@ -176,65 +136,49 @@ rm -rf %{buildroot}%{_datadir}/terminfo/g/ghostty
 %files
 %doc README.md
 %license LICENSE
-%{_bindir}/%{name}
-%{_datadir}/applications/%{appid}.desktop
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/doc
-%{_datadir}/%{name}/themes
-%{_datadir}/metainfo/%{appid}.metainfo.xml
-%{_iconsdir}/hicolor/16x16/apps/%{appid}.png
-%{_iconsdir}/hicolor/16x16@2/apps/%{appid}.png
-%{_iconsdir}/hicolor/32x32/apps/%{appid}.png
-%{_iconsdir}/hicolor/32x32@2/apps/%{appid}.png
-%{_iconsdir}/hicolor/128x128/apps/%{appid}.png
-%{_iconsdir}/hicolor/128x128@2/apps/%{appid}.png
-%{_iconsdir}/hicolor/256x256/apps/%{appid}.png
-%{_iconsdir}/hicolor/256x256@2/apps/%{appid}.png
-%{_iconsdir}/hicolor/512x512/apps/%{appid}.png
-%{_iconsdir}/hicolor/1024x1024/apps/%{appid}.png
-%{_mandir}/man1/%{name}.1.gz
-%{_mandir}/man5/%{name}.5.gz
-%{_userunitdir}/%{appid}.service
-%{_prefix}/lib/dbus-1/services/%{appid}.service
+%{_bindir}/ghostty
+%{_datadir}/applications/com.mitchellh.ghostty.desktop
+%{_datadir}/bat/syntaxes/ghostty.sublime-syntax
+%{_datadir}/ghostty/
+%{_datadir}/kio/servicemenus/com.mitchellh.ghostty.desktop
+%{_datadir}/nautilus-python/extensions/ghostty.py
+%{_datadir}/nvim/site/compiler/ghostty.vim
+%{_datadir}/nvim/site/ftdetect/ghostty.vim
+%{_datadir}/nvim/site/ftplugin/ghostty.vim
+%{_datadir}/nvim/site/syntax/ghostty.vim
+%{_datadir}/vim/vimfiles/compiler/ghostty.vim
+%{_datadir}/vim/vimfiles/ftdetect/ghostty.vim
+%{_datadir}/vim/vimfiles/ftplugin/ghostty.vim
+%{_datadir}/vim/vimfiles/syntax/ghostty.vim
+%{_iconsdir}/hicolor/16x16/apps/com.mitchellh.ghostty.png
+%{_iconsdir}/hicolor/16x16@2/apps/com.mitchellh.ghostty.png
+%{_iconsdir}/hicolor/32x32/apps/com.mitchellh.ghostty.png
+%{_iconsdir}/hicolor/32x32@2/apps/com.mitchellh.ghostty.png
+%{_iconsdir}/hicolor/128x128/apps/com.mitchellh.ghostty.png
+%{_iconsdir}/hicolor/128x128@2/apps/com.mitchellh.ghostty.png
+%{_iconsdir}/hicolor/256x256/apps/com.mitchellh.ghostty.png
+%{_iconsdir}/hicolor/256x256@2/apps/com.mitchellh.ghostty.png
+%{_iconsdir}/hicolor/512x512/apps/com.mitchellh.ghostty.png
+%{_iconsdir}/hicolor/1024x1024/apps/com.mitchellh.ghostty.png
+%{_mandir}/man1/ghostty.1.gz
+%{_mandir}/man5/ghostty.5.gz

 %files bash-completion
-%{bash_completions_dir}/%{name}.bash
+%{bash_completions_dir}/ghostty.bash

 %files fish-completion
-%{fish_completions_dir}/%{name}.fish
+%{fish_completions_dir}/ghostty.fish

 %files zsh-completion
-%{zsh_completions_dir}/_%{name}
-
-%files kio
-%{_datadir}/kio/servicemenus/%{appid}.desktop
-
-%files nautilus
-%{_datadir}/nautilus-python/extensions/%{name}.py
-
-%files vim
-%{_datadir}/vim/vimfiles/compiler/%{name}.vim
-%{_datadir}/vim/vimfiles/ftdetect/%{name}.vim
-%{_datadir}/vim/vimfiles/ftplugin/%{name}.vim
-%{_datadir}/vim/vimfiles/syntax/%{name}.vim
-
-%files neovim
-%{_datadir}/nvim/site/compiler/%{name}.vim
-%{_datadir}/nvim/site/ftdetect/%{name}.vim
-%{_datadir}/nvim/site/ftplugin/%{name}.vim
-%{_datadir}/nvim/site/syntax/%{name}.vim
-
-%files bat-syntax
-%{_datadir}/bat/syntaxes/%{name}.sublime-syntax
+%{zsh_completions_dir}/_ghostty

 %files shell-integration
-%dir %{_datadir}/%{name}/shell-integration
-%{_datadir}/%{name}/shell-integration/bash/bash-preexec.sh
-%{_datadir}/%{name}/shell-integration/bash/%{name}.bash
-%{_datadir}/%{name}/shell-integration/elvish/lib/%{name}-integration.elv
-%{_datadir}/%{name}/shell-integration/fish/vendor_conf.d/%{name}-shell-integration.fish
-%{_datadir}/%{name}/shell-integration/zsh/.zshenv
-%{_datadir}/%{name}/shell-integration/zsh/%{name}-integration
+%{_datadir}/ghostty/shell-integration/bash/bash-preexec.sh
+%{_datadir}/ghostty/shell-integration/bash/ghostty.bash
+%{_datadir}/ghostty/shell-integration/elvish/lib/ghostty-integration.elv
+%{_datadir}/ghostty/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish
+%{_datadir}/ghostty/shell-integration/zsh/.zshenv
+%{_datadir}/ghostty/shell-integration/zsh/ghostty-integration

 %files terminfo
 %if 0%{?fedora} < 42
@@ -12,8 +12,8 @@

 # Naming variable as something other than "commit" is necessary
 # to stop %%gometa from putting commit hash in release
-%global commit_hash da02f836ff273214fe78476c105c891101ce9a0c
-%global commit_date 20250626
+%global commit_hash 5eddf5b85d66f95e9e61d2f0a9f972d432936979
+%global commit_date 20250527
 %global shortcommit %{sub %{commit_hash} 1 7}
 %global ver 2.0.14

@@ -4,7 +4,7 @@ A hardware-accelerated terminal emulator focusing to run in desktops and browser
 %bcond docs 1

 Name:          rio
-Version:       0.2.19
+Version:       0.2.18
 Release:       1%?dist
 Summary:       A hardware-accelerated terminal written in Rust.
 SourceLicense: MIT
@@ -1,7 +1,7 @@
 %global _desc Tracy is a real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.

 Name:			tracy
-Version:		0.12.2
+Version:		0.12.1
 Release:		1%?dist
 Summary:		A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.
 License:		BSD-3-Clause
@@ -1,7 +1,7 @@
-%global commit bbf16bda75587626cc1e2bb959e714d817aeffec
+%global commit 783412fa1d07f5e1d010151a94d870388993a2c8
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20250628
-%global ver 0.194.0
+%global commit_date 20250617
+%global ver 0.192.0

 %bcond_with check

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

-%global ver 0.193.2-pre
+%global ver 0.191.3-pre
 # Exclude input files from mangling
 %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$

@@ -9,7 +9,7 @@
 %global rustflags_debuginfo 0

 Name:           zed
-Version:        0.192.7
+Version:        0.190.6
 Release:        1%?dist
 Summary:        Zed is a high-performance, multiplayer code editor
 SourceLicense:  AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later
@@ -1,6 +1,6 @@
 %define debug_package %nil
 %define _ttfontsdir %{_datadir}/fonts/maple
-%global upstream_ver v7.4
+%global upstream_ver v7.3
 %define sanitized_ver %(echo "$( sed 's/^.//;s/-/~/' <<< "%{upstream_ver}" )")

 Name:           maple-fonts
@@ -16,7 +16,7 @@

 Name:          %{shortname}-games-launcher
 Version:       2.17.2
-Release:       2%?dist
+Release:       1%?dist
 Summary:       A games launcher for GOG, Amazon, and Epic Games
 License:       GPL-3.0-only AND MIT AND BSD-3-Clause
 URL:           https://heroicgameslauncher.com
@@ -37,7 +37,7 @@ Requires:      hicolor-icon-theme
 Requires:      nss
 Requires:      python3
 Requires:      which
-Recommends:    (falcond or gamemode)
+Recommends:    gamemode
 Recommends:    mangohud
 Recommends:    umu-launcher
 Provides:      bundled(comet) = %{comet_version}
@@ -1,7 +1,7 @@
 %global __brp_mangle_shebangs %{nil}

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

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

-%global commit 497cea0bd538450512339fa0ed3dd9783d8a8d9b
+%global commit 1889dca401151682a3c1c0eab713bbfcb37caf7b
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

-%global commit_date 20250628
+%global commit_date 20250617
 %global snapshot_info %{commit_date}.%{shortcommit}

 %bcond_without qt6
@@ -6,8 +6,8 @@
 # Need to get rid of everything Clang can't use and undefine -Wunused-command-line-argument where possible due to the project's build flags
 %global build_cflags %(echo %{build_cflags} | sed 's:-Werror ::g' | sed 's:-Wunused-command-line-argument ::g' | sed 's:-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 ::g' | sed 's:-specs=/usr/lib/rpm/redhat/redhat-hardened-ld ::g' | sed 's:-specs=/usr/lib/rpm/redhat/redhat-hardened-ld-errors ::g' | sed 's:-specs=/usr/lib/rpm/redhat/redhat-package-notes ::g') -Wno-unused-command-line-argument
 %global build_cxxflags %(echo %{build_cxxflags} | sed 's:-Werror ::g' | sed 's:-Wunused-command-line-argument ::g' | sed 's:-specs\=/usr/lib/rpm/redhat/redhat-annobin-cc1 ::g' | sed 's:-specs=/usr/lib/rpm/redhat/redhat-hardened-ld ::g' | sed 's:-specs=/usr/lib/rpm/redhat/redhat-hardened-ld-errors ::g' | sed 's:-specs=/usr/lib/rpm/redhat/redhat-package-notes ::g') -Wno-unused-command-line-argument
-%global commit 9c93ec0bc31bbc94ca4dce2a76ceea80da6f6554
-%global ver 0.0.37-18022
+%global commit 9634e58f0a5b21469282c44dceeee9e5b902a03b
+%global ver 0.0.37-18009

 Name:           rpcs3
 Version:        %(echo %{ver} | sed 's/-/^/g')
@@ -5,7 +5,7 @@

 Name:           steam
 Version:        1.0.0.83
-Release:        2%?dist
+Release:        1%?dist
 Summary:        Installer for the Steam software distribution service
 # Redistribution and repackaging for Linux is allowed, see license file. udev rules are MIT.
 License:        Steam License Agreement and MIT
@@ -111,8 +111,8 @@ Requires:       SDL2%{?_isa}
 %endif

 # Game performance is increased with gamemode (for games that support it)
-Recommends:     (falcond or gamemode)
-Recommends:     (gamemode%{?_isa} if gamemode(x86-64))
+Recommends:     gamemode
+Recommends:     gamemode%{?_isa}
 Recommends:     (gnome-shell-extension-appindicator if gnome-shell)

 Recommends:     (gnome-shell-extension-appindicator if gnome-shell)
@@ -4,7 +4,7 @@

 # https://github.com/twpayne/chezmoi
 %global goipath         github.com/twpayne/chezmoi
-Version:                2.62.7
+Version:                2.62.6

 %gometa -f

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

 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Name:           kotlin-native
-Version:        2.2.0
+Version:        2.1.21
 Release:        1%?dist
 Summary:        LLVM backend for the Kotlin compiler
 ExclusiveArch:  x86_64
@@ -1,7 +1,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 Name:           kotlin
-Version:        2.2.0
+Version:        2.1.21
 Release:        1%?dist
 Summary:        Statically typed programming language

@@ -1,5 +1,5 @@
-%global commit 8499635c56018b22dd4efbd20e274fae045c569b
-%global commit_date 20250628
+%global commit 4e354b27dd27765f22f7ce8cf094ee76aa699605
+%global commit_date 20250617
 %global shortcommit %{sub %commit 1 7}

 Name:			grabnim
@@ -1,8 +1,8 @@
 %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
-%global commit 6bdb069a6651e419b2d808f488051322cd05d753
+%global commit c22bfe6bc06951a037d3094612151c6ea1b9fc79
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global ver 2.3.1
-%global commit_date 20250628
+%global commit_date 20250617
 %global debug_package %nil

 Name:			nim-nightly
@@ -1,5 +1,5 @@
 Name:           nimble
-Version:        0.14.2
+Version:        0.18.2
 Release:        1%?dist
 Summary:        Package manager for the Nim programming language
 License:        BSD
@@ -0,0 +1,9 @@
+project pkg {
+    arches = ["x86_64"]
+  rpm {
+	spec = "python-colorthief.spec"
+  }
+  labels {
+    updbranch = 1
+  }
+}
@@ -0,0 +1,77 @@
+## Spec originally from Fedora, only modified for multibranch support and Terra changes
+
+## ...I don't know why they have this here?
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch: %{ix86}
+
+%global pypi_name colorthief
+
+Name:           python-%{pypi_name}
+Version:        0.2.1
+Release:        1%{?dist}
+Summary:        Grabs the dominant color or a representative color palette from an image
+
+# https://gitlab.com/fedora/legal/fedora-license-data/-/issues/382
+# License file provided by Python module, see:
+# rpm -q --licensefiles {python3_sitelib}/{name}-{version}.dist-info/LICENSE
+License:        BSD-3-Clause
+URL:            https://github.com/fengsp/color-thief-py
+Source0:        %{pypi_source}
+BuildRequires:  pyproject-rpm-macros
+BuildRequires:  python3-devel
+BuildRequires:  python3dist(pillow)
+BuildRequires:  python3dist(pip)
+BuildRequires:  python3dist(setuptools)
+BuildArch:      noarch
+Packager:       Gilver E. <rockgrub@disroot.org>
+
+%global _description %{expand:
+A Python module for grabbing the color palette from an image.}
+
+%description %_description
+
+%package -n     python3-%{pypi_name}
+Summary:        %{summary}
+
+%description -n python3-%{pypi_name} %_description
+
+%prep
+%autosetup -n %{pypi_name}-%{version}
+
+%build
+%if 0%{?fedora} <= 41 || 0%{?rhel}
+%py3_build
+%else
+%pyproject_wheel
+%endif
+
+%install
+%if 0%{?fedora} <= 41 || 0%{?rhel}
+%py3_install
+%else
+%pyproject_install
+%pyproject_save_files %{pypi_name}
+%endif
+
+%if 0%{?fedora} > 41
+%check
+%pyproject_check_import
+%endif
+
+%if 0%{?fedora} <= 41 || 0%{?rhel}
+%files -n python3-%{pypi_name}
+%license LICENSE
+%doc README.rst
+%{python3_sitelib}/__pycache__/*
+%{python3_sitelib}/%{pypi_name}.py
+%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info/
+%else
+%files -n python3-%{pypi_name} -f %{pyproject_files}
+%license LICENSE
+%doc README.rst
+%endif
+
+
+%changelog
+* Mon May 26 2025 Gilver E. <rockgrub@disroot.org> - 0.2.1-1
+- Initial port from Fedora
@@ -0,0 +1 @@
+rpm.version(pypi("colorthief"));
@@ -1,6 +1,6 @@
 # Created by pyp2rpm-3.3.10
 %global pypi_name pip-system-certs
-%global pypi_version 5.2
+%global pypi_version 5.0

 Name:           python-%{pypi_name}
 Version:        %{pypi_version}
@@ -0,0 +1,5 @@
+project pkg {
+    rpm {
+        spec = "rust-onefetch.spec"
+    }
+}
@@ -0,0 +1,11 @@
+--- onefetch-2.21.0/Cargo.toml	1970-01-01T00:00:01+00:00
+++ onefetch-2.21.0/Cargo.toml	2024-07-23T17:12:11.234589+00:00
+@@ -164,8 +164,3 @@
+ [features]
+ fail-on-deprecated = []
+ 
+-[target."cfg(windows)".dependencies.enable-ansi-support]
+-version = "0.2.1"
+-
+-[target."cfg(windows)".build-dependencies.winres]
+-version = "0.1"
@@ -0,0 +1,103 @@
+# Generated by rust2rpm 26
+%bcond_without check
+
+%global crate onefetch
+
+Name:           rust-onefetch
+Version:        2.24.0
+Release:        1%?dist
+Summary:        Command-line Git information tool
+
+License:        MIT
+URL:            https://crates.io/crates/onefetch
+Source:         %{crates_source}
+# Automatically generated patch to strip dependencies and normalize metadata
+Patch:          onefetch-fix-metadata-auto.diff
+
+BuildRequires:  anda-srpm-macros cargo-rpm-macros >= 24
+BuildRequires:  cmake mold
+
+%global _description %{expand:
+Command-line Git information tool.}
+
+%description %{_description}
+
+%package     -n %{crate}
+Summary:        %{summary}
+License:        (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-3-Clause AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND (Unlicense OR MIT) AND Zlib AND (Zlib OR Apache-2.0 OR MIT)
+
+%description -n %{crate} %{_description}
+
+%files       -n %{crate}
+%license LICENSE.md
+%license resources/license.cache.zstd
+%license src/info/license.rs
+%license LICENSE.dependencies
+%doc CHANGELOG.md
+%doc CONTRIBUTING.md
+%doc README.md
+%{_bindir}/onefetch
+
+%package        devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description    devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
+
+%files          devel
+%license %{crate_instdir}/LICENSE.md
+%license %{crate_instdir}/resources/license.cache.zstd
+%license %{crate_instdir}/src/info/license.rs
+%doc %{crate_instdir}/CHANGELOG.md
+%doc %{crate_instdir}/CONTRIBUTING.md
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
+
+%package     -n %{name}+default-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
+
+%files       -n %{name}+default-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+fail-on-deprecated-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+fail-on-deprecated-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "fail-on-deprecated" feature of the "%{crate}" crate.
+
+%files       -n %{name}+fail-on-deprecated-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%prep
+%autosetup -n %{crate}-%{version} -p1
+%cargo_prep_online
+
+%build
+cat<<EOF > license.sh
+%{cargo_license} > LICENSE.dependencies
+EOF
+sed -i "s/--offline//g" license.sh
+bash license.sh
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%changelog
+%autochangelog
@@ -0,0 +1 @@
+rpm.version(crates("onefetch"));
@@ -1,3 +1,4 @@
+%global build_rustflags %build_rustflags -C link-arg=-fuse-ld=mold
 %global rustflags_debuginfo 1

 Name:           rnote
@@ -22,7 +23,7 @@ import/export, an infinite canvas and an adaptive UI for big and small screens.

 %prep
 %autosetup -n rnote-%{version}
-%cargo_prep_online
+

 %build
 %meson
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "rust-wild-linker.spec"
-	}
-}
@@ -1,54 +0,0 @@
-# Generated by rust2rpm 27
-%bcond check 0
-
-%global crate wild-linker
-
-Name:           rust-wild-linker
-Version:        0.5.0
-Release:        1%?dist
-Summary:        Very fast linker for Linux
-
-License:        MIT OR Apache-2.0
-URL:            https://crates.io/crates/wild-linker
-Source:         %{crates_source}
-Source1:        https://github.com/davidlattimore/wild/archive/refs/tags/%version.tar.gz
-
-BuildRequires:  cargo-rpm-macros >= 24
-BuildRequires:  gcc-c++
-
-%global _description %{expand:
-A very fast linker for Linux.}
-
-%description %{_description}
-
-%package     -n %{crate}
-Summary:        %{summary}
-License:        (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-2-Clause AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR LGPL-2.1-or-later) AND (MIT OR NCSA) AND (MIT OR Zlib OR Apache-2.0) AND (Unlicense OR MIT) AND Zlib AND (Zlib OR Apache-2.0 OR MIT)
-# LICENSE.dependencies contains a full license breakdown
-Provides:		wild = %evr
-
-%description -n %{crate} %{_description}
-
-%files       -n %{crate}
-%license LICENSE-APACHE LICENSE-MIT
-%license LICENSE.dependencies
-%doc README.md
-%{_bindir}/wild
-
-%prep
-%autosetup -n %{crate}-%{version} -p1
-%cargo_prep_online
-tar xf %{S:1}
-cp wild-%version/LICENSE-* .
-
-%build
-%{cargo_license_summary_online}
-%{cargo_license_online} > LICENSE.dependencies
-
-%install
-%cargo_install
-
-%if %{with check}
-%check
-%cargo_test
-%endif
@@ -1 +0,0 @@
-rpm.version(crates("wild-linker"));
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/vala-panel-project/vala-panel-appmenu
-%global commit c1727022ae164a49013679ba14daeabf23b2b933
+%global commit f05d28d805a22a7564895aa178772361c44b6b7a
 %forgemeta

 Name:    vala-panel-appmenu
@@ -7,7 +7,7 @@
 %define         llvm_compat 20
 %endif
 %global         llvm_version 20.0.0
-%global         ver 0.15.0-dev.877+0adcfd60f
+%global         ver 0.15.0-dev.832+1ca213dab
 %bcond bootstrap 1
 %bcond docs      %{without bootstrap}
 %bcond test      1
@@ -13,7 +13,7 @@
 %global zig_cache_dir %{builddir}/zig-cache

 Name:           zig-master
-Version:        0.15.0~dev.877+0adcfd60f
+Version:        0.15.0~dev.832+1ca213dab
 Release:        1%?dist
 Summary:        Master builds of the Zig language
 License:        MIT AND NCSA AND LGPL-2.1-or-later AND LGPL-2.1-or-later WITH GCC-exception-2.0 AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND BSD-3-Clause AND Inner-Net-2.0 AND ISC AND LicenseRef-Fedora-Public-Domain AND GFDL-1.1-or-later AND ZPL-2.1
@@ -1,5 +1,5 @@
-%global commit 95c6d6d
-%global commit_date 20250628
+%global commit ca3190d
+%global commit_date 20250616

 Name:			astal
 Version:		0^%commit_date.%commit
@@ -1,7 +1,7 @@

-%global commit 95c6d6dbaf0eaa71a17abf02c20bfca7371956c1
+%global commit ca3190d077d09b9597e7de471a8e388a08f112e9
 %global shortcommit %{sub %commit 1 7}
-%global commit_date 20250628
+%global commit_date 20250616

 Name:			astal
 Version:		0^%commit_date.%shortcommit
@@ -1,6 +1,6 @@
 %global debug_package %{nil}
-%global commit 30e87664829782811a765b0ca9eea3a878a7ff29
-%global commit_date 20250627
+%global commit eff4a63c32b3ce4ac86d521d924b9973bbec8b99
+%global commit_date 20250521
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global ver 1.0.0

@@ -0,0 +1,32 @@
+From 24f85c06c28736b73c14208a0ffa6657d2aee9cd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= <jexposit@redhat.com>
+Date: Mon, 21 Apr 2025 13:52:14 +0200
+Subject: [PATCH] Revert "kopper: Explicitly choose zink"
+
+On QEMU (virtio driver), without 3D acceleration enabled and without
+mesa-vulkan-drivers installed, this commit prevents Mutter to start.
+
+This reverts commit c0bc957c5d8c7edd57626284b712dd6ea1e375fc.
+
+Related: https://bugzilla.redhat.com/show_bug.cgi?id=2360851
+Related: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13009
+---
+ src/gallium/frontends/dri/kopper.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/gallium/frontends/dri/kopper.c b/src/gallium/frontends/dri/kopper.c
+index a1d7dcb79b4..3bdb56022a9 100644
+--- a/src/gallium/frontends/dri/kopper.c
+++ b/src/gallium/frontends/dri/kopper.c
+@@ -73,7 +73,7 @@ kopper_init_screen(struct dri_screen *screen, bool driver_name_is_inferred)
+    bool success;
+ #ifdef HAVE_LIBDRM
+    if (screen->fd != -1)
+-      success = pipe_loader_drm_probe_fd(&screen->dev, screen->fd, true);
+      success = pipe_loader_drm_probe_fd(&screen->dev, screen->fd, false);
+    else
+       success = pipe_loader_vk_probe_dri(&screen->dev);
+ #else
+-- 
+2.49.0
+
@@ -1,256 +1,16 @@
-From 27e5ca5e9f32a3dab5d9f22e53c34133a98fc1ef Mon Sep 17 00:00:00 2001
-From: Antheas Kapenekakis <git@antheas.dev>
-Date: Sat, 15 Mar 2025 16:38:53 +0100
-Subject: [PATCH 01/11] [NA] Developer files, readme, etc
-
---
- Containerfile | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++
- sync.sh       |  94 ++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 211 insertions(+)
- create mode 100644 Containerfile
- create mode 100755 sync.sh
-
-diff --git a/Containerfile b/Containerfile
-new file mode 100644
-index 00000000000..ba4ecf6c172
--- /dev/null
-+++ b/Containerfile
-@@ -0,0 +1,117 @@
-+ARG FEDORA_VERSION=41
-+
-+FROM fedora:${FEDORA_VERSION}
-+
-+# noarch
-+RUN dnf5 install -y \
-+    meson \
-+    python3-mako \
-+    python3-ply \
-+    python3-pycparser \
-+    rust-paste-devel \
-+    rust-proc-macro2-devel \
-+    rust-quote-devel \
-+    cargo-rpm-macros \
-+    rust-syn+clone-impls-devel \
-+    rust-unicode-ident-devel \
-+    vulkan-headers \
-+    wayland-protocols-devel \
-+    xorg-x11-proto-devel \
-+    && dnf5 clean all
-+
-+# x86_64
-+RUN dnf5 install -y \
-+    bindgen-cli \
-+    bison \
-+    cbindgen \
-+    clang-devel \
-+    elfutils-libelf-devel \
-+    expat-devel \
-+    flex \
-+    gcc \
-+    gettext \
-+    glslang \
-+    kernel-headers \
-+    libX11-devel \
-+    libXdamage-devel \
-+    libXext-devel \
-+    libXfixes-devel \
-+    libXrandr-devel \
-+    libXxf86vm-devel \
-+    libclc-devel \
-+    libdrm-devel \
-+    libglvnd-core-devel \
-+    libselinux-devel \
-+    libunwind-devel \
-+    libva-devel \
-+    libvdpau-devel \
-+    libxcb-devel \
-+    libxshmfence-devel \
-+    libzstd-devel \
-+    python3-devel \
-+    lm_sensors-devel \
-+    python3-pyyaml \
-+    valgrind-devel \
-+    spirv-llvm-translator-devel \
-+    spirv-tools-devel \
-+    vulkan-loader-devel \
-+    wayland-devel \
-+    zlib-ng-compat-devel
-+
-+# x86
-+RUN dnf5 install -y \
-+    clang-devel.i686 \
-+    elfutils-libelf-devel.i686 \
-+    expat-devel.i686 \
-+    glslang.i686 \
-+    kernel-headers.i686 \
-+    libX11-devel.i686 \
-+    libXdamage-devel.i686 \
-+    libXext-devel.i686 \
-+    libXfixes-devel.i686 \
-+    libXrandr-devel.i686 \
-+    libXxf86vm-devel.i686 \
-+    libclc-devel.i686 \
-+    libdrm-devel.i686 \
-+    libglvnd-core-devel.i686 \
-+    libselinux-devel.i686 \
-+    libunwind-devel.i686 \
-+    libva-devel.i686 \
-+    libvdpau-devel.i686 \
-+    libxcb-devel.i686 \
-+    libxshmfence-devel.i686 \
-+    libzstd-devel.i686 \
-+    python3-devel.i686 \
-+    lm_sensors-devel.i686 \
-+    valgrind-devel.i686 \
-+    spirv-llvm-translator-devel.i686 \
-+    spirv-tools-devel.i686 \
-+    vulkan-loader-devel.i686 \
-+    wayland-devel.i686 \
-+    zlib-ng-compat-devel.i686 \
-+    pkgconf-pkg-config.i686
-+
-+# these do not have an i686 version
-+# bindgen-cli.i686 \
-+# bison.i686 \
-+# cbindgen.i686 \
-+# flex.i686 \
-+# gcc.i686 \
-+# gettext.i686 \
-+# python3-pyyaml.i686 \
-+
-+RUN dnf install -y ccache
-+
-+ARG UID=1000
-+ARG GID=1000
-+
-+RUN groupadd -g $GID -o builder && \
-+    useradd -m -u $UID -g $GID -o -s /bin/bash builder && \
-+    echo "builder ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/builder && \
-+    chmod 0440 /etc/sudoers.d/builder
-+
-+USER builder
-+
-+ENV PATH="/usr/lib64/ccache/:$PATH"
-+
-+WORKDIR /workspace
-\ No newline at end of file
-diff --git a/sync.sh b/sync.sh
-new file mode 100755
-index 00000000000..f0fa113f876
--- /dev/null
-+++ b/sync.sh
-@@ -0,0 +1,94 @@
-+if [ -z "$1" ]; then
-+    echo "Usage: $0 <host>"
-+    exit 1
-+fi
-+
-+# https://gist.github.com/Venemo/a9483106565df3a83fc67a411191edbd
-+
-+RHOST=$1
-+RSYNC="rsync -rv --exclude .git --exclude venv --exclude __pycache__ --links"
-+DEVUSER=${DEVUSER:-bazzite}
-+
-+# If RHOST=claw, set driver name to intel
-+if [ "$RHOST" = "claw" ]; then
-+    echo "Using Intel driver"
-+    DRIVER_NAME=intel
-+    VKICD_NAME=intel
-+    GALLIUM_DRIVER=iris
-+else
-+    echo "Using AMD driver"
-+    DRIVER_NAME=amd
-+    VKICD_NAME=radeon
-+    GALLIUM_DRIVER=radeonsi
-+fi
-+
-+set -e -x
-+
-+sudo podman build . --tag mesa_builder \
-+    --build-arg UID=$(id -u) --build-arg GID=$(id -g)
-+
-+PODMAN_RUN="sudo podman run --rm -v $(pwd):/workspace \
-+  --env CCACHE_DIR=/workspace/.cache \
-+  --env CCACHE_MAXSIZE=5G \
-+  --env CCACHE_COMPRESS=1 \
-+    -it mesa_builder"
-+
-+$PODMAN_RUN rm -rf build64 build32
-+
-+$PODMAN_RUN meson setup build64 --libdir lib64 --prefix /workspace/.out \
-+    -Dgallium-drivers=swrast,zink,$GALLIUM_DRIVER -Dvulkan-drivers=$DRIVER_NAME \
-+    -Dgallium-nine=true -Dbuildtype=release \
-+    -Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec
-+
-+# Cross-file for arch: lib32, fedora: ./gcc-i686
-+$PODMAN_RUN meson setup build32 --libdir lib --prefix /workspace/.out \
-+    -Dgallium-drivers=swrast,zink,$GALLIUM_DRIVER -Dvulkan-drivers=$DRIVER_NAME \
-+    -Dgallium-nine=true -Dbuildtype=release \
-+    -Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec
-+
-+time $PODMAN_RUN ninja -C build64 install
-+
-+time $PODMAN_RUN ninja -C build32 install
-+
-+RUNCONFIG=$(cat << EOF
-+
-+
-+MESA=/home/$DEVUSER/.out
-+
-+export LD_LIBRARY_PATH=\$MESA/lib64:\$MESA/lib:\$LD_LIBRARY_PATH
-+export LIBGL_DRIVERS_PATH=\$MESA/lib64/dri:\$MESA/lib/dri
-+export EGL_DRIVERS_PATH=\$MESA/lib64/dri:\$MESA/lib/dri
-+export VK_ICD_FILENAMES=\$MESA/share/vulkan/icd.d/${VKICD_NAME}_icd.x86_64.json:\$MESA/share/vulkan/icd.d/${VKICD_NAME}_icd.i686.json
-+export LIBVA_DRIVERS_PATH=\$MESA/lib64/dri:\$MESA/lib/dri
-+export VDPAU_DRIVER_PATH=\$MESA/lib64/vdpau
-+export D3D_MODULE_PATH=\$MESA/lib64/d3d/d3dadapter9.so.1:\$MESA/lib/d3d/d3dadapter9.so.1
-+# export ENABLE_GAMESCOPE_WSI=0
-+
-+EOF
-+)
-+
-+ssh $RHOST /bin/bash << EOF
-+    rm -rf .out
-+    mkdir -p .out
-+EOF
-+
-+echo "$RUNCONFIG" > .out/runconfig
-+
-+# Fixup vunkan_icd install dir
-+sed -i "s|/workspace/.out|/home/$DEVUSER/.out|g" .out/share/vulkan/icd.d/*.json
-+
-+$RSYNC .out/ $RHOST:.out/
-+
-+ssh $RHOST /bin/bash << EOF
-+    sudo rpm-ostree usroverlay --hotfix
-+
-+    # check if session does not have D3D_MODULE_PATH
-+    if ! grep -q D3D_MODULE_PATH /usr/share/gamescope-session-plus/device-quirks; then
-+        cat ~/.out/runconfig | sudo tee -a /usr/share/gamescope-session-plus/device-quirks
-+    fi
-+
-+    # sudo rsync -r -v ~/.out/* /usr/
-+    
-+    bazzite-session-select gamescope
-+    # sudo reboot
-+EOF
-- 
-2.49.0
-
-
-From 2f02ad01e44eddb1d78e6e2a336bb21b7c3c93af Mon Sep 17 00:00:00 2001
+From aac6b04f39717f7363071f5500a89bb33e01cb33 Mon Sep 17 00:00:00 2001
 From: Antheas Kapenekakis <git@antheas.dev>
 Date: Sat, 15 Mar 2025 16:39:08 +0100
-Subject: [PATCH 02/11] [BEGIN] SteamOS Changes
+Subject: [PATCH 01/12] [BEGIN] SteamOS Changes

 -- 
 2.49.0


-From d446cc1258a6c6fd042e9a3d651a799a033a2d8c Mon Sep 17 00:00:00 2001
+From 9fc35e8c53fe7e6c84b7da9ddff3d528f22ea4a9 Mon Sep 17 00:00:00 2001
 From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
 Date: Fri, 14 Jan 2022 15:58:45 +0100
-Subject: [PATCH 03/11] STEAMOS: radv: min image count override for FH5
+Subject: [PATCH 02/12] STEAMOS: radv: min image count override for FH5

 Otherwise in combination with the vblank time reservation in
 gamescope the game could get stuck in low power states.
@@ -259,10 +19,10 @@ gamescope the game could get stuck in low power states.
 1 file changed, 4 insertions(+)

 diff --git a/src/util/00-radv-defaults.conf b/src/util/00-radv-defaults.conf
-index e0e5b34dc87..5e931f61760 100644
+index aef8b9006cd..2a6b0ec84a4 100644
 --- a/src/util/00-radv-defaults.conf
 +++ b/src/util/00-radv-defaults.conf
-@@ -238,5 +238,9 @@ Application bugs worked around in this file:
+@@ -223,5 +223,9 @@ Application bugs worked around in this file:
         <application name="Total War: WARHAMMER III" application_name_match="TotalWarhammer3">
             <option name="radv_disable_depth_storage" value="true"/>
         </application>
@@ -276,10 +36,10 @@ index e0e5b34dc87..5e931f61760 100644
 2.49.0


-From 016b60d32de3cd99e10207e7f0fa2c6fce91476c Mon Sep 17 00:00:00 2001
+From 09299a2cf516078ce9ed9786a49ea6f957ac6527 Mon Sep 17 00:00:00 2001
 From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
 Date: Thu, 22 Feb 2024 22:32:45 +0100
-Subject: [PATCH 04/11] STEAMOS: Dynamic swapchain override for gamescope
+Subject: [PATCH 03/12] STEAMOS: Dynamic swapchain override for gamescope
 limiter for DRI3 only

 The original patch (from Bas) contained WSI VK support too but it's
@@ -383,28 +143,28 @@ index 4da19d73090..819a0e548fc 100644
 2.49.0


-From 23db9ff0bf721f2c9080955c8c5dcf1f187d7adc Mon Sep 17 00:00:00 2001
+From 379efbce79f2ca73d34ec48b10e28942be3ed1be Mon Sep 17 00:00:00 2001
 From: Antheas Kapenekakis <git@antheas.dev>
 Date: Sat, 15 Mar 2025 16:39:25 +0100
-Subject: [PATCH 05/11] [BEGIN] SteamOS Backports
+Subject: [PATCH 04/12] [BEGIN] SteamOS Backports

 -- 
 2.49.0


-From 69160c86a0d01b1c8482277faca1f6f7fa24cfce Mon Sep 17 00:00:00 2001
+From a4ac8f2bcd23eb4194adfe41117d4e168ffc6ddd Mon Sep 17 00:00:00 2001
 From: Antheas Kapenekakis <git@antheas.dev>
 Date: Sat, 15 Mar 2025 16:39:33 +0100
-Subject: [PATCH 06/11] [BEGIN] Our Mesa backports
+Subject: [PATCH 05/12] [BEGIN] Our Mesa backports

 -- 
 2.49.0


-From 59e3d359a4f4f78112ee965bb790dec2208ea480 Mon Sep 17 00:00:00 2001
+From 7286b058c851688929bd145116c61872d06d81c8 Mon Sep 17 00:00:00 2001
 From: Maarten Lankhorst <maarten.lankhorst@intel.com>
 Date: Mon, 17 Feb 2025 14:55:29 -0800
-Subject: [PATCH 07/11] anv: Mark images with format modifiers set as scanout.
+Subject: [PATCH 06/12] anv: Mark images with format modifiers set as scanout.

 We currently use the presence of struct WSI_IMAGE_CREATE_INFO_MESA.scanout to mark the BO as scanout,
 but this only handles the linear case, and fails when drm format modifiers are used.
@@ -439,10 +199,10 @@ index 0fb86e9d846..de37994d324 100644
 2.49.0


-From 8c17b9dd7ad7f565080bd3623cfb820efb729444 Mon Sep 17 00:00:00 2001
+From 643137e1f57b1c89451a77edec40565e6084e2e1 Mon Sep 17 00:00:00 2001
 From: Antheas Kapenekakis <git@antheas.dev>
 Date: Mon, 24 Mar 2025 19:50:51 +0100
-Subject: [PATCH 08/11] Revert "winsys/amdgpu: use VM_ALWAYS_VALID for all VRAM
+Subject: [PATCH 07/12] Revert "winsys/amdgpu: use VM_ALWAYS_VALID for all VRAM
 and GTT allocations"

 This reverts commit 8c91624614c1f939974fe0d2d1a3baf83335cecb.
@@ -472,19 +232,135 @@ index dfefc468bca..cc0719a1898 100644
 2.49.0


-From 816dec380bba16f65d7c65ddf9960a0ff79a8923 Mon Sep 17 00:00:00 2001
-From: Kyle Gospodnetich <me@kylegospodneti.ch>
-Date: Sun, 18 May 2025 09:40:01 -0700
-Subject: [PATCH 09/11] [BEGIN] Proton-GE Patches
+From e38d54fb349d78b10ca5000add7cd97bf921323a Mon Sep 17 00:00:00 2001
+From: Antheas Kapenekakis <git@antheas.dev>
+Date: Wed, 7 May 2025 18:50:48 +0200
+Subject: [PATCH 08/12] [BEGIN] Intel DX12 fix

 -- 
 2.49.0


-From e768b0cf066c73e9c379d59d380462c15f050a03 Mon Sep 17 00:00:00 2001
+From cb2c3290e03518f90e13e83f68edea63c9c6c0cf Mon Sep 17 00:00:00 2001
+From: Kyle Gospodnetich <me@kylegospodneti.ch>
+Date: Sun, 18 May 2025 09:40:01 -0700
+Subject: [PATCH 09/12] [BEGIN] Proton-GE Patches
+
+-- 
+2.49.0
+
+
+From 24d4a18ec695dbdc4fba33eee941dcca49a9a106 Mon Sep 17 00:00:00 2001
+From: Kyle Gospodnetich <me@kylegospodneti.ch>
+Date: Sun, 18 May 2025 09:41:21 -0700
+Subject: [PATCH 10/12] radv,driconf: Add radv_force_64k_sparse_alignment
+ config
+
+---
+ src/amd/vulkan/radv_buffer.c   | 6 +++++-
+ src/amd/vulkan/radv_instance.c | 3 +++
+ src/amd/vulkan/radv_instance.h | 1 +
+ src/util/00-radv-defaults.conf | 7 +++++++
+ src/util/driconf.h             | 3 +++
+ 5 files changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/src/amd/vulkan/radv_buffer.c b/src/amd/vulkan/radv_buffer.c
+index 88111750517..8ef575f8246 100644
+--- a/src/amd/vulkan/radv_buffer.c
+++ b/src/amd/vulkan/radv_buffer.c
+@@ -167,6 +167,7 @@ radv_get_buffer_memory_requirements(struct radv_device *device, VkDeviceSize siz
+                                     VkBufferUsageFlags2 usage, VkMemoryRequirements2 *pMemoryRequirements)
+ {
+    const struct radv_physical_device *pdev = radv_device_physical(device);
+   const struct radv_instance *instance = radv_physical_device_instance(pdev);
+ 
+    pMemoryRequirements->memoryRequirements.memoryTypeBits =
+       ((1u << pdev->memory_properties.memoryTypeCount) - 1u) & ~pdev->memory_types_32bit;
+@@ -179,7 +180,10 @@ radv_get_buffer_memory_requirements(struct radv_device *device, VkDeviceSize siz
+       pMemoryRequirements->memoryRequirements.memoryTypeBits = pdev->memory_types_32bit;
+ 
+    if (flags & VK_BUFFER_CREATE_SPARSE_BINDING_BIT) {
+-      pMemoryRequirements->memoryRequirements.alignment = 4096;
+      if (instance->drirc.force_64k_sparse_alignment)
+         pMemoryRequirements->memoryRequirements.alignment = 65536;
+      else
+         pMemoryRequirements->memoryRequirements.alignment = 4096;
+    } else {
+       if (usage & VK_BUFFER_USAGE_2_PREPROCESS_BUFFER_BIT_EXT)
+          pMemoryRequirements->memoryRequirements.alignment = radv_dgc_get_buffer_alignment(device);
+diff --git a/src/amd/vulkan/radv_instance.c b/src/amd/vulkan/radv_instance.c
+index 7aebf073dfd..15a3f710502 100644
+--- a/src/amd/vulkan/radv_instance.c
+++ b/src/amd/vulkan/radv_instance.c
+@@ -194,6 +194,7 @@ static const driOptionDescription radv_dri_options[] = {
+       DRI_CONF_RADV_APP_LAYER()
+       DRI_CONF_RADV_EMULATE_RT(false)
+       DRI_CONF_RADV_ENABLE_FLOAT16_GFX8(false)
+      DRI_CONF_RADV_FORCE_64K_SPARSE_ALIGNMENT(false)
+    DRI_CONF_SECTION_END
+ };
+ // clang-format on
+@@ -298,6 +299,8 @@ radv_init_dri_options(struct radv_instance *instance)
+    instance->drirc.emulate_rt = driQueryOptionb(&instance->drirc.options, "radv_emulate_rt");
+ 
+    instance->drirc.expose_float16_gfx8 = driQueryOptionb(&instance->drirc.options, "radv_enable_float16_gfx8");
+
+   instance->drirc.force_64k_sparse_alignment = driQueryOptionb(&instance->drirc.options, "radv_force_64k_sparse_alignment");
+ }
+ 
+ static const struct vk_instance_extension_table radv_instance_extensions_supported = {
+diff --git a/src/amd/vulkan/radv_instance.h b/src/amd/vulkan/radv_instance.h
+index d0f23404285..81c4921222e 100644
+--- a/src/amd/vulkan/radv_instance.h
+++ b/src/amd/vulkan/radv_instance.h
+@@ -74,6 +74,7 @@ struct radv_instance {
+       bool lower_terminate_to_discard;
+       bool emulate_rt;
+       bool expose_float16_gfx8;
+      bool force_64k_sparse_alignment;
+       char *app_layer;
+       uint8_t override_graphics_shader_version;
+       uint8_t override_compute_shader_version;
+diff --git a/src/util/00-radv-defaults.conf b/src/util/00-radv-defaults.conf
+index 2a6b0ec84a4..595a435802f 100644
+--- a/src/util/00-radv-defaults.conf
+++ b/src/util/00-radv-defaults.conf
+@@ -123,6 +123,13 @@ Application bugs worked around in this file:
+             <option name="radv_invariant_geom" value="true" />
+         </application>
+ 
+        <application name="DOOM: The Dark Ages" application_name_match="DOOMTheDarkAges">
+            <option name="radv_force_64k_sparse_alignment" value="true" />
+            <option name="radv_zero_vram" value="true" />
+            <option name="radv_disable_dedicated_sparse_queue" value="true" />
+            <option name="radv_disable_dcc_stores" value="true" />
+        </application>
+
+         <application name="Wolfenstein II" application_name_match="Wolfenstein II The New Colossus">
+             <option name="radv_disable_dcc" value="true" />
+         </application>
+diff --git a/src/util/driconf.h b/src/util/driconf.h
+index 5b0481912c8..26f7ca0b551 100644
+--- a/src/util/driconf.h
+++ b/src/util/driconf.h
+@@ -834,6 +834,9 @@
+    DRI_CONF_OPT_B(radv_enable_float16_gfx8, def, \
+                   "Expose float16 on GFX8, where it's supported but usually not beneficial.")
+ 
+#define DRI_CONF_RADV_FORCE_64K_SPARSE_ALIGNMENT(def) \
+   DRI_CONF_OPT_B(radv_force_64k_sparse_alignment, def, \
+                  "Force the alignment of sparse buffers to 64KiB")
+ /**
+  * \brief ANV specific configuration options
+  */
+-- 
+2.49.0
+
+
+From 06e57ae464ad6a373808a132e096d6a7bc137dfb Mon Sep 17 00:00:00 2001
 From: Kyle Gospodnetich <me@kylegospodneti.ch>
 Date: Sun, 18 May 2025 09:42:23 -0700
-Subject: [PATCH 10/11] radv: min image count patch for Wine Wayland/Path of
+Subject: [PATCH 11/12] radv: min image count patch for Wine Wayland/Path of
 Exile 2 Credit to Glorious Eggroll.

 ---
@@ -506,7 +382,7 @@ Subject: [PATCH 10/11] radv: min image count patch for Wine Wayland/Path of
 15 files changed, 42 insertions(+), 22 deletions(-)

 diff --git a/src/amd/vulkan/radv_instance.c b/src/amd/vulkan/radv_instance.c
-index d03b311fa07..910d3989451 100644
+index 15a3f710502..a6af9d67db0 100644
 --- a/src/amd/vulkan/radv_instance.c
 +++ b/src/amd/vulkan/radv_instance.c
@@ -148,7 +148,7 @@ static const struct debug_control trace_options[] = {
@@ -532,7 +408,7 @@ index 4be7a763da7..f1171053e0b 100644
       DRI_CONF_VK_X11_ENSURE_MIN_IMAGE_COUNT(false)
       DRI_CONF_VK_KHR_PRESENT_WAIT(false)
 diff --git a/src/freedreno/vulkan/tu_device.cc b/src/freedreno/vulkan/tu_device.cc
-index dd79caf6927..a86a2e31017 100644
+index 50b9b322ad4..8d7ab456a87 100644
 --- a/src/freedreno/vulkan/tu_device.cc
 +++ b/src/freedreno/vulkan/tu_device.cc
@@ -1623,7 +1623,7 @@ tu_destroy_physical_device(struct vk_physical_device *device)
@@ -584,7 +460,7 @@ index 8c7d9050063..3966dab52c5 100644
       DRI_CONF_VK_X11_ENSURE_MIN_IMAGE_COUNT(false)
       DRI_CONF_VK_KHR_PRESENT_WAIT(false)
 diff --git a/src/panfrost/vulkan/panvk_instance.c b/src/panfrost/vulkan/panvk_instance.c
-index f6cbe8de4b7..7d3e3c71acf 100644
+index a87abdd4c7c..836f91bad40 100644
 --- a/src/panfrost/vulkan/panvk_instance.c
 +++ b/src/panfrost/vulkan/panvk_instance.c
@@ -151,7 +151,7 @@ panvk_kmod_free(const struct pan_kmod_allocator *allocator, void *data)
@@ -597,10 +473,10 @@ index f6cbe8de4b7..7d3e3c71acf 100644
       DRI_CONF_VK_X11_ENSURE_MIN_IMAGE_COUNT(false)
       DRI_CONF_VK_KHR_PRESENT_WAIT(false)
 diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
-index 5f6034061c2..ca7511877ee 100644
+index 082add17d58..31e8b277bd7 100644
 --- a/src/util/00-mesa-defaults.conf
 +++ b/src/util/00-mesa-defaults.conf
-@@ -625,24 +625,24 @@ TODO: document the other workarounds.
+@@ -616,24 +616,24 @@ TODO: document the other workarounds.
 
         <application name="gfxbench" executable="testfw_app">
             <option name="mesa_glthread_app_profile" value="0" />
@@ -629,7 +505,7 @@ index 5f6034061c2..ca7511877ee 100644
             <option name="vk_x11_strict_image_count" value="true" />
         </application>
 
-@@ -703,10 +703,12 @@ TODO: document the other workarounds.
+@@ -694,10 +694,12 @@ TODO: document the other workarounds.
 
         <application name="Path of Exile" executable="PathOfExile_x64Steam.exe">
             <option name="vk_zero_vram" value="true" />
@@ -641,12 +517,12 @@ index 5f6034061c2..ca7511877ee 100644
 +            <option name="vk_override_min_image_count" value="3" />
         </application>
 
-         <application name="X4 Foundations" executable="X4">
+         <application name="X4 Foundations" executable="X4.exe">
 diff --git a/src/util/driconf.h b/src/util/driconf.h
-index 86e00d6edd6..a00c4c0e9a5 100644
+index 26f7ca0b551..5ced93ddede 100644
 --- a/src/util/driconf.h
 +++ b/src/util/driconf.h
-@@ -448,8 +448,8 @@
+@@ -445,8 +445,8 @@
    DRI_CONF_OPT_B(vk_wsi_force_swapchain_to_current_extent, def, \
                   "Force VkSwapchainCreateInfoKHR::imageExtent to be VkSurfaceCapabilities2KHR::currentExtent")
 
@@ -672,7 +548,7 @@ index a843b463e84..4de75ceb8af 100644
       DRI_CONF_VK_XWAYLAND_WAIT_READY(true)
       DRI_CONF_VENUS_IMPLICIT_FENCING(false)
 diff --git a/src/vulkan/wsi/wsi_common.c b/src/vulkan/wsi/wsi_common.c
-index 528605856d5..d0ffd475b8f 100644
+index 05a247181cf..b0fb88bf2d6 100644
 --- a/src/vulkan/wsi/wsi_common.c
 +++ b/src/vulkan/wsi/wsi_common.c
@@ -219,7 +219,7 @@ wsi_device_init(struct wsi_device *wsi,
@@ -714,7 +590,7 @@ index 51bfa77d4b2..593743c8b0e 100644
                        const VkAllocationCallbacks *alloc);
 VkResult wsi_win32_init_wsi(struct wsi_device *wsi_device,
 diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c
-index d592aa59401..4c1bbed855e 100644
+index 6be46f49d14..1f1adf4ddf9 100644
 --- a/src/vulkan/wsi/wsi_common_wayland.c
 +++ b/src/vulkan/wsi/wsi_common_wayland.c
@@ -58,6 +58,7 @@
@@ -725,7 +601,7 @@ index d592aa59401..4c1bbed855e 100644
 
 #include <loader/loader_wayland_helper.h>
 
-@@ -1684,9 +1685,12 @@ wsi_wl_surface_get_support(VkIcdSurfaceBase *surface,
+@@ -1683,9 +1684,12 @@ wsi_wl_surface_get_support(VkIcdSurfaceBase *surface,
 #define WSI_WL_DEFAULT_NUM_IMAGES 3
 
 static uint32_t
@@ -739,7 +615,7 @@ index d592aa59401..4c1bbed855e 100644
    if (present_mode) {
       return present_mode->presentMode == VK_PRESENT_MODE_MAILBOX_KHR ?
              WSI_WL_BUMPED_NUM_IMAGES : WSI_WL_DEFAULT_NUM_IMAGES;
-@@ -1735,7 +1739,7 @@ wsi_wl_surface_get_capabilities(VkIcdSurfaceBase *icd_surface,
+@@ -1734,7 +1738,7 @@ wsi_wl_surface_get_capabilities(VkIcdSurfaceBase *icd_surface,
       display = &temp_display;
    }
 
@@ -748,7 +624,7 @@ index d592aa59401..4c1bbed855e 100644
 
    if (!wsi_wl_surface->display)
       wsi_wl_display_finish(&temp_display);
-@@ -3497,7 +3501,7 @@ wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
+@@ -3496,7 +3500,7 @@ wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
       const VkSurfacePresentModeEXT mode =
             { VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_EXT, NULL, pCreateInfo->presentMode };
 
@@ -757,7 +633,7 @@ index d592aa59401..4c1bbed855e 100644
       bool requires_image_count_bump = min_images == WSI_WL_BUMPED_NUM_IMAGES;
       if (requires_image_count_bump)
          num_images = MAX2(min_images, num_images);
-@@ -3685,7 +3689,8 @@ fail:
+@@ -3684,7 +3688,8 @@ fail:
 VkResult
 wsi_wl_init_wsi(struct wsi_device *wsi_device,
                 const VkAllocationCallbacks *alloc,
@@ -767,7 +643,7 @@ index d592aa59401..4c1bbed855e 100644
 {
    struct wsi_wayland *wsi;
    VkResult result;
-@@ -3711,6 +3716,14 @@ wsi_wl_init_wsi(struct wsi_device *wsi_device,
+@@ -3710,6 +3715,14 @@ wsi_wl_init_wsi(struct wsi_device *wsi_device,
 
    wsi_device->wsi[VK_ICD_WSI_PLATFORM_WAYLAND] = &wsi->base;
 
@@ -802,17 +678,17 @@ index 65b7fdf7212..ea5d3750f46 100644
 2.49.0


-From a1be005decba7afccc3f9ef36d7b8913d3e53952 Mon Sep 17 00:00:00 2001
+From 71a603439c89eb97a0cedf9733dbd4202294175a Mon Sep 17 00:00:00 2001
 From: Kyle Gospodnetich <me@kylegospodneti.ch>
 Date: Sun, 18 May 2025 09:59:41 -0700
-Subject: [PATCH 11/11] vulkan/wsi/wayland: Move drm syncobj to swapchain
+Subject: [PATCH 12/12] vulkan/wsi/wayland: Move drm syncobj to swapchain

 ---
- src/vulkan/wsi/wsi_common_wayland.c | 84 +++++++++++++++--------------
- 1 file changed, 44 insertions(+), 40 deletions(-)
+ src/vulkan/wsi/wsi_common_wayland.c | 81 +++++++++++++++--------------
+ 1 file changed, 43 insertions(+), 38 deletions(-)

 diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c
-index 4c1bbed855e..c4da2626a31 100644
+index 1f1adf4ddf9..12c7b5256f9 100644
 --- a/src/vulkan/wsi/wsi_common_wayland.c
 +++ b/src/vulkan/wsi/wsi_common_wayland.c
@@ -194,13 +194,9 @@ struct wsi_wl_surface {
@@ -879,20 +755,18 @@ index 4c1bbed855e..c4da2626a31 100644
    }
 }
 
-@@ -1237,14 +1237,14 @@ wsi_wl_swapchain_update_colorspace(struct wsi_wl_swapchain *chain)
+@@ -1237,13 +1237,14 @@ wsi_wl_swapchain_update_colorspace(struct wsi_wl_swapchain *chain)
       }
    }
 
 -   bool new_color_surface = !surface->color.color_surface;
 +   bool new_color_surface = !chain->color.color_surface;
    bool needs_color_surface_new = needs_color_surface(display, chain->color.colorspace);
-   bool needs_color_surface_old = surface->color.color_surface &&
-      needs_color_surface(display, surface->color.colorspace);
-   if (!needs_color_surface_old && needs_color_surface_new) {
-      wsi_wl_surface_add_color_refcount(surface);
+-   bool needs_color_surface_old = needs_color_surface(display, surface->color.colorspace);
 +   bool needs_color_surface_old = chain->color.color_surface &&
 +      needs_color_surface(display, chain->color.colorspace);
-+   if ((new_color_surface || !needs_color_surface_old) && needs_color_surface_new) {
+    if ((new_color_surface || !needs_color_surface_old) && needs_color_surface_new) {
+-      wsi_wl_surface_add_color_refcount(surface);
 +      wsi_wl_swapchain_add_color_refcount(chain);
    } else if (needs_color_surface_old && !needs_color_surface_new) {
 -      wsi_wl_surface_remove_color_refcount(surface);
@@ -900,7 +774,7 @@ index 4c1bbed855e..c4da2626a31 100644
    }
 
    struct wayland_hdr_metadata wayland_hdr_metadata = {
-@@ -1350,7 +1350,7 @@ wsi_wl_swapchain_update_colorspace(struct wsi_wl_swapchain *chain)
+@@ -1349,7 +1350,7 @@ wsi_wl_swapchain_update_colorspace(struct wsi_wl_swapchain *chain)
       }
    }
 
@@ -909,7 +783,7 @@ index 4c1bbed855e..c4da2626a31 100644
                                                         image_desc,
                                                         WP_COLOR_MANAGER_V1_RENDER_INTENT_PERCEPTUAL);
    wp_image_description_v1_destroy(image_desc);
-@@ -2026,18 +2026,12 @@ wsi_wl_surface_destroy(VkIcdSurfaceBase *icd_surface, VkInstance _instance,
+@@ -2025,18 +2026,12 @@ wsi_wl_surface_destroy(VkIcdSurfaceBase *icd_surface, VkInstance _instance,
    struct wsi_wl_surface *wsi_wl_surface =
       wl_container_of((VkIcdSurfaceWayland *)icd_surface, wsi_wl_surface, base);
 
@@ -928,7 +802,7 @@ index 4c1bbed855e..c4da2626a31 100644
    if (wsi_wl_surface->surface)
       wl_proxy_wrapper_destroy(wsi_wl_surface->surface);
 
-@@ -2315,15 +2309,6 @@ static VkResult wsi_wl_surface_init(struct wsi_wl_surface *wsi_wl_surface,
+@@ -2314,15 +2309,6 @@ static VkResult wsi_wl_surface_init(struct wsi_wl_surface *wsi_wl_surface,
                                  wsi_wl_surface->display->queue);
    }
 
@@ -944,7 +818,7 @@ index 4c1bbed855e..c4da2626a31 100644
    wsi_wl_surface_analytics_init(wsi_wl_surface, pAllocator);
 
    return VK_SUCCESS;
-@@ -3005,11 +2990,11 @@ wsi_wl_swapchain_queue_present(struct wsi_swapchain *wsi_chain,
+@@ -3004,11 +2990,11 @@ wsi_wl_swapchain_queue_present(struct wsi_swapchain *wsi_chain,
       /* Incremented by signal in base queue_present. */
       uint64_t acquire_point = image->base.explicit_sync[WSI_ES_ACQUIRE].timeline;
       uint64_t release_point = image->base.explicit_sync[WSI_ES_RELEASE].timeline;
@@ -958,7 +832,7 @@ index 4c1bbed855e..c4da2626a31 100644
                                                         image->wl_syncobj_timeline[WSI_ES_RELEASE],
                                                         (uint32_t)(release_point >> 32),
                                                         (uint32_t)(release_point & 0xffffffff));
-@@ -3352,9 +3337,10 @@ wsi_wl_swapchain_chain_free(struct wsi_wl_swapchain *chain,
+@@ -3351,9 +3337,10 @@ wsi_wl_swapchain_chain_free(struct wsi_wl_swapchain *chain,
       wl_callback_destroy(chain->frame);
    if (chain->tearing_control)
       wp_tearing_control_v1_destroy(chain->tearing_control);
@@ -972,7 +846,7 @@ index 4c1bbed855e..c4da2626a31 100644
    }
 
    /* Only unregister if we are the non-retired swapchain, or
-@@ -3472,6 +3458,15 @@ wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
+@@ -3471,6 +3458,15 @@ wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
          wp_commit_timer_v1_destroy(old_chain->commit_timer);
          old_chain->commit_timer = NULL;
       }
@@ -988,7 +862,7 @@ index 4c1bbed855e..c4da2626a31 100644
    }
 
    /* Take ownership of the wsi_wl_surface */
-@@ -3520,6 +3515,15 @@ wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
+@@ -3519,6 +3515,15 @@ wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
                                                           WP_TEARING_CONTROL_V1_PRESENTATION_HINT_ASYNC);
    }
 
@@ -29,13 +29,11 @@

 %ifarch %{ix86} x86_64
 %global with_crocus 1
+%global with_i915   1
 %global with_iris   1
 %global with_xa     1
 %global with_intel_clc 1
 %global intel_platform_vulkan %{?with_vulkan_hw:,intel,intel_hasvk}%{!?with_vulkan_hw:%{nil}}
-%if !0%{?rhel}
-%global with_i915   1
-%endif 
 %endif
 %ifarch x86_64
 %if !0%{?with_vulkan_hw}
@@ -44,18 +42,17 @@
 %endif

 %ifarch aarch64 x86_64 %{ix86}
+%global with_kmsro     1
 %if !0%{?rhel}
-%global with_asahi     1
-%global with_d3d12     1
-%global with_etnaviv   1
 %global with_lima      1
-%global with_tegra     1
 %global with_vc4       1
-%global with_v3d       1
+%global with_etnaviv   1
+%global with_tegra     1
+%global with_asahi     1
 %endif
 %global with_freedreno 1
-%global with_kmsro     1
 %global with_panfrost  1
+%global with_v3d       1
 %global with_xa        1
 %if 0%{?with_asahi}
 %global asahi_platform_vulkan %{?with_vulkan_hw:,asahi}%{!?with_vulkan_hw:%{nil}}
@@ -66,7 +63,6 @@
 %if !0%{?rhel}
 %global with_libunwind 1
 %global with_lmsensors 1
-%global with_virtio    1
 %endif

 %ifarch %{valgrind_arches}
@@ -75,7 +71,7 @@
 %bcond_with valgrind
 %endif

-%global vulkan_drivers swrast%{?base_vulkan}%{?intel_platform_vulkan}%{?asahi_platform_vulkan}%{?extra_platform_vulkan}%{?with_nvk:,nouveau}%{?with_virtio:,virtio}
+%global vulkan_drivers swrast,virtio%{?base_vulkan}%{?intel_platform_vulkan}%{?asahi_platform_vulkan}%{?extra_platform_vulkan}%{?with_nvk:,nouveau}

 Name:           %{srcname}
 Summary:        Mesa graphics libraries
@@ -83,8 +79,8 @@ Summary:        Mesa graphics libraries
 # This should not break anything by default as the Mesa stream is ***EXPLICITLY***
 # disabled by default, and has to be enabled manually. See `terra/release/terra-mesa.repo` for details.
 Epoch:          1
-Version:        25.1.4
-Release:        2%?dist
+Version:        25.1.3
+Release:        1%?dist
 License:        MIT AND BSD-3-Clause AND SGI-B-2.0
 URL:            http://www.mesa3d.org

@@ -99,6 +95,12 @@ Patch10:        gnome-shell-glthread-disable.patch
 # https://github.com/bazzite-org/mesa
 Patch20:        bazzite.patch

+# This patch makes Fedora CI fail and causes issues in QEMU. Revert it until
+# we find a fix.
+# https://bugzilla.redhat.com/show_bug.cgi?id=2360851
+# https://gitlab.freedesktop.org/mesa/mesa/-/issues/13009
+Patch30:        0001-Revert-kopper-Explicitly-choose-zink.patch
+
 BuildRequires:  meson >= 1.3.0
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -192,9 +194,6 @@ BuildRequires:  glslang
 %if 0%{?with_vulkan_hw}
 BuildRequires:  pkgconfig(vulkan)
 %endif
-%if 0%{?with_d3d12}
-BuildRequires:  pkgconfig(DirectX-Headers) >= 1.614.1
-%endif 

 %description
 %{summary}.
@@ -255,7 +254,6 @@ Requires:       %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{rel
 Recommends:     %{name}-va-drivers%{?_isa}
 %endif
 Obsoletes:      %{name}-libglapi < %{?epoch:%{epoch}:}25.0.0~rc2-1
-Provides:       %{name}-libglapi >= %{?epoch:%{epoch}:}25.0.0~rc2-1

 %description dri-drivers
 %{summary}.
@@ -401,7 +399,7 @@ export MESON_PACKAGE_CACHE_DIR="%{cargo_registry}/"
  -Dplatforms=x11,wayland \
  -Dosmesa=true \
 %if 0%{?with_hardware}
-  -Dgallium-drivers=llvmpipe,virgl,nouveau%{?with_r300:,r300}%{?with_crocus:,crocus}%{?with_i915:,i915}%{?with_iris:,iris}%{?with_vmware:,svga}%{?with_radeonsi:,radeonsi}%{?with_r600:,r600}%{?with_asahi:,asahi}%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_v3d:,v3d}%{?with_lima:,lima}%{?with_panfrost:,panfrost}%{?with_vulkan_hw:,zink}%{?with_d3d12:,d3d12} \
+  -Dgallium-drivers=llvmpipe,virgl,nouveau%{?with_r300:,r300}%{?with_crocus:,crocus}%{?with_i915:,i915}%{?with_iris:,iris}%{?with_vmware:,svga}%{?with_radeonsi:,radeonsi}%{?with_r600:,r600}%{?with_asahi:,asahi}%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_v3d:,v3d}%{?with_lima:,lima}%{?with_panfrost:,panfrost}%{?with_vulkan_hw:,zink} \
 %else
  -Dgallium-drivers=llvmpipe,virgl \
 %endif
@@ -410,9 +408,9 @@ export MESON_PACKAGE_CACHE_DIR="%{cargo_registry}/"
  -Dgallium-xa=%{?with_xa:enabled}%{!?with_xa:disabled} \
  -Dgallium-nine=%{?with_nine:true}%{!?with_nine:false} \
  -Dteflon=%{?with_teflon:true}%{!?with_teflon:false} \
+  -Dgallium-opencl=%{?with_opencl:icd}%{!?with_opencl:disabled} \
 %if 0%{?with_opencl}
  -Dgallium-rusticl=true \
-  -Dgallium-opencl=disabled \
 %endif
  -Dvulkan-drivers=%{?vulkan_drivers} \
  -Dvulkan-layers=device-select \
@@ -531,10 +529,13 @@ popd

 %if 0%{?with_opencl}
 %files libOpenCL
+%{_libdir}/libMesaOpenCL.so.*
 %{_libdir}/libRusticlOpenCL.so.*
+%{_sysconfdir}/OpenCL/vendors/mesa.icd
 %{_sysconfdir}/OpenCL/vendors/rusticl.icd

 %files libOpenCL-devel
+%{_libdir}/libMesaOpenCL.so
 %{_libdir}/libRusticlOpenCL.so
 %endif

@@ -570,19 +571,14 @@ popd
 %endif
 %ifarch %{ix86} x86_64
 %{_libdir}/dri/crocus_dri.so
-%{_libdir}/dri/iris_dri.so
-%if 0%{?with_i915}
 %{_libdir}/dri/i915_dri.so
-%endif 
+%{_libdir}/dri/iris_dri.so
 %endif
 %ifarch aarch64 x86_64 %{ix86}
 %if 0%{?with_asahi}
 %{_libdir}/dri/apple_dri.so
 %{_libdir}/dri/asahi_dri.so
 %endif
-%if 0%{?with_d3d12}
-%{_libdir}/dri/d3d12_dri.so
-%endif 
 %{_libdir}/dri/ingenic-drm_dri.so
 %{_libdir}/dri/imx-drm_dri.so
 %{_libdir}/dri/imx-lcdif_dri.so
@@ -622,6 +618,10 @@ popd
 %{_libdir}/dri/vmwgfx_dri.so
 %endif
 %endif
+%if 0%{?with_opencl}
+%dir %{_libdir}/gallium-pipe
+%{_libdir}/gallium-pipe/*.so
+%endif
 %if 0%{?with_kmsro}
 %{_libdir}/dri/armada-drm_dri.so
 %{_libdir}/dri/exynos_dri.so
@@ -663,9 +663,6 @@ popd
 %if 0%{?with_radeonsi}
 %{_libdir}/dri/radeonsi_drv_video.so
 %endif
-%if 0%{?with_d3d12}
-%{_libdir}/dri/d3d12_drv_video.so
-%endif 
 %{_libdir}/dri/virtio_gpu_drv_video.so
 %endif

@@ -679,21 +676,16 @@ popd
 %if 0%{?with_radeonsi}
 %{_libdir}/vdpau/libvdpau_radeonsi.so.1*
 %endif
-%if 0%{?with_d3d12}
-%{_libdir}/vdpau/libvdpau_d3d12.so.1*
-%endif 
 %{_libdir}/vdpau/libvdpau_virtio_gpu.so.1*
 %endif

 %files vulkan-drivers
 %{_libdir}/libvulkan_lvp.so
 %{_datadir}/vulkan/icd.d/lvp_icd.*.json
-%{_libdir}/libVkLayer_MESA_device_select.so
-%{_datadir}/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json
-%if 0%{?with_virtio}
 %{_libdir}/libvulkan_virtio.so
 %{_datadir}/vulkan/icd.d/virtio_icd.*.json
-%endif 
+%{_libdir}/libVkLayer_MESA_device_select.so
+%{_datadir}/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json
 %if 0%{?with_vulkan_hw}
 %{_libdir}/libvulkan_radeon.so
 %{_datadir}/drirc.d/00-radv-defaults.conf
@@ -1,5 +1,5 @@
 Name:           compat-nvidia-repo
-Version:        575.64
+Version:        575.57.08
 Epoch:          3
 Release:        1%?dist
 Summary:        Compatibility package required by official CUDA packages
@@ -1,5 +1,5 @@
 Name:           scenefx
-Version:        0.4.1
+Version:        0.3
 Release:        1%?dist

 Summary:        A drop-in replacement for the wlroots scene API that allows wayland compositors to render surfaces with eye-candy effects
@@ -25,7 +25,7 @@ BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-protocols) >= 1.32
 BuildRequires:  pkgconfig(wayland-scanner)
 BuildRequires:  pkgconfig(wayland-server) >= 1.22
-BuildRequires:  pkgconfig(wlroots-0.19)
+BuildRequires:  pkgconfig(wlroots-0.18)


 Packager:       Atmois <atmois@atmois.com>
@@ -65,9 +65,9 @@ MESON_OPTIONS=(
 %files
 %license LICENSE
 %doc README.md
-%{_libdir}/lib%{name}-*.so
+%{_libdir}/lib%{name}-0.2.so


 %files  devel
-%{_includedir}/%{name}-*/*
-%{_libdir}/pkgconfig/%{name}-*.pc
+%{_includedir}/%{name}-0.2/*
+%{_libdir}/pkgconfig/%{name}-0.2.pc
@@ -1,6 +1,6 @@
-%global commit 64852808ae50d43c655f3f46734f2f90a670f95f
+%global commit 1e75ca0ce40b9bae36ed3eb7b676fcad1bbbdc0a
 %global ver 1.8.50
-%global commit_date 20250622
+%global commit_date 20250616
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

 Name:          tdlib-nightly
@@ -1,6 +1,6 @@
 %global ver 2.0.0
-%global commit 079f3d8b4cb3906f9eb7bd2a7b32f52f9df9bb97
-%global commit_date 20250623
+%global commit 0cc91abe97f98da356bd886c3cd6657e2c187478
+%global commit_date 20250602
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

 Name:           openbangla-keyboard-nightly
@@ -1,26 +1,19 @@
-From eb811f9950a3b00dab37ce194adf43140789c58e Mon Sep 17 00:00:00 2001
+From 77ade97f4c3a1acc5955feeac3bf6e83e0f4d22e Mon Sep 17 00:00:00 2001
 From: VirtualFreeEx <contact@ffi.lol>
-Date: Fri, 20 Jun 2025 07:07:50 +0300
-Subject: [PATCH 1/2] build: dont strip
+Date: Thu, 1 May 2025 18:21:33 +0300
+Subject: [PATCH 2/2] build: dont strip

 ---
- ip2net/Makefile |  8 ++++----
- mdig/Makefile   | 10 +++++-----
- nfq/Makefile    |  6 +++---
- tpws/Makefile   | 10 +++++-----
- 4 files changed, 17 insertions(+), 17 deletions(-)
+ ip2net/Makefile | 6 +++---
+ mdig/Makefile   | 8 ++++----
+ nfq/Makefile    | 4 ++--
+ tpws/Makefile   | 8 ++++----
+ 4 files changed, 13 insertions(+), 13 deletions(-)

 diff --git a/ip2net/Makefile b/ip2net/Makefile
-index 484f3d7..c3c68be 100644
+index 484f3d7..209ad3c 100644
 --- a/ip2net/Makefile
 +++ b/ip2net/Makefile
-@@ -1,5 +1,5 @@
- CC ?= gcc
-CFLAGS += -std=gnu99 -Os -flto=auto
-+CFLAGS += -g -std=gnu99 -Os -flto=auto
- CFLAGS_BSD = -Wno-address-of-packed-member
- CFLAGS_WIN = -static
- LIBS = 
@@ -9,14 +9,14 @@ SRC_FILES = ip2net.c qsort.c
 all: ip2net
 
@@ -48,16 +41,9 @@ index 484f3d7..c3c68be 100644
 clean:
 	rm -f ip2net *.o
 diff --git a/mdig/Makefile b/mdig/Makefile
-index 21b6c84..d841433 100644
+index 21b6c84..a9ea0e1 100644
 --- a/mdig/Makefile
 +++ b/mdig/Makefile
-@@ -1,5 +1,5 @@
- CC ?= gcc
-CFLAGS += -std=gnu99 -Os
-+CFLAGS += -g -std=gnu99 -Os
- CFLAGS_BSD = -Wno-address-of-packed-member
- CFLAGS_WIN = -static
- LIBS = -lpthread
@@ -10,15 +10,15 @@ SRC_FILES = *.c
 all: mdig
 
@@ -87,17 +73,10 @@ index 21b6c84..d841433 100644
 clean:
 	rm -f mdig *.o
 diff --git a/nfq/Makefile b/nfq/Makefile
-index f368101..3cb9559 100644
+index 85a29e4..4b6491b 100644
 --- a/nfq/Makefile
 +++ b/nfq/Makefile
-@@ -1,5 +1,5 @@
- CC ?= gcc
-CFLAGS += -std=gnu99 -Os -flto=auto
-+CFLAGS += -std=gnu99 -Os -flto=auto -g
- CFLAGS_SYSTEMD = -DUSE_SYSTEMD
- CFLAGS_BSD = -Wno-address-of-packed-member
- CFLAGS_CYGWIN = -Wno-address-of-packed-member -static
-@@ -17,10 +17,10 @@ SRC_FILES = *.c crypto/*.c
+@@ -16,10 +16,10 @@ SRC_FILES = *.c crypto/*.c
 all: nfqws
 
 nfqws: $(SRC_FILES)
@@ -108,33 +87,26 @@ index f368101..3cb9559 100644
 -	$(CC) -s $(CFLAGS) $(CFLAGS_SYSTEMD) -o nfqws $(SRC_FILES) $(LIBS_LINUX) $(LIBS_SYSTEMD) $(LDFLAGS)
 +	$(CC) $(CFLAGS) $(CFLAGS_SYSTEMD) -o nfqws $(SRC_FILES) $(LIBS_LINUX) $(LIBS_SYSTEMD) $(LDFLAGS)
 
- android: $(SRC_FILES)
- 	$(CC) -s $(CFLAGS) -o nfqws $(SRC_FILES) $(LIBS_LINUX) $(LDFLAGS) $(LDFLAGS_ANDROID)
+ android: nfqws
+ 
 diff --git a/tpws/Makefile b/tpws/Makefile
-index e1270f8..47c4348 100644
+index 2f53263..4fc1743 100644
 --- a/tpws/Makefile
 +++ b/tpws/Makefile
-@@ -1,5 +1,5 @@
- CC ?= gcc
-CFLAGS += -std=gnu99 -Os -flto=auto
-+CFLAGS += -g -std=gnu99 -Os -flto=auto
- CFLAGS_SYSTEMD = -DUSE_SYSTEMD
- CFLAGS_BSD = -Wno-address-of-packed-member
- LDFLAGS_ANDROID = -llog
-@@ -12,16 +12,16 @@ SRC_FILES_ANDROID = $(SRC_FILES) andr/*.c
+@@ -11,16 +11,16 @@ SRC_FILES_ANDROID = $(SRC_FILES) andr/*.c
 all: tpws
 
 tpws: $(SRC_FILES)
 -	$(CC) -s $(CFLAGS) -o tpws $(SRC_FILES) $(LIBS) $(LDFLAGS)
-+	$(CC) $(CFLAGS) -o tpws $(SRC_FILES) $(LIBS) $(LDFLAGS)
+	$(CC) -g $(CFLAGS) -o tpws $(SRC_FILES) $(LIBS) $(LDFLAGS)
 
 systemd: $(SRC_FILES)
 -	$(CC) -s $(CFLAGS) $(CFLAGS_SYSTEMD) -o tpws $(SRC_FILES) $(LIBS) $(LIBS_SYSTEMD) $(LDFLAGS)
-+	$(CC) $(CFLAGS) $(CFLAGS_SYSTEMD) -o tpws $(SRC_FILES) $(LIBS) $(LIBS_SYSTEMD) $(LDFLAGS)
+	$(CC) -g $(CFLAGS) $(CFLAGS_SYSTEMD) -o tpws $(SRC_FILES) $(LIBS) $(LIBS_SYSTEMD) $(LDFLAGS)
 
 android: $(SRC_FILES)
-	$(CC) -s $(CFLAGS) -o tpws $(SRC_FILES_ANDROID) $(LIBS_ANDROID) $(LDFLAGS) $(LDFLAGS_ANDROID)
-+	$(CC) $(CFLAGS) -o tpws $(SRC_FILES_ANDROID) $(LIBS_ANDROID) $(LDFLAGS) $(LDFLAGS_ANDROID)
+-	$(CC) -s $(CFLAGS) -o tpws $(SRC_FILES_ANDROID) $(LIBS_ANDROID) $(LDFLAGS)
+	$(CC) -g $(CFLAGS) -o tpws $(SRC_FILES_ANDROID) $(LIBS_ANDROID) $(LDFLAGS)
 
 bsd: $(SRC_FILES)
 -	$(CC) -s $(CFLAGS) $(CFLAGS_BSD) -Iepoll-shim/include -o tpws $(SRC_FILES) epoll-shim/src/*.c $(LIBS) $(LDFLAGS)
@@ -1,7 +1,7 @@
-From e6e3b033683453f3bffceb099ebe4195f35a3d7c Mon Sep 17 00:00:00 2001
+From 97c9edf12cad05fb8c682ce432a3e8e5ff4c1956 Mon Sep 17 00:00:00 2001
 From: VirtualFreeEx <contact@ffi.lol>
-Date: Fri, 20 Jun 2025 07:08:06 +0300
-Subject: [PATCH 2/2] chore: move to different dirs
+Date: Thu, 1 May 2025 18:22:41 +0300
+Subject: [PATCH 1/2] chore: move to different dirs

 ---
 blockcheck.sh                             | 15 ++++++++-------
@@ -15,7 +15,7 @@ Subject: [PATCH 2/2] chore: move to different dirs
 8 files changed, 19 insertions(+), 20 deletions(-)

 diff --git a/blockcheck.sh b/blockcheck.sh
-index 24ad898..1fa77ea 100755
+index a827843..9fb0d2b 100755
 --- a/blockcheck.sh
 +++ b/blockcheck.sh
@@ -3,9 +3,10 @@
@@ -49,7 +49,7 @@ index 24ad898..1fa77ea 100755
 IPFW_RULE_NUM=${IPFW_RULE_NUM:-1}
 IPFW_DIVERT_PORT=${IPFW_DIVERT_PORT:-59780}
 diff --git a/config.default b/config.default
-index ac04997..bee9a86 100644
+index 3a79e59..6a4fc31 100644
 --- a/config.default
 +++ b/config.default
@@ -1,9 +1,6 @@
@@ -63,7 +63,7 @@ index ac04997..bee9a86 100644
 #WS_USER=nobody
 
 diff --git a/init.d/systemd/nfqws@.service b/init.d/systemd/nfqws@.service
-index 5a18c7e..98daa37 100644
+index ca1a6d5..3ddbbb5 100644
 --- a/init.d/systemd/nfqws@.service
 +++ b/init.d/systemd/nfqws@.service
@@ -30,7 +30,7 @@ After=network.target
@@ -76,7 +76,7 @@ index 5a18c7e..98daa37 100644
 Environment=CONFIG_DIR=/etc/zapret
 Environment=INSTANCE=%i
 diff --git a/init.d/systemd/tpws@.service b/init.d/systemd/tpws@.service
-index c278008..62732b5 100644
+index d6cce63..6ce1ca9 100644
 --- a/init.d/systemd/tpws@.service
 +++ b/init.d/systemd/tpws@.service
@@ -30,7 +30,7 @@ After=network.target
@@ -1,6 +1,6 @@
 Name:    zapret
 Version: 71.1.1
-Release: 2%?dist
+Release: 1%?dist
 Summary: A multi-platform Deep Packet Inspection (DPI) bypass tool
 License: MIT 
 ExcludeArch: s390x
@@ -16,7 +16,6 @@ BuildRequires: gcc
 BuildRequires: make
 BuildRequires: git
 # Headers.
-BuildRequires: libmnl-devel
 BuildRequires: libcap-devel
 BuildRequires: systemd-devel

@@ -1,8 +1,8 @@
 %global pname   carla
 %global ver     v2.5.9
-%global commit  54ebc831f54d37b23a400f85cb3d44637718d52e
+%global commit  17000e7fe99459b25a50094a8b00bdfa12f2bfbc
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20250623
+%global commit_date 20241205

 Name:           Carla-nightly
 Version:        %(echo %ver | tr -d 'v')^%commit_date.git~%shortcommit
@@ -79,14 +79,12 @@ BuildRequires:  pkgconfig(mxml)
 BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  python3-qt5-base
-BuildRequires:  python3-file-magic
+BuildRequires:  python3-magic
 BuildRequires:  python3-rdflib
 BuildRequires:  pkgconfig(liblo)
 BuildRequires:  pkgconfig(zlib)
 Buildrequires:  pkgconfig(libmagic)
-BuildRequires:  cmake(SDL2)
-BuildRequires:  cmake(SDL3)
-BuildRequires:  ffmpeg-devel
+BuildRequires:  (ffmpeg-free-devel or ffmpeg-devel)
 BuildRequires:  desktop-file-utils
 BuildRequires:  make
 BuildRequires:  /usr/bin/appstream-util
@@ -1,8 +0,0 @@
-project pkg {
-	rpm {
-		spec = "deadbeef.spec"
-	}
-	labels {
-		subrepo = "extras"
-	}
-}
@@ -1,381 +0,0 @@
-#? https://github.com/rpmfusion/deadbeef
-
-%global toolchain clang
-%global _distro_extra_cxxflags -std=c++11 -Wno-unused-but-set-variable -Wno-unused-variable
-%global _distro_extra_cflags -Wno-unused-but-set-variable -Wno-unused-variable
-
-Name:           deadbeef
-Version:        0.2.2.2
-Release:        2%?dist
-Summary:        An audio player for GNU/Linux
-
-License:        GPL-2.0-or later AND LGPL-2.0-or-later and BSD and MIT AND Zlib
-URL:            https://deadbeef.sourceforge.io/
-Source0:        https://sourceforge.net/projects/%{name}/files/travis/linux/%{version}/%{name}-%{version}.tar.bz2
-
-BuildRequires:  clang
-BuildRequires:  pkgconfig(alsa)
-BuildRequires:  pkgconfig(dbus-1)
-BuildRequires:  ffmpeg-devel
-BuildRequires:  pkgconfig(flac)
-BuildRequires:  faad2-devel
-BuildRequires:  pkgconfig(libmms)
-BuildRequires:  intltool
-BuildRequires:  gettext-devel
-BuildRequires:  pkgconfig(libcddb)
-BuildRequires:  pkgconfig(libcdio)
-BuildRequires:  pkgconfig(libcurl)
-BuildRequires:  pkgconfig(mad)
-BuildRequires:  pkgconfig(libmpg123)
-BuildRequires:  pkgconfig(samplerate)
-BuildRequires:  pkgconfig(sndfile)
-BuildRequires:  libtool
-BuildRequires:  pkgconfig(vorbis)
-BuildRequires:  pkgconfig(libpipewire-0.3)
-BuildRequires:  pkgconfig(wavpack)
-BuildRequires:  yasm-devel
-BuildRequires:  bison
-BuildRequires:  pkgconfig(imlib2)
-BuildRequires:  pkgconfig(libzip)
-BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  desktop-file-utils
-BuildRequires:  pkgconfig(jansson)
-BuildRequires:  pkgconfig(opusfile)
-BuildRequires:  libdispatch-devel
-
-Requires:       hicolor-icon-theme
-Requires:       %{name}-plugins%{?_isa} = %evr
-
-Recommends:     deadbeef-mpris2-plugin
-
-%description
-DeaDBeeF (as in 0xDEADBEEF) is an audio player for GNU/Linux systems with X11 
-(though now it also runs in plain console without X, in FreeBSD, and in
-OpenSolaris).
-
-
-%package devel
-Requires:   %{name}%{?_isa} = %evr
-%pkg_devel_files
-
-%package plugins
-Summary:    Plugins for %{name}
-Requires:   %{name}%{?_isa} = %evr
-
-%description plugins
-This package contains plugins for %{name}.
-
-
-%prep
-%autosetup -p1
-
-sed -i "s|size_t|std::size_t|" external/ddb_dsp_libretro/sinc_resampler.h
-%ifnarch x86_64
-sed -i -re 's/^(.*)\s+([-]msse3)\s+(.*)$/\1 \3/g' external/ddb_dsp_libretro/Makefile.am
-%endif
-
-# Regenerate the build files
-autoreconf -fiv
-
-# Remove exec permission from source files
-find . \( -name '*.cpp' -or -name '*.hpp' -or -name '*.h' \) -and -executable -exec chmod -x {} \;
-
-sed -i 's|Toggle Pause|Toggle-Pause|' deadbeef.desktop.in
-for data in Play Pause Toggle-Pause Stop Next Prev
-do
-    sed -i "s|$data Shortcut Group|X-$data Shortcut Group|" deadbeef.desktop.in
-done
-
-%build
-%configure \
-    --enable-ffmpeg \
-    --docdir=%{_defaultdocdir}/%{name}-%{version} \
-    --disable-silent-rules \
-    --disable-static \
-    --disable-gtk2 \
-%ifarch ppc64le
-    --disable-lfm \
-    --disable-notify \
-%else
-    --enable-lfm \
-%endif
-    --enable-gtk3 \
-    --disable-pulse \
-    --enable-pipewire
-%make_build
-
-
-%install
-%make_install
-find %{buildroot} -name "*.la" -exec rm {} \;
-
-install -Dpm0644 %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/%{name}.png \
-    %{buildroot}%{_datadir}/pixmaps/%{name}.png
-
-sed -i -e "s!MP3!MP3;!" %{buildroot}%{_datadir}/applications/%{name}.desktop
-
-%find_lang %{name}
-
-%check
-desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
-
-
-%files -f %{name}.lang
-%doc README ChangeLog AUTHORS
-%license COPYING
-%{_defaultdocdir}/%{name}-%{version}
-%{_bindir}/%{name}
-%dir %{_libdir}/%{name}
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/%{name}
-%{_datadir}/pixmaps/%{name}.png
-%{_iconsdir}/hicolor/*/apps/*
-
-
-%files plugins
-%{_libdir}/%{name}/convpresets
-%{_libdir}/%{name}/*.so
-%{_libdir}/%{name}/data68
-
-
-%changelog
-* Fri May 30 2025 Leigh Scott <leigh123linux@gmail.com> - 1.10.0-2
- Rebuild for new flac .so version
-
-* Wed Apr 02 2025 Leigh Scott <leigh123linux@gmail.com> - 1.10.0-1
- Update to 1.10.0
- Switch to release tarball as it makes packaging easier
- Drop ffmpeg-7 patch
- Use autoreconf to regenerate the build files
- Drop the arm conditionals
-
-* Tue Jan 28 2025 RPM Fusion Release Engineering <sergiomb@rpmfusion.org> - 1.9.6-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Oct 12 2024 Leigh Scott <leigh123linux@gmail.com> - 1.9.6-4
- rebuild for ffmpeg
-
-* Thu Aug 01 2024 RPM Fusion Release Engineering <sergiomb@rpmfusion.org> - 1.9.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Feb 03 2024 RPM Fusion Release Engineering <sergiomb@rpmfusion.org> - 1.9.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Nov 13 2023 Vasiliy N. Glazov <vascom2@gmail.com> - 1.9.6-1
- Update to 1.9.6
-
-* Wed Nov 08 2023 Leigh Scott <leigh123linux@gmail.com> - 1.9.5-5
- Rebuild for new faad2 version
-
-* Fri Aug 04 2023 Vasiliy N. Glazov <vascom2@gmail.com> - 1.9.5-4
- Fix Build for F39
-
-* Tue Aug 01 2023 Vasiliy N. Glazov <vascom2@gmail.com> - 1.9.5-3
- Add mpris plugin to recommends
-
-* Wed Mar 01 2023 Leigh Scott <leigh123linux@gmail.com> - 1.9.5-2
- Rebuild for new ffmpeg
-
-* Mon Feb 20 2023 Vasiliy N. Glazov <vascom2@gmail.com> - 1.9.5-1
- Update to 1.9.5
- Switch to Pipewire
-
-* Tue Dec 20 2022 Vasiliy N. Glazov <vascom2@gmail.com> - 1.9.4-1
- Update to 1.9.4
-
-* Tue Nov 15 2022 Vasiliy N. Glazov <vascom2@gmail.com> - 1.9.3-1
- Update to 1.9.3
-
-* Fri Oct 07 2022 Vasiliy N. Glazov <vascom2@gmail.com> - 1.9.2-1
- Update to 1.9.2
-
-* Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb@rpmfusion.org> - 1.9.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
-  5.1
-
-* Tue May 24 2022 Vasiliy N. Glazov <vascom2@gmail.com> - 1.9.1-1
- Update to 1.9.1
-
-* Sat May 14 2022 Vasiliy N. Glazov <vascom2@gmail.com> - 1.9.0-1
- Update to 1.9.0
-
-* Sat Mar 05 2022 Leigh Scott <leigh123linux@gmail.com> - 1.8.8-6
- Use compat-ffmpeg4 for f36+
-
-* Fri Feb 25 2022 Vasiliy N. Glazov <vascom2@gmail.com> - 1.8.8-5
- Enable notifications
-
-* Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb@rpmfusion.org> - 1.8.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Nov 11 2021 Leigh Scott <leigh123linux@gmail.com> - 1.8.8-3
- Rebuilt for new ffmpeg snapshot
-
-* Thu Sep 23 2021 Vasiliy N. Glazov <vascom2@gmail.com> - 1.8.8-2
- Fix segfault 0 bytes stack allocation
-
-* Thu Aug 05 2021 Vasiliy N. Glazov <vascom2@gmail.com> - 1.8.8-1
- Update to 1.8.8
-
-* Mon Aug 02 2021 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1.8.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Feb 23 2021 Vasiliy N. Glazov <vascom2@gmail.com> - 1.8.7-1
- Update to 1.8.7
-
-* Wed Feb 03 2021 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1.8.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Dec 31 2020 Leigh Scott <leigh123linux@gmail.com> - 1.8.4-3
- Rebuilt for new ffmpeg snapshot
-
-* Mon Aug 17 2020 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1.8.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sun Jul  5 2020 Vasiliy N. Glazov <vascom2@gmail.com> - 1.8.4-1
- Update to 1.8.4
-
-* Fri Apr 10 2020 Leigh Scott <leigh123linux@gmail.com> - 1.8.3-2
- Rebuild for new libcdio version
-
-* Tue Mar 24 2020 Vasiliy N. Glazov <vascom2@gmail.com> - 1.8.3-1
- Update to 1.8.3
-
-* Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1.8.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Aug 09 2019 Vasiliy N. Glazov <vascom2@gmail.com> - 1.8.2-1
- Update to 1.8.2
-
-* Wed Aug 07 2019 Leigh Scott <leigh123linux@gmail.com> - 1.8.1-2
- Rebuild for new ffmpeg version
-
-* Fri Jun 28 2019 Vasiliy N. Glazov <vascom2@gmail.com> - 1.8.1-1
- Update to 1.8.1
-
-* Mon Apr 08 2019 Vasiliy N. Glazov <vascom2@gmail.com> - 1.8.0-1
- Update to 1.8.0
-
-* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 0.7.3-0.2.20190209git373f556
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Feb 27 2019 Vasiliy N. Glazov <vascom2@gmail.com> - 0.7.3-0.1.20190209git373f556
- Update to latest git
- Enable LTO
-
-* Thu Dec 27 2018 Vasiliy N. Glazov <vascom2@gmail.com> - 0.7.3-0.1.20181224git73f9722
- Update to latest git
-
-* Tue Aug 14 2018 Vasiliy N. Glazov <vascom2@gmail.com> - 0.7.3-0.1.20180814git6d02b02
- Update to latest git
-
-* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 0.7.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu May 10 2018 Vasiliy N. Glazov <vascom2@gmail.com> - 0.7.2-6
- Correct patches as in upstream
-
-* Fri May 04 2018 Vasiliy N. Glazov <vascom2@gmail.com> - 0.7.2-5
- Rebuild with new ffmpeg
-
-* Tue Feb 07 2017 Vasiliy N. Glazov <vascom2@gmail.com> - 0.7.2-4
- Remove unneeded scriptlet
-
-* Tue Aug 16 2016 Vasiliy N. Glazov <vascom2@gmail.com> - 0.7.2-3
- Clean spec
-
-* Tue Jun 14 2016 Arkady L. Shane <ashejn@russianfedora.pro> - 0.7.2-2.R
- rebuilt against new ffmpeg
-
-* Thu Apr 28 2016 Vasiliy N. Glazov <vascom2@gmail.com> - 0.7.2-1.R
- Update to 0.7.2
- Add patch for desktop-file
-
-* Wed Mar 16 2016 Vasiliy N. Glazov <vascom2@gmail.com> - 0.7.1-1.R
- Update to 0.7.1
-
-* Tue Feb 02 2016 Vasiliy N. Glazov <vascom2@gmail.com> - 0.7.0-2.R
- Add Icon Cache scriptlets
- Add desktop-database scriptlets
- Add libmpg123 support
-
-* Mon Feb 01 2016 Vasiliy N. Glazov <vascom2@gmail.com> - 0.7.0-1.R
- Update to 0.7.0
-
-* Tue Nov 18 2014 Vasiliy N. Glazov <vascom2@gmail.com> - 0.6.2-3.R
- Bump rebuild for new ffmpeg
-
-* Fri Oct 03 2014 Vasiliy N. Glazov <vascom2@gmail.com> - 0.6.2-2.R
- Bump rebuild for new cdio
-
-* Thu Aug 07 2014 Vasiliy N. Glazov <vascom2@gmail.com> - 0.6.2-1.R
- update to 0.6.2
-
-* Mon Feb 03 2014 Vasiliy N. Glazov <vascom2@gmail.com> - 0.6.1-1.R
- update to 0.6.1
-
-* Tue Nov 26 2013 Vasiliy N. Glazov <vascom2@gmail.com> - 0.6.0-2.R
- correct FSF address and other errors and warnings
-
-* Tue Nov 26 2013 Vasiliy N. Glazov <vascom2@gmail.com> - 0.6.0-1.R
- update to 0.6.0
-
-* Wed Apr 03 2013 Vasiliy N. Glazov <vascom2@gmail.com> - 0.5.6-5.R
- bump release for update dependencies
-
-* Tue Nov 06 2012 Vasiliy N. Glazov <vascom2@gmail.com> - 0.5.6-4.R
- added documentation to help menu
-
-* Fri Oct 26 2012 Vasiliy N. Glazov <vascom2@gmail.com> - 0.5.6-3.R
- correct compile for >= F18
-
-* Thu Oct 25 2012 Vasiliy N. Glazov <vascom2@gmail.com> - 0.5.6-2.R
- added plugins artwork, ffmpeg, vfs_zip
-
-* Tue Oct 23 2012 Vasiliy N. Glazov <vascom2@gmail.com> - 0.5.6-1.R
- update to 0.5.6
- switch to GTK3
-
-* Tue Sep 11 2012 Vasiliy N. Glazov <vascom2@gmail.com> - 0.5.5-2.R
- add some BR
-
-* Thu Jun 07 2012 Vasiliy N. Glazov <vascom2@gmail.com> - 0.5.5-1.R
- update to 0.5.5
-
-* Sat May 12 2012 Vasiliy N. Glazov <vascom2@gmail.com> - 0.5.4-1.R
- update to 0.5.4
- enable SID plugin
-
-* Wed Mar 28 2012 Vasiliy N. Glazov <vascom2@gmail.com> - 0.5.2-2.R
- Added APE support
-
-* Mon Mar 26 2012 Vasiliy N. Glazov <vascom2@gmail.com> - 0.5.2-1.R
- update to 0.5.2
-
-* Sun Feb  5 2012 Arkady L. Shane <ashejn@russianfedora.ru> - 0.5.1-4.R
- added conditions to build for EL6
-
-* Tue Nov 22 2011 Vasiliy N. Glazov <vascom2@gmail.com> - 0.5.1-3.R
- Added description in russian language
-
-* Mon Oct 31 2011 Vasiliy N. Glazov <vascom2@gmail.com> - 0.5.1-2.R
- Added patch to compile in F16
-
-* Mon Jun  6 2011 Arkady L. Shane <ashejn@yandex-team.ru> - 0.5.1-1.R
- update to 0.5.1
-
-* Mon May 16 2011 Arkady L. Shane <ashejn@yandex-team.ru> - 0.5.0-1.R
- update to 0.5.0
- added BR: libstdc++-static for fedora >= 14
-
-* Tue Nov 16 2010 Arkady L. Shane <ashejn@yandex-team.ru> - 0.4.4-1
- update to 0.4.4
-
-* Tue Nov  2 2010 Arkady L. Shane <ashejn@yandex-team.ru> - 0.4.3-1
- update to 0.4.3
-
-* Mon Oct 18 2010 Arkady L. Shane <ashejn@yandex-team.ru> - 0.4.2-2
- install deadbeef.png to /usr/share/pixmaps
-
-* Mon Oct 18 2010 Arkady L. Shane <ashejn@yandex-team.ru> - 0.4.2-1
- initial build for Fedora
@@ -1 +0,0 @@
-rpm.version(gh_tag("DeaDBeeF-Player/deadbeef"));
@@ -1 +1 @@
-5.1.0
+5.5.1
@@ -2,7 +2,7 @@ project pkg {
    arches = ["x86_64", "aarch64", "i386"]
    rpm {
        spec = "ffmpeg.spec"
-        extra_repos = ["https://repos.fyralabs.com/terra\\$releasever-nvidia"]
+        extra_repos = ["https://repos.fyralabs.com/terrarawhide-nvidia"]
    }
    labels {
        updbranch = 1
@@ -12,7 +12,7 @@
 Summary:        A complete solution to record, convert and stream audio and video
 Name:           ffmpeg
 Version:        7.1.1
-Release:        13%?dist
+Release:        7%?dist
 License:        LGPL-3.0-or-later
 URL:            http://%{name}.org/
 Epoch:          1
@@ -7,8 +7,8 @@ open_file("anda/multimedia/ffmpeg/VERSION_x265.txt", "w").write(bump::madoguchi(
 open_file("anda/multimedia/ffmpeg/VERSION_tesseract.txt", "w").write(bump::bodhi("tesseract", bump::as_bodhi_ver(labels.branch)));
 open_file("anda/multimedia/ffmpeg/VERSION_vvenc.txt", "w").write(bump::madoguchi("vvenc-libs", labels.branch));

-let dir = sub(`/[^/]+$`, "", __script_path);
-if sh("[[ `git status " + dir + " --porcelain` ]] && exit 1 || exit 0", #{}).ctx.rc == 1 {
+let dir = sub(`/[^/]+`, "", __script_path);
+if sh("[[ `git status " + dir + "--porcelain` ]] && exit 1", #{}).ctx.rc == 1 {
    let rel = spec::get_release(rpm).parse_int();
    rpm.release(rel + 1);
 }
@@ -17,7 +17,7 @@

 Name:           LCEVCdec
 Version:        3.3.7
-Release:        1%{?dist}
+Release:        1%?dist
 Summary:        MPEG-5 LCEVC Decoder
 License:        BSD-3-Clause-Clear
 URL:            https://docs.v-nova.com/v-nova/lcevc/lcevc-sdk-overview
@@ -150,7 +150,7 @@ python3 src/func_tests/run_tests.py

 %files devel
 %{_includedir}/LCEVC
-#{_includedir}/lcevc_config.h
+%{_includedir}/lcevc_config.h
 %{_libdir}/liblcevc_dec_api.so
 %{_libdir}/liblcevc_dec_core.so
 %{_libdir}/pkgconfig/lcevc_dec.pc
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`rpm.version(gh_tag("DeaDBeeF-Player/deadbeef"));`
@@ -1 +1 @@
 .1.0
 .5.1