More build fixes.

This commit is contained in:
casey langen 2020-04-09 18:39:57 -07:00
parent 11d116276d
commit 8e769d2cab
3 changed files with 17 additions and 3 deletions

View File

@ -52,6 +52,19 @@ jobs:
- run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/
- store_artifacts:
path: /root/debs/
build_ubuntu_focal:
docker:
- image: ubuntu:focal
steps:
- checkout
- run: apt-get update
- run: apt-get install -y 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
- run: cmake -DGENERATE_DEB=1 -DDEB_ARCHITECTURE=amd64 -DDEB_PLATFORM=ubuntu -DDEB_DISTRO=eoan -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .
- run: make -j2
- run: make package
- run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/
- store_artifacts:
path: /root/debs/
build_fedora_26:
docker:
- image: fedora:26
@ -126,6 +139,7 @@ workflows:
- build_ubuntu_cosmic: *workflow_filters
- build_ubuntu_disco: *workflow_filters
- build_ubuntu_eoan: *workflow_filters
- build_ubuntu_focal: *workflow_filters
- build_fedora_26: *workflow_filters
- build_fedora_27: *workflow_filters
- build_fedora_28: *workflow_filters

View File

@ -314,6 +314,9 @@ if (GENERATE_DEB MATCHES "1")
set(DEB_AVUTIL_VERSION "56")
set(DEB_AVFORMAT_VERSION "58")
set(DEB_SWRESAMPLE_VERSION "3")
elseif (DEB_DISTRO MATCHES "focal")
set(DEB_BOOST_VERSION "1.71.0")
set(DEB_MICROHTTPD_VERSION "12")
elseif (DEB_DISTRO MATCHES "xenial")
set(DEB_BOOST_VERSION "1.58.0")
set(DEB_MICROHTTPD_VERSION "10")

View File

@ -91,10 +91,7 @@ apps:
- network-bind
- audio-playback
- alsa
- unity7
- x11
- desktop
- desktop-legacy
slots:
- mpris