4 files changed, 46 insertions, 21 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52877636f..0cbcd8ba6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,6 +187,7 @@ PRINT_SUMMARY ("OSS support ..........................." USE_OSS 1)
 PRINT_SUMMARY ("OSS4 support .........................." USE_OSS4 OSS4_FOUND)
 PRINT_SUMMARY ("JACK support .........................." USE_JACK JACK_FOUND)
 PRINT_SUMMARY ("PulseAudio support ...................." USE_PULSE PULSE_FOUND)
+PRINT_SUMMARY ("PipeWire support ......................" USE_PIPEWIRE PIPEWIRE_FOUND)
 PRINT_SUMMARY ("Null output support ..................." USE_NULL 1)
 PRINT_SUMMARY ("Waveout support (Windows) ............." USE_WAVEOUT WINDOWS_H_FOUND)
 PRINT_SUMMARY ("DirectSound support (Windows) ........." USE_DSOUND DSOUND_H_FOUND)
diff --git a/src/plugins/Output/CMakeLists.txt b/src/plugins/Output/CMakeLists.txt
index 60c206692..867fe49fc 100644
--- a/src/plugins/Output/CMakeLists.txt
+++ b/src/plugins/Output/CMakeLists.txt
@@ -2,7 +2,8 @@ SET(USE_ALSA TRUE CACHE BOOL "enable/disable alsa plugin")
 SET(USE_JACK TRUE CACHE BOOL "enable/disable jack plugin")
 SET(USE_OSS FALSE CACHE BOOL "enable/disable oss plugin")
 SET(USE_OSS4 TRUE CACHE BOOL "enable/disable oss4 plugin")
-SET(USE_PULSE TRUE CACHE BOOL "enable/disable pulse audio plugin")
+SET(USE_PULSE TRUE CACHE BOOL "enable/disable pulseaudio plugin")
+SET(USE_PIPEWIRE TRUE CACHE BOOL "enable/disable pipewire plugin")
 SET(USE_NULL TRUE CACHE BOOL "enable/disable null output plugin")
 SET(USE_WAVEOUT TRUE CACHE BOOL "enable/disable Win32 waveout plugin")
 SET(USE_DSOUND TRUE CACHE BOOL "enable/disable DirectSound plugin")
@@ -30,6 +31,10 @@ IF(USE_PULSE)
 add_subdirectory(pulseaudio)
 ENDIF(USE_PULSE)
 
+IF(USE_PIPEWIRE)
+add_subdirectory(pipewire)
+ENDIF(USE_PIPEWIRE)
+
 IF(USE_NULL)
 add_subdirectory(null)
 ENDIF(USE_NULL)
diff --git a/src/plugins/Output/pipewire/CMakeLists.txt b/src/plugins/Output/pipewire/CMakeLists.txt
new file mode 100644
index 000000000..988fcd56c
--- /dev/null
+++ b/src/plugins/Output/pipewire/CMakeLists.txt
@@ -0,0 +1,39 @@
+project(libpipewire)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+# libqmmp
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
+
+# pipewire
+pkg_check_modules(PIPEWIRE libpipewire-0.3>=0.3.26 libspa-0.2>=0.2)
+
+include_directories(${PIPEWIRE_INCLUDE_DIRS})
+link_directories(${PIPEWIRE_LIBRARY_DIRS})
+ADD_DEFINITIONS(${PIPEWIRE_CFLAGS})
+
+SET(libpipewire_SRCS
+  outputpipewire.cpp
+  outputpipewirefactory.cpp
+)
+
+SET(libpipewire_HDRS
+  outputpipewire.h
+)
+
+SET(libpipewire_RCCS translations/translations.qrc)
+
+QT5_ADD_RESOURCES(libpipewire_RCC_SRCS ${libpipewire_RCCS})
+
+# Don't forget to include output directory, otherwise
+# the UI file won't be wrapped!
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+IF(PIPEWIRE_FOUND)
+ADD_LIBRARY(pipewire MODULE ${libpipewire_SRCS} ${libpipewire_UIS_H}
+  ${libpipewire_RCC_SRCS} ${libpipewire_HDRS})
+add_dependencies(pipewire libqmmp)
+target_link_libraries(pipewire Qt5::Widgets libqmmp ${PIPEWIRE_LDFLAGS})
+install(TARGETS pipewire DESTINATION ${PLUGIN_DIR}/Output)
+ENDIF(PIPEWIRE_FOUND)
diff --git a/src/plugins/Output/pipewire/pipewire.pro.autosave b/src/plugins/Output/pipewire/pipewire.pro.autosave
deleted file mode 100644
index 549c3aef3..000000000
--- a/src/plugins/Output/pipewire/pipewire.pro.autosave
+++ /dev/null
@@ -1,20 +0,0 @@
-include(../../plugins.pri)
-
-TARGET = $$PLUGINS_PREFIX/Output/pipewire
-
-HEADERS += outputpipewirefactory.h \
-           outputpipewire.h
-
-SOURCES += outputpipewirefactory.cpp \
-           outputpipewire.cpp
-
-INCLUDEPATH += /usr/include/pipewire-0.3 /usr/include/spa-0.2
-
-#RESOURCES = translations/translations.qrc
-
-PKGCONFIG += libpipewire-0.3 lib
-
-QMAKE_CXXFLAGS += -Wno-missing-field-initializers
-
-target.path = $$PLUGIN_DIR/Output
-INSTALLS += target