From 76e9c64f41f98ce435b453f5fa4e600513dbdd62 Mon Sep 17 00:00:00 2001 From: columbarius Date: Wed, 3 Aug 2022 19:36:10 +0200 Subject: [PATCH] Revert "linux-capture: Fix Ubuntu 21.10 builds" This reverts commit 0532a5c1f0296098a268dc43d889a08c932e1c48. Ubuntu 21.10 is from OBS 28 onwards not longer supported and as such we can raise the requirement of the PipeWire dependency to 0.3.33. --- plugins/linux-pipewire/CMakeLists.txt | 2 +- plugins/linux-pipewire/pipewire.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/plugins/linux-pipewire/CMakeLists.txt b/plugins/linux-pipewire/CMakeLists.txt index faf610033..31a55e68b 100644 --- a/plugins/linux-pipewire/CMakeLists.txt +++ b/plugins/linux-pipewire/CMakeLists.txt @@ -6,7 +6,7 @@ if(NOT ENABLE_PIPEWIRE) return() endif() -find_package(PipeWire 0.3.32 REQUIRED) +find_package(PipeWire 0.3.33 REQUIRED) find_package(Gio QUIET) find_package(Libdrm QUIET) # we require libdrm/drm_fourcc.h to build diff --git a/plugins/linux-pipewire/pipewire.c b/plugins/linux-pipewire/pipewire.c index 4bf9c7ea2..b269344a9 100644 --- a/plugins/linux-pipewire/pipewire.c +++ b/plugins/linux-pipewire/pipewire.c @@ -36,10 +36,6 @@ #include #include -#ifndef SPA_POD_PROP_FLAG_DONT_FIXATE -#define SPA_POD_PROP_FLAG_DONT_FIXATE (1 << 4) -#endif - #define CURSOR_META_SIZE(width, height) \ (sizeof(struct spa_meta_cursor) + sizeof(struct spa_meta_bitmap) + \ width * height * 4)