Преглед на файлове

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.
columbarius преди 3 години
родител
ревизия
76e9c64f41
променени са 2 файла, в които са добавени 1 реда и са изтрити 5 реда
  1. 1 1
      plugins/linux-pipewire/CMakeLists.txt
  2. 0 4
      plugins/linux-pipewire/pipewire.c

+ 1 - 1
plugins/linux-pipewire/CMakeLists.txt

@@ -6,7 +6,7 @@ if(NOT ENABLE_PIPEWIRE)
   return()
   return()
 endif()
 endif()
 
 
-find_package(PipeWire 0.3.32 REQUIRED)
+find_package(PipeWire 0.3.33 REQUIRED)
 find_package(Gio QUIET)
 find_package(Gio QUIET)
 find_package(Libdrm QUIET) # we require libdrm/drm_fourcc.h to build
 find_package(Libdrm QUIET) # we require libdrm/drm_fourcc.h to build
 
 

+ 0 - 4
plugins/linux-pipewire/pipewire.c

@@ -36,10 +36,6 @@
 #include <spa/param/video/type-info.h>
 #include <spa/param/video/type-info.h>
 #include <spa/utils/result.h>
 #include <spa/utils/result.h>
 
 
-#ifndef SPA_POD_PROP_FLAG_DONT_FIXATE
-#define SPA_POD_PROP_FLAG_DONT_FIXATE (1 << 4)
-#endif
-
 #define CURSOR_META_SIZE(width, height)                                    \
 #define CURSOR_META_SIZE(width, height)                                    \
 	(sizeof(struct spa_meta_cursor) + sizeof(struct spa_meta_bitmap) + \
 	(sizeof(struct spa_meta_cursor) + sizeof(struct spa_meta_bitmap) + \
 	 width * height * 4)
 	 width * height * 4)