Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git

CMakeLists.txt

@@ -2349,12 +2349,19 @@ if(COREAUDIO)
   target_include_directories(mixxx-lib SYSTEM PUBLIC lib/apple)
 endif()
 
+
 # FAAD AAC audio file decoder plugin
 find_package(MP4)
 find_package(MP4v2)
 # It is enabled by default on Linux only, because other targets have other
 # solutions. It requires MP4 or MP4v2.
-default_option(FAAD "FAAD AAC audio file decoder support" "UNIX;NOT APPLE;(MP4_FOUND OR MP4v2_FOUND)")
+# Note, we use if() here, because the following line does not work with cmake 3.16.3
+# default_option(FAAD "FAAD AAC audio file decoder support" "UNIX;NOT APPLE;(MP4_FOUND OR MP4v2_FOUND)")
+if (UNIX AND NOT APPLE AND (MP4_FOUND OR MP4v2_FOUND))
+  option(FAAD "FAAD AAC audio file decoder support" ON)
+else()
+  option(FAAD "FAAD AAC audio file decoder support" OFF)
+endif()
 if(FAAD)
   if(NOT MP4_FOUND AND NOT MP4v2_FOUND)
     message(FATAL_ERROR "FAAD AAC audio support requires libmp4 or libmp4v2 with development headers.")

packaging/CPackDebInstall.cmake

@@ -27,7 +27,7 @@ endif()
 message( NOTICE "Creating temporary debian folder for debhelper" )
 file(COPY ${CPACK_DEBIAN_SOURCE_DIR}/packaging/debian
     DESTINATION ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME})
-set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS_EXTRA "libavcodec-dev, libavutil-dev,")
+set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS_EXTRA "libavformat-dev, ")
 configure_file(${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/debian/control.in
                ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/debian/control
                @ONLY)

packaging/CPackDebUploadPPA.cmake

@@ -98,7 +98,7 @@ foreach(RELEASE ${CPACK_DEBIAN_DISTRIBUTION_RELEASES})
   if (RELEASE STREQUAL "bionic")
     set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS_EXTRA "libmp4v2-dev,")
   else()
-    set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS_EXTRA "libavcodec-dev, libavutil-dev,")
+    set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS_EXTRA "libavformat-dev,")
   endif()
 
   configure_file(${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/packaging/debian/control.in

tools/debian_buildenv.sh

@@ -21,8 +21,7 @@ case "$COMMAND" in
                 ;;
             *) # libmp4v2 was removed from Debian 10 & Ubuntu 20.04 due to lack of maintenance, so use FFMPEG instead
                 PACKAGES_EXTRA=(
-                    libavcodec-dev
-                    libavutil-dev
+                    libavformat-dev
                 )
         esac
 
@@ -48,7 +47,6 @@ case "$COMMAND" in
             fonts-open-sans \
             fonts-ubuntu \
             g++ \
-            libavformat-dev \
             libchromaprint-dev \
             libdistro-info-perl \
             libebur128-dev \