From 11b9fb2dfe7aadc0ce2e67f29f4191f0af726526 Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Tue, 14 Oct 2025 21:59:14 +0900
Subject: [PATCH 01/12] Properly handle pkg-config dep through workspace

[skip changelog]
(not interesting for users)
---
 cargo-workspace.patch | 308 ++++++++++++++++++++++++++++++++++++++++++
 waypipe.spec          |   3 +-
 2 files changed, 309 insertions(+), 2 deletions(-)
 create mode 100644 cargo-workspace.patch

diff --git a/cargo-workspace.patch b/cargo-workspace.patch
new file mode 100644
index 0000000..2699ed2
--- /dev/null
+++ b/cargo-workspace.patch
@@ -0,0 +1,308 @@
+From d8b4426ff54ea2f19f142a1513ed9b8f07e1fe18 Mon Sep 17 00:00:00 2001
+From: Dominique Martinet <asmadeus@codewreck.org>
+Date: Tue, 14 Oct 2025 22:16:32 +0900
+Subject: [PATCH] Cargo.toml: define a workspace for helper crates
+
+This has multiple benefits:
+- Cargo.lock are now all shared between crates, making dependency
+updates easier to manage
+- This could also allow managing all versions or some properties in
+lockstep, e.g. writing 'rust-version.workspace = true' in members
+Cargo.toml (supported props:
+https://doc.rust-lang.org/cargo/reference/workspaces.html#the-package-table
+)
+- some tools like cargo2rpm used by fedora packaging use 'cargo
+metadata' under the hood, and this did not properly pick up
+wrapper dependencies automatically
+---
+Merged in https://gitlab.freedesktop.org/mstoeckl/waypipe/-/merge_requests/35
+
+ Cargo.toml             |  3 ++
+ shaders/Cargo.lock     |  7 ---
+ wrap-ffmpeg/Cargo.lock | 97 ------------------------------------------
+ wrap-gbm/Cargo.lock    | 97 ------------------------------------------
+ wrap-lz4/Cargo.lock    | 16 -------
+ wrap-zstd/Cargo.lock   | 16 -------
+ 6 files changed, 3 insertions(+), 233 deletions(-)
+ delete mode 100644 shaders/Cargo.lock
+ delete mode 100644 wrap-ffmpeg/Cargo.lock
+ delete mode 100644 wrap-gbm/Cargo.lock
+ delete mode 100644 wrap-lz4/Cargo.lock
+ delete mode 100644 wrap-zstd/Cargo.lock
+
+diff --git a/Cargo.toml b/Cargo.toml
+index aeb7bea7e426..ecba518d49ee 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -1,3 +1,6 @@
++[workspace]
++
+ [package]
+ name = "waypipe"
+ version = "0.10.5"
+diff --git a/shaders/Cargo.lock b/shaders/Cargo.lock
+deleted file mode 100644
+index 33f0e02785e4..000000000000
+--- a/shaders/Cargo.lock
++++ /dev/null
+@@ -1,7 +0,0 @@
+-# This file is automatically @generated by Cargo.
+-# It is not intended for manual editing.
+-version = 3
+-
+-[[package]]
+-name = "waypipe-shaders"
+-version = "0.1.0"
+diff --git a/wrap-ffmpeg/Cargo.lock b/wrap-ffmpeg/Cargo.lock
+deleted file mode 100644
+index ec7f892fba1b..000000000000
+--- a/wrap-ffmpeg/Cargo.lock
++++ /dev/null
+@@ -1,97 +0,0 @@
+-# This file is automatically @generated by Cargo.
+-# It is not intended for manual editing.
+-version = 3
+-
+-[[package]]
+-name = "cfg-if"
+-version = "1.0.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+-
+-[[package]]
+-name = "libloading"
+-version = "0.8.5"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+-dependencies = [
+- "cfg-if",
+- "windows-targets",
+-]
+-
+-[[package]]
+-name = "pkg-config"
+-version = "0.3.31"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+-
+-[[package]]
+-name = "waypipe-ffmpeg-wrapper"
+-version = "0.1.0"
+-dependencies = [
+- "libloading",
+- "pkg-config",
+-]
+-
+-[[package]]
+-name = "windows-targets"
+-version = "0.52.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+-dependencies = [
+- "windows_aarch64_gnullvm",
+- "windows_aarch64_msvc",
+- "windows_i686_gnu",
+- "windows_i686_gnullvm",
+- "windows_i686_msvc",
+- "windows_x86_64_gnu",
+- "windows_x86_64_gnullvm",
+- "windows_x86_64_msvc",
+-]
+-
+-[[package]]
+-name = "windows_aarch64_gnullvm"
+-version = "0.52.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+-
+-[[package]]
+-name = "windows_aarch64_msvc"
+-version = "0.52.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+-
+-[[package]]
+-name = "windows_i686_gnu"
+-version = "0.52.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+-
+-[[package]]
+-name = "windows_i686_gnullvm"
+-version = "0.52.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+-
+-[[package]]
+-name = "windows_i686_msvc"
+-version = "0.52.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+-
+-[[package]]
+-name = "windows_x86_64_gnu"
+-version = "0.52.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+-
+-[[package]]
+-name = "windows_x86_64_gnullvm"
+-version = "0.52.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+-
+-[[package]]
+-name = "windows_x86_64_msvc"
+-version = "0.52.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+diff --git a/wrap-gbm/Cargo.lock b/wrap-gbm/Cargo.lock
+deleted file mode 100644
+index f361ece261e8..000000000000
+--- a/wrap-gbm/Cargo.lock
++++ /dev/null
+@@ -1,97 +0,0 @@
+-# This file is automatically @generated by Cargo.
+-# It is not intended for manual editing.
+-version = 3
+-
+-[[package]]
+-name = "cfg-if"
+-version = "1.0.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+-
+-[[package]]
+-name = "libloading"
+-version = "0.8.5"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+-dependencies = [
+- "cfg-if",
+- "windows-targets",
+-]
+-
+-[[package]]
+-name = "pkg-config"
+-version = "0.3.31"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+-
+-[[package]]
+-name = "waypipe-gbm-wrapper"
+-version = "0.1.0"
+-dependencies = [
+- "libloading",
+- "pkg-config",
+-]
+-
+-[[package]]
+-name = "windows-targets"
+-version = "0.52.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+-dependencies = [
+- "windows_aarch64_gnullvm",
+- "windows_aarch64_msvc",
+- "windows_i686_gnu",
+- "windows_i686_gnullvm",
+- "windows_i686_msvc",
+- "windows_x86_64_gnu",
+- "windows_x86_64_gnullvm",
+- "windows_x86_64_msvc",
+-]
+-
+-[[package]]
+-name = "windows_aarch64_gnullvm"
+-version = "0.52.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+-
+-[[package]]
+-name = "windows_aarch64_msvc"
+-version = "0.52.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+-
+-[[package]]
+-name = "windows_i686_gnu"
+-version = "0.52.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+-
+-[[package]]
+-name = "windows_i686_gnullvm"
+-version = "0.52.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+-
+-[[package]]
+-name = "windows_i686_msvc"
+-version = "0.52.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+-
+-[[package]]
+-name = "windows_x86_64_gnu"
+-version = "0.52.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+-
+-[[package]]
+-name = "windows_x86_64_gnullvm"
+-version = "0.52.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+-
+-[[package]]
+-name = "windows_x86_64_msvc"
+-version = "0.52.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+diff --git a/wrap-lz4/Cargo.lock b/wrap-lz4/Cargo.lock
+deleted file mode 100644
+index 8405819dc511..000000000000
+--- a/wrap-lz4/Cargo.lock
++++ /dev/null
+@@ -1,16 +0,0 @@
+-# This file is automatically @generated by Cargo.
+-# It is not intended for manual editing.
+-version = 3
+-
+-[[package]]
+-name = "pkg-config"
+-version = "0.3.31"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+-
+-[[package]]
+-name = "waypipe-lz4-wrapper"
+-version = "0.1.0"
+-dependencies = [
+- "pkg-config",
+-]
+diff --git a/wrap-zstd/Cargo.lock b/wrap-zstd/Cargo.lock
+deleted file mode 100644
+index 47777ffaa8ca..000000000000
+--- a/wrap-zstd/Cargo.lock
++++ /dev/null
+@@ -1,16 +0,0 @@
+-# This file is automatically @generated by Cargo.
+-# It is not intended for manual editing.
+-version = 3
+-
+-[[package]]
+-name = "pkg-config"
+-version = "0.3.31"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+-
+-[[package]]
+-name = "waypipe-zstd-wrapper"
+-version = "0.1.0"
+-dependencies = [
+- "pkg-config",
+-]
+-- 
+2.51.0
+
diff --git a/waypipe.spec b/waypipe.spec
index 9ede503..de13549 100644
--- a/waypipe.spec
+++ b/waypipe.spec
@@ -22,6 +22,7 @@ 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
+Patch2:         cargo-workspace.patch
 
 BuildRequires:  cargo-rpm-macros >= 26
 BuildRequires:  bindgen-cli
