diff --git a/.gitignore b/.gitignore index 9ecf52e..ffb9da5 100644 --- a/.gitignore +++ b/.gitignore @@ -9,8 +9,3 @@ /waypipe-v0.9.0.tar.gz /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 diff --git a/0001-Cargo.toml-features-remove-test_proto-from-defaults.patch b/0001-Cargo.toml-features-remove-test_proto-from-defaults.patch deleted file mode 100644 index 1dfcada..0000000 --- a/0001-Cargo.toml-features-remove-test_proto-from-defaults.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fa4d12296de749eafb06f8dfb7e53a7ce8699876 Mon Sep 17 00:00:00 2001 -From: Dominique Martinet -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 - diff --git a/0002-Cargo.toml-features-remove-video-from-defaults-for-r.patch b/0002-Cargo.toml-features-remove-video-from-defaults-for-r.patch deleted file mode 100644 index 2d0c62e..0000000 --- a/0002-Cargo.toml-features-remove-video-from-defaults-for-r.patch +++ /dev/null @@ -1,26 +0,0 @@ -From eed41ad0ef6ae0784b30df8e20b7293846610f23 Mon Sep 17 00:00:00 2001 -From: Dominique Martinet -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 - diff --git a/license.patch b/license.patch new file mode 100644 index 0000000..b66f038 --- /dev/null +++ b/license.patch @@ -0,0 +1,18 @@ +From 2c16f24a53f79b010a677288d0c91ea4a8683a4a Mon Sep 17 00:00:00 2001 +From: Dominique Martinet +Date: Fri, 15 Aug 2025 21:05:34 +0900 +Subject: [PATCH] license + + +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 = "GPLv3-or-later" + + [[bin]] + name = "waypipe" diff --git a/sources b/sources index 1bddf05..e48fa05 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (waypipe-v0.11.2.tar.gz) = e1b475f6c4b41cdc15ac1765a6a0dbb865f1bdc384d7f7393660e39baf38a375a501d7ec7493a82cd8aaeef9faba67422164e26d56f19737949f8578495ca5f1 +SHA512 (waypipe-v0.10.4.tar.gz) = 85fcbed39f64ae3c814416b50eb75bcacad74201b82a632631c6078e31335557145e60183c1046d2064ae558a5384544c92e8bfcc13be43eb7772ec02c123582 diff --git a/waypipe.1 b/waypipe.1 index 6c9f676..bb65250 100644 --- a/waypipe.1 +++ b/waypipe.1 @@ -5,7 +5,7 @@ .nh .ad l .\" Begin generated content: -.TH "waypipe" "1" "2025-10-12" +.TH "waypipe" "1" "2025-08-15" .PP .SH NAME .PP @@ -23,7 +23,7 @@ waypipe - A transparent proxy for Wayland applications .br \fBwaypipe\fR [\fB--version\fR] [\fB-h\fR, \fB--help\fR] .PP -[options.\&.\&.\&] = [\fB-c\fR, \fB--compress\fR C] [\fB-d\fR, \fB--debug\fR] [\fB-n\fR, \fB--no-gpu\fR] [\fB-o\fR, \fB--oneshot\fR] [\fB-s\fR, \fB--socket\fR S] [\fB--display\fR D] [\fB--drm-node\fR R] [\fB--remote-node\fR R] [\fB--remote-bin\fR R] [\fB--remote-socket\fR S] [\fB--login-shell\fR] [\fB--threads\fR T] [\fB--title-prefix\fR P] [\fB--unlink-socket\fR] [\fB--video\fR V] [\fB--vsock\fR] [\fB--secctx S\fR] +[options.\&.\&.\&] = [\fB-c\fR, \fB--compress\fR C] [\fB-d\fR, \fB--debug\fR] [\fB-n\fR, \fB--no-gpu\fR] [\fB-o\fR, \fB--oneshot\fR] [\fB-s\fR, \fB--socket\fR S] [\fB--display\fR D] [\fB--drm-node\fR R] [\fB--remote-node\fR R] [\fB--remote-bin\fR R] [\fB--login-shell\fR] [\fB--threads\fR T] [\fB--title-prefix\fR P] [\fB--unlink-socket\fR] [\fB--video\fR V] [\fB--vsock\fR] [\fB--secctx S\fR] .PP .PP .SH DESCRIPTION @@ -94,9 +94,8 @@ Only permit a single connection, and exit when it is closed.\& Use \fBS\fR as the path for the Unix socket.\& The default socket path for server mode is \fI/tmp/waypipe-server.\&sock\fR; for client mode, it is \fI/tmp/waypipe-client.\&sock\fR; and in ssh mode, \fBS\fR gives the prefix used by -both the client and the server for their socket paths.\& (The actual socket -paths in ssh mode add a randomized suffix to \fBS\fR.\&) The default prefix in ssh -mode is \fI/tmp/waypipe\fR.\& +both the client and the server for their socket paths.\& The default prefix +in ssh mode is \fI/tmp/waypipe\fR.\& .PP When vsock is enabled use \fBS\fR to specify a CID and a port number.\& .PP @@ -135,13 +134,6 @@ computer, or its name if it is available in \fIPATH\fR.\& It defaults to \fBwaypipe\fR if this option isn’t passed.\& .PP .RE -\fB--remote-socket R\fR -.RS 4 -In ssh mode, specify the prefix used by the remote \fBwaypipe server\fR for -its socket path.\& This overrides the \fB--socket\fR option, on the server side -only.\& -.PP -.RE \fB--login-shell\fR .RS 4 Only for server mode; if no command is being run, open a login shell.\& @@ -421,8 +413,6 @@ from being leaked to disk.\& .PP File bug reports at: https://gitlab.\&freedesktop.\&org/mstoeckl/waypipe/ .PP -.SS Common issues -.PP Some programs (gnome-terminal, firefox, kate, among others) have special mechanisms to ensure that only one process is running at a time.\& Starting those programs under Waypipe while they are running under a different @@ -430,12 +420,6 @@ Wayland compositor may silently open a window or tab in the original instance of the program.\& Such programs may have a command line argument to create a new instance.\& .PP -The \fBwaypipe ssh\fR command requires that the \fBssh\fR executable supports Unix -socket forwarding; this is only supported in OpenSSH since version 6.\&7 (from -2014), and may require specific configuration.\& Other implementations of SSH may -not be able to forward Unix sockets; see the EXAMPLE section above for how to -use non-SSH transports.\& -.PP .SH SEE ALSO .PP \fBweston\fR(1), \fBssh\fR(1), \fBsocat(1)\fR, \fBncat(1)\fR diff --git a/waypipe.spec b/waypipe.spec index 0b54f35..647a725 100644 --- a/waypipe.spec +++ b/waypipe.spec @@ -4,30 +4,24 @@ # 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.11.2 +Version: 0.10.4 Release: %autorelease Summary: Wayland forwarding proxy -SourceLicense: GPL-3.0-or-later -# GPL-3.0-or-later +SourceLicense: GPLv3-or-later +# GPLv3-or-later # ISC # MIT # MIT OR Apache-2.0 # (also MIT for the protocols/ directory) -License: GPL-3.0-or-later AND (Apache-2.0 OR MIT) AND ISC AND MIT +License: (Apache-2.0 OR MIT) AND ISC AND MIT AND (MIT OR Apache-2.0) # LICENSE.dependencies contains a full license breakdown URL: https://gitlab.freedesktop.org/mstoeckl/waypipe -Source0: https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v%{version}/%{name}-v%{version}.tar.gz +Source0: waypipe-v0.10.4.tar.gz Source1: waypipe.1 -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 +Patch1: license.patch BuildRequires: cargo-rpm-macros >= 26 BuildRequires: bindgen-cli @@ -43,6 +37,7 @@ BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libswscale) +# not sure if needed without ffmpeg? BuildRequires: glslc BuildRequires: vulkan-headers %endif @@ -53,6 +48,8 @@ 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}.} @@ -64,7 +61,7 @@ BuildRequires: pkgconfig(wayland-server) %cargo_prep %generate_buildrequires -%cargo_generate_buildrequires -f %{test_features} +%cargo_generate_buildrequires %build %cargo_build @@ -76,6 +73,8 @@ 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 @@ -84,7 +83,7 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/waypipe.1 %if %{with check} %check -%cargo_test -f %{test_features} +%cargo_test %endif %files