From 4b53a11cef2c041aa1a0e05111441c342b4db28d Mon Sep 17 00:00:00 2001 From: casey langen Date: Fri, 16 Apr 2021 20:28:39 -0700 Subject: [PATCH] Packaging script updates. --- CMakeLists.txt | 10 +++++++++- script/install-deps.sh | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e3aeef211..d685695f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -298,7 +298,7 @@ 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" OR DEB_DISTRO MATCHES "groovy") + elseif (DEB_DISTRO MATCHES "focal" OR DEB_DISTRO MATCHES "groovy" OR DEB_DISTRO MATCHES "ulyssa") set(DEB_BOOST_VERSION "1.71.0") set(DEB_MICROHTTPD_VERSION "12") set(DEB_LIBCURL_VERSION "4") @@ -306,6 +306,14 @@ if (GENERATE_DEB MATCHES "1") set(DEB_AVFORMAT_VERSION "58") set(DEB_SWRESAMPLE_VERSION "3") set(DEB_NCURSES_VERSION "6") + elseif (DEB_DISTRO MATCHES "hirsute") + set(DEB_BOOST_VERSION "1.74.0") + set(DEB_MICROHTTPD_VERSION "12") + set(DEB_LIBCURL_VERSION "4") + set(DEB_AVUTIL_VERSION "56") + set(DEB_AVFORMAT_VERSION "58") + set(DEB_SWRESAMPLE_VERSION "3") + set(DEB_NCURSES_VERSION "6") endif() set(DEPENDENCIES "libboost-thread${DEB_BOOST_VERSION}, libboost-system${DEB_BOOST_VERSION}, libboost-chrono${DEB_BOOST_VERSION}, libboost-filesystem${DEB_BOOST_VERSION}, libboost-date-time${DEB_BOOST_VERSION}, libmicrohttpd${DEB_MICROHTTPD_VERSION}, libcurl${DEB_LIBCURL_VERSION}, libogg0, libvorbis0a, libvorbisfile3, libncursesw${DEB_NCURSES_VERSION}, libasound2, libpulse0, pulseaudio, libmp3lame0, libev4, libopenmpt0, libssl1.1") diff --git a/script/install-deps.sh b/script/install-deps.sh index d3295c790..e7b058b8b 100755 --- a/script/install-deps.sh +++ b/script/install-deps.sh @@ -7,9 +7,9 @@ if [ $OS == "Linux" ]; then echo "detected ${DISTRO}" case $DISTRO in "hirsute") - sudo apt-get install 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 libncurses-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev libev-dev libtag1-dev libsystemd-dev libavcodec-extra libopenmpt-dev libssl-dev libspa-0.2-dev libpipewire-0.3-dev pipewire pipewire-bin pipewire-audio-client-libraries + sudo apt-get install build-essential clang cmake libboost-thread1.74-dev libboost-system1.74-dev libboost-filesystem1.74-dev libboost-date-time1.74-dev libboost-atomic1.74-dev libboost-chrono1.74-dev libogg-dev libvorbis-dev libavutil-dev libavformat-dev libswresample-dev libncurses-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev libev-dev libtag1-dev libsystemd-dev libavcodec-extra libopenmpt-dev libssl-dev libspa-0.2-dev libpipewire-0.3-dev pipewire pipewire-bin pipewire-audio-client-libraries ;; - "focal" | "groovy") + "focal" | "groovy" | "ulyssa") sudo apt-get install 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 libncurses-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev libev-dev libtag1-dev libsystemd-dev libavcodec-extra libopenmpt-dev libssl-dev ;; "buster")