@@ -48,8 +49,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}.}

From 20fd833d5198916963e7163a19bf05a143d7d4d3 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Wed, 29 Oct 2025 19:50:37 -0400
Subject: [PATCH 02/12] Use cargo features (fix RHEL build)

RHEL does not include ffmpeg for the video feature, and test_proto is only
needed during %check.  Therefore, we should not rely on the default features,
and instead specify them when calling cargo.
---
 waypipe.spec | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/waypipe.spec b/waypipe.spec
index de13549..7263d43 100644
--- a/waypipe.spec
+++ b/waypipe.spec
@@ -4,6 +4,12 @@
 # prevent library files from being installed
 %global cargo_install_lib 0
 
+# Default features in Cargo.toml, except:
+# video: requires ffmpeg (not included in RHEL)
+# test_proto: only needed in %%check
+%global features %{!?rhel:video,}dmabuf,lz4,zstd,gbmfallback
+%global test_features test_proto
+
 Name:           waypipe
 Version:        0.10.5
 Release:        %autorelease
@@ -38,7 +44,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
@@ -60,10 +65,10 @@ BuildRequires:  pkgconfig(wayland-server)
 %cargo_prep
 
 %generate_buildrequires
-%cargo_generate_buildrequires
+%cargo_generate_buildrequires -n -f %{features},%{test_features}
 
 %build
