mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-10-02 04:52:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable PipeWire by default; added ENABLE_PIPEWIRE flag to CMake. Added Hirsute build target that includes PipeWire.

Browse Source
This commit is contained in:
casey langen 2021-03-19 23:28:11 -07:00
parent 7b4864bed9
commit 9cacfb9832
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.circleci/config.yml
View File

@ -42,6 +42,20 @@ jobs:
- run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/ - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/
- store_artifacts: - store_artifacts:
path: /root/debs/ 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: build_fedora_31:
docker: docker:
- image: fedora:31 - image: fedora:31

2
CMakeLists.txt
View File

@ -155,8 +155,10 @@ add_dependencies(musikcubed musikcube)
if (CMAKE_SYSTEM_NAME MATCHES "Linux") if (CMAKE_SYSTEM_NAME MATCHES "Linux")
add_subdirectory(src/plugins/alsaout) add_subdirectory(src/plugins/alsaout)
add_subdirectory(src/plugins/pulseout) add_subdirectory(src/plugins/pulseout)
if (${ENABLE_PIPEWIRE} MATCHES "true")
add_subdirectory(src/plugins/pipewireout) add_subdirectory(src/plugins/pipewireout)
add_dependencies(musikcube pipewireout) add_dependencies(musikcube pipewireout)
endif()
if (${ENABLE_MPRIS} MATCHES "true") if (${ENABLE_MPRIS} MATCHES "true")
add_subdirectory(src/plugins/mpris) add_subdirectory(src/plugins/mpris)
add_dependencies(musikcube mpris) add_dependencies(musikcube mpris)

2
src/plugins/pipewireout/CMakeLists.txt
View File

@ -6,7 +6,9 @@ set (pipewireout_SOURCES
message(STATUS "[pipewireout] plugin enabled") message(STATUS "[pipewireout] plugin enabled")
include_directories("/usr/include/spa-0.2") 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/include/pipewire-0.3")
include_directories("/usr/local/include/pipewire-0.3")
add_library(pipewireout SHARED ${pipewireout_SOURCES}) add_library(pipewireout SHARED ${pipewireout_SOURCES})
target_link_libraries(pipewireout ${musikcube_LINK_LIBS} pipewire-0.3) target_link_libraries(pipewireout ${musikcube_LINK_LIBS} pipewire-0.3)