bump(branch): ffmpeg

2026-06-08 20:57:38 +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
113 changed files with 1071 additions and 1355 deletions
@@ -2,7 +2,7 @@
  "repoOwner": "terrapkg",
  "repoName": "packages",
  "resetAuthor": true,
-  "targetBranchChoices": ["el10", "f40", "f41", "f42", "frawhide"],
+  "targetBranchChoices": ["el10", "f41", "f42", "frawhide"],
  "branchLabelMapping": {
    "^sync-(.+)$": "$1"
  }
@@ -11,7 +11,6 @@ jobs:
      matrix:
        branch:
          - frawhide
-          - f40
          - f41
          - f42
          - el10
@@ -6,7 +6,6 @@ on:
      - frawhide
      - f42
      - f41
-      - f40
      - el10
    paths:
      - comps.xml
@@ -46,7 +46,6 @@ jobs:
              git add anda
              git commit -S -a -m "$msg"
            }
-            copy_over f40 || true
            copy_over f41 || true
            copy_over f42 || true
            copy_over el10 || true
@@ -46,7 +46,6 @@ jobs:
              git add anda
              git commit -S -a -m "$msg"
            }
-            copy_over f40 || true
            copy_over f41 || true
            copy_over f42 || true
            copy_over el10 || true
@@ -46,7 +46,6 @@ jobs:
              git add anda
              git commit -S -a -m "$msg"
            }
-            copy_over f40 || true
            copy_over f41 || true
            copy_over f42 || true
            copy_over el10 || true
@@ -13,6 +13,8 @@ This monorepo contains the package manifests for all packages in Terra.

 ## Installation

+### Fedora
+
 ```bash
 sudo dnf install --nogpgcheck --repofrompath 'terra,https://repos.fyralabs.com/terra$releasever' terra-release
 ```