-%cargo_build
+%cargo_build -n -f %{features}
 %{cargo_license_summary}
 %{cargo_license} > LICENSE.dependencies
 %if !0%{?rhel}
@@ -71,9 +76,7 @@ scdoc < waypipe.scd > waypipe.1
 %endif
 
 %install
-%cargo_install
-# Is there a better way to build only `--bin waypipe` ?
-rm -f %{buildroot}%{_bindir}/test_proto
+%cargo_install -n -f %{features}
 %if !0%{?rhel}
 install -D -p -m 0644 waypipe.1 %{buildroot}%{_mandir}/man1/waypipe.1
 %else
@@ -82,7 +85,7 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/waypipe.1
 
 %if %{with check}
 %check
-%cargo_test
+%cargo_test -n -f %{features},%{test_features}
 %endif
 
 %files

From 79b8092a6d8ea0329cd797d859951d467663490a Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Thu, 30 Oct 2025 22:56:37 +0900
Subject: [PATCH 03/12] fix cargo-workspace.patch

diff was edited manually incorrectly.. woops.
[skip changelog]
---
 cargo-workspace.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cargo-workspace.patch b/cargo-workspace.patch
index 2699ed2..8f6b19c 100644
--- a/cargo-workspace.patch
+++ b/cargo-workspace.patch
@@ -34,7 +34,7 @@ diff --git a/Cargo.toml b/Cargo.toml
 index aeb7bea7e426..ecba518d49ee 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -1,3 +1,6 @@
