Compare commits
12 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e8d34c4bba | ||
|
|
a787f50d30 | ||
|
|
86540dc318 | ||
|
|
5d1e990678 | ||
|
|
43a89ed836 | ||
|
|
91c0d46b9f | ||
|
|
0bd31dde9f | ||
|
|
2d31a300b0 | ||
|
|
9f56196bff | ||
|
|
79b8092a6d | ||
|
|
20fd833d51 | ||
|
|
11b9fb2dfe |
6 changed files with 66 additions and 29 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -10,3 +10,7 @@
|
|||
/waypipe-v0.9.1.tar.gz
|
||||
/waypipe-v0.10.4.tar.gz
|
||||
/waypipe-v0.10.5.tar.gz
|
||||
/waypipe-v0.10.6.tar.gz
|
||||
/waypipe-v0.11.0.tar.gz
|
||||
/waypipe-v0.11.1.tar.gz
|
||||
/waypipe-v0.11.2.tar.gz
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
From fa4d12296de749eafb06f8dfb7e53a7ce8699876 Mon Sep 17 00:00:00 2001
|
||||
From: Dominique Martinet <asmadeus@codewreck.org>
|
||||
Date: Sun, 7 Dec 2025 11:57:55 +0000
|
||||
Subject: [PATCH 1/2] Cargo.toml: features: remove test_proto from defaults
|
||||
|
||||
---
|
||||
Cargo.toml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 9213b3a94500..4d5fb42494b9 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -20,7 +20,7 @@ path = "src/test_proto.rs"
|
||||
required-features = ["test_proto"]
|
||||
|
||||
[features]
|
||||
-default = ["video", "dmabuf", "lz4", "zstd", "gbmfallback", "test_proto"]
|
||||
+default = ["video", "dmabuf", "lz4", "zstd", "gbmfallback"]
|
||||
video = ["dep:waypipe-ffmpeg-wrapper", "dep:waypipe-shaders", "dmabuf"]
|
||||
dmabuf = ["dep:ash"]
|
||||
lz4 = ["dep:waypipe-lz4-wrapper"]
|
||||
--
|
||||
2.52.0
|
||||
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
From eed41ad0ef6ae0784b30df8e20b7293846610f23 Mon Sep 17 00:00:00 2001
|
||||
From: Dominique Martinet <asmadeus@codewreck.org>
|
||||
Date: Sun, 7 Dec 2025 11:58:21 +0000
|
||||
Subject: [PATCH 2/2] Cargo.toml: features: remove video from defaults (for
|
||||
rhel)
|
||||
|
||||
---
|
||||
Cargo.toml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 4d5fb42494b9..75e4845750af 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -20,7 +20,7 @@ path = "src/test_proto.rs"
|
||||
required-features = ["test_proto"]
|
||||
|
||||
[features]
|
||||
-default = ["video", "dmabuf", "lz4", "zstd", "gbmfallback"]
|
||||
+default = ["dmabuf", "lz4", "zstd", "gbmfallback"]
|
||||
video = ["dep:waypipe-ffmpeg-wrapper", "dep:waypipe-shaders", "dmabuf"]
|
||||
dmabuf = ["dep:ash"]
|
||||
lz4 = ["dep:waypipe-lz4-wrapper"]
|
||||
--
|
||||
2.52.0
|
||||
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
From 2c16f24a53f79b010a677288d0c91ea4a8683a4a Mon Sep 17 00:00:00 2001
|
||||
From: Dominique Martinet <asmadeus@codewreck.org>
|
||||
Date: Fri, 15 Aug 2025 21:05:34 +0900
|
||||
Subject: [PATCH] license
|
||||
|
||||
Merged in https://gitlab.freedesktop.org/mstoeckl/waypipe/-/merge_requests/33
|
||||
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 8674dfab1f62..5d627e37ae23 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -6,6 +6,7 @@ version = "0.10.4"
|
||||
edition = "2021"
|
||||
rust-version = "1.77.0"
|
||||
default-run = "waypipe"
|
||||
+license = "GPL-3.0-or-later"
|
||||
|
||||
[[bin]]
|
||||
name = "waypipe"
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (waypipe-v0.10.5.tar.gz) = 1a9cf484d55adef247c63eccb8de7979eb0d5deabb3c0a0f64e476ab6cf47038cec8c6146690c446ba6070d3e0638d73359f1e84bcfe812cc0968157cae7d8d2
|
||||
SHA512 (waypipe-v0.11.2.tar.gz) = e1b475f6c4b41cdc15ac1765a6a0dbb865f1bdc384d7f7393660e39baf38a375a501d7ec7493a82cd8aaeef9faba67422164e26d56f19737949f8578495ca5f1
|
||||
|
|
|
|||
19
waypipe.spec
19
waypipe.spec
|
|
@ -4,8 +4,11 @@
|
|||
# prevent library files from being installed
|
||||
%global cargo_install_lib 0
|
||||
|
||||
# test_proto is only needed in %%check
|
||||
%global test_features test_proto
|
||||
|
||||
Name: waypipe
|
||||
Version: 0.10.5
|
||||
Version: 0.11.2
|
||||
Release: %autorelease
|
||||
Summary: Wayland forwarding proxy
|
||||
|
||||
|
|
@ -21,7 +24,10 @@ License: GPL-3.0-or-later AND (Apache-2.0 OR MIT) AND ISC AND MIT
|
|||
URL: https://gitlab.freedesktop.org/mstoeckl/waypipe
|
||||
Source0: https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v%{version}/%{name}-v%{version}.tar.gz
|
||||
Source1: waypipe.1
|
||||
Patch1: license.patch
|
||||
Patch1: 0001-Cargo.toml-features-remove-test_proto-from-defaults.patch
|
||||
%if 0%{?rhel}
|
||||
Patch2: 0002-Cargo.toml-features-remove-video-from-defaults-for-r.patch
|
||||
%endif
|
||||
|
||||
BuildRequires: cargo-rpm-macros >= 26
|
||||
BuildRequires: bindgen-cli
|
||||
|
|
@ -37,7 +43,6 @@ BuildRequires: pkgconfig(gbm)
|
|||
BuildRequires: pkgconfig(libavcodec)
|
||||
BuildRequires: pkgconfig(libavutil)
|
||||
BuildRequires: pkgconfig(libswscale)
|
||||
# not sure if needed without ffmpeg?
|
||||
BuildRequires: glslc
|
||||
BuildRequires: vulkan-headers
|
||||
%endif
|
||||
|
|
@ -48,8 +53,6 @@ BuildRequires: pkgconfig(libva)
|
|||
BuildRequires: pkgconfig(wayland-protocols)
|
||||
BuildRequires: pkgconfig(wayland-client)
|
||||
BuildRequires: pkgconfig(wayland-server)
|
||||
# This one is not automatically detected properly...
|
||||
BuildRequires: rust-pkg-config+default-devel
|
||||
|
||||
%global _description %{expand:
|
||||
%{summary}.}
|
||||
|
|
@ -61,7 +64,7 @@ BuildRequires: rust-pkg-config+default-devel
|
|||
%cargo_prep
|
||||
|
||||
%generate_buildrequires
|
||||
%cargo_generate_buildrequires
|
||||
%cargo_generate_buildrequires -f %{test_features}
|
||||
|
||||
%build
|
||||
%cargo_build
|
||||
|
|
@ -73,8 +76,6 @@ scdoc < waypipe.scd > waypipe.1
|
|||
|
||||
%install
|
||||
%cargo_install
|
||||
# Is there a better way to build only `--bin waypipe` ?
|
||||
rm -f %{buildroot}%{_bindir}/test_proto
|
||||
%if !0%{?rhel}
|
||||
install -D -p -m 0644 waypipe.1 %{buildroot}%{_mandir}/man1/waypipe.1
|
||||
%else
|
||||
|
|
@ -83,7 +84,7 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/waypipe.1
|
|||
|
||||
%if %{with check}
|
||||
%check
|
||||
%cargo_test
|
||||
%cargo_test -f %{test_features}
|
||||
%endif
|
||||
|
||||
%files
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue