chore(f41): backport frawhide changes (#3166)

* Change: Moved all V4L2 packages out of the Fusion folder

(cherry picked from 8dede7dbd6)

* bump(nightly): mpv flow nightly nightly prismlauncher-nightly spotx-bash

---------

Co-authored-by: Raboneko <raboneko@fyralabs.com>
This commit is contained in:
sadlerm4
2025-01-31 11:39:08 +08:00
committed by GitHub
parent cdd0ccd209
commit 777b24cbb8
11 changed files with 15 additions and 122 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
%global commit c438732b239bf4e7f3d574f8fcc141f92366018a
%global commit 72d976b3c150425b678122e68bd98c9fd9d9fb92
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20250119
%global commit_date 20250130
%global ver 0.39.0
Name: mpv-nightly
+2 -2
View File
@@ -1,6 +1,6 @@
%global commit 9f29853cd6c4842a7746292f829a9da761a76b88
%global commit e6e0301a782989782464e5f141ff4b4030a23c38
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20250119
%global commit_date 20250130
Name: flow-control-nightly
Version: %commit_date.%shortcommit
@@ -1,12 +1,12 @@
%global commit 72d085525b22d66468c5969a4d507a0fa68d4a04
%global commit 04d36361b1a19a3b78b9cbcea5a233ccd56fb4e8
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20250118
%global commit_date 20250130
%global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV
%global cache_dir %{builddir}/zig-cache
Name: ghostty-nightly
Version: %{commit_date}.%{shortcommit}
Release: 2%?dist
Release: 1%?dist
Summary: A fast, native terminal emulator written in Zig; this is the Tip (nightly) build.
License: MIT AND MPL-2.0 AND OFL-1.1 AND (WTFPL OR CC0-1.0) AND Apache-2.0
URL: https://ghostty.org/
+3 -3
View File
@@ -1,7 +1,7 @@
%global commit ac8220bb2e03a94e8c62022fa0efe9ff9adf1c1c
%global commit 303cce0cbc91ea3b4082b91117d6dca8d7a2816a
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20250119
%global ver 0.171.0
%global commit_date 20250130
%global ver 0.173.0
%bcond_with check
@@ -1,34 +0,0 @@
From 1be2bafe7a9aabf0389da9e685051859c56e64ce Mon Sep 17 00:00:00 2001
From: Kate Hsuan <hpa@redhat.com>
Date: Thu, 9 Feb 2023 15:26:37 +0800
Subject: [PATCH] Set a new ID offset for the private event
According to the v4l2loopback, the private event ID should be
start from V4L2_EVENT_PRIVATE_START+0x08E00000. Therefore, the
V4L2_EVENT_PRI_CLIENT_USAGE is V4L2_EVENT_PRIVATE_START+
0x08E00000+1
Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
src/v4l2-relayd.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/v4l2-relayd.c b/src/v4l2-relayd.c
index 21bb0d5..d731af0 100644
--- a/src/v4l2-relayd.c
+++ b/src/v4l2-relayd.c
@@ -27,7 +27,10 @@
#include <gst/app/gstappsrc.h>
#include <gst/video/video-info.h>
-#define V4L2_EVENT_PRI_CLIENT_USAGE V4L2_EVENT_PRIVATE_START
+#define V4L2LOOPBACK_EVENT_OFFSET 0x08E00000
+#define V4L2_EVENT_PRI_CLIENT_USAGE (V4L2_EVENT_PRIVATE_START+\
+ V4L2LOOPBACK_EVENT_OFFSET+\
+ 1)
struct v4l2_event_client_usage {
__u32 count;
--
2.39.2
-8
View File
@@ -1,8 +0,0 @@
project pkg {
rpm {
spec = "v4l2-relayd.spec"
}
labels {
weekly = 1
}
}
-1
View File
@@ -1 +0,0 @@
rpm.version(gitlab("24306684"));
@@ -1 +0,0 @@
enable v4l2-relayd.service
-63
View File
@@ -1,63 +0,0 @@
%global commit 2e4d5c9ba53bfe8cfe16ea91932c8e5ecb090a87
%global commitdate 20220126
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: v4l2-relayd
Summary: Utils for relaying the video stream between two video devices
Version: %{commitdate}.%{shortcommit}
Release: 1%{?dist}
License: GPL-2.0-only
Source0: https://gitlab.com/vicamo/v4l2-relayd//-/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
Source1: v4l2-relayd.preset
### RPM Fusion | [v4l2-relayd] Set output stream to I420
## https://lists.rpmfusion.org/archives/list/rpmfusion-commits@lists.rpmfusion.org/thread/VUMAJABDYISF3UVOSESSFYQBAMQK7VKY/
Patch0: 0000-set-new-offset.patch
BuildRequires: systemd-rpm-macros
BuildRequires: gcc
BuildRequires: g++
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: glib2-devel
BuildRequires: gstreamer1-devel
BuildRequires: gstreamer1-plugins-base-devel
BuildRequires: systemd
Requires: v4l2loopback
%description
This is used to relay the input GStreamer source to an output source or a V4L2 device.
%prep
%autosetup -p1 -n %{name}-%{commit}
autoreconf --force --install --verbose
%build
%configure
%make_build
%install
%make_install modprobedir=%{_modprobedir}
sed -i '/^EnvironmentFile=\/etc\/default\/v4l2-relayd/a EnvironmentFile=-\/run\/v4l2-relayd' %{buildroot}%{_unitdir}/v4l2-relayd.service
sed -i 's/videoconvert/videoconvert ! video\/x-raw,format=I420/g' %{buildroot}%{_unitdir}/v4l2-relayd.service
install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_presetdir}/95-v4l2-relayd.preset
%post
%systemd_post v4l2-relayd.service
%preun
%systemd_preun v4l2-relayd.service
%postun
%systemd_postun_with_restart v4l2-relayd.service
%files
%license LICENSE
%{_bindir}/v4l2-relayd
%{_sysconfdir}/default/v4l2-relayd
%{_modprobedir}/v4l2-relayd.conf
%{_modulesloaddir}/v4l2-relayd.conf
%{_unitdir}/v4l2-relayd.service
%{_presetdir}/95-v4l2-relayd.preset
%changelog
%autochangelog
@@ -1,11 +1,11 @@
%global real_name prismlauncher
%global nice_name PrismLauncher
%global commit f17599c8b870072e2da759c85df060f7088bf388
%global commit 6ae9fa4df445aa577d58230559f5b025c93e1e7c
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad
%global commit_date 20250118
%global commit_date 20250130
%global snapshot_info %{commit_date}.%{shortcommit}
%bcond_without qt6
+3 -3
View File
@@ -1,5 +1,5 @@
%global commit e0fd4704b043941b4ddc0f24bc2b7614a6db23f1
%global commit_date 20250104
%global commit bfd07df616bb656f4990b15996c7e1c4f5a9ebc6
%global commit_date 20250130
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: spotx-bash
@@ -33,4 +33,4 @@ install -Dm 755 spotx.sh %buildroot%{_bindir}/spotx
%changelog
* Sat Dec 14 2024 Its-J
- Package SpotX-Bash
- Package SpotX-Bash