+@@ -1,3 +1,5 @@
 +[workspace]
 +
  [package]

From 9f56196bff4d1a0228e66b8474a76419b6228558 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Thu, 6 Nov 2025 13:12:51 +0100
Subject: [PATCH 04/12] Rebuilt for FFmpeg 8


From 2d31a300b04f5411fb07289eba39f02265dd3420 Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Sun, 7 Dec 2025 12:21:48 +0000
Subject: [PATCH 05/12] replace feature list with Cargo.toml patch

This should allow detecting if the feature list changes in the future
unlike the current approach, as suggested in [1]

Link: https://src.fedoraproject.org/rpms/waypipe/pull-request/7 [1]
---
 ...ures-remove-test_proto-from-defaults.patch | 25 ++++++++++++++++++
 ...res-remove-video-from-defaults-for-r.patch | 26 +++++++++++++++++++
 waypipe.spec                                  | 17 ++++++------
 3 files changed, 60 insertions(+), 8 deletions(-)
 create mode 100644 0001-Cargo.toml-features-remove-test_proto-from-defaults.patch
 create mode 100644 0002-Cargo.toml-features-remove-video-from-defaults-for-r.patch

diff --git a/0001-Cargo.toml-features-remove-test_proto-from-defaults.patch b/0001-Cargo.toml-features-remove-test_proto-from-defaults.patch
new file mode 100644
index 0000000..1dfcada
--- /dev/null
+++ b/0001-Cargo.toml-features-remove-test_proto-from-defaults.patch
@@ -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
+
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
new file mode 100644
index 0000000..2d0c62e
--- /dev/null
+++ b/0002-Cargo.toml-features-remove-video-from-defaults-for-r.patch
@@ -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
+
diff --git a/waypipe.spec b/waypipe.spec
index 7263d43..599e094 100644
--- a/waypipe.spec
+++ b/waypipe.spec
@@ -4,10 +4,7 @@
 # prevent library files from being installed
 %global cargo_install_lib 0
 
-# Default features in Cargo.toml, except:
-# video: requires ffmpeg (not included in RHEL)
-# test_proto: only needed in %%check
-%global features %{!?rhel:video,}dmabuf,lz4,zstd,gbmfallback
+# test_proto is only needed in %%check
 %global test_features test_proto
 
 Name:           waypipe