@@ -24,6 +26,24 @@ curl -fsSL https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo | pke
 sudo rpm-ostree install terra-release
 ```

+Optionally, you can install `terra-release-extra` to use the Extras repository. This also installs the Nvidia, and Mesa streams but does not enable them.
+
+### Enterprise Linux (EL)
+
+Only EL10 is supported. Not all packages available in Terra are available in Terra EL at this time.
+
+Terra EL requires the EPEL repos, which may be installed with:
+
+```bash
+sudo dnf install 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-$releasever.noarch.rpm'
+```
+
+And Terra EL itself can be installed with:
+
+```bash
+sudo dnf install --nogpgcheck --repofrompath 'terra,https://repos.fyralabs.com/terrael$releasever' terra-release
+```
+
 ## Documentation

 Our documentation can be found on our [Devdocs](https://developer.fyralabs.com/terra/).
@@ -1,5 +1,5 @@
 Name:           anki-qt5
-Version:        25.02.6
+Version:        25.02.7
 Release:        1%?dist
 Summary:        Flashcard program for using space repetition learning
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
@@ -1,5 +1,5 @@
 Name:           anki
-Version:        25.02.6
+Version:        25.02.7
 Release:        1%?dist
 Summary:        Flashcard program for using space repetition learning
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

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

 Name:			discord
-Version:		0.0.97
+Version:		0.0.98
 Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
@@ -1,5 +1,5 @@
-%global commit 754395586e8c690343d9826b437dd0a98a34b154
-%global commit_date 20250613
+%global commit 8f3f9b8759eecca4768f4860cbf6dc878337fb82
+%global commit_date 20250615
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

 Name:           envision-nightly
@@ -1,9 +1,9 @@
 #? https://github.com/flameshot-org/flameshot/blob/master/packaging/rpm/fedora/flameshot.spec

 %global ver v12.1.0
-%global commit 58afdce7414bbe3881610042e4da3772d2d0365f
+%global commit d420a53a4a61cb39842ee632fb8183ab07b58879
 %global shortcommit %{sub %{commit} 1 7}
-%global commit_date 20250613
+%global commit_date 20250617
 %global devel_name QtColorWidgets

 Name:			flameshot.nightly
@@ -3,10 +3,10 @@
 %global gtk4_version        4.14.4
 %global libadwaita_version  1.5.1
 %global pure_protobuf_version 2.0.0
-%global raw_ver v1.79.1
+%global raw_ver v1.80.0

 Name:           komikku
-Version:        1.79.1
+Version:        1.80.0
 %forgemeta
 Release:        1%?dist
 Summary:        A manga reader for GNOME
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "opensnitch.spec"
+	}
+}
@@ -0,0 +1,119 @@
+# Generated by go2rpm 1.16.0
+%bcond check 1
+%bcond bootstrap 0
+
+# https://github.com/evilsocket/opensnitch
+%global goipath         github.com/evilsocket/opensnitch
+Version:                1.7.0.0
+
+%gometa -f
+
+%global common_description %{expand:
+OpenSnitch is a GNU/Linux interactive application firewall inspired by Little
+Snitch.}
+
+%global golicenses      LICENSE ui/LICENSE\\\
+                        ui/opensnitch/res/themes/dark/icons/LICENSE
+%global godocs          README.md ebpf_prog/README ui/requirements.txt\\\
+                        ui/i18n/README.md example example example\\\
+                        utils/packaging/daemon/deb/debian/changelog\\\
+                        utils/packaging/ui/deb/debian/changelog
+
+Name:           opensnitch
+Release:        %autorelease
+Summary:        OpenSnitch is a GNU/Linux interactive application firewall inspired by Little Snitch
+
+License:        GPL-3.0-only AND LGPL-2.1-or-later
+URL:            %{gourl}
+Source:         %{gosource}
+BuildRequires:  gcc-c++
+BuildRequires:  python3-devel
+BuildRequires:  python-rpm-macros
+BuildRequires:  python3dist(pip)
+BuildRequires:  python3dist(setuptools) >= 61.0
+BuildRequires:  python3dist(wheel) >= 0.37.1
+BuildRequires:  python3dist(pyqt5)
+BuildRequires:  /usr/bin/lrelease-qt5
+BuildRequires:  protobuf-compiler
+BuildRequires:  pkgconfig(libnetfilter_queue)
+#BuildRequires:  protoc-gen-go
+#BuildRequires:  /usr/bin/protoc-gen-go-grpc
+
+%description %{common_description}
+
+%gopkg
+
+
+%prep
+%goprep -A
+%autopatch -p1
+
+export GOBIN=$(go env GOPATH | sed -E 's/:.+$//')/bin
+echo $GOBIN > %_builddir/gobin
+go install github.com/golang/protobuf/protoc-gen-go@latest
+go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.34.1
+go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
+
+sed -i 's/@pip3 /@python3 -m pip /' ui/Makefile
+
+%build
+pushd ui
+%make_build deps
+popd
+
+export GOBIN=$(cat %_builddir/gobin)
+export PATH=$GOBIN:$PATH
+pushd proto
+%make_build
+popd
+
+pushd ui
+%make_build
+%pyproject_wheel
+popd
+
+%global gomodulesmode GO111MODULE=on
+pushd daemon
+%gobuild -o ../opensnitchd .
+popd
+
+
+%install
+%gopkginstall
+install -Dm755 opensnitchd -t %buildroot%_bindir
+
+pushd ui
+%if 0%{?fedora} <= 41
+%py3_install
+%else
+%pyproject_install
+%pyproject_save_files %name
+%endif
+popd
+
+rm -rf %buildroot%python3_sitelib/tests/
+cp -r %buildroot%python3_sitelib%_usr/ %buildroot%_usr/ --preserve=all --no-target-directory
+rm -rf %buildroot%python3_sitelib%_usr
+
+
+%if 0%{?fedora} <= 41
+%files
+%{python3_sitelib}/%name/
+%{python3_sitelib}/%name-%{version}-py%{python3_version}.egg-info/
+%else
+%files -f %{pyproject_files}
+%endif
+%license LICENSE
+%doc README.md
+%_bindir/opensnitch-ui
+%_bindir/opensnitchd
+%_datadir/applications/opensnitch_ui.desktop
+%_iconsdir/hicolor/48x48/apps/opensnitch-ui.png
+%_iconsdir/hicolor/64x64/apps/opensnitch-ui.png
+%_iconsdir/hicolor/scalable/apps/opensnitch-ui.svg
+%_datadir/kservices5/kcm_opensnitch.desktop
+%_metainfodir/io.github.evilsocket.opensnitch.appdata.xml
+
+/usr/share/icons/hicolor/scalable/apps/opensnitch-ui.svg
+
+%gopkgfiles
@@ -2,7 +2,7 @@
 %define debug_package %nil

 Name:           peazip
-Version:        10.4.0
+Version:        10.5.0
 Release:        1%?dist
 Summary:        Free Zip / Unzip software and Rar file extractor. Cross-platform file and archive manager
 License:        LGPL-3.0-only
@@ -1,4 +1,4 @@
-%global ver 2025-06-13
+%global ver 2025-06-16
 %global goodver %(echo %ver | sed 's/-//g')
 %global __brp_mangle_shebangs %{nil}
 %bcond_without mold
@@ -0,0 +1,6 @@
+project pkg {
+  arches = ["x86_64"]
+  rpm {
+    spec = "vpkedit.spec"
+  }
+}
@@ -0,0 +1 @@
+rpm.version(gh("craftablescience/VPKEdit"));
@@ -0,0 +1,54 @@
+Name:           vpkedit
+Version:        4.4.2
+Release:        2%?dist
+Summary:        A CLI/GUI tool to create, read, and write several pack file formats
+License:        MIT
+URL:            https://github.com/craftablescience/VPKEdit
+Requires:       qt6-qtbase hicolor-icon-theme
+Suggests:       qt6-qtwayland
+Packager:       madonuko <mado@fyralabs.com>
+BuildRequires:  cmake git-core gcc gcc-c++ binutils
+BuildRequires:  cmake(Qt6)
+BuildRequires:  cmake(Qt6Svg)
+BuildRequires:  cmake(Qt6Linguist)
+BuildRequires:  cmake(Qt6Charts)
+BuildRequires:  cmake(Qt6LinguistTools)
+ExclusiveArch:  x86_64
+
+%description
+VPKEdit is an open source MIT-licensed tool that can extract from, preview the
+contents of and write to several pack file formats. It also supports creating
+new VPKs.
+
+
+%prep
+%git_clone %url v%version
+
+
+%build
+%cmake -DCMAKE_INSTALL_PREFIX=%_libdir/%name \
+   -DBUILD_SHARED_LIBS:BOOL=OFF
+#   -DVPKEDIT_BUILD_LIBC=ON
+%cmake_build
+
+
+%install
+%cmake_install
+pushd %buildroot%_libdir/%name
+rm -rf libQt*
+popd
+ln -sf %_libdir/vpkedit/vpkedit %buildroot%_bindir/vpkedit
+ln -sf %_libdir/vpkedit/vpkeditcli %buildroot%_bindir/vpkeditcli
+sed -i 's@Exec=/opt/vpkedit/@Exec=@g' %buildroot%_datadir/applications/vpkedit.desktop
+
+
+%files
+%doc README.md CREDITS.md
+%license LICENSE
+%_bindir/vpkedit
+%_bindir/vpkeditcli
+%_libdir/%name/
+%_datadir/applications/vpkedit.desktop
+%_iconsdir/hicolor/128x128/mimetypes/application-x-vpkedit.png
+%_datadir/mime/packages/vpkedit.xml
+%_datadir/pixmaps/vpkedit.png
@@ -1,11 +1,11 @@
 %global framework kio

 %global stable_kf6 stable
-%global majmin_ver_kf6 6.14
+%global majmin_ver_kf6 6.15

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

 Obsoletes: kf6-%{framework}.switcheroo < 6.14.0-4
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit 09bbf9d79006bbba5e30a71c04b4b48d65f9c401
+%global commit f16f9c336f54f3da72604cb5e8703b416c3726b6
 %forgemeta

 Name:       lomiri-system-settings
@@ -9,8 +9,10 @@ Summary:    The system settings application for Lomiri
 License:    GPLv3
 URL:        https://gitlab.com/ubports/development/core/lomiri-system-settings
 Source0:    %{url}/-/archive/%commit/lomiri-system-settings-%commit.tar.gz
-Patch0:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.3.1-2/debian/patches/2002_use-Noto-font-instead-of-Ubuntu-font.patch
-Patch1:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.3.1-2/debian/patches/2011_build-without-trust-store.patch
+Patch0:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.3.1-4/debian/patches/0001_lib-LomiriSystemSettingsPrivate-accountsservice.cpp-Register-missing-D-Bus-types.patch
+Patch1:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.3.1-4/debian/patches/2002_use-Noto-font-instead-of-Ubuntu-font.patch
+Patch2:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.3.1-4/debian/patches/2011_build-without-trust-store.patch
+Patch3:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.3.1-4/debian/patches/2013_show-hotspot-on-desktop.patch

 BuildRequires: cmake
 BuildRequires: gcc-c++
@@ -73,10 +75,10 @@ developing applications that use %{name}.
 %dir %{_datadir}/lomiri-system-settings
 %{_datadir}/lomiri-system-settings/*.settings
 %{_datadir}/lomiri-system-settings/*.svg
-%{_datadir}/lomiri-system-settings/*.png
+%dnl %{_datadir}/lomiri-system-settings/*.png
 %{_datadir}/lomiri-system-settings/url-map.ini
-%dir %{_datadir}/lomiri-system-settings/icons
-%{_datadir}/lomiri-system-settings/icons/*.svg
+%dnl %dir %{_datadir}/lomiri-system-settings/icons
+%dnl %{_datadir}/lomiri-system-settings/icons/*.svg
 %{_datadir}/lomiri-system-settings/qml-plugins/
 %{_datadir}/lomiri-url-dispatcher/urls/lomiri-system-settings.url-dispatcher

@@ -0,0 +1,9 @@
+project pkg {
+  rpm {
+    spec = "hyprgraphics.nightly.spec"
+  }
+  labels {
+    nightly = 1
+    subrepo = "extras"
+  }
+}
@@ -0,0 +1,67 @@
+#? https://src.fedoraproject.org/rpms/hyprgraphics/blob/rawhide/f/hyprgraphics.spec
+
+%global realname hyprgraphics
+%global ver 0.1.3
+%global commit c7225d73755a6c4c7c72f4d4f3925ea426e325a8
+%global commit_date 20250607
+%global shortcommit %{sub %commit 1 7}
+
+%bcond libjxl 1
+Name:           %realname.nightly
+Version:        %ver^%{commit_date}git.%shortcommit
+Release:        1%?dist
+Summary:        Graphics library for Hyprland
+
+License:        BSD-3-Clause
+URL:            https://github.com/hyprwm/hyprgraphics
+Source0:		%url/archive/%commit.tar.gz
+Packager:		madonuko <mado@fyralabs.com>
+
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch:    %{ix86}
+
+BuildRequires:  cmake
+BuildRequires:  gcc-c++
+BuildRequires:  (pkgconfig(hyprlang) with hyprlang.nightly-devel)
+BuildRequires:  pkgconfig(cairo)
+BuildRequires:  (pkgconfig(hyprutils) with hyprutils.nightly-devel)
+BuildRequires:  pkgconfig(libjpeg)
+BuildRequires:  pkgconfig(libwebp)
+BuildRequires:  pkgconfig(libmagic)
+BuildRequires:  pkgconfig(spng)
+
+%if %{with libjxl}
+BuildRequires:  pkgconfig(libjxl)
+BuildRequires:  pkgconfig(libjxl_cms)
+BuildRequires:  pkgconfig(libjxl_threads)
+%endif
+
+%description
+%{summary}.
+
+%package        devel
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+%pkg_devel_files
+
+
+%prep
+%autosetup -p1 -n %realname-%commit
+
+%build
+%cmake
+%cmake_build
+
+%install
+%cmake_install
+
+%check
+%ifarch s390x
+rm tests/resource/images/hyprland.jpg
+%endif
+%ctest
+
+%files
+%license LICENSE
+%doc README.md
+%{_libdir}/libhyprgraphics.so.0
+%{_libdir}/libhyprgraphics.so.%{ver}
@@ -0,0 +1,5 @@
+rpm.global("commit", gh_commit("hyprwm/hyprgraphics"));
+if rpm.changed() {
+	rpm.global("ver", gh_rawfile("hyprwm/hyprgraphics", "main", "VERSION"));
+	rpm.global("commit_date", date());
+}
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "hypridle.spec"
+	}
+}
@@ -0,0 +1 @@
+sh("dnf swap sdbus-cpp sdbus-cpp.terra -y --allowerasing", #{});
@@ -0,0 +1,45 @@
+Name:			hypridle
+Version:		0.1.6
+Release:		1%?dist
+Summary:		Hyprland's idle daemon
+License:		BSD-3-Clause
+URL:			https://github.com/hyprwm/hypridle
+Source0:		%url/archive/refs/tags/v%version.tar.gz
+Packager:		madonuko <mado@fyralabs.com>
+BuildRequires:	cmake gcc gcc-c++
+BuildRequires:	pkgconfig(wayland-client)
+BuildRequires:	pkgconfig(wayland-protocols)
+BuildRequires:	(pkgconfig(hyprland-protocols) with hyprland-protocols.nightly-devel)
+BuildRequires:	(pkgconfig(hyprlang) with hyprlang.nightly-devel)
+BuildRequires:	(pkgconfig(sdbus-c++) with sdbus-cpp.terra-devel)
+BuildRequires:	(pkgconfig(hyprwayland-scanner) with hyprwayland-scanner.nightly-devel)
+BuildRequires:	(pkgconfig(hyprutils) with hyprutils.nightly-devel)
+
+%description
+%summary.
+
+%prep
+%autosetup
+
+%build
+%cmake -DCMAKE_BUILD_TYPE:STRING=Release
+%cmake_build
+
+%install
+%cmake_install
+
+%post
+%systemd_user_post %name.service
+
+%preun
+%systemd_user_preun %name.service
+
+%postun
+%systemd_user_postun_with_restart %name.service
+
+%files
+%doc README.md
+%license LICENSE
+%_bindir/hypridle
+%_datadir/hypr/hypridle.conf
+%_userunitdir/%name.service
@@ -0,0 +1,3 @@
+let v = gh_rawfile("hyprwm/hypridle", "main", "VERSION");
+v.trim();
+rpm.version(v);
@@ -0,0 +1,9 @@
+project pkg {
+	rpm {
+		spec = "hyprlang.nightly.spec"
+	}
+	labels {
+		nightly = 1
+		subrepo = "extras"
+	}
+}
@@ -0,0 +1,57 @@
+#? https://src.fedoraproject.org/rpms/hyprlang/blob/rawhide/f/hyprlang.spec
+
+%global realname hyprlang
+%global ver 0.6.3
+%global commit 1bfb84f54d50c7ae6558c794d3cfd5f6a7e6e676
+%global commit_date 20250606
+%global shortcommit %{sub %commit 1 7}
+
+Name:           %realname.nightly
+Version:        %ver^%{commit_date}git.%shortcommit
+Release:        1%?dist
+Summary:        The official implementation library for the hypr config language
+
+License:        LGPL-3.0-only
+URL:            https://github.com/hyprwm/hyprlang
+Source0:        %url/archive/%commit.tar.gz
+
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch:    %{ix86}
+
+BuildRequires:  cmake
+BuildRequires:  gcc-c++
+BuildRequires:  (pkgconfig(hyprutils) with hyprutils.nightly-devel)
+
+Provides:		%realname = %evr
+Conflicts:		%realname
+
+%description
+%{summary}.
+
+%package        devel
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Provides:		%realname-devel = %evr
+Conflicts:		%realname-devel
+%pkg_devel_files
+
+%prep
+%autosetup -p1 -n %realname-%commit
+
+%build
+%cmake
+%cmake_build
+
+%install
+%cmake_install
+
+%check
+%ctest
+
+%files
+%license LICENSE
+%doc README.md
+%{_libdir}/libhyprlang.so.2
+%{_libdir}/libhyprlang.so.%{ver}
+
+%changelog
+%autochangelog
@@ -0,0 +1,5 @@
+rpm.global("commit", gh_commit("hyprwm/hyprlang"));
+if rpm.changed() {
+	rpm.global("ver", gh_rawfile("hyprwm/hyprlang", "main", "VERSION"));
+	rpm.global("commit_date", date());
+}
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "hyprlock.spec"
+	}
+}
@@ -0,0 +1 @@
+sh("dnf swap sdbus-cpp sdbus-cpp.terra -y --allowerasing", #{});
@@ -0,0 +1,46 @@
+Name:			hyprlock
+Version:		0.8.2
+Release:		1%?dist
+Summary:		Hyprland's GPU-accelerated screen locking utility
+License:		BSD-3-Clause
+URL:			https://github.com/hyprwm/%name
+Source0:		%url/archive/refs/tags/v%version.tar.gz
+Packager:		madonuko <mado@fyralabs.com>
+BuildRequires:	cmake gcc gcc-c++
+BuildRequires:	pkgconfig(cairo)
+BuildRequires:	(pkgconfig(hyprgraphics) with hyprgraphics.nightly-devel)
+BuildRequires:	pkgconfig(hyprland-protocols)
+BuildRequires:	(pkgconfig(hyprlang) with hyprlang.nightly-devel)
+BuildRequires:	(pkgconfig(hyprutils) with hyprutils.nightly-devel)
+BuildRequires:	(pkgconfig(hyprwayland-scanner) with hyprwayland-scanner.nightly-devel)
+BuildRequires:	mesa-libgbm-devel
+BuildRequires:	mesa-libGL-devel
+BuildRequires:	pkgconfig(pam)
+BuildRequires:	pkgconfig(pango)
+BuildRequires:	pkgconfig(wayland-client)
+BuildRequires:	pkgconfig(wayland-protocols)
+BuildRequires:	pkgconfig(xkbcommon)
+BuildRequires:	pkgconfig(sdbus-c++) >= 2.1.0
+BuildRequires:	pkgconfig(libjpeg)
+BuildRequires:	pkgconfig(libwebp)
+BuildRequires:	pkgconfig(libmagic)
+
+%description
+%summary.
+
+%prep
+%autosetup
+
+%build
+%cmake -DCMAKE_BUILD_TYPE:STRING=Release
+%cmake_build
+
+%install
+%cmake_install
+
+%files
+%doc README.md
+%license LICENSE
+%_bindir/%name
+%_pam_confdir/%name
+%_datadir/hypr/%name.conf
@@ -0,0 +1,3 @@
+let v = gh_rawfile("hyprwm/hyprlock", "main", "VERSION");
+v.trim();
+rpm.version(v);
@@ -0,0 +1,9 @@
+project pkg {
+  rpm {
+    spec = "hyprutils.nightly.spec"
+  }
+  labels {
+    nightly = 1
+    subrepo = "extras"
+  }
+}
@@ -0,0 +1,55 @@
+#? https://src.fedoraproject.org/rpms/hyprutils/blob/rawhide/f/hyprutils.spec
+
+%global realname hyprutils
+%global ver 0.7.1
+
+%global commit c9cd5f153c090005437b5fac504bb4f7172a7cc1
+%global commit_date 20250617
+%global shortcommit %{sub %commit 1 7}
+
+Name:           %realname.nightly
+Version:        %ver^%{commit_date}git.%shortcommit
+Release:        1%?dist
+Summary:        Hyprland utilities library used across the ecosystem
+
+License:        BSD-3-Clause
+URL:            https://github.com/hyprwm/hyprutils
+Source0:        %url/archive/%commit.tar.gz
+
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch:    %{ix86}
+
+BuildRequires:  cmake
+BuildRequires:  gcc-c++
+BuildRequires:  pkgconfig(pixman-1)
+
+Provides:		%realname = %evr
+Conflicts:		%realname
+
+%description
+%{summary}.
+
+%package        devel
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Provides:		%realname-devel = %evr
+Conflicts:		%realname-devel
+%pkg_devel_files
+
+%prep
+%autosetup -p1 -n %realname-%commit
+
+%build
+%cmake
+%cmake_build
+
+%install
+%cmake_install
+
+%check
+%ctest
+
+%files
+%license LICENSE
+%doc README.md
+%{_libdir}/lib%{realname}.so.%{ver}
+%{_libdir}/lib%{realname}.so.6
@@ -0,0 +1,5 @@
+rpm.global("commit", gh_commit("hyprwm/hyprutils"));
+if rpm.changed() {
+	rpm.global("ver", gh_rawfile("hyprwm/hyprutils", "main", "VERSION"));
+	rpm.global("commit_date", date());
+}
@@ -1,12 +1,7 @@
 %global _description %{expand:
 An editor that pays homage to the classic MS-DOS Editor, but with a modern interface and input controls similar to VS Code.}
 %global crate edit
-%bcond rust_nightly 1
-%if %{with rust_nightly}
-%define __cargo /usr/bin/env CARGO_HOME=.cargo RUSTC_BOOTSTRAP=1 RUSTFLAGS='%{build_rustflags}' $HOME/.cargo/bin/cargo
-%define __rustc $HOME/.cargo/bin/rustc
-%define __rustdoc $HOME/.cargo/bin/rustdoc
-%endif
+%bcond rust_nightly 0

 Name:          %{crate}
 Version:       1.2.0
@@ -29,10 +24,7 @@ Packager:      Gilver E. <rockgrub@disroot.org>
 %prep
 %autosetup -n %{name}-%{version}
 %if %{with rust_nightly}
-rustup-init -y
-. "$HOME/.cargo/env"
-rustup toolchain install nightly
-rustup override set nightly
+%rustup_nightly
 %endif
 %cargo_prep_online

@@ -1,16 +1,11 @@
-%global commit c3d65d3975f91773f10fb19e10911e0f4d6463aa
+%global commit d0f116da3554c151c63fd3a11e90661cb8489359
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global fulldate 2025-06-11
+%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 reverse_dns com.mitchellh.%{base_name}
-%if 0%{?fedora} <= 40
-%global cache_dir %{_builddir}/zig-cache
-%else
-%global cache_dir %{builddir}/zig-cache
-%endif

 Name:           %{base_name}-nightly
 Version:        %{ver}~tip^%{commit_date}git%{shortcommit}
@@ -23,7 +18,7 @@ License:        MIT AND MPL-2.0 AND OFL-1.1 AND (WTFPL OR CC0-1.0) AND Apache-2.
 URL:            https://%{base_name}.org
 Source0:        https://github.com/%{base_name}-org/%{base_name}/releases/download/tip/%{base_name}-source.tar.gz
 Source1:        https://github.com/%{base_name}-org/%{base_name}/releases/download/tip/%{base_name}-source.tar.gz.minisig
-BuildRequires:  anda-srpm-macros
+BuildRequires:  anda-srpm-macros >= 0.2.15
 BuildRequires:  gettext
 BuildRequires:  gtk4-devel
 BuildRequires:  libadwaita-devel
@@ -33,6 +28,7 @@ BuildRequires:  ncurses
 BuildRequires:  ncurses-devel
 BuildRequires:  pandoc-cli
 BuildRequires:  zig >= 0.14.0
+BuildRequires:  zig-rpm-macros
 BuildRequires:  pkgconfig(blueprint-compiler)
 BuildRequires:  pkgconfig(bzip2)
 BuildRequires:  pkgconfig(freetype2)
@@ -130,22 +126,16 @@ Ghostty's terminfo. Needed for basic terminal function.
 /usr/bin/minisign -V -m %{SOURCE0} -x %{SOURCE1} -P %{public_key}
 %autosetup -n %{base_name}-%{ver}-main+%{shortcommit}

-ZIG_GLOBAL_CACHE_DIR="%{cache_dir}" ./nix/build-support/fetch-zig-cache.sh
+ZIG_GLOBAL_CACHE_DIR="%{_zig_cache_dir}" ./nix/build-support/fetch-zig-cache.sh

 %build

 %install
 DESTDIR="%{buildroot}" \
-zig build \
-    --summary all \
-    --release=fast \
-    --system "%{cache_dir}/p" \
+%{zig_build_target -r fast} \
    --prefix "%{_prefix}" --prefix-lib-dir "%{_libdir}" \
    --prefix-exe-dir "%{_bindir}" --prefix-include-dir "%{_includedir}" \
-    --verbose \
-    --build-id=sha1 \
    -Dversion-string="%{ver}-dev+%{shortcommit}" \
-    -Dcpu=baseline \
    -Dstrip=false \
    -Dpie=true \
    -Demit-docs 
@@ -9,7 +9,7 @@ Release:       1%?dist
 Summary:       A hardware-accelerated terminal written in Rust.
 SourceLicense: MIT
 License:       ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND Apache-2.0 AND BSD-2-Clause AND BSL-1.0 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 CC0-1.0 AND ISC AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND (MPL-2.0 OR GPL-3.0-only) AND MPL-2.0+ AND MPL-2.0 AND Unicode-3.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND Zlib
-URL:           http://rioterm.com
+URL:           https://rioterm.com/
 Source0:       https://github.com/raphamorim/%{name}/archive/refs/tags/v%{version}.tar.gz
 BuildRequires: anda-srpm-macros
 BuildRequires: cargo-rpm-macros
@@ -1,6 +1,6 @@
-%global commit e8d495806f3f87ea88f1106ed2fa3ef964c7792a
+%global commit 783412fa1d07f5e1d010151a94d870388993a2c8
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20250614
+%global commit_date 20250617
 %global ver 0.192.0

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

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

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

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

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

 %bcond_without qt6
@@ -6,12 +6,12 @@
 # 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 5514d7c3d8b622e6fb6e6de62d958704493610cd
-%global ver 0.0.37-18003
+%global commit 9634e58f0a5b21469282c44dceeee9e5b902a03b
+%global ver 0.0.37-18009

 Name:           rpcs3
 Version:        %(echo %{ver} | sed 's/-/^/g')
-Release:        2%?dist
+Release:        1%?dist
 Summary:        PlayStation 3 emulator and debugger
 License:        GPL-2.0-only
 URL:            https://github.com/RPCS3/rpcs3
@@ -1,5 +1,5 @@
-%global commit 7f8498fe0c53380073316d56293a9b26b38c1876
-%global commit_date 20250614
+%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 7701b3c7e6f6c640a89cc445b40f466834ab4fcf
+%global commit c22bfe6bc06951a037d3094612151c6ea1b9fc79
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global ver 2.3.1
-%global commit_date 20250613
+%global commit_date 20250617
 %global debug_package %nil

 Name:			nim-nightly
@@ -14,7 +14,6 @@ URL:			https://nim-lang.org
 Source0:		https://github.com/nim-lang/Nim/archive/%commit.tar.gz
 Source1:		nim.1
 Source2:		nimgrep.1
-Source3:		nimble.1
 Source4:		nimsuggest.1
 BuildRequires:	gcc mold git gcc-c++ nodejs openssl-devel pkgconfig(bash-completion) gc-devel pcre pcre-devel
 Requires:		redhat-rpm-config gcc
@@ -104,7 +103,7 @@ mkdir -p %buildroot/%_bindir %buildroot/%_datadir/bash-completion/completions %b
 install -Dpm755 bin/nim{grep,suggest,pretty} %buildroot/%_bindir
 install -Dpm644 tools/nim.bash-completion %buildroot/%_datadir/bash-completion/completions/nim
 install -Dpm644 dist/nimble/nimble.bash-completion %buildroot/%_datadir/bash-completion/completions/nimble
-install -Dpm644 -t%buildroot/%_mandir/man1 %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4
+install -Dpm644 -t%buildroot/%_mandir/man1 %SOURCE1 %SOURCE2 %SOURCE4
 mv %buildroot%_bindir/nim %buildroot%_datadir/
 ln -s %_datadir/nim/bin/nim %buildroot%_bindir/nim

@@ -133,7 +132,7 @@ cp -r %buildroot%_prefix/lib/nim/dist %buildroot%_datadir/nim/
 %license copying.txt dist/nimble/license.txt
 %doc doc/readme.txt
 %_bindir/nim{,ble}
-%_mandir/man1/nim{,ble}.1*
+%_mandir/man1/nim.1.*
 %_datadir/bash-completion/completions/nim{,ble}
 %_datadir/nim/
 %_prefix/lib/nim/
@@ -0,0 +1,5 @@
+project pkg {
+  rpm {
+    spec = "nimble.spec"
+  }
+}
@@ -0,0 +1,35 @@
+Name:           nimble
+Version:        0.18.2
+Release:        1%?dist
+Summary:        Package manager for the Nim programming language
+License:        BSD
+URL:            https://github.com/nim-lang/nimble
+Source0:        %url/archive/refs/tags/v%version.tar.gz
+Source1:        nimble.1
+# We use `nim` to get `nimble`… to build `nimble`
+BuildRequires:  nim anda-srpm-macros git-core rpm_macro(bash_completions_dir)
+Conflicts:      nim
+
+%description
+%summary.
+
+%prep
+%autosetup
+%nim_prep
+
+%build
+%nim_build src/nimble
+
+%install
+install -Dpm755 src/nimble %buildroot%_bindir/nimble
+install -Dpm644 -t%buildroot%_mandir/man1 %SOURCE1
+install -Dpm644 nimble.bash-completion %buildroot%bash_completions_dir/nimble
+install -Dpm644 nimble.zsh-completion %buildroot%zsh_completions_dir/_nimble.zsh
+
+%files
+%doc readme.markdown
+%license license.txt
+%_bindir/nimble
+%_mandir/man1/nimble.1.gz
+%bash_completions_dir/nimble
+%zsh_completions_dir/_nimble.zsh
@@ -0,0 +1 @@
+rpm.version(gh("nim-lang/nimble"));
@@ -1,27 +1,30 @@
-From 48aa23307d1a47b444854fc09478da6d4ee8e624 Mon Sep 17 00:00:00 2001
+From 1796a91063dc5ed71418f164bb7d98ca65c33d4a Mon Sep 17 00:00:00 2001
 From: Jan200101 <sentrycraft123@gmail.com>
-Date: Sun, 11 May 2025 01:09:41 +0200
-Subject: [PATCH 5/5] link.Elf: add root directory of libraries to linker path
+Date: Mon, 16 Jun 2025 20:46:25 +0200
+Subject: [PATCH] link.Elf: add root directory of libraries to linker path

-all the given dynamic shared objects will be linked with an absolute path however they may link to other dynamic shared objects which won't have an absolute path, for this we need to add the library path so that lld can resolve it
+All the given dynamic shared objects will be linked with an absolute
+path however they may link to other dynamic shared objects which won't
+have an absolute path, for this we need to add the library path so that
+lld can resolve it.

 Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
 ---
- src/link/Elf.zig | 12 +++++++++++-
+ src/link/Lld.zig | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

-diff --git a/src/link/Elf.zig b/src/link/Elf.zig
-index 53f88101b1..fe2b7abd48 100644
--- a/src/link/Elf.zig
-+++ b/src/link/Elf.zig
-@@ -1938,9 +1938,19 @@ fn linkWithLLD(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_node: s
+diff --git a/src/link/Lld.zig b/src/link/Lld.zig
+index 4ea809428e..b8421dd60a 100644
+--- a/src/link/Lld.zig
+++ b/src/link/Lld.zig
+@@ -1109,9 +1109,19 @@ fn elfLink(lld: *Lld, arena: Allocator) !void {
         // Positional arguments to the linker such as object files.
         var whole_archive = false;
 
 +        var lib_directories = std.StringArrayHashMap(void).init(gpa);
 +        defer lib_directories.deinit();
 +
-         for (self.base.comp.link_inputs) |link_input| switch (link_input) {
+         for (base.comp.link_inputs) |link_input| switch (link_input) {
             .res => unreachable, // Windows-only
 -            .dso => continue,
 +            .dso => |dso| {
@@ -7,7 +7,7 @@
 %define         llvm_compat 20
 %endif
 %global         llvm_version 20.0.0
-%global         ver 0.15.0-dev.822+dd75e7bcb
+%global         ver 0.15.0-dev.832+1ca213dab
 %bcond bootstrap 1
 %bcond docs      %{without bootstrap}
 %bcond test      1
@@ -1,27 +1,30 @@
-From 48aa23307d1a47b444854fc09478da6d4ee8e624 Mon Sep 17 00:00:00 2001
+From 1796a91063dc5ed71418f164bb7d98ca65c33d4a Mon Sep 17 00:00:00 2001
 From: Jan200101 <sentrycraft123@gmail.com>
-Date: Sun, 11 May 2025 01:09:41 +0200
-Subject: [PATCH 5/5] link.Elf: add root directory of libraries to linker path
+Date: Mon, 16 Jun 2025 20:46:25 +0200
+Subject: [PATCH] link.Elf: add root directory of libraries to linker path

-all the given dynamic shared objects will be linked with an absolute path however they may link to other dynamic shared objects which won't have an absolute path, for this we need to add the library path so that lld can resolve it
+All the given dynamic shared objects will be linked with an absolute
+path however they may link to other dynamic shared objects which won't
+have an absolute path, for this we need to add the library path so that
+lld can resolve it.

 Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
 ---
- src/link/Elf.zig | 12 +++++++++++-
+ src/link/Lld.zig | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

-diff --git a/src/link/Elf.zig b/src/link/Elf.zig
-index 53f88101b1..fe2b7abd48 100644
--- a/src/link/Elf.zig
-+++ b/src/link/Elf.zig
-@@ -1938,9 +1938,19 @@ fn linkWithLLD(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_node: s
+diff --git a/src/link/Lld.zig b/src/link/Lld.zig
+index 4ea809428e..b8421dd60a 100644
+--- a/src/link/Lld.zig
+++ b/src/link/Lld.zig
+@@ -1109,9 +1109,19 @@ fn elfLink(lld: *Lld, arena: Allocator) !void {
         // Positional arguments to the linker such as object files.
         var whole_archive = false;
 
 +        var lib_directories = std.StringArrayHashMap(void).init(gpa);
 +        defer lib_directories.deinit();
 +
-         for (self.base.comp.link_inputs) |link_input| switch (link_input) {
+         for (base.comp.link_inputs) |link_input| switch (link_input) {
             .res => unreachable, // Windows-only
 -            .dso => continue,
 +            .dso => |dso| {
@@ -13,7 +13,7 @@
 %global zig_cache_dir %{builddir}/zig-cache

 Name:           zig-master
-Version:        0.15.0~dev.784+4a02e080d
+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 4e455bb
-%global commit_date 20250614
+%global commit ca3190d
+%global commit_date 20250616

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

-%global commit 4e455bb6e7f256742849322d31427b9defc95c16
+%global commit ca3190d077d09b9597e7de471a8e388a08f112e9
 %global shortcommit %{sub %commit 1 7}
-%global commit_date 20250614
+%global commit_date 20250616

 Name:			astal
 Version:		0^%commit_date.%shortcommit
@@ -1 +1 @@
-rpm.version(`(?m)^project\(sdbus-c\+\+ VERSION ([\d.]+) LANGUAGES CXX C\)$`.find(gh_rawfile("Kistler-Group/sdbus-cpp", "master", "CMakeLists.txt")));
+rpm.version(`(?m)^project\(sdbus-c\+\+ VERSION ([\d.]+) LANGUAGES CXX C\)$`.find(gh_rawfile("Kistler-Group/sdbus-cpp", "master", "CMakeLists.txt"), 1));
@@ -2,4 +2,7 @@ project pkg {
 	rpm {
 		spec = "tdlib-nightly.spec"
 	}
+	labels {
+		nightly = 1
+	}
 }
@@ -1,6 +1,6 @@
-%global commit fb04b8d40e5e3d24c30001af2e9784c91d4606c0
+%global commit 1e75ca0ce40b9bae36ed3eb7b676fcad1bbbdc0a
 %global ver 1.8.50
-%global commit_date 20250613
+%global commit_date 20250616
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

 Name:          tdlib-nightly
@@ -1,9 +0,0 @@
-project pkg {
-    arches = ["x86_64", "aarch64", "i386"]
-    rpm {
-        spec = "faad2.spec"
-    }
-    labels {
-        mock = 1
-   }
-}
@@ -1,322 +0,0 @@
-Summary:	Library and frontend for decoding MPEG2/4 AAC
-Name:		faad2
-Epoch:		1
-Version:	2.11.2
-Release:	1%?dist
-License:	GPLv2+
-URL:		http://www.audiocoding.com/faad2.html
-Source:		https://github.com/knik0/faad2/archive/%{version}/%{name}-%{version}.tar.gz
-
-
-BuildRequires:	gcc-c++
-BuildRequires:  cmake
-BuildRequires:  libsysfs-devel
-
-Requires:	%{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
-Obsoletes:	%{name}-xmms < %{version}-%{release}
-
-%description
-FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
-written from scratch.
-
-%package libs
-Summary:	Shared libraries of the FAAD 2 AAC decoder
-
-%description libs
-FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
-written from scratch.
-
-This package contains libfaad.
-
-%package devel
-Summary:	Development libraries of the FAAD 2 AAC decoder
-Requires:	%{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
-
-%description devel
-FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
-written from scratch.
-
-This package contains development files and documentation for libfaad.
-
-%prep
-%autosetup -p1
-
-%build
-%cmake
-
-%cmake_build
-
-%install
-%cmake_install
-install -m 0755 -d %{buildroot}%{_mandir}/man3
-install -D -m 644 docs/libfaad.3 -t %{buildroot}%{_mandir}/man3/
-
-%ldconfig_scriptlets libs
-
-
-%files
-%doc AUTHORS ChangeLog README*
-%license COPYING
-%{_bindir}/faad
-%{_mandir}/man1/faad.1*
-
-%files libs
-%{_libdir}/libfaad*.so.*
-%{_mandir}/man3/libfaad.3*
-
-%files devel
-%{_includedir}/faad.h
-%{_includedir}/neaacdec.h
-%{_libdir}/pkgconfig/faad2.pc
-%{_libdir}/libfaad*.so
-
-%changelog
-* Thu Aug 01 2024 RPM Fusion Release Engineering <sergiomb@rpmfusion.org> - 1:2.11.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Feb 03 2024 RPM Fusion Release Engineering <sergiomb@rpmfusion.org> - 1:2.11.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Thu Nov 16 2023 Leigh Scott <leigh123linux@gmail.com> - 1:2.11.1-1
- Update to 2.11.1
-
-* Tue Nov 07 2023 Leigh Scott <leigh123linux@gmail.com> - 1:2.11.0-1
- Update to 2.11.0
-
-* Wed Aug 02 2023 RPM Fusion Release Engineering <sergiomb@rpmfusion.org> - 1:2.10.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Oct 21 2022 Leigh Scott <leigh123linux@gmail.com> - 1:2.10.1-1
- Update to 2.10.1
-
-* Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb@rpmfusion.org> - 1:2.10.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
-  5.1
-
-* Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb@rpmfusion.org> - 1:2.10.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Aug 02 2021 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1:2.10.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri May 21 2021 Sérgio Basto <sergio@serjux.com> - 1:2.10.0-1
- Update to 2.10.0
-
-* Wed Feb 03 2021 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1:2.9.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Aug 18 2020 Leigh Scott <leigh123linux@gmail.com> - 1:2.9.2-3
- Rebuilt for i686
-
-* Mon Aug 17 2020 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1:2.9.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue May 05 2020 Leigh Scott <leigh123linux@gmail.com> - 1:2.9.2-1
- Update to 2.9.2
-
-* Thu Mar 12 2020 Leigh Scott <leigh123linux@gmail.com> - 1:2.9.1-3
- Rebuilt for i686
-
-* Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1:2.9.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jan 01 2020 Leigh Scott <leigh123linux@googlemail.com> - 1:2.9.1-1
- Update to 2.9.1
-
-* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1:2.8.8-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Jun 07 2019 Nicolas Chauvet <kwizart@gmail.com> - 1:2.8.8-6
- Fix overflows
- Conditionalize xmms
-
-* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1:2.8.8-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Feb 26 2019 Nicolas Chauvet <kwizart@gmail.com> - 1:2.8.8-4
- Group Clean-up
-
-* Tue Jan 29 2019 Nicolas Chauvet <kwizart@gmail.com> - 1:2.8.8-3
- Drop autoreconf
-
-* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1:2.8.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Sat Apr 14 2018 Leigh Scott <leigh123linux@googlemail.com> - 1:2.8.8-1
- Update to 2.8.8
-
-* Wed Feb 28 2018 RPM Fusion Release Engineering <leigh123linux@googlemail.com> - 1:2.8.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart@rpmfusion.org> - 1:2.8.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Jul 28 2017 Leigh Scott <leigh123linux@googlemail.com> - 1:2.8.1-1
- update to 2.8.1
-
-* Sun Mar 19 2017 RPM Fusion Release Engineering <kwizart@rpmfusion.org> - 1:2.7-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Aug 23 2016 Nicolas Chauvet <nicolas.chauvet@kwizart.fr> - 1:2.7-8
- Bump for dist
-
-* Thu Aug 18 2016 Sérgio Basto <sergio@serjux.com> - 1:2.7-7
- Clean spec, Vascom patches series, rfbz #4200, add license tag
-
-* Mon Sep 01 2014 Sérgio Basto <sergio@serjux.com> - 1:2.7-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Mon Dec 30 2013 Nicolas Chauvet <kwizart@gmail.com> - 1:2.7-5
- Rebuilt for F-20
-
-* Wed Mar 27 2013 Nicolas Chauvet <kwizart@gmail.com> - 1:2.7-4
- Change the escaping space hack - rhbz#928110
-
-* Sun Mar 03 2013 Nicolas Chauvet <kwizart@gmail.com> - 1:2.7-3
- Mass rebuilt for Fedora 19 Features
-
-* Wed Jan 25 2012 Nicolas Chauvet <kwizart@gmail.com> - 1:2.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Fri Mar 13 2009 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.7-1
- update to 2.7
- don't install internal libmp4ff
- include manpage
- fix build on x86_64 (non-PIC objects in libmp4ff.a)
- fix rpaths
- make xmms plugin depend on -libs, not the frontend
- preserve docs timestamps
-
-* Mon Nov 10 2008 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.6.1-6
- fix CVE-2008-4201
-
-* Sat Oct 18 2008 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.6.1-5
- add Obsoletes: for xmms-aac to ensure smooth upgrade from Freshrpms
- add some additional docs for xmms-faad2
-
-* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1:2.6.1-4
- rebuild
-
-* Sun Jan 13 2008 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.6.1-3
- split off libs to avoid multilib conflicts
-
-* Sun Nov 11 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.6.1-2
- bring back the XMMS plugin
- move EOL fixup to prep
- fix URLs
-
-* Thu Nov 01 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.6.1-1
- remerge freshrpms specfile
- update to latest upstream, fixes licensing issues!
-
-* Thu Oct 18 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.0-21
- fix missing epochs in dependencies
-
-* Tue Oct 16 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.0-20
- revert from 2.5
-
-* Wed Sep 26 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 2.5-4
- disable drm, fixes playback of many AAC streams (bug #1465)
-
-* Sun Sep 23 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 2.5-3
- remove redundant BRs
- don't disable backward compatibility (breaks ffmpeg)
- silence tar in setup
- use disttag
- fix source file permissions and other rpmlint warnings
-
-* Sat Sep 15 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 2.5-2
- import faad2 from freshrpms as discussed on on repomerge-list
-
-* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 2.0-19
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
-
-* Tue Sep 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.0-18.20050131
- Rebuild.
-
-* Sat Jun 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.0-17.20050131
- Let soname based autogenerated deps take care of xmms-libs (#1018).
- Revert x86_64 patch to the correct one again (#1017).
-
-* Thu Jun 15 2006 Noa Resare <noa@resare.com> - 2.0-16.20050131
- reverted to obviously broken x86_64 patch to preserve binary compatibility
-  and prevent slow motion bug (#1017)
- fixed xmms-libs regression (#1018)
-
-* Wed May 24 2006 Noa Resare <noa@resare.com> - 2.0-15.20050131
- added patch to fix apple trailer playback problem
-
-* Tue May 23 2006 Noa Resare <noa@resare.com> - 2.0-14.20050131
- reverted to older cvs to avoid a GPL violating extra redistribution
-  requirement in README
- changed the bogus uint8_t to correct uin32_t in the x86_64 patch
-
-* Sun May 21 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.0-13.20060505
- Avoid aclocal >= 1.8 warnings.
-
-* Sun May 21 2006 Noa Resare <noa@resare.com> - 2.0-12.20060505
- re-introduce the x86_64 patch to restore binary compatibility
-
-* Sat May 20 2006 Noa Resare <noa@resare.com> - 2.0-10.20060505
- patch the sources to be binary compatible with old faad2
- remove library major version bump
- add symbol versioning script for new symbols
-
-* Fri May 05 2006 Noa Resare <noa@resare.com> - 2.0-9.20060505
- upgrade to cvs version
- mp4v2 is no longer included (now a separate package)
- bump libary major version
- drop static library
- remove mp4ff headers from -devel
-
-* Mon Mar 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 2.0-8
- Drop Epoch completely
-
-* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
-
-* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
-
-* Tue Jan 17 2006 Adrian Reber <adrian@lisas.de> - 2.0-0.lvn.7
- Removed change of ownership to root:root during %%install
- Droped Epoch
-
-* Sat Oct 01 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info - 0:2.0-0.lvn.6
- Add faad2-amd64.patch to fix #510
-
-* Wed Jun 15 2005 Ricahrd June <rjune[AT]bravegnuworld.com> - 0:2.0-0.lvn.5
- Included some hand install lines because make install did not place some required header files
-
-* Wed Apr 27 2005 Dams <anvil[AT]livna.org> - 0:2.0-0.lvn.4
- Fixed gcc4 build
-
-* Fri Nov 12 2004 Dams <anvil[AT]livna.org> 0:2.0-0.lvn.3
- Fixing gcc34 build
-
-* Wed Oct 13 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.0-0.lvn.2
- libsndfile is no longer required since 2.0rc1.
-
-* Wed Mar 10 2004 Dams <anvil[AT]livna.org> 0:2.0-0.lvn.1
- Updated to 2.0 final release
- Added missing defattr
- Added xmms-aac provides to xmms-{name}
- Fixed makefile (patch)
-
-* Sun Sep 28 2003 Dams <anvil[AT]livna.org> 0:2.0-0.fdr.0.1.rc1
- Updated to 2.0 rc1
- Added xmms-faad2 subpackage
-
-* Sun Sep 28 2003 Dams <anvil[AT]livna.org> 0:1.1-0.fdr.4
- Added missing scriplets
- buildroot -> RPM_BUILD_ROOT
-
-* Tue Apr 15 2003 Dams <anvil[AT]livna.org> 0:1.1-0.fdr.3
- turned bootstrap into ./bootstrap to prevent build to fail with
-  people who dont have "." in their PATH.
-
-* Sat Apr 12 2003 Dams <anvil[AT]livna.org> 0:1.1-0.fdr.2
- Typo in devel Requires.
-
-* Sat Apr 12 2003 Dams <anvil[AT]livna.org> 
- Initial build.
@@ -1 +0,0 @@
-rpm.version(gh("knik0/faad2"));
@@ -12,7 +12,7 @@
 Summary:        A complete solution to record, convert and stream audio and video
 Name:           ffmpeg
 Version:        7.1.1
-Release:        3%{?dist}
+Release:        7%?dist
 License:        LGPL-3.0-or-later
 URL:            http://%{name}.org/
 Epoch:          1
@@ -7,4 +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));

-import "andax/ci/bump_release.rhai";
+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);
+}
@@ -4,7 +4,7 @@

 Name:           gstreamer1-plugins-bad
 Version:        1.26.2
-Release:        1%?dist
+Release:        2%?dist
 Epoch:          2
 Summary:        GStreamer streaming media framework "bad" plugins
 License:        LGPL-2.0-or-later and LGPL-2.0-only
@@ -1,28 +0,0 @@
-From 7ce00bf77d1b92981f471a26fa2d92c96d14e51c Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Tue, 14 Jan 2025 23:07:35 +0100
-Subject: [PATCH 5/9] media: ipu6: Fix out of tree builds
-
-Fix out of tree builds not finding the ipu6*.h files.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
- drivers/media/pci/intel/ipu6/psys/Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/media/pci/intel/ipu6/psys/Makefile b/drivers/media/pci/intel/ipu6/psys/Makefile
-index fa638fcdf..9a3aa6e78 100644
--- a/drivers/media/pci/intel/ipu6/psys/Makefile
-+++ b/drivers/media/pci/intel/ipu6/psys/Makefile
-@@ -23,6 +23,8 @@ obj-$(CONFIG_VIDEO_INTEL_IPU6)		+= intel-ipu6-psys.o
- 
- ifeq ($(is_kernel_lt_6_10), 1)
- ccflags-y += -I$(src)/../ipu6/
-+else
-+ccflags-y += -I/lib/modules/$(KERNELRELEASE)/build/drivers/media/pci/intel/ipu6/
- endif
- ccflags-y += -I$(src)/../
- ccflags-y += -I$(src)/../../
-- 
-2.48.1
-
@@ -1,38 +0,0 @@
-From d5f08986936a7fda0cce543c73fb8d9bab76eae2 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Wed, 15 Jan 2025 11:28:54 +0100
-Subject: [PATCH 10/12] usbio: Fix GPIO and I2C driver modaliases
-
-The created GPIO and I2C devices have modaliases of
-"platform:usbio-gpio" and "platform:usbio-i2c" note "usbio" not "usb"
-fix the aliases of the drivers so that these will properly auto load.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
- drivers/gpio/gpio-usbio.c      | 2 +-
- drivers/i2c/busses/i2c-usbio.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/gpio/gpio-usbio.c b/drivers/gpio/gpio-usbio.c
-index 625558b..de9d5cb 100644
--- a/drivers/gpio/gpio-usbio.c
-+++ b/drivers/gpio/gpio-usbio.c
-@@ -499,4 +499,4 @@ MODULE_AUTHOR("Israel Cepeda <israel.a.cepeda.lopez@intel.com>");
- MODULE_AUTHOR("Lifu Wang <lifu.wang@intel.com>");
- MODULE_DESCRIPTION("Intel USBIO-GPIO driver");
- MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:usb-gpio");
-+MODULE_ALIAS("platform:usbio-gpio");
-diff --git a/drivers/i2c/busses/i2c-usbio.c b/drivers/i2c/busses/i2c-usbio.c
-index ef1f380..3b2c856 100644
--- a/drivers/i2c/busses/i2c-usbio.c
-+++ b/drivers/i2c/busses/i2c-usbio.c
-@@ -437,4 +437,4 @@ MODULE_AUTHOR("Israel Cepeda <israel.a.cepeda.lopez@intel.com>");
- MODULE_AUTHOR("Lifu Wang <lifu.wang@intel.com>");
- MODULE_DESCRIPTION("Intel USBIO-I2C driver");
- MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:usb-i2c");
-+MODULE_ALIAS("platform:usbio-i2c");
-- 
-2.47.1
-
@@ -1,130 +0,0 @@
-From ce28836eb5ce74ae26a66a97949778bdb2cebc3c Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Tue, 4 Feb 2025 17:34:54 +0100
-Subject: [PATCH 11/11] psys: Use cdev_device_add() for /dev/ipu-psys0
-
-Use cdev_device_add() for /dev/ipu-psys0 so that its kobj parents gets
-set properly by calling cdev_set_parent().
-
-"cdev_set_parent() sets a parent kobject which will be referenced
- appropriately so the parent is not freed before the cdev. This
- should be called before cdev_add."
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
- drivers/media/pci/intel/ipu6/psys/ipu-psys.c | 45 ++++++++------------
- 1 file changed, 17 insertions(+), 28 deletions(-)
-
-diff --git a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c
-index c06cd515a..62fcf0215 100644
--- a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c
-+++ b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c
-@@ -2170,17 +2170,6 @@ static int ipu_psys_probe(struct ipu_bus_device *adev)
- 	ipu_trace_init(adev->isp, psys->pdata->base, &adev->dev,
- 		       psys_trace_blocks);
- 
-	cdev_init(&psys->cdev, &ipu_psys_fops);
-	psys->cdev.owner = ipu_psys_fops.owner;
-
-	rval = cdev_add(&psys->cdev, MKDEV(MAJOR(ipu_psys_dev_t), minor), 1);
-	if (rval) {
-		dev_err(&adev->dev, "cdev_add failed (%d)\n", rval);
-		goto out_unlock;
-	}
-
-	set_bit(minor, ipu_psys_devices);
-
- 	spin_lock_init(&psys->ready_lock);
- 	spin_lock_init(&psys->pgs_lock);
- 	psys->ready = 0;
-@@ -2261,12 +2250,19 @@ static int ipu_psys_probe(struct ipu_bus_device *adev)
- 	psys->dev.devt = MKDEV(MAJOR(ipu_psys_dev_t), minor);
- 	psys->dev.release = ipu_psys_dev_release;
- 	dev_set_name(&psys->dev, "ipu-psys%d", minor);
-	rval = device_register(&psys->dev);
-+	device_initialize(&psys->dev);
-+
-+	cdev_init(&psys->cdev, &ipu_psys_fops);
-+	psys->cdev.owner = ipu_psys_fops.owner;
-+
-+	rval = cdev_device_add(&psys->cdev, &psys->dev);
- 	if (rval < 0) {
- 		dev_err(&psys->dev, "psys device_register failed\n");
- 		goto out_release_fw_com;
- 	}
- 
-+	set_bit(minor, ipu_psys_devices);
-+
- 	/* Add the hw stepping information to caps */
- 	strscpy(psys->caps.dev_model, IPU_MEDIA_DEV_MODEL_NAME,
- 		sizeof(psys->caps.dev_model));
-@@ -2298,7 +2294,6 @@ out_free_pgs:
- 	ipu_psys_resource_pool_cleanup(&psys->resource_pool_running);
- out_mutex_destroy:
- 	mutex_destroy(&psys->mutex);
-	cdev_del(&psys->cdev);
- 	if (psys->sched_cmd_thread) {
- 		kthread_stop(psys->sched_cmd_thread);
- 		psys->sched_cmd_thread = NULL;
-@@ -2359,17 +2354,6 @@ static int ipu6_psys_probe(struct auxiliary_device *auxdev,
- 
- 	psys->power_gating = 0;
- 
-	cdev_init(&psys->cdev, &ipu_psys_fops);
-	psys->cdev.owner = ipu_psys_fops.owner;
-
-	rval = cdev_add(&psys->cdev, MKDEV(MAJOR(ipu_psys_dev_t), minor), 1);
-	if (rval) {
-		dev_err(dev, "cdev_add failed (%d)\n", rval);
-		goto out_unlock;
-	}
-
-	set_bit(minor, ipu_psys_devices);
-
- 	spin_lock_init(&psys->ready_lock);
- 	spin_lock_init(&psys->pgs_lock);
- 	psys->ready = 0;
-@@ -2450,12 +2434,19 @@ static int ipu6_psys_probe(struct auxiliary_device *auxdev,
- 	psys->dev.devt = MKDEV(MAJOR(ipu_psys_dev_t), minor);
- 	psys->dev.release = ipu_psys_dev_release;
- 	dev_set_name(&psys->dev, "ipu-psys%d", minor);
-	rval = device_register(&psys->dev);
-+	device_initialize(&psys->dev);
-+
-+	cdev_init(&psys->cdev, &ipu_psys_fops);
-+	psys->cdev.owner = ipu_psys_fops.owner;
-+
-+	rval = cdev_device_add(&psys->cdev, &psys->dev);
- 	if (rval < 0) {
- 		dev_err(dev, "psys device_register failed\n");
- 		goto out_release_fw_com;
- 	}
- 
-+	set_bit(minor, ipu_psys_devices);
-+
- 	/* Add the hw stepping information to caps */
- 	strscpy(psys->caps.dev_model, IPU6_MEDIA_DEV_MODEL_NAME,
- 		sizeof(psys->caps.dev_model));
-@@ -2483,7 +2474,6 @@ out_free_pgs:
- 	ipu_psys_resource_pool_cleanup(&psys->resource_pool_running);
- out_mutex_destroy:
- 	mutex_destroy(&psys->mutex);
-	cdev_del(&psys->cdev);
- 	if (psys->sched_cmd_thread) {
- 		kthread_stop(psys->sched_cmd_thread);
- 		psys->sched_cmd_thread = NULL;
-@@ -2552,10 +2542,9 @@ static void ipu6_psys_remove(struct auxiliary_device *auxdev)
- 
- 	ipu_psys_resource_pool_cleanup(&psys->resource_pool_running);
- 
-	device_unregister(&psys->dev);
-+	cdev_device_del(&psys->cdev, &psys->dev);
- 
- 	clear_bit(MINOR(psys->cdev.dev), ipu_psys_devices);
-	cdev_del(&psys->cdev);
- 
- 	mutex_unlock(&ipu_psys_mutex);
- 
-- 
-2.48.1
-
@@ -1,115 +0,0 @@
-From 47b34a6f467eebb4e9fc59f5e25618fe760fbf33 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Wed, 29 Jan 2025 19:13:29 +0100
-Subject: [PATCH 11/12] usbio: Fix I2C max transfer size
-
-There are 2 issues with the I2C max transfer size in the i2c-usbio module:
-
-1. The code defines a usbio_i2c_quirks struct but does not set
-i2c_adapter.quirks. This causes ov08x40_burst_fill_regs() to not split
-i2c-transfers larger then USBIO_I2C_MAX_XFER_SIZE which causes them
-to be rejected with -EINVAL. Fix this by setting i2c_adapter.quirks.
-
-2. Once 1. is fixed the following error messages show up in dmesg:
-
-Jan 28 18:31:04 x1 kernel: usbio-bridge 3-9:1.0: data not correct header->len:5 payload_len:3
-Jan 28 18:31:04 x1 kernel: usbio-bridge 3-9:1.0: data not correct header->len:5 payload_len:3
-...
-
-Every time ov08x40_burst_fill_regs() gets called. This is caused by
-the usbio_transfer_internal() splitting-up the i2c-transfer into
-multiple USB bulk packets to honor MAX_PACKET_SIZE.
-
-This splitting up seems to not work and the USBIO expander responds with
-a 3 byte answer with flags set 0x0e which includes ERR_FLAG, it seems that
-when ERR_FLAG is set only a 3 byte header is returned (no length field).
-
-Modify USBIO_I2C_MAX_XFER_SIZE to avoid the splitting of the i2c-transfer
-over multiple USB bulk packets, since the USBIO chip seems to not like
-the splitting.
-
-After this change to USBIO_I2C_MAX_XFER_SIZE the code to split transfers
-in usbio_transfer_internal() is no longer necessary, remove it.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
- drivers/i2c/busses/i2c-usbio.c | 11 ++++++++++-
- drivers/mfd/usbio.c            | 33 ++-------------------------------
- 2 files changed, 12 insertions(+), 32 deletions(-)
-
-diff --git a/drivers/i2c/busses/i2c-usbio.c b/drivers/i2c/busses/i2c-usbio.c
-index 3b2c856..a6c5edc 100644
--- a/drivers/i2c/busses/i2c-usbio.c
-+++ b/drivers/i2c/busses/i2c-usbio.c
-@@ -65,7 +65,15 @@ struct i2c_xfer {
- 	u8 data[];
- } __packed;
- 
-#define USBIO_I2C_MAX_XFER_SIZE 256
-+//[WA]: Max USB packet size needs to be 63
-+//in order for fw download to work
-+#define USBIO_MAX_PACKET_SIZE    63
-+#define USBIO_BULK_MSG_HDR_SIZE   5
-+
-+#define USBIO_I2C_MAX_XFER_SIZE                            \
-+	(USBIO_MAX_PACKET_SIZE - USBIO_BULK_MSG_HDR_SIZE - \
-+	 sizeof(struct i2c_rw_packet))
-+
- #define USBIO_I2C_BUF_SIZE                                                      \
- 	(USBIO_I2C_MAX_XFER_SIZE + sizeof(struct i2c_rw_packet))
- 
-@@ -384,6 +392,7 @@ static int usbio_i2c_probe(struct platform_device *pdev)
- 	usbio_i2c->adap.owner = THIS_MODULE;
- 	usbio_i2c->adap.class = I2C_CLASS_HWMON;
- 	usbio_i2c->adap.algo = &usbio_i2c_algo;
-+	usbio_i2c->adap.quirks = &usbio_i2c_quirks;
- 	usbio_i2c->adap.dev.parent = &pdev->dev;
- 
- 	try_bind_acpi(pdev, usbio_i2c);
-diff --git a/drivers/mfd/usbio.c b/drivers/mfd/usbio.c
-index 8bc7600..51757df 100644
--- a/drivers/mfd/usbio.c
-+++ b/drivers/mfd/usbio.c
-@@ -390,37 +390,8 @@ static int usbio_transfer_internal(struct platform_device *pdev, u8 cmd,
- 		ret = usbio_control_xfer(stub, cmd, obuf, obuf_len,
- 			ibuf, ibuf_len,	wait_ack, USB_WRITE_ACK_TIMEOUT);
- 	else if (stub->type == I2C_STUB) {
-		if (cmd == I2C_WRITE) {
-			u8 *i2cpkt = obuf;
-			int wsize = 0;
-			bool done = false;
-			while (wsize < obuf_len) {
-				int chunk;
-
-				if ((obuf_len - wsize) <= MAX_PAYLOAD_BSIZE) {
-					chunk = obuf_len - wsize;
-					done = true;
-				} else
-					chunk = MAX_PAYLOAD_BSIZE;
-
-				//[WA]: The I2C header in each chunk has to be updated
-				//to the payload bytes being sent in that chunk for fw
-				//download to work.
-				struct i2c_rw_packet *i2cpkt_hdr = (struct i2c_rw_packet *)i2cpkt;
-				i2cpkt_hdr->len = chunk - sizeof(struct i2c_rw_packet);
-				
-				ret = usbio_bulk_write(stub, cmd, i2cpkt, chunk, ibuf, ibuf_len,
-						done, done? wait_ack : false, USB_WRITE_ACK_TIMEOUT);
-				if (ret || done)
-					break;
-
-				wsize += chunk - sizeof(struct i2c_rw_packet);
-				i2cpkt += chunk - sizeof(struct i2c_rw_packet);
-				memcpy(i2cpkt, obuf, sizeof(struct i2c_rw_packet));
-			}
-		} else
-			ret = usbio_bulk_write(stub, cmd, obuf, obuf_len,
-					ibuf, ibuf_len,	true, wait_ack, USB_WRITE_ACK_TIMEOUT);
-+		ret = usbio_bulk_write(stub, cmd, obuf, obuf_len,
-+			ibuf, ibuf_len, true, wait_ack, USB_WRITE_ACK_TIMEOUT);
- 	}
- 
- 	return ret;
-- 
-2.47.1
-
@@ -1,30 +0,0 @@
-From 0eae85556558b410635ad03ed5eccb9648e11fce Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Wed, 29 Jan 2025 19:26:16 +0100
-Subject: [PATCH 12/12] usbio: Use MAX_PAYLOAD_BSIZE in usbio_bulk_write()
-
-usbio_bulk_write() uses a struct usbio_bmsg header rather than
-a struct usbio_msg header. So its max payload length check must use
-MAX_PAYLOAD_BSIZE instead of MAX_PAYLOAD_SIZE.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
- drivers/mfd/usbio.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/mfd/usbio.c b/drivers/mfd/usbio.c
-index 51757df..ab5dae9 100644
--- a/drivers/mfd/usbio.c
-+++ b/drivers/mfd/usbio.c
-@@ -303,7 +303,7 @@ static int usbio_bulk_write(struct usbio_stub *stub, u8 cmd, const void *obuf,
- 	if (bridge->state == BRIDGE_STOPPED)
- 		return -ENODEV;
- 
-	if (obuf_len > MAX_PAYLOAD_SIZE)
-+	if (obuf_len > MAX_PAYLOAD_BSIZE)
- 		return -EINVAL;
- 
- 	if (last_pkt)
-- 
-2.47.1
-
@@ -1,38 +0,0 @@
-From a6c5a0c329fd1582fc94b51ba9c6f1c21abc0084 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Thu, 30 Jan 2025 22:04:41 +0100
-Subject: [PATCH 8/8] Fedora local mod: integrate usbio-drivers within
- ipu6-drivers Makefile
-
-Integrate usbio-drivers within ipu6-drivers Makefile.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
- Makefile | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 7ae3be835..637382d6d 100644
--- a/Makefile
-+++ b/Makefile
-@@ -114,6 +114,17 @@ ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_IVSC)),true)
- ccflags-y += -I$(src)/backport-include/drivers/misc/mei/
- endif
- 
-+# begin integrate usbio-drivers within ipu6-drivers Makefile
-+obj-m += usbio.o
-+usbio-y := drivers/mfd/usbio.o
-+
-+obj-m += gpio-usbio.o
-+gpio-usbio-y := drivers/gpio/gpio-usbio.o
-+
-+obj-m += i2c-usbio.o
-+i2c-usbio-y := drivers/i2c/busses/i2c-usbio.o
-+# end integrate usbio-drivers within ipu6-drivers Makefile
-+
- subdir-ccflags-y += -I$(src)/include/ \
- 	-DCONFIG_VIDEO_V4L2_SUBDEV_API
- 
-- 
-2.47.1
-
@@ -1,42 +1,28 @@
-%if 0%{?fedora}
 %global buildforkernels akmod
 %global debug_package %{nil}
-%endif
-%global ipu6_commit e89983c628d046b2f77af3b6678cc49c2dd58332
-%global ipu6_commitdate 20250521
-%global ipu6_shortcommit %(c=%{ipu6_commit}; echo ${c:0:7})
-%global usbio_commit 450939ff5f8af733bc89c564603222a4d420acf3
-%global usbio_commitdate 20241210
-%global usbio_shortcommit %(c=%{usbio_commit}; echo ${c:0:7})
+%global commit e89983c628d046b2f77af3b6678cc49c2dd58332
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commit_date 20250521
 %global modulename intel-ipu6
 # Actual "release" version, currently unused as the release versions are back and forth on if on if they use 1.0.0 or 1.0.1
 %global ver 1.0.1

 Name:           %{modulename}-kmod
 Summary:        Akmods module for %{modulename}
-Version:        0^%{ipu6_commitdate}git.%{ipu6_shortcommit}
-Release:        1%?dist
+Version:        0^%{commit_date}git.%{shortcommit}
+Release:        2%?dist
 License:        GPL-2.0-or-later
 URL:            https://github.com/intel/ipu6-drivers
-Source0:        https://github.com/intel/ipu6-drivers/archive/%{ipu6_commit}/ipu6-drivers-%{ipu6_shortcommit}.tar.gz
-Source1:        https://github.com/intel/usbio-drivers/archive/%{usbio_commit}/usbio-drivers-%{usbio_shortcommit}.tar.gz
-# Patches
-# https://github.com/intel/ipu6-drivers/pull/321
-Patch0:         0005-media-ipu6-Fix-out-of-tree-builds.patch
-Patch20:        0010-usbio-Fix-GPIO-and-I2C-driver-modaliases.patch
-# https://github.com/intel/usbio-drivers/pull/34
-Patch21:        0011-usbio-Fix-I2C-max-transfer-size.patch
-Patch22:        0012-usbio-Use-MAX_PAYLOAD_BSIZE-in-usbio_bulk_write.patch
-# Downstream/Fedora specific patches
-Patch101:       0101-Fedora-local-mod-integrate-usbio-drivers-within-ipu6.patch
+Source0:        https://github.com/intel/ipu6-drivers/archive/%{commit}/ipu6-drivers-%{shortcommit}.tar.gz
 BuildRequires:  elfutils-libelf-devel
 BuildRequires:  gcc
 BuildRequires:  kmodtool
 Requires:       %{modulename}-kmod-common = %{?epoch:%{epoch}:}%{version}
 Requires:       akmods
+Requires:       akmod-intel-usbio
 %if 0%{?fedora} <= 43 || 0%{?rhel} <= 10
-Provides:       %{name} = %{ipu6_commitdate}.%{ipu6_shortcommit}-%{release}
-Provides:       akmod-%{modulename} = %{ipu6_commitdate}.%{ipu6_shortcommit}-%{release}
+Provides:       %{name} = %{commitdate}.%{shortcommit}-%{release}
+Provides:       akmod-%{modulename} = %{commitdate}.%{shortcommit}-%{release}
 %endif

 %{expand:%(kmodtool --target %{_target_cpu} --repo terra --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
@@ -45,43 +31,36 @@ Provides:       akmod-%{modulename} = %{ipu6_commitdate}.%{ipu6_shortcommit}-%{r
 This package enables the Intel IPU6 image processor.

 %prep
-# error out if there was something wrong with kmodtool
+# Error out if there was something wrong with kmodtool:
 %{?kmodtool_check}
+# Print kmodtool output for debugging purposes:
+kmodtool  --target %{_target_cpu}  --repo terra --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null

-# print kmodtool output for debugging purposes:
-kmodtool  --target %{_target_cpu} --repo terra --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
+%autosetup -p1 -n ipu6-drivers-%{commit}
+patch -p1 -i patches/*.patch
+rm -fr dkms.conf .github

-%setup -q -c -a 1
-(cd ipu6-drivers-%{ipu6_commit}
-%patch 0 -p1
-%patch 101 -p1
-patch -p1 < patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch
-)
-(cd usbio-drivers-%{usbio_commit}
-%patch 20 -p1
-%patch 21 -p1
-%patch 22 -p1
-)
-
-cp -Rp usbio-drivers-%{usbio_commit}/drivers ipu6-drivers-%{ipu6_commit}/
-cp -Rp usbio-drivers-%{usbio_commit}/include ipu6-drivers-%{ipu6_commit}/
-
-for kernel_version in %{?kernel_versions} ; do
-  cp -a ipu6-drivers-%{ipu6_commit}/ _kmod_build_${kernel_version%%___*}
+for kernel_version in %{?kernel_versions}; do
+    mkdir _kmod_build_${kernel_version%%___*}
+    cp -fr drivers include Makefile _kmod_build_${kernel_version%%___*}
 done

 %build
-for kernel_version in %{?kernel_versions} ; do
-  make -C ${kernel_version##*___} M=${PWD}/_kmod_build_${kernel_version%%___*} modules
+for kernel_version in %{?kernel_versions}; do
+    pushd _kmod_build_${kernel_version%%___*}/
+        %make_build -C "${kernel_version##*___}" M=$(pwd) VERSION="v%{version}" modules
+    popd
 done

 %install
 for kernel_version in %{?kernel_versions}; do
-  mkdir -p %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/drivers/media/i2c/
-  mkdir -p %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/drivers/media/pci/intel/ipu6/psys/
-  install -m 755 _kmod_build_${kernel_version%%___*}/drivers/media/i2c/*.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/drivers/media/i2c/
-  install -m 755 _kmod_build_${kernel_version%%___*}/drivers/media/pci/intel/ipu6/psys/*.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/drivers/media/pci/intel/ipu6/psys/
-  install -m 755 _kmod_build_${kernel_version%%___*}/*.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}
+    # Print out modules that are getting built:
+    find _kmod_build_${kernel_version%%___*} -name "*.ko"
+    mkdir -p %{buildroot}/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
+    install -p -m 0755 \
+        _kmod_build_${kernel_version%%___*}/drivers/media/i2c/*.ko \
+        _kmod_build_${kernel_version%%___*}/drivers/media/pci/intel/ipu6/psys/*.ko \
+        %{buildroot}/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
 done
 %{?akmod_install}

@@ -1,11 +1,11 @@
-let c = sh("cat anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec | grep '%global ipu6_commit ' | sed -E 's/.+ipu6_commit //'", #{"stdout": "piped"}).ctx.stdout;
+let c = sh("cat anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout;
 c.pop();
-rpm.global("ipu6_commit", c);
+rpm.global("commit", c);
 if rpm.changed() {
    rpm.release();
-    let d = sh("cat anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec | grep '%global ipu6_commitdate' | sed -E 's/.+ipu6_commitdate //'", #{"stdout": "piped"}).ctx.stdout;
+    let d = sh("cat anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout;
    d.pop();
-    rpm.global("ipu6_commitdate", d);
+    rpm.global("commit_date", d);
    let v = sh("cat anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout;
    v.pop();
    rpm.global("ver", v);
@@ -1,28 +0,0 @@
-From 7ce00bf77d1b92981f471a26fa2d92c96d14e51c Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Tue, 14 Jan 2025 23:07:35 +0100
-Subject: [PATCH 5/9] media: ipu6: Fix out of tree builds
-
-Fix out of tree builds not finding the ipu6*.h files.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
- drivers/media/pci/intel/ipu6/psys/Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/media/pci/intel/ipu6/psys/Makefile b/drivers/media/pci/intel/ipu6/psys/Makefile
-index fa638fcdf..9a3aa6e78 100644
--- a/drivers/media/pci/intel/ipu6/psys/Makefile
-+++ b/drivers/media/pci/intel/ipu6/psys/Makefile
-@@ -23,6 +23,8 @@ obj-$(CONFIG_VIDEO_INTEL_IPU6)		+= intel-ipu6-psys.o
- 
- ifeq ($(is_kernel_lt_6_10), 1)
- ccflags-y += -I$(src)/../ipu6/
-+else
-+ccflags-y += -I/lib/modules/$(KERNELRELEASE)/build/drivers/media/pci/intel/ipu6/
- endif
- ccflags-y += -I$(src)/../
- ccflags-y += -I$(src)/../../
-- 
-2.48.1
-
@@ -1,38 +0,0 @@
-From d5f08986936a7fda0cce543c73fb8d9bab76eae2 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Wed, 15 Jan 2025 11:28:54 +0100
-Subject: [PATCH 10/12] usbio: Fix GPIO and I2C driver modaliases
-
-The created GPIO and I2C devices have modaliases of
-"platform:usbio-gpio" and "platform:usbio-i2c" note "usbio" not "usb"
-fix the aliases of the drivers so that these will properly auto load.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
- drivers/gpio/gpio-usbio.c      | 2 +-
- drivers/i2c/busses/i2c-usbio.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/gpio/gpio-usbio.c b/drivers/gpio/gpio-usbio.c
-index 625558b..de9d5cb 100644
--- a/drivers/gpio/gpio-usbio.c
-+++ b/drivers/gpio/gpio-usbio.c
-@@ -499,4 +499,4 @@ MODULE_AUTHOR("Israel Cepeda <israel.a.cepeda.lopez@intel.com>");
- MODULE_AUTHOR("Lifu Wang <lifu.wang@intel.com>");
- MODULE_DESCRIPTION("Intel USBIO-GPIO driver");
- MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:usb-gpio");
-+MODULE_ALIAS("platform:usbio-gpio");
-diff --git a/drivers/i2c/busses/i2c-usbio.c b/drivers/i2c/busses/i2c-usbio.c
-index ef1f380..3b2c856 100644
--- a/drivers/i2c/busses/i2c-usbio.c
-+++ b/drivers/i2c/busses/i2c-usbio.c
-@@ -437,4 +437,4 @@ MODULE_AUTHOR("Israel Cepeda <israel.a.cepeda.lopez@intel.com>");
- MODULE_AUTHOR("Lifu Wang <lifu.wang@intel.com>");
- MODULE_DESCRIPTION("Intel USBIO-I2C driver");
- MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:usb-i2c");
-+MODULE_ALIAS("platform:usbio-i2c");
-- 
-2.47.1
-
@@ -1,130 +0,0 @@
-From ce28836eb5ce74ae26a66a97949778bdb2cebc3c Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Tue, 4 Feb 2025 17:34:54 +0100
-Subject: [PATCH 11/11] psys: Use cdev_device_add() for /dev/ipu-psys0
-
-Use cdev_device_add() for /dev/ipu-psys0 so that its kobj parents gets
-set properly by calling cdev_set_parent().
-
-"cdev_set_parent() sets a parent kobject which will be referenced
- appropriately so the parent is not freed before the cdev. This
- should be called before cdev_add."
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
- drivers/media/pci/intel/ipu6/psys/ipu-psys.c | 45 ++++++++------------
- 1 file changed, 17 insertions(+), 28 deletions(-)
-
-diff --git a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c
-index c06cd515a..62fcf0215 100644
--- a/drivers/media/pci/intel/ipu6/psys/ipu-psys.c
-+++ b/drivers/media/pci/intel/ipu6/psys/ipu-psys.c
-@@ -2170,17 +2170,6 @@ static int ipu_psys_probe(struct ipu_bus_device *adev)
- 	ipu_trace_init(adev->isp, psys->pdata->base, &adev->dev,
- 		       psys_trace_blocks);
- 
-	cdev_init(&psys->cdev, &ipu_psys_fops);
-	psys->cdev.owner = ipu_psys_fops.owner;
-
-	rval = cdev_add(&psys->cdev, MKDEV(MAJOR(ipu_psys_dev_t), minor), 1);
-	if (rval) {
-		dev_err(&adev->dev, "cdev_add failed (%d)\n", rval);
-		goto out_unlock;
-	}
-
-	set_bit(minor, ipu_psys_devices);
-
- 	spin_lock_init(&psys->ready_lock);
- 	spin_lock_init(&psys->pgs_lock);
- 	psys->ready = 0;
-@@ -2261,12 +2250,19 @@ static int ipu_psys_probe(struct ipu_bus_device *adev)
- 	psys->dev.devt = MKDEV(MAJOR(ipu_psys_dev_t), minor);
- 	psys->dev.release = ipu_psys_dev_release;
- 	dev_set_name(&psys->dev, "ipu-psys%d", minor);
-	rval = device_register(&psys->dev);
-+	device_initialize(&psys->dev);
-+
-+	cdev_init(&psys->cdev, &ipu_psys_fops);
-+	psys->cdev.owner = ipu_psys_fops.owner;
-+
-+	rval = cdev_device_add(&psys->cdev, &psys->dev);
- 	if (rval < 0) {
- 		dev_err(&psys->dev, "psys device_register failed\n");
- 		goto out_release_fw_com;
- 	}
- 
-+	set_bit(minor, ipu_psys_devices);
-+
- 	/* Add the hw stepping information to caps */
- 	strscpy(psys->caps.dev_model, IPU_MEDIA_DEV_MODEL_NAME,
- 		sizeof(psys->caps.dev_model));
-@@ -2298,7 +2294,6 @@ out_free_pgs:
- 	ipu_psys_resource_pool_cleanup(&psys->resource_pool_running);
- out_mutex_destroy:
- 	mutex_destroy(&psys->mutex);
-	cdev_del(&psys->cdev);
- 	if (psys->sched_cmd_thread) {
- 		kthread_stop(psys->sched_cmd_thread);
- 		psys->sched_cmd_thread = NULL;
-@@ -2359,17 +2354,6 @@ static int ipu6_psys_probe(struct auxiliary_device *auxdev,
- 
- 	psys->power_gating = 0;
- 
-	cdev_init(&psys->cdev, &ipu_psys_fops);
-	psys->cdev.owner = ipu_psys_fops.owner;
-
-	rval = cdev_add(&psys->cdev, MKDEV(MAJOR(ipu_psys_dev_t), minor), 1);
-	if (rval) {
-		dev_err(dev, "cdev_add failed (%d)\n", rval);
-		goto out_unlock;
-	}
-
-	set_bit(minor, ipu_psys_devices);
-
- 	spin_lock_init(&psys->ready_lock);
- 	spin_lock_init(&psys->pgs_lock);
- 	psys->ready = 0;
-@@ -2450,12 +2434,19 @@ static int ipu6_psys_probe(struct auxiliary_device *auxdev,
- 	psys->dev.devt = MKDEV(MAJOR(ipu_psys_dev_t), minor);
- 	psys->dev.release = ipu_psys_dev_release;
- 	dev_set_name(&psys->dev, "ipu-psys%d", minor);
-	rval = device_register(&psys->dev);
-+	device_initialize(&psys->dev);
-+
-+	cdev_init(&psys->cdev, &ipu_psys_fops);
-+	psys->cdev.owner = ipu_psys_fops.owner;
-+
-+	rval = cdev_device_add(&psys->cdev, &psys->dev);
- 	if (rval < 0) {
- 		dev_err(dev, "psys device_register failed\n");
- 		goto out_release_fw_com;
- 	}
- 
-+	set_bit(minor, ipu_psys_devices);
-+
- 	/* Add the hw stepping information to caps */
- 	strscpy(psys->caps.dev_model, IPU6_MEDIA_DEV_MODEL_NAME,
- 		sizeof(psys->caps.dev_model));
-@@ -2483,7 +2474,6 @@ out_free_pgs:
- 	ipu_psys_resource_pool_cleanup(&psys->resource_pool_running);
- out_mutex_destroy:
- 	mutex_destroy(&psys->mutex);
-	cdev_del(&psys->cdev);
- 	if (psys->sched_cmd_thread) {
- 		kthread_stop(psys->sched_cmd_thread);
- 		psys->sched_cmd_thread = NULL;
-@@ -2552,10 +2542,9 @@ static void ipu6_psys_remove(struct auxiliary_device *auxdev)
- 
- 	ipu_psys_resource_pool_cleanup(&psys->resource_pool_running);
- 
-	device_unregister(&psys->dev);
-+	cdev_device_del(&psys->cdev, &psys->dev);
- 
- 	clear_bit(MINOR(psys->cdev.dev), ipu_psys_devices);
-	cdev_del(&psys->cdev);
- 
- 	mutex_unlock(&ipu_psys_mutex);
- 
-- 
-2.48.1
-
@@ -1,115 +0,0 @@
-From 47b34a6f467eebb4e9fc59f5e25618fe760fbf33 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Wed, 29 Jan 2025 19:13:29 +0100
-Subject: [PATCH 11/12] usbio: Fix I2C max transfer size
-
-There are 2 issues with the I2C max transfer size in the i2c-usbio module:
-
-1. The code defines a usbio_i2c_quirks struct but does not set
-i2c_adapter.quirks. This causes ov08x40_burst_fill_regs() to not split
-i2c-transfers larger then USBIO_I2C_MAX_XFER_SIZE which causes them
-to be rejected with -EINVAL. Fix this by setting i2c_adapter.quirks.
-
-2. Once 1. is fixed the following error messages show up in dmesg:
-
-Jan 28 18:31:04 x1 kernel: usbio-bridge 3-9:1.0: data not correct header->len:5 payload_len:3
-Jan 28 18:31:04 x1 kernel: usbio-bridge 3-9:1.0: data not correct header->len:5 payload_len:3
-...
-
-Every time ov08x40_burst_fill_regs() gets called. This is caused by
-the usbio_transfer_internal() splitting-up the i2c-transfer into
-multiple USB bulk packets to honor MAX_PACKET_SIZE.
-
-This splitting up seems to not work and the USBIO expander responds with
-a 3 byte answer with flags set 0x0e which includes ERR_FLAG, it seems that
-when ERR_FLAG is set only a 3 byte header is returned (no length field).
-
-Modify USBIO_I2C_MAX_XFER_SIZE to avoid the splitting of the i2c-transfer
-over multiple USB bulk packets, since the USBIO chip seems to not like
-the splitting.
-
-After this change to USBIO_I2C_MAX_XFER_SIZE the code to split transfers
-in usbio_transfer_internal() is no longer necessary, remove it.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
- drivers/i2c/busses/i2c-usbio.c | 11 ++++++++++-
- drivers/mfd/usbio.c            | 33 ++-------------------------------
- 2 files changed, 12 insertions(+), 32 deletions(-)
-
-diff --git a/drivers/i2c/busses/i2c-usbio.c b/drivers/i2c/busses/i2c-usbio.c
-index 3b2c856..a6c5edc 100644
--- a/drivers/i2c/busses/i2c-usbio.c
-+++ b/drivers/i2c/busses/i2c-usbio.c
-@@ -65,7 +65,15 @@ struct i2c_xfer {
- 	u8 data[];
- } __packed;
- 
-#define USBIO_I2C_MAX_XFER_SIZE 256
-+//[WA]: Max USB packet size needs to be 63
-+//in order for fw download to work
-+#define USBIO_MAX_PACKET_SIZE    63
-+#define USBIO_BULK_MSG_HDR_SIZE   5
-+
-+#define USBIO_I2C_MAX_XFER_SIZE                            \
-+	(USBIO_MAX_PACKET_SIZE - USBIO_BULK_MSG_HDR_SIZE - \
-+	 sizeof(struct i2c_rw_packet))
-+
- #define USBIO_I2C_BUF_SIZE                                                      \
- 	(USBIO_I2C_MAX_XFER_SIZE + sizeof(struct i2c_rw_packet))
- 
-@@ -384,6 +392,7 @@ static int usbio_i2c_probe(struct platform_device *pdev)
- 	usbio_i2c->adap.owner = THIS_MODULE;
- 	usbio_i2c->adap.class = I2C_CLASS_HWMON;
- 	usbio_i2c->adap.algo = &usbio_i2c_algo;
-+	usbio_i2c->adap.quirks = &usbio_i2c_quirks;
- 	usbio_i2c->adap.dev.parent = &pdev->dev;
- 
- 	try_bind_acpi(pdev, usbio_i2c);
-diff --git a/drivers/mfd/usbio.c b/drivers/mfd/usbio.c
-index 8bc7600..51757df 100644
--- a/drivers/mfd/usbio.c
-+++ b/drivers/mfd/usbio.c
-@@ -390,37 +390,8 @@ static int usbio_transfer_internal(struct platform_device *pdev, u8 cmd,
- 		ret = usbio_control_xfer(stub, cmd, obuf, obuf_len,
- 			ibuf, ibuf_len,	wait_ack, USB_WRITE_ACK_TIMEOUT);
- 	else if (stub->type == I2C_STUB) {
-		if (cmd == I2C_WRITE) {
-			u8 *i2cpkt = obuf;
-			int wsize = 0;
-			bool done = false;
-			while (wsize < obuf_len) {
-				int chunk;
-
-				if ((obuf_len - wsize) <= MAX_PAYLOAD_BSIZE) {
-					chunk = obuf_len - wsize;
-					done = true;
-				} else
-					chunk = MAX_PAYLOAD_BSIZE;
-
-				//[WA]: The I2C header in each chunk has to be updated
-				//to the payload bytes being sent in that chunk for fw
-				//download to work.
-				struct i2c_rw_packet *i2cpkt_hdr = (struct i2c_rw_packet *)i2cpkt;
-				i2cpkt_hdr->len = chunk - sizeof(struct i2c_rw_packet);
-				
-				ret = usbio_bulk_write(stub, cmd, i2cpkt, chunk, ibuf, ibuf_len,
-						done, done? wait_ack : false, USB_WRITE_ACK_TIMEOUT);
-				if (ret || done)
-					break;
-
-				wsize += chunk - sizeof(struct i2c_rw_packet);
-				i2cpkt += chunk - sizeof(struct i2c_rw_packet);
-				memcpy(i2cpkt, obuf, sizeof(struct i2c_rw_packet));
-			}
-		} else
-			ret = usbio_bulk_write(stub, cmd, obuf, obuf_len,
-					ibuf, ibuf_len,	true, wait_ack, USB_WRITE_ACK_TIMEOUT);
-+		ret = usbio_bulk_write(stub, cmd, obuf, obuf_len,
-+			ibuf, ibuf_len, true, wait_ack, USB_WRITE_ACK_TIMEOUT);
- 	}
- 
- 	return ret;
-- 
-2.47.1
-
@@ -1,30 +0,0 @@
-From 0eae85556558b410635ad03ed5eccb9648e11fce Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Wed, 29 Jan 2025 19:26:16 +0100
-Subject: [PATCH 12/12] usbio: Use MAX_PAYLOAD_BSIZE in usbio_bulk_write()
-
-usbio_bulk_write() uses a struct usbio_bmsg header rather than
-a struct usbio_msg header. So its max payload length check must use
-MAX_PAYLOAD_BSIZE instead of MAX_PAYLOAD_SIZE.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
- drivers/mfd/usbio.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/mfd/usbio.c b/drivers/mfd/usbio.c
-index 51757df..ab5dae9 100644
--- a/drivers/mfd/usbio.c
-+++ b/drivers/mfd/usbio.c
-@@ -303,7 +303,7 @@ static int usbio_bulk_write(struct usbio_stub *stub, u8 cmd, const void *obuf,
- 	if (bridge->state == BRIDGE_STOPPED)
- 		return -ENODEV;
- 
-	if (obuf_len > MAX_PAYLOAD_SIZE)
-+	if (obuf_len > MAX_PAYLOAD_BSIZE)
- 		return -EINVAL;
- 
- 	if (last_pkt)
-- 
-2.47.1
-
@@ -1,38 +0,0 @@
-From a6c5a0c329fd1582fc94b51ba9c6f1c21abc0084 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Thu, 30 Jan 2025 22:04:41 +0100
-Subject: [PATCH 8/8] Fedora local mod: integrate usbio-drivers within
- ipu6-drivers Makefile
-
-Integrate usbio-drivers within ipu6-drivers Makefile.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
- Makefile | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 7ae3be835..637382d6d 100644
--- a/Makefile
-+++ b/Makefile
-@@ -114,6 +114,17 @@ ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_IVSC)),true)
- ccflags-y += -I$(src)/backport-include/drivers/misc/mei/
- endif
- 
-+# begin integrate usbio-drivers within ipu6-drivers Makefile
-+obj-m += usbio.o
-+usbio-y := drivers/mfd/usbio.o
-+
-+obj-m += gpio-usbio.o
-+gpio-usbio-y := drivers/gpio/gpio-usbio.o
-+
-+obj-m += i2c-usbio.o
-+i2c-usbio-y := drivers/i2c/busses/i2c-usbio.o
-+# end integrate usbio-drivers within ipu6-drivers Makefile
-+
- subdir-ccflags-y += -I$(src)/include/ \
- 	-DCONFIG_VIDEO_V4L2_SUBDEV_API
- 
-- 
-2.47.1
-
@@ -0,0 +1,40 @@
+PACKAGE_NAME=ipu6-drivers
+PACKAGE_VERSION=0.1
+AUTOINSTALL="yes"
+BUILD_EXCLUSIVE_CONFIG="CONFIG_VIDEO_V4L2_I2C CONFIG_V4L2_CCI_I2C"
+
+BUILT_MODULE_NAME[0]="hm11b1"
+BUILT_MODULE_LOCATION[0]="drivers/media/i2c"
+DEST_MODULE_LOCATION[0]="/extra"
+
+BUILT_MODULE_NAME[1]="ov01a1s"
+BUILT_MODULE_LOCATION[1]="drivers/media/i2c"
+DEST_MODULE_LOCATION[1]="/extra"
+
+BUILT_MODULE_NAME[2]="ov02c10"
+BUILT_MODULE_LOCATION[2]="drivers/media/i2c"
+DEST_MODULE_LOCATION[2]="/extra"
+
+BUILT_MODULE_NAME[3]="ov02e10"
+BUILT_MODULE_LOCATION[3]="drivers/media/i2c"
+DEST_MODULE_LOCATION[3]="/extra"
+
+BUILT_MODULE_NAME[4]="hm2170"
+BUILT_MODULE_LOCATION[4]="drivers/media/i2c"
+DEST_MODULE_LOCATION[4]="/extra"
+
+BUILT_MODULE_NAME[5]="hm2172"
+BUILT_MODULE_LOCATION[5]="drivers/media/i2c"
+DEST_MODULE_LOCATION[5]="/extra"
+
+BUILT_MODULE_NAME[6]="ov05c10"
+BUILT_MODULE_LOCATION[6]="drivers/media/i2c"
+DEST_MODULE_LOCATION[6]="/extra"
+
+BUILT_MODULE_NAME[7]="intel-ipu6-psys"
+BUILT_MODULE_LOCATION[7]="drivers/media/pci/intel/ipu6/psys"
+DEST_MODULE_LOCATION[7]="/extra"
+
+BUILT_MODULE_NAME[8]="imx471"
+BUILT_MODULE_LOCATION[8]="drivers/media/i2c"
+DEST_MODULE_LOCATION[8]="/extra"
@@ -1,38 +1,26 @@
 %global debug_package %{nil}
-%global ipu6_commit e89983c628d046b2f77af3b6678cc49c2dd58332
-%global ipu6_commitdate 20250521
-%global ipu6_shortcommit %(c=%{ipu6_commit}; echo ${c:0:7})
-%global usbio_commit 450939ff5f8af733bc89c564603222a4d420acf3
-%global usbio_commitdate 20241210
-%global usbio_shortcommit %(c=%{usbio_commit}; echo ${c:0:7})
-%global commit_date 20250224
+%global commit e89983c628d046b2f77af3b6678cc49c2dd58332
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commit_date 20250521
 %global modulename intel-ipu6
 # Actual "release" version, currently unused as the release versions are back and forth on if on if they use 1.0.0 or 1.0.1
 %global ver 1.0.1

 Name:           dkms-%{modulename}
 Summary:        DKMS module for %{modulename}
-Version:        0^%{ipu6_commitdate}git.%{ipu6_shortcommit}
-Release:        1%?dist
+Version:        0^%{commit_date}git.%{shortcommit}
+Release:        2%?dist
 License:        GPL-2.0-or-later
 URL:            https://github.com/intel/ipu6-drivers
-Source0:        https://github.com/intel/ipu6-drivers/archive/%{ipu6_commit}/ipu6-drivers-%{ipu6_shortcommit}.tar.gz
-Source1:        https://github.com/intel/usbio-drivers/archive/%{usbio_commit}/usbio-drivers-%{usbio_shortcommit}.tar.gz
-Source2:        no-weak-modules.conf
-# Patches
-# https://github.com/intel/ipu6-drivers/pull/321
-Patch0:         0005-media-ipu6-Fix-out-of-tree-builds.patch
-Patch20:        0010-usbio-Fix-GPIO-and-I2C-driver-modaliases.patch
-# https://github.com/intel/usbio-drivers/pull/34
-Patch21:        0011-usbio-Fix-I2C-max-transfer-size.patch
-Patch22:        0012-usbio-Use-MAX_PAYLOAD_BSIZE-in-usbio_bulk_write.patch
-# Downstream/Fedora specific patches
-Patch101:       0101-Fedora-local-mod-integrate-usbio-drivers-within-ipu6.patch
+Source0:        %{url}/archive/%{commit}.tar.gz#/ipu6-drivers-%{shortcommit}.tar.gz
+Source1:        %{name}.conf
 BuildRequires:  elfutils-libelf-devel
 BuildRequires:  gcc
 BuildRequires:  systemd-rpm-macros
+Provides:       %{modulename}-kmod
 Requires:       %{modulename}-kmod-common = %{?epoch:%{epoch}:}%{version}
 Requires:       dkms
+Requires:       dkms-usbio-drivers
 BuildArch:      noarch
 Packager:       Gilver E. <rockgrub@disroot.org>

@@ -40,47 +28,32 @@ Packager:       Gilver E. <rockgrub@disroot.org>
 This package enables the Intel IPU6 image processor.

 %prep
-%setup -q -c -a 1
-(cd ipu6-drivers-%{ipu6_commit}
-%patch 0 -p1
-%patch 101 -p1
-patch -p1 < patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch
-)
-(cd usbio-drivers-%{usbio_commit}
-%patch 20 -p1
-%patch 21 -p1
-%patch 22 -p1
-)
+%autosetup -p1 -n ipu6-drivers-%{commit}
+# Pre-apply patch listed in dkms.conf:
+patch -p1 -i patches/*.patch
+rm -fr patch* .github

-cp -Rp usbio-drivers-%{usbio_commit}/drivers ipu6-drivers-%{ipu6_commit}/
-cp -Rp usbio-drivers-%{usbio_commit}/include ipu6-drivers-%{ipu6_commit}/
+cp -f %{SOURCE1} dkms.conf

 %build

 %install
-mkdir -p %{buildroot}%{_usrsrc}/%{modulename}-%{version}
-cp -fr ipu6-drivers-%{ipu6_commit}/{drivers,include,patch,patches,Makefile,dkms.conf} %{buildroot}%{_usrsrc}/%{modulename}-%{version}/
-
-%if 0%{?fedora}
-# Do not enable weak modules support in Fedora (no kABI):
-install -Dpm644 %{SOURCE2} %{buildroot}%{_sysconfdir}/dkms/%{modulename}.conf
-%endif
+# Create empty tree:
+mkdir -p %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/
+cp -fr * %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/

 %post
-dkms add -m %{modulename} -v %{version} -q --rpm_safe_upgrade || :
+dkms add -m %{dkms_name} -v %{version} -q || :
 # Rebuild and make available for the currently running kernel:
-dkms build -m %{modulename} -v %{version} -q || :
-dkms install -m %{modulename} -v %{version} -q --force || :
+dkms build -m %{dkms_name} -v %{version} -q || :
+dkms install -m %{dkms_name} -v %{version} -q --force || :

 %preun
 # Remove all versions from DKMS registry:
-dkms remove -m %{modulename} -v %{version} -q --all --rpm_safe_upgrade || :
+dkms remove -m %{dkms_name} -v %{version} -q --all || :

 %files
-%{_usrsrc}/%{modulename}-%{version}
-%if 0%{?fedora}
-%{_sysconfdir}/dkms/%{modulename}.conf
-%endif
+%{_usrsrc}/%{dkms_name}-%{version}

 %changelog
 * Thu Apr 24 2025 Gilver E. <rockgrub@disroot.org>
@@ -1 +0,0 @@
-NO_WEAK_MODULES="yes"
@@ -1,11 +1,11 @@
-let c = sh("cat anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec | grep '%global ipu6_commit ' | sed -E 's/.+ipu6_commit //'", #{"stdout": "piped"}).ctx.stdout;
+let c = sh("cat anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout;
 c.pop();
-rpm.global("ipu6_commit", c);
+rpm.global("commit", c);
 if rpm.changed() {
    rpm.release();
-    let d = sh("cat anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec | grep '%global ipu6_commitdate' | sed -E 's/.+ipu6_commitdate //'", #{"stdout": "piped"}).ctx.stdout;
+    let d = sh("cat anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout;
    d.pop();
-    rpm.global("ipu6_commitdate", d);
+    rpm.global("commit_date", d);
    let v = sh("cat anda/system/ipu6-drivers/kmod-common/intel-ipu6-drivers.spec | grep '%global ver' | sed -E 's/.+ver //'", #{"stdout": "piped"}).ctx.stdout;
    v.pop();
    rpm.global("ver", v);
@@ -1,24 +1,20 @@
 %global debug_package %{nil}
-%global ipu6_commit e89983c628d046b2f77af3b6678cc49c2dd58332
-%global ipu6_commitdate 20250521
-%global ipu6_shortcommit %(c=%{ipu6_commit}; echo ${c:0:7})
-%global usbio_commit 4fb690c6d15a81c492954636c2db396cb700a119
-%global usbio_commitdate 20241210
-%global usbio_shortcommit %(c=%{usbio_commit}; echo ${c:0:7})
+%global commit e89983c628d046b2f77af3b6678cc49c2dd58332
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commit_date 20250521
 # Actual "release" version, currently unused as the release versions are back and forth on if on if they use 1.0.0 or 1.0.1
 # Use this if they ever stop doing that I guess
 %global ver 1.0.1

 Name:           intel-ipu6-drivers
 Summary:        Common files for Intel IPU6 drivers
-Version:        0^%{ipu6_commitdate}git.%{ipu6_shortcommit}
-Release:        1%?dist
+Version:        0^%{commit_date}git.%{shortcommit}
+Release:        2%?dist
 License:        GPL-2.0-or-later
 URL:            https://github.com/intel/ipu6-drivers
-Source0:        https://github.com/intel/ipu6-drivers/archive/%{ipu6_commit}/ipu6-drivers-%{ipu6_shortcommit}.tar.gz
-Source1:        https://github.com/intel/usbio-drivers/archive/%{usbio_commit}/usbio-drivers-%{usbio_shortcommit}.tar.gz
+Source0:        https://github.com/intel/ipu6-drivers/archive/%{commit}/ipu6-drivers-%{shortcommit}.tar.gz
 Requires:       ipu6-camera-bins
-Requires:       (intel-ipu6-kmod = %{?epoch:%{epoch}:}%{version} or dkms-intel-ipu6 = %{?epoch:%{epoch}:}%{version})
+Requires:       intel-ipu6-kmod = %{?epoch:%{epoch}:}%{version}
 Provides:       intel-ipu6-kmod-common = %{?epoch:%{epoch}:}%{version}-%{release}
 BuildArch:      noarch
 Packager:       Gilver E. <rockgrub@disroot.org>
@@ -27,20 +23,16 @@ Packager:       Gilver E. <rockgrub@disroot.org>
 Common files for the Intel IPU6 camera drivers.

 %prep
-%setup -q -c -a 1
+%autosetup -n ipu6-drivers-%{commit}

 %build

 %install
-install -Dpm644 usbio-drivers-%{usbio_commit}/LICENSE.txt -t %{buildroot}%{_defaultlicensedir}/%{name}/usbio-drivers/
-install -Dpm644 usbio-drivers-%{usbio_commit}/{CODE_OF_CONDUCT.md,README.md,SECURITY.md,security.md} -t %{buildroot}%{_defaultdocdir}/%{name}/usbio-drivers/

 %files
-%license ipu6-drivers-%{ipu6_commit}/LICENSE
-%doc ipu6-drivers-%{ipu6_commit}/README.md
-%doc ipu6-drivers-%{ipu6_commit}/SECURITY.md
-%{_defaultdocdir}/%{name}/usbio-drivers
-%{_defaultlicensedir}/%{name}/usbio-drivers
+%license LICENSE
+%doc README.md
+%doc SECURITY.md

 %changelog
 * Thu Apr 24 2025 Gilver E. <rockgrub@disroot.org>
@@ -1,6 +1,5 @@
-rpm.global("ipu6_commit", gh_commit("intel/ipu6-drivers"));
+rpm.global("commit", gh_commit("intel/ipu6-drivers"));
 if rpm.changed() {
    rpm.release();
-    rpm.global("usbio_commit", gh_commit("intel/usbio-drivers"));
-    rpm.global("ipu6_commitdate", date());
+    rpm.global("commit_date", date());
 }
@@ -0,0 +1,10 @@
+project pkg {
+        arches = ["x86_64"]
+    rpm {
+        spec = "intel-usbio-kmod.spec"
+    }
+    labels {
+        mock = 1
+        updbranch = 1
+    }
+}
@@ -0,0 +1,64 @@
+%global buildforkernels akmod
+%global debug_package %{nil}
+%global commit 4fb690c6d15a81c492954636c2db396cb700a119
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commit_date 20241210
+%global modulename intel-usbio
+
+Name:           %{modulename}-kmod
+Summary:        Kernel drivers for the USBIO Extension
+Version:        0^%{commit_date}git.%{shortcommit}
+Release:        1%?dist
+License:        GPL-2.0-only
+URL:            https://github.com/intel/usbio-drivers
+Source0:        %{url}/archive/%{commit}.tar.gz#/usbio-drivers-%{shortcommit}.tar.gz
+Patch0:         https://github.com/jwrdegoede/usbio-drivers/commit/d5f08986936a7fda0cce543c73fb8d9bab76eae2.patch
+Patch1:         https://github.com/jwrdegoede/usbio-drivers/commit/47b34a6f467eebb4e9fc59f5e25618fe760fbf33.patch
+Patch2:         https://github.com/jwrdegoede/usbio-drivers/commit/0eae85556558b410635ad03ed5eccb9648e11fce.patch
+BuildRequires:  elfutils-libelf-devel
+BuildRequires:  gcc
+BuildRequires:  kmodtool
+Requires:       %{modulename}-kmod-common = %{?epoch:%{epoch}:}%{version}
+Requires:       akmods
+Requires:       akmod-intel-ipu6
+Packager:       Gilver E. <rockgrub@disroot.org>
+
+%{expand:%(kmodtool --target %{_target_cpu} --repo terra --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
+
+%description
+This package enables USBIO Extension drivers on Intel Alder Lake, Raptor Lake, Meteor Lake and Lunar Lake platforms.
+
+%prep
+# error out if there was something wrong with kmodtool
+%{?kmodtool_check}
+
+# print kmodtool output for debugging purposes:
+kmodtool  --target %{_target_cpu} --repo terra --kmodname %{modulename} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
+
+%autosetup -p1 -n usbio-drivers-%{commit}
+rm -fr .github
+
+for kernel_version in %{?kernel_versions} ; do
+  cp -a ./* _kmod_build_${kernel_version%%___*}
+done
+
+%build
+for kernel_version in %{?kernel_versions} ; do
+  make -C ${kernel_version##*___} M=${PWD}/_kmod_build_${kernel_version%%___*} modules
+done
+
+%install
+for kernel_version in %{?kernel_versions}; do
+  mkdir -p %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/drivers/gpio/
+  mkdir -p %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/drivers/i2c/busses/
+  mkdir -p %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/drivers/mfd/
+  install -m 755 _kmod_build_${kernel_version%%___*}/drivers/gpio/*.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/drivers/gpio/
+  install -m 755 _kmod_build_${kernel_version%%___*}/drivers/i2c/busses/*.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/drivers/i2c/busses/
+  install -m 755 _kmod_build_${kernel_version%%___*}/drivers/mfd/*.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/drivers/mfd/
+  install -m 755 _kmod_build_${kernel_version%%___*}/*.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}
+done
+%{?akmod_install}
+
+%changelog
+* Mon Jun 16 2025 Gilver E. <rockgrub@disroot.org> - 0^20250312git4fb690c
+- Initial package
@@ -0,0 +1,10 @@
+let c = sh("cat anda/system/usbio-drivers/kmod-common/intel-usbio-drivers.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout;
+c.pop();
+rpm.global("commit", c);
+if rpm.changed() {
+    rpm.release();
+    let d = sh("cat anda/system/usbio-drivers/kmod-common/intel-usbio-drivers.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout;
+    d.pop();
+    rpm.global("commit_date", d);
+}
+
@@ -0,0 +1,9 @@
+project pkg {
+        arches = ["x86_64"]
+    rpm {
+        spec = "dkms-intel-usbio.spec"
+    }
+    labels {
+        updbranch = 1
+    }
+}
@@ -0,0 +1,12 @@
+PACKAGE_NAME="usbio-drivers"
+PACKAGE_VERSION="0.1"
+AUTOINSTALL="yes"
+
+BUILT_MODULE_NAME[0]="usbio"
+DEST_MODULE_LOCATION[0]="/extra"
+
+BUILT_MODULE_NAME[1]="gpio-usbio"
+DEST_MODULE_LOCATION[1]="/extra"
+
+BUILT_MODULE_NAME[2]="i2c-usbio"
+DEST_MODULE_LOCATION[2]="/extra"
@@ -0,0 +1,56 @@
+%global commit 4fb690c6d15a81c492954636c2db396cb700a119
+%global shortcommit %{sub %{commit} 1 7}
+%global commit_date 20250312
+%global debug_package %{nil}
+%global modulename intel-usbio
+
+Name:       dkms-%{modulename}
+Version:    0^%{commit_date}git.%{shortcommit}
+Release:    1%{?dist}
+Summary:    Kernel drivers for the USBIO Extension
+License:    GPL-2.0-only
+URL:        https://github.com/intel/usbio-drivers
+Source0:    %{url}/archive/%{commit}.tar.gz#/usbio-drivers-%{shortcommit}.tar.gz
+Source2:    %{name}.conf
+Patch0:     https://github.com/jwrdegoede/usbio-drivers/commit/d5f08986936a7fda0cce543c73fb8d9bab76eae2.patch
+Patch1:     https://github.com/jwrdegoede/usbio-drivers/commit/47b34a6f467eebb4e9fc59f5e25618fe760fbf33.patch
+Patch2:     https://github.com/jwrdegoede/usbio-drivers/commit/0eae85556558b410635ad03ed5eccb9648e11fce.patch
+Provides:   %{modulename}-kmod = %{version}
+Requires:   dkms
+Requires:   dkms-intel-ipu6
+BuildArch:  noarch
+Packager:   Gilver E. <rockgrub@disroot.org>
+
+%description
+This package enables USBIO Extension drivers on Intel Alder Lake, Raptor Lake, Meteor Lake and Lunar Lake platforms.
+
+%prep
+%autosetup -p1 -n usbio-drivers-%{commit}
+rm -fr .github
+
+cp -f %{SOURCE2} dkms.conf
+
+%build
+
+%install
+# Create empty tree:
+mkdir -p %{buildroot}%{_usrsrc}/%{modulename}-%{version}/
+cp -fr * %{buildroot}%{_usrsrc}/%{modulename}-%{version}/
+
+%post
+dkms add -m %{modulename} -v %{version} -q || :
+# Rebuild and make available for the currently running kernel:
+dkms build -m %{modulename} -v %{version} -q || :
+dkms install -m %{modulename} -v %{version} -q --force || :
+
+%preun
+# Remove all versions from DKMS registry:
+dkms remove -m %{modulename} -v %{version} -q --all || :
+
+%files
+%{_usrsrc}/%{modulename}-%{version}
+
+%changelog
+* Mon Jun 16 2025 Gilver E. <rockgrub@disroot.org> - 0^20250312git4fb690c
+- Initial package
+
@@ -0,0 +1,10 @@
+let c = sh("cat anda/system/usbio-drivers/kmod-common/intel-usbio-drivers.spec | grep '%global commit ' | sed -E 's/.+commit //'", #{"stdout": "piped"}).ctx.stdout;
+c.pop();
+rpm.global("commit", c);
+if rpm.changed() {
+    rpm.release();
+    let d = sh("cat anda/system/usbio-drivers/kmod-common/intel-usbio-drivers.spec | grep '%global commit_date' | sed -E 's/.+commit_date //'", #{"stdout": "piped"}).ctx.stdout;
+    d.pop();
+    rpm.global("commit_date", d);
+}
+
@@ -0,0 +1,9 @@
+project pkg {
+        arches = ["x86_64"]
+    rpm {
+        spec = "intel-usbio-drivers.spec"
+    }
+    labels {
+        nightly = 1
+    }
+}
@@ -0,0 +1,40 @@
+%global commit 4fb690c6d15a81c492954636c2db396cb700a119
+%global shortcommit %{sub %{commit} 1 7}
+%global commit_date 20250312
+%global debug_package %{nil}
+
+Name:          dkms-%{modulename}
+Version:       0^%{commit_date}git.%{shortcommit}
+Release:       1%{?dist}
+Summary:       Common files for the USBIO drivers
+License:       GPL-2.0-only
+URL:           https://github.com/intel/usbio-drivers
+Source0:       %{url}/archive/%{commit}.tar.gz#/usbio-drivers-%{shortcommit}.tar.gz
+BuildRequires: anda-srpm-macros
+Provides:      intel-usbio-kmod-common = %{evr}
+Requires:      intel-ipu6-kmod-common
+BuildArch:     noarch
+Packager:      Gilver E. <rockgrub@disroot.org>
+
+%description
+This package contains the common files for the UBSIO kernel modules.
+
+%prep
+%autosetup -p1 -n usbio-drivers-%{commit}
+
+%build
+# Hi, I'm empty.
+
+%install
+# Hi, I'm also empty!
+
+%files
+%doc CODE_OF_CONDUCT.md
+%doc README.md
+%doc SECURITY.md
+%doc security.md
+%license LICENSE.txt
+
+%changelog
+* Mon Jun 16 2025 Gilver E. <rockgrub@disroot.org> - 0^20250312git4fb690c
+- Initial package
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Raboneko	18b34423d2	bump(branch): ffmpeg	2025-06-17 05:14:39 +00:00
Raboneko	3d01a27a3e	bump(branch): ffmpeg	2025-06-17 04:33:18 +00:00
Raboneko	ebb366103c	bump(branch): ffmpeg	2025-06-17 03:59:52 +00:00
Raboneko	23b077affd	bump(branch): ffmpeg	2025-06-17 03:01:17 +00:00
Raboneko	e6e2505156	bump(nightly): flameshot-nightly hyprutils.nightly zed-nightly prismlauncher-nightly grabnim nim-nightly	2025-06-17 01:54:51 +00:00
Raboneko	8e6122fccd	bump: discord-canary-openasar discord-canary	2025-06-17 01:50:07 +00:00
Raboneko	9de3ebca33	bump: rust-mise	2025-06-16 22:43:10 +00:00
Raboneko	d427f0452b	bump(branch): kf6-kio zig-master	2025-06-16 21:38:31 +00:00
Raboneko	4dbbfae9af	bump: discord-openasar discord	2025-06-16 21:19:00 +00:00
Jan	2bb25592d7	fix(zig-master): rebase linker patches (#5517 )	2025-06-16 15:36:15 -05:00
Raboneko	fc27af6eb6	bump: discord-canary-openasar discord-canary	2025-06-16 17:48:28 +00:00
Raboneko	f362f50d45	bump: zed-preview	2025-06-16 17:37:23 +00:00
Raboneko	edc6b020e8	bump: discord-canary-openasar discord-canary rust-anda	2025-06-16 16:51:50 +00:00
Gilver	653079f0b3	chore(edit): RUSTC_BOOSTRAP=1 is enough now (#5508 ) Signed-off-by: Gilver <rockgrub@disroot.org>	2025-06-17 00:41:46 +08:00
madomado	b5c48d5bd7	fix(tdlib): set it to nightly (#5509 ) Signed-off-by: madomado <madonuko@outlook.com>	2025-06-16 11:38:35 -05:00
Raboneko	d2b26e8107	bump: tdlib-nightly	2025-06-16 14:55:43 +00:00
Raboneko	60d457b445	bump: zig-master-bootstrap tdlib-nightly	2025-06-16 13:24:22 +00:00
Raboneko	ebb66f781e	bump: anki-qt5 anki	2025-06-16 12:43:38 +00:00
Raboneko	897ce35461	bump: tdlib-nightly	2025-06-16 11:55:51 +00:00
Gilver	59256dd066	chore: Deprecate faad2 (#5503 ) Pack it up boys. https://src.fedoraproject.org/rpms/faad2 Signed-off-by: Gilver <rockgrub@disroot.org>	2025-06-16 18:31:21 +08:00
madomado	4968498c64	fix(andax/ci/bump_release): maybe import paths are relative? (#5489 ) * fix(andax/ci/bump_release): maybe import paths are relative? Signed-off-by: madomado <madonuko@outlook.com> * fix(ffmpeg): bump release correctly --------- Signed-off-by: madomado <madonuko@outlook.com>	2025-06-16 18:01:12 +08:00
madomado	6c82ee48a2	add: opensnitch (#5413 ) * add: opensnitch * enable the builddep then idk * a * alsdkfjalskj * sjdfl * idrk anymore * sdlkfj * comments * Update opensnitch.spec Signed-off-by: madomado <madonuko@outlook.com> * Update opensnitch.spec Signed-off-by: madomado <madonuko@outlook.com> * who would've guessed you need c++ * qmake? * cmake(Qt6) Signed-off-by: madomado <madonuko@outlook.com> * qt5-linguist Signed-off-by: madomado <madonuko@outlook.com> * maybe qt6? what? Signed-off-by: madomado <madonuko@outlook.com> --------- Signed-off-by: madomado <madonuko@outlook.com>	2025-06-16 04:55:08 -05:00
Gilver	205fe13dd3	chore: Update Intel IPU6 specs, separate IPU6 drivers and USBIO drivers (#5490 ) * chore: Update Intel IPU6 specs, separate IPU6 drivers and USBIO drivers * chore: Changelogs * fix: Some oopsies * fix: Commit? * fix: Cleanup * fix: dfshdfshjksdfdfhjs	2025-06-16 17:49:30 +08:00
Gilver	972f3a0de3	fix(lomiri-system-settings): Update patches (#5491 ) * fix(lomiri-system-settings): Update patches * fix: Begone PATCH3 Signed-off-by: Gilver <rockgrub@disroot.org> * fix: I somehow did not add back THE MOST IMPORTANT PATCH Signed-off-by: Gilver <rockgrub@disroot.org> --------- Signed-off-by: Gilver <rockgrub@disroot.org>	2025-06-16 17:48:41 +08:00
Raboneko	95b80ebd5a	bump(branch): gstreamer1-plugins-bad	2025-06-16 08:48:41 +00:00
madomado	b0af6bfc7b	fix(sdbus-cpp): update.rhai (#5485 ) Signed-off-by: madomado <madonuko@outlook.com>	2025-06-16 06:57:51 +00:00
madomado	b5e5d5ecac	fix(hyprlock): swap sdbus (#5478 )	2025-06-16 01:16:55 -05:00
madomado	59212fec95	fix(hypridle): require sdbus-cpp.terra-devel (#5450 ) * fix(hypridle): require sdbus-cpp.terra-devel Signed-off-by: madomado <madonuko@outlook.com> * can we swap sdbus? Signed-off-by: madomado <madonuko@outlook.com> * allowerasing --------- Signed-off-by: madomado <madonuko@outlook.com>	2025-06-16 01:16:41 -05:00
madomado	fb4b4f39c6	fix(hyprlock): explicit builddeps from terra (#5462 ) * fix(hyprlock): explicit builddeps from terra Signed-off-by: madomado <madonuko@outlook.com> * Update update.rhai Signed-off-by: madomado <madonuko@outlook.com> * Update hyprlock.spec Signed-off-by: madomado <madonuko@outlook.com> --------- Signed-off-by: madomado <madonuko@outlook.com>	2025-06-16 00:39:49 -05:00
Raboneko	43780ecb94	bump: hyprlock	2025-06-16 05:34:37 +00:00
Raboneko	0e4a371a29	bump: hyprlock	2025-06-16 05:01:07 +00:00
Gilver	e47a913e76	fix(v4l2-relayd): Change to nightly so commit date is accurate (#5465 ) Signed-off-by: Gilver <rockgrub@disroot.org>	2025-06-16 12:48:02 +08:00
Gilver	038d5b818d	fix(vpkedit): Don't disable static linking (#5464 ) Signed-off-by: Gilver <rockgrub@disroot.org>	2025-06-16 12:47:35 +08:00
Raboneko	9f3538aaae	bump: hyprlock	2025-06-16 04:42:21 +00:00
Raboneko	ba30a4cb86	bump: hyprlock	2025-06-16 04:02:43 +00:00
Owen Zimmerman	04c6da7499	add: cbmem (#3323 ) * Add: cbmem * Fix url and date * add --depth 1 and cd into make directory * Commit suggestions Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * use make build macro Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Fix git clone Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Try the funny Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Fix license Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Add global compiler thing at the top Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Add licenses/docs and remove -std thing Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * fix build flag macro Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Add wno error flag Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Add other licenses Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * Install all licenses Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> * meow Signed-off-by: madomado <madonuko@outlook.com> * Update cbmem.spec Signed-off-by: madomado <madonuko@outlook.com> * Update cbmem.spec Signed-off-by: madomado <madonuko@outlook.com> * meow Signed-off-by: madomado <madonuko@outlook.com> * Update version and changelog, remove global build flags This should work lol Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --------- Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Signed-off-by: madomado <madonuko@outlook.com> Co-authored-by: madomado <madonuko@outlook.com>	2025-06-15 22:26:05 -05:00
Raboneko	e6666a0373	bump: hyprlock	2025-06-16 03:14:34 +00:00
Raboneko	23bd6664d3	bump(branch): astal-gtk	2025-06-16 03:07:34 +00:00
Raboneko	4c4d610969	bump(nightly): ghostty-nightly zed-nightly prismlauncher-nightly grabnim astal	2025-06-16 01:58:20 +00:00
Raboneko	1a9d3cea6b	bump: ruffle-nightly hyprlock	2025-06-16 01:45:19 +00:00
Raboneko	b53770d4d7	bump(weekly): v4l2-relayd	2025-06-16 00:52:24 +00:00
Raboneko	3b21b4e689	bump: hyprlock	2025-06-15 23:55:41 +00:00
Raboneko	83af1ab5cd	bump: hyprlock	2025-06-15 23:45:57 +00:00
Raboneko	61e0d66b92	bump: hyprlock	2025-06-15 23:32:24 +00:00
Raboneko	db6fc3ad2c	bump: hyprlock	2025-06-15 23:17:42 +00:00
Raboneko	e5ebb5041c	bump: hyprlock	2025-06-15 22:55:33 +00:00
Raboneko	b16d04953d	bump: hyprlock	2025-06-15 22:42:10 +00:00
Raboneko	ba82ef2b60	bump: hyprlock	2025-06-15 22:25:17 +00:00
Raboneko	2c87fe2fe4	bump: komikku hyprlock	2025-06-15 21:58:58 +00:00
Raboneko	5abbcc8b2d	bump: hyprlock	2025-06-15 21:48:47 +00:00
Raboneko	0d75d7d2e5	bump: hyprlock	2025-06-15 21:38:22 +00:00
Raboneko	32373b8257	bump: hyprlock	2025-06-15 21:23:21 +00:00
Raboneko	24875af532	bump: hyprlock	2025-06-15 20:58:25 +00:00
Raboneko	91e1907dc1	bump: hyprlock	2025-06-15 20:48:26 +00:00
Raboneko	4f12fe109b	bump: hyprlock	2025-06-15 20:37:20 +00:00
Raboneko	0c88365bcb	bump: hyprlock	2025-06-15 20:20:05 +00:00
Raboneko	329d7c3451	bump: hyprlock	2025-06-15 19:55:27 +00:00
Raboneko	9cb98ee966	bump: hyprlock	2025-06-15 19:40:45 +00:00
Raboneko	7c9b487572	bump: hyprlock	2025-06-15 19:30:05 +00:00
Raboneko	e9e878bb50	bump: hyprlock	2025-06-15 19:20:04 +00:00
Raboneko	4f8d3b6065	bump: hyprlock	2025-06-15 18:58:47 +00:00
Raboneko	9cc8afc313	bump: hyprlock	2025-06-15 18:48:43 +00:00
Raboneko	fff0ff5d95	bump: hyprlock	2025-06-15 18:29:51 +00:00
Raboneko	0cadf0e271	bump: hyprlock	2025-06-15 17:57:00 +00:00
Raboneko	ec15bc707d	bump: hyprlock	2025-06-15 17:46:53 +00:00
Raboneko	2ef05b7bf4	bump: hyprlock	2025-06-15 17:36:50 +00:00
Raboneko	e398e3a28b	bump: hyprlock	2025-06-15 17:20:48 +00:00
madomado	a5e8ce1d7c	add: hyprlock (#5411 ) * add: hyprlock * fix deps and add files	2025-06-15 11:59:38 -05:00
madomado	273ab3f944	fix(hypridle): trim the version correctly (#5453 ) Signed-off-by: madomado <madonuko@outlook.com>	2025-06-15 11:54:59 -05:00
Raboneko	c11b95ff1d	bump: hypridle rpcs3	2025-06-15 16:46:28 +00:00
Raboneko	93439ba108	bump: hypridle	2025-06-15 16:23:25 +00:00
madomado	cbdfc82e1f	docs(readme): add instructions for EL, notes for extras (#5341 )	2025-06-16 00:01:34 +08:00
madomado	25d6e18c69	add: hypridle (#5378 ) * add: hypridle * builddeps * Update update.rhai Signed-off-by: madomado <madonuko@outlook.com> * gcc Signed-off-by: madomado <madonuko@outlook.com> * Update hypridle.spec Signed-off-by: madomado <madonuko@outlook.com> --------- Signed-off-by: madomado <madonuko@outlook.com>	2025-06-15 10:58:57 -05:00
madomado	23a0741bb9	add: hyprgraphics (#5410 )	2025-06-15 10:55:23 -05:00
madomado	7edd8cf388	add: vpkedit (#1284 ) * add: vpkedit * bump to 4.2.3 Signed-off-by: madomado <madonuko@outlook.com> * clear cwd Signed-off-by: madomado <madonuko@outlook.com> * maybe no libc moment? Signed-off-by: madomado <madonuko@outlook.com> --------- Signed-off-by: madomado <madonuko@outlook.com>	2025-06-15 10:37:52 -05:00
madomado	a720185740	add: hyprlang.nightly (#5371 )	2025-06-15 10:11:10 -05:00
Gilver	f9a1ebd7e5	chore: Deprecate F40 (#5130 )	2025-06-15 09:53:20 -05:00
Raboneko	4249c711fd	bump: helium-gtk-theme	2025-06-15 14:37:19 +00:00
Raboneko	d921a5e824	bump: nimble	2025-06-15 14:19:55 +00:00
madomado	5de302be3b	add: nimble (#3960 ) * add: nimble Sequel to #1245 * Update nimble.spec Signed-off-by: madomado <madonuko@outlook.com> * Update nim-nightly.spec Signed-off-by: madomado <madonuko@outlook.com> --------- Signed-off-by: madomado <madonuko@outlook.com>	2025-06-15 08:56:57 -05:00
madomado	c6fc58f4d6	add: hyprutils.nightly (#5372 )	2025-06-15 08:56:38 -05:00
madomado	bdca17a588	fix(rio): use https url (#5409 ) Signed-off-by: madomado <madonuko@outlook.com>	2025-06-15 08:56:13 -05:00
madomado	df7fa9a0f3	fix(flashprog): update urls and license (#5408 ) Signed-off-by: madomado <madonuko@outlook.com>	2025-06-15 08:56:01 -05:00
Raboneko	e4dd32fd96	bump: lomiri-system-settings	2025-06-15 13:35:01 +00:00
Raboneko	41cc820f4a	bump: peazip	2025-06-15 09:19:27 +00:00
Gilver	568c075221	chore(ghostty-nightly): Use zig_build_target (#5379 ) * chore(ghostty-nightly): Use zig_build_target Signed-off-by: Gilver <rockgrub@disroot.org> * fix: Update cache dir macro Signed-off-by: Gilver <rockgrub@disroot.org> * Update ghostty-nightly.spec Signed-off-by: Gilver <rockgrub@disroot.org> * chore: Add back lang stuff Signed-off-by: Gilver <rockgrub@disroot.org> --------- Signed-off-by: Gilver <rockgrub@disroot.org>	2025-06-15 00:51:59 -05:00
Raboneko	cf3f08b622	bump: zig-master-bootstrap	2025-06-15 05:50:15 +00:00
Raboneko	4db85e1953	bump(nightly): envision ghostty-nightly zed-nightly grabnim spotx-bash	2025-06-15 02:04:10 +00:00
Raboneko	57c0f7164c	bump: ruffle-nightly	2025-06-15 01:48:03 +00:00
				`@@ -0,0 +1 @@`
				`rpm.version(gh("craftablescience/VPKEdit"));`
				`@@ -0,0 +1 @@`
				`sh("dnf swap sdbus-cpp sdbus-cpp.terra -y --allowerasing", #{});`