diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f59f04bb..6debe74a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -253,12 +253,16 @@ if (GENERATE_DEB MATCHES "1") set(DEB_MICROHTTPD_VERSION "10") endif() - set(DEPENDENCIES "libboost-thread${DEB_BOOST_VERSION}, libboost-system${DEB_BOOST_VERSION}, libboost-filesystem${DEB_BOOST_VERSION}, libmicrohttpd${DEB_MICROHTTPD_VERSION}, libcurl${DEB_LIBCURL_VERSION}, libogg0, libvorbis0a, libvorbisfile3, libncursesw5, libasound2, libpulse0, pulseaudio, libmp3lame0, libev4,") + set(DEPENDENCIES "libboost-thread${DEB_BOOST_VERSION}, libboost-system${DEB_BOOST_VERSION}, libboost-filesystem${DEB_BOOST_VERSION}, libmicrohttpd${DEB_MICROHTTPD_VERSION}, libcurl${DEB_LIBCURL_VERSION}, libogg0, libvorbis0a, libvorbisfile3, libncursesw5, libasound2, libpulse0, pulseaudio, libmp3lame0, libev4") if (${FFMPEG_DECODER} MATCHES "true") - set(DEPENDENCIES "${DEPENDENCIES} libavcodec-extra, libavutil55, libavformat57, libswresample2") + set(DEPENDENCIES "${DEPENDENCIES}, libavcodec-extra, libavutil55, libavformat57, libswresample2") else() - set(DEPENDENCIES "${DEPENDENCIES} libflac8, libfaad2") + set(DEPENDENCIES "${DEPENDENCIES}, libflac8, libfaad2") + endif() + + if (NOT ${USE_BUNDLED_TAGLIB} MATCHES "true") + set(DEPENDENCIES "${DEPENDENCIES}, libtag1v5") endif() set(CPACK_GENERATOR "DEB") diff --git a/musikcube.spec b/musikcube.spec index 8c9491c99..24a851cf0 100644 --- a/musikcube.spec +++ b/musikcube.spec @@ -8,8 +8,8 @@ Summary: A cross-platform, terminal-based audio engine, library, player and serv Source0: https://github.com/clangen/musikcube/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz License: BSD-3-Clause Packager: David Muckle -BuildRequires: gcc-c++ cmake boost-devel libogg-devel libvorbis-devel flac-devel faad2-devel ncurses-devel zlib-devel alsa-lib-devel pulseaudio-libs-devel openssl-devel libcurl-devel libmicrohttpd-devel lame-devel libev-devel make -Requires: boost libogg libvorbis flac ncurses zlib alsa-lib pulseaudio-libs openssl libcurl libmicrohttpd lame libev +BuildRequires: gcc-c++ cmake boost-devel libogg-devel libvorbis-devel flac-devel faad2-devel ncurses-devel zlib-devel alsa-lib-devel pulseaudio-libs-devel openssl-devel libcurl-devel libmicrohttpd-devel lame-devel libev-devel taglib-devel make +Requires: boost libogg libvorbis flac ncurses zlib alsa-lib pulseaudio-libs openssl libcurl libmicrohttpd lame libevn taglib Recommends: faad2 %description