@@ -29,6 +26,10 @@ Source0:        https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v%{ver
 Source1:        waypipe.1
 Patch1:         license.patch
 Patch2:         cargo-workspace.patch
+Patch3:         0001-Cargo.toml-features-remove-test_proto-from-defaults.patch
+%if 0%{?rhel}
+Patch4:         0002-Cargo.toml-features-remove-video-from-defaults-for-r.patch
+%endif
 
 BuildRequires:  cargo-rpm-macros >= 26
 BuildRequires:  bindgen-cli
@@ -65,10 +66,10 @@ BuildRequires:  pkgconfig(wayland-server)
 %cargo_prep
 
 %generate_buildrequires
-%cargo_generate_buildrequires -n -f %{features},%{test_features}
+%cargo_generate_buildrequires -f %{test_features}
 
 %build
-%cargo_build -n -f %{features}
+%cargo_build
 %{cargo_license_summary}
 %{cargo_license} > LICENSE.dependencies
 %if !0%{?rhel}
@@ -76,7 +77,7 @@ scdoc < waypipe.scd > waypipe.1
 %endif
 
 %install
-%cargo_install -n -f %{features}
+%cargo_install
 %if !0%{?rhel}
 install -D -p -m 0644 waypipe.1 %{buildroot}%{_mandir}/man1/waypipe.1
 %else
@@ -85,7 +86,7 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/waypipe.1
 
 %if %{with check}
 %check
-%cargo_test -n -f %{features},%{test_features}
+%cargo_test -f %{test_features}
 %endif
 
 %files

From 0bd31dde9f5853bfd9428b1bd6e512c4b168f57d Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Sun, 7 Dec 2025 12:24:56 +0000
Subject: [PATCH 06/12] Update to 0.10.6

---
 .gitignore   | 1 +
 sources      | 2 +-
 waypipe.spec | 8 +++-----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2c3f348..660842d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /waypipe-v0.9.1.tar.gz
 /waypipe-v0.10.4.tar.gz
 /waypipe-v0.10.5.tar.gz
+/waypipe-v0.10.6.tar.gz
diff --git a/sources b/sources
index 5041244..c4a7c56 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (waypipe-v0.10.5.tar.gz) = 1a9cf484d55adef247c63eccb8de7979eb0d5deabb3c0a0f64e476ab6cf47038cec8c6146690c446ba6070d3e0638d73359f1e84bcfe812cc0968157cae7d8d2
+SHA512 (waypipe-v0.10.6.tar.gz) = d74ae79cc18319952b131c78e5551a06636e88d7b434762c5a8f9d18e64b886996b26204b3952c096d79c7823f65e82992a9bc24f7c114a14b0aa70633596f52
diff --git a/waypipe.spec b/waypipe.spec
index 599e094..0384589 100644
--- a/waypipe.spec
+++ b/waypipe.spec
@@ -8,7 +8,7 @@
 %global test_features test_proto
 
 Name:           waypipe
-Version:        0.10.5
+Version:        0.10.6
 Release:        %autorelease
 Summary:        Wayland forwarding proxy
 
@@ -24,11 +24,9 @@ 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
-Patch2:         cargo-workspace.patch
-Patch3:         0001-Cargo.toml-features-remove-test_proto-from-defaults.patch
+Patch1:         0001-Cargo.toml-features-remove-test_proto-from-defaults.patch
 %if 0%{?rhel}
-Patch4:         0002-Cargo.toml-features-remove-video-from-defaults-for-r.patch
+Patch2:         0002-Cargo.toml-features-remove-video-from-defaults-for-r.patch
 %endif
 
 BuildRequires:  cargo-rpm-macros >= 26

From 91c0d46b9fd6b813bd5486a50fcb0c496a967b65 Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Sun, 7 Dec 2025 12:30:45 +0000
Subject: [PATCH 07/12] Remove unused patches

[skip changelog]
---
 cargo-workspace.patch | 308 ------------------------------------------
 license.patch         |  19 ---
 2 files changed, 327 deletions(-)
 delete mode 100644 cargo-workspace.patch
 delete mode 100644 license.patch

diff --git a/cargo-workspace.patch b/cargo-workspace.patch
deleted file mode 100644
index 8f6b19c..0000000
--- a/cargo-workspace.patch
+++ /dev/null
@@ -1,308 +0,0 @@
-From d8b4426ff54ea2f19f142a1513ed9b8f07e1fe18 Mon Sep 17 00:00:00 2001
-From: Dominique Martinet <asmadeus@codewreck.org>
-Date: Tue, 14 Oct 2025 22:16:32 +0900
-Subject: [PATCH] Cargo.toml: define a workspace for helper crates
-
-This has multiple benefits:
-- Cargo.lock are now all shared between crates, making dependency
-updates easier to manage
-- This could also allow managing all versions or some properties in
-lockstep, e.g. writing 'rust-version.workspace = true' in members
-Cargo.toml (supported props:
-https://doc.rust-lang.org/cargo/reference/workspaces.html#the-package-table
-)
-- some tools like cargo2rpm used by fedora packaging use 'cargo
-metadata' under the hood, and this did not properly pick up
-wrapper dependencies automatically
----
-Merged in https://gitlab.freedesktop.org/mstoeckl/waypipe/-/merge_requests/35
-
- Cargo.toml             |  3 ++
- shaders/Cargo.lock     |  7 ---
- wrap-ffmpeg/Cargo.lock | 97 ------------------------------------------
- wrap-gbm/Cargo.lock    | 97 ------------------------------------------
- wrap-lz4/Cargo.lock    | 16 -------
- wrap-zstd/Cargo.lock   | 16 -------
- 6 files changed, 3 insertions(+), 233 deletions(-)
- delete mode 100644 shaders/Cargo.lock
- delete mode 100644 wrap-ffmpeg/Cargo.lock
- delete mode 100644 wrap-gbm/Cargo.lock
- delete mode 100644 wrap-lz4/Cargo.lock
- delete mode 100644 wrap-zstd/Cargo.lock
-
-diff --git a/Cargo.toml b/Cargo.toml
-index aeb7bea7e426..ecba518d49ee 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -1,3 +1,5 @@
-+[workspace]
-+
- [package]
- name = "waypipe"
- version = "0.10.5"
-diff --git a/shaders/Cargo.lock b/shaders/Cargo.lock
-deleted file mode 100644
-index 33f0e02785e4..000000000000
---- a/shaders/Cargo.lock
-+++ /dev/null
-@@ -1,7 +0,0 @@
--# This file is automatically @generated by Cargo.
--# It is not intended for manual editing.
--version = 3
--
--[[package]]
--name = "waypipe-shaders"
--version = "0.1.0"
-diff --git a/wrap-ffmpeg/Cargo.lock b/wrap-ffmpeg/Cargo.lock
-deleted file mode 100644
-index ec7f892fba1b..000000000000
---- a/wrap-ffmpeg/Cargo.lock
-+++ /dev/null
-@@ -1,97 +0,0 @@
--# This file is automatically @generated by Cargo.
--# It is not intended for manual editing.
--version = 3
--
--[[package]]
--name = "cfg-if"
--version = "1.0.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
--
--[[package]]
--name = "libloading"
--version = "0.8.5"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
--dependencies = [
-- "cfg-if",
-- "windows-targets",
--]
--
--[[package]]
--name = "pkg-config"
--version = "0.3.31"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
--
--[[package]]
--name = "waypipe-ffmpeg-wrapper"
--version = "0.1.0"
--dependencies = [
-- "libloading",
-- "pkg-config",
--]
--
--[[package]]
--name = "windows-targets"
--version = "0.52.6"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
--dependencies = [
-- "windows_aarch64_gnullvm",
-- "windows_aarch64_msvc",
-- "windows_i686_gnu",
-- "windows_i686_gnullvm",
-- "windows_i686_msvc",
-- "windows_x86_64_gnu",
-- "windows_x86_64_gnullvm",
-- "windows_x86_64_msvc",
--]
--
--[[package]]
--name = "windows_aarch64_gnullvm"
--version = "0.52.6"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
--
--[[package]]
--name = "windows_aarch64_msvc"
--version = "0.52.6"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
--
--[[package]]
--name = "windows_i686_gnu"
--version = "0.52.6"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
--
--[[package]]
--name = "windows_i686_gnullvm"
--version = "0.52.6"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
--
--[[package]]
--name = "windows_i686_msvc"
--version = "0.52.6"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
--
--[[package]]
--name = "windows_x86_64_gnu"
--version = "0.52.6"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
--
--[[package]]
--name = "windows_x86_64_gnullvm"
--version = "0.52.6"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
--
--[[package]]
--name = "windows_x86_64_msvc"
--version = "0.52.6"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-diff --git a/wrap-gbm/Cargo.lock b/wrap-gbm/Cargo.lock
-deleted file mode 100644
-index f361ece261e8..000000000000
---- a/wrap-gbm/Cargo.lock
-+++ /dev/null
-@@ -1,97 +0,0 @@
--# This file is automatically @generated by Cargo.
--# It is not intended for manual editing.
--version = 3
--
--[[package]]
--name = "cfg-if"
--version = "1.0.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
--
--[[package]]
--name = "libloading"
--version = "0.8.5"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
--dependencies = [
-- "cfg-if",
-- "windows-targets",
--]
--
--[[package]]
--name = "pkg-config"
--version = "0.3.31"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
--
--[[package]]
--name = "waypipe-gbm-wrapper"
--version = "0.1.0"
--dependencies = [
-- "libloading",
-- "pkg-config",
--]
--
--[[package]]
--name = "windows-targets"
--version = "0.52.6"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
--dependencies = [
-- "windows_aarch64_gnullvm",
-- "windows_aarch64_msvc",
-- "windows_i686_gnu",
-- "windows_i686_gnullvm",
-- "windows_i686_msvc",
-- "windows_x86_64_gnu",
-- "windows_x86_64_gnullvm",
-- "windows_x86_64_msvc",
--]
--
--[[package]]
--name = "windows_aarch64_gnullvm"
--version = "0.52.6"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
--
--[[package]]
--name = "windows_aarch64_msvc"
--version = "0.52.6"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
--
--[[package]]
--name = "windows_i686_gnu"
--version = "0.52.6"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
--
--[[package]]
--name = "windows_i686_gnullvm"
--version = "0.52.6"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
--
--[[package]]
--name = "windows_i686_msvc"
--version = "0.52.6"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
--
--[[package]]
--name = "windows_x86_64_gnu"
--version = "0.52.6"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
--
--[[package]]
--name = "windows_x86_64_gnullvm"
--version = "0.52.6"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
--
--[[package]]
--name = "windows_x86_64_msvc"
--version = "0.52.6"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-diff --git a/wrap-lz4/Cargo.lock b/wrap-lz4/Cargo.lock
-deleted file mode 100644
-index 8405819dc511..000000000000
---- a/wrap-lz4/Cargo.lock
-+++ /dev/null
-@@ -1,16 +0,0 @@
--# This file is automatically @generated by Cargo.
--# It is not intended for manual editing.
--version = 3
--
--[[package]]
--name = "pkg-config"
--version = "0.3.31"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
--
--[[package]]
--name = "waypipe-lz4-wrapper"
--version = "0.1.0"
--dependencies = [
-- "pkg-config",
--]
-diff --git a/wrap-zstd/Cargo.lock b/wrap-zstd/Cargo.lock
-deleted file mode 100644
-index 47777ffaa8ca..000000000000
---- a/wrap-zstd/Cargo.lock
-+++ /dev/null
-@@ -1,16 +0,0 @@
--# This file is automatically @generated by Cargo.
--# It is not intended for manual editing.
--version = 3
--
--[[package]]
--name = "pkg-config"
--version = "0.3.31"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
--
--[[package]]
--name = "waypipe-zstd-wrapper"
--version = "0.1.0"
--dependencies = [
-- "pkg-config",
--]
--- 
-2.51.0
-
diff --git a/license.patch b/license.patch
deleted file mode 100644
index b43abb6..0000000
--- a/license.patch
+++ /dev/null
@@ -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"

From 43a89ed836aabcdce95498333fb1350615cd1e6b Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Sat, 20 Dec 2025 06:02:15 +0000
Subject: [PATCH 08/12] Update to 0.11.0 (identical to 0.10.6)

---
 .gitignore   | 1 +
 sources      | 2 +-
 waypipe.spec | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 660842d..1b4b62e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /waypipe-v0.10.4.tar.gz
 /waypipe-v0.10.5.tar.gz
 /waypipe-v0.10.6.tar.gz
+/waypipe-v0.11.0.tar.gz
diff --git a/sources b/sources
index c4a7c56..17bd915 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (waypipe-v0.10.6.tar.gz) = d74ae79cc18319952b131c78e5551a06636e88d7b434762c5a8f9d18e64b886996b26204b3952c096d79c7823f65e82992a9bc24f7c114a14b0aa70633596f52
+SHA512 (waypipe-v0.11.0.tar.gz) = 02f723ec553c530378649ece93b2ee38d2c39c6087043566204150254f7234277dca477eb4402fe2d311d1554efbfd28652079c2d1db66e7291ea9ad30f10fa4
diff --git a/waypipe.spec b/waypipe.spec
index 0384589..59dde18 100644
--- a/waypipe.spec
+++ b/waypipe.spec
@@ -8,7 +8,7 @@
 %global test_features test_proto
 
 Name:           waypipe
-Version:        0.10.6
+Version:        0.11.0
 Release:        %autorelease
 Summary:        Wayland forwarding proxy
 

From 5d1e990678c3f7b8f36ac6226297a463d8170ce9 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 17 Jan 2026 20:08:55 +0000
Subject: [PATCH 09/12] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild


From 86540dc31878177b44ceedd62129e904ad960dcf Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jul 2026 08:43:16 +0000
Subject: [PATCH 10/12] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild


From a787f50d30da3fb2c720c83391f6a03396dad961 Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Mon, 17 Aug 2026 00:40:42 +0000
Subject: [PATCH 11/12] Update to 0.11.1

---
 .gitignore   | 1 +
 sources      | 2 +-
 waypipe.spec | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1b4b62e..8b3a6a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /waypipe-v0.10.5.tar.gz
 /waypipe-v0.10.6.tar.gz
 /waypipe-v0.11.0.tar.gz
+/waypipe-v0.11.1.tar.gz
diff --git a/sources b/sources
index 17bd915..34597e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (waypipe-v0.11.0.tar.gz) = 02f723ec553c530378649ece93b2ee38d2c39c6087043566204150254f7234277dca477eb4402fe2d311d1554efbfd28652079c2d1db66e7291ea9ad30f10fa4
+SHA512 (waypipe-v0.11.1.tar.gz) = 2bb2eeb46f165b96ed843c0a20431d2404d08e0e1f3b5e580f849f07ab7b5cc96c6fbb76ed81beb4f26c0c7e4d0c4d655adf2729e9f141685523bcb4697ce64b
diff --git a/waypipe.spec b/waypipe.spec
index 59dde18..eb51dac 100644
--- a/waypipe.spec
+++ b/waypipe.spec
@@ -8,7 +8,7 @@
 %global test_features test_proto
 
 Name:           waypipe
-Version:        0.11.0
+Version:        0.11.1
 Release:        %autorelease
 Summary:        Wayland forwarding proxy
 

From e8d34c4bbab2bf68eac2e1fcdc05463acf85bd28 Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Thu, 27 Aug 2026 00:05:25 +0000
Subject: [PATCH 12/12] Update to 0.11.2

Prepare for ffmpeg 9 update
---
 .gitignore   | 1 +
 sources      | 2 +-
 waypipe.spec | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8b3a6a3..9ecf52e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /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/sources b/sources
index 34597e0..1bddf05 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (waypipe-v0.11.1.tar.gz) = 2bb2eeb46f165b96ed843c0a20431d2404d08e0e1f3b5e580f849f07ab7b5cc96c6fbb76ed81beb4f26c0c7e4d0c4d655adf2729e9f141685523bcb4697ce64b
+SHA512 (waypipe-v0.11.2.tar.gz) = e1b475f6c4b41cdc15ac1765a6a0dbb865f1bdc384d7f7393660e39baf38a375a501d7ec7493a82cd8aaeef9faba67422164e26d56f19737949f8578495ca5f1
diff --git a/waypipe.spec b/waypipe.spec
index eb51dac..0b54f35 100644
--- a/waypipe.spec
+++ b/waypipe.spec
@@ -8,7 +8,7 @@
 %global test_features test_proto
 
 Name:           waypipe
-Version:        0.11.1
+Version:        0.11.2
 Release:        %autorelease
 Summary:        Wayland forwarding proxy