Commit 4f286141 authored by Jan Grulich's avatar Jan Grulich
Browse files

Revert "Improve PipeWire code"

This reverts commit eb1dc503.

Revert "Add dma-buf defines to build dma-buf support everywhere"

This reverts commit 8f0de624.

Revert "Drop support for PipeWire 0.2"

This reverts commit 028ac099.

These were accidentally pushed without review. They were meant
to be pushed to my fork instead.
parent eb1dc503
......@@ -62,8 +62,8 @@
# in the FIND_PATH() and FIND_LIBRARY() calls
find_package(PkgConfig QUIET)
pkg_search_module(PKG_PipeWire QUIET libpipewire-0.3)
pkg_search_module(PKG_Spa QUIET libspa-0.2)
pkg_search_module(PKG_PipeWire QUIET libpipewire-0.3 libpipewire-0.2)
pkg_search_module(PKG_Spa QUIET libspa-0.2 libspa-0.1)
set(PipeWire_DEFINITIONS "${PKG_PipeWire_CFLAGS}" "${PKG_Spa_CFLAGS}")
set(PipeWire_VERSION "${PKG_PipeWire_VERSION}")
......@@ -76,13 +76,6 @@ find_path(PipeWire_INCLUDE_DIRS
${PKG_PipeWire_INCLUDE_DIRS}/pipewire-0.3
)
find_library(PipeWire_LIBRARIES
NAMES
pipewire-0.3
HINTS
${PKG_PipeWire_LIBRARY_DIRS}
)
find_path(Spa_INCLUDE_DIRS
NAMES
spa/param/props.h
......@@ -91,6 +84,14 @@ find_path(Spa_INCLUDE_DIRS
${PKG_Spa_INCLUDE_DIRS}/spa-0.2
)
find_library(PipeWire_LIBRARIES
NAMES
pipewire-0.3
pipewire-0.2
HINTS
${PKG_PipeWire_LIBRARY_DIRS}
)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(PipeWire
FOUND_VAR
......
......@@ -33,6 +33,12 @@ add_library(krfb_framebuffer_pw
${krfb_framebuffer_pw_SRCS}
)
check_include_file("linux/dma-buf.h" HAVE_LINUX_DMABUF_H)
if (HAVE_LINUX_DMABUF_H)
target_compile_definitions(krfb_framebuffer_pw PRIVATE -DHAVE_LINUX_DMABUF_H)
endif ()
target_link_libraries (krfb_framebuffer_pw
Qt5::Core
Qt5::Gui
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment