Revert "Recommend, but don't depend on libcodec-extra for debian-based"

This reverts commit 076bcbf2ff.
This commit is contained in:
casey langen 2022-01-25 19:17:56 -08:00
parent 076bcbf2ff
commit 6f7b86f930

View File

@ -343,10 +343,8 @@ if (GENERATE_DEB MATCHES "1")
if (${ENABLE_FFMPEG} MATCHES "false") if (${ENABLE_FFMPEG} MATCHES "false")
set(DEPENDENCIES "${DEPENDENCIES}, libflac8, libfaad2") set(DEPENDENCIES "${DEPENDENCIES}, libflac8, libfaad2")
set(RECOMMENDS "")
else() else()
set(DEPENDENCIES "${DEPENDENCIES}, libavutil${DEB_AVUTIL_VERSION}, libavformat${DEB_AVFORMAT_VERSION}, libswresample${DEB_SWRESAMPLE_VERSION}") set(DEPENDENCIES "${DEPENDENCIES}, libavcodec-extra, libavutil${DEB_AVUTIL_VERSION}, libavformat${DEB_AVFORMAT_VERSION}, libswresample${DEB_SWRESAMPLE_VERSION}")
set(RECOMMENDS "libavcodec-extra")
endif() endif()
if (${ENABLE_BUNDLED_TAGLIB} MATCHES "false") if (${ENABLE_BUNDLED_TAGLIB} MATCHES "false")
@ -359,7 +357,6 @@ if (GENERATE_DEB MATCHES "1")
set(CPACK_PACKAGE_VERSION_MINOR "${musikcube_VERSION_MINOR}") set(CPACK_PACKAGE_VERSION_MINOR "${musikcube_VERSION_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${musikcube_VERSION_PATCH}") set(CPACK_PACKAGE_VERSION_PATCH "${musikcube_VERSION_PATCH}")
set(CPACK_DEBIAN_PACKAGE_DEPENDS ${DEPENDENCIES}) set(CPACK_DEBIAN_PACKAGE_DEPENDS ${DEPENDENCIES})
set(CPACK_DEBIAN_PACKAGE_RECOMMENDS ${RECOMMENDS})
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "casey langen") set(CPACK_DEBIAN_PACKAGE_MAINTAINER "casey langen")
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${DEB_ARCHITECTURE}) set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${DEB_ARCHITECTURE})
set(CPACK_PACKAGE_FILE_NAME "musikcube_${musikcube_VERSION}_${DEB_PLATFORM}_${DEB_DISTRO}_${DEB_ARCHITECTURE}") set(CPACK_PACKAGE_FILE_NAME "musikcube_${musikcube_VERSION}_${DEB_PLATFORM}_${DEB_DISTRO}_${DEB_ARCHITECTURE}")