From 9cacfb9832d5a0ad47989126a862d891e5df9799 Mon Sep 17 00:00:00 2001 From: casey langen Date: Fri, 19 Mar 2021 23:28:11 -0700 Subject: [PATCH] Disable PipeWire by default; added ENABLE_PIPEWIRE flag to CMake. Added Hirsute build target that includes PipeWire. --- .circleci/config.yml | 14 ++++++++++++++ CMakeLists.txt | 6 ++++-- src/plugins/pipewireout/CMakeLists.txt | 2 ++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 983b53263..edce0a1d8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -42,6 +42,20 @@ jobs: - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/ - store_artifacts: path: /root/debs/ + build_ubuntu_hirsute: + docker: + - image: ubuntu:hirsute + steps: + - run: apt-get update + - run: DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles" apt-get install -y git ssh sshpass build-essential clang cmake libboost-thread1.71-dev libboost-system1.71-dev libboost-filesystem1.71-dev libboost-date-time1.71-dev libboost-atomic1.71-dev libboost-chrono1.71-dev libogg-dev libvorbis-dev libavutil-dev libavformat-dev libswresample-dev libncursesw5-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev libev-dev libssl-dev libtag1-dev libsystemd-dev libpipewire-0.3-dev libspa-0.2-dev + - checkout + - run: cmake -DENABLE_PCH=true -DENABLE_PIPEWIRE=true -DGENERATE_DEB=1 -DDEB_ARCHITECTURE=amd64 -DDEB_PLATFORM=ubuntu -DDEB_DISTRO=groovy -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release . + - run: make -j2 + - run: make package + - run: ./script/copy-artifacts-to-host.sh /root/project/*.deb + - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/ + - store_artifacts: + path: /root/debs/ build_fedora_31: docker: - image: fedora:31 diff --git a/CMakeLists.txt b/CMakeLists.txt index d638e8adb..d6248b562 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -155,8 +155,10 @@ add_dependencies(musikcubed musikcube) if (CMAKE_SYSTEM_NAME MATCHES "Linux") add_subdirectory(src/plugins/alsaout) add_subdirectory(src/plugins/pulseout) - add_subdirectory(src/plugins/pipewireout) - add_dependencies(musikcube pipewireout) + if (${ENABLE_PIPEWIRE} MATCHES "true") + add_subdirectory(src/plugins/pipewireout) + add_dependencies(musikcube pipewireout) + endif() if (${ENABLE_MPRIS} MATCHES "true") add_subdirectory(src/plugins/mpris) add_dependencies(musikcube mpris) diff --git a/src/plugins/pipewireout/CMakeLists.txt b/src/plugins/pipewireout/CMakeLists.txt index 7a4fb8ee3..5edf57fa8 100644 --- a/src/plugins/pipewireout/CMakeLists.txt +++ b/src/plugins/pipewireout/CMakeLists.txt @@ -6,7 +6,9 @@ set (pipewireout_SOURCES message(STATUS "[pipewireout] plugin enabled") include_directories("/usr/include/spa-0.2") +include_directories("/usr/local/include/spa-0.2") include_directories("/usr/include/pipewire-0.3") +include_directories("/usr/local/include/pipewire-0.3") add_library(pipewireout SHARED ${pipewireout_SOURCES}) target_link_libraries(pipewireout ${musikcube_LINK_LIBS} pipewire-0.3)