Merge remote-tracking branch 'upstream/2.4' into mainmain

56 files changed, 628 insertions, 337 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7cc9d03a2..cfdf20419e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -526,8 +526,7 @@
   [#10416](https://github.com/mixxxdj/mixxx/issues/10416)
   [#11460](https://github.com/mixxxdj/mixxx/issues/11460)
   [#11556](https://github.com/mixxxdj/mixxx/issues/11556)
-  [#11460](https://github.com/mixxxdj/mixxx/issues/11460)
-  [#11460](https://github.com/mixxxdj/mixxx/issues/11450)
+  [#11450](https://github.com/mixxxdj/mixxx/issues/11450)
   [#10416](https://github.com/mixxxdj/mixxx/issues/10416)
 
 ### Effects
@@ -1031,7 +1030,19 @@
 
 ## [2.3.6](https://github.com/mixxxdj/mixxx/milestone/40) (unreleased)
 
-* TODO
+* Numark DJ2GO2 Touch: Add missing loop_out mapping for the right deck
+  [#11595](https://github.com/mixxxdj/mixxx/pull/11595)
+* No longer stop a track with an active loop at the very end.
+  [#11558](https://github.com/mixxxdj/mixxx/pull/11558)
+  [#11557](https://github.com/mixxxdj/mixxx/issues/11557)
+* Shade: Fixed VU-Meter and other minor issues
+  [#11598](https://github.com/mixxxdj/mixxx/pull/11598)
+* Fixed possible crash when closing Mixxx while browsing the file system
+  [#11593](https://github.com/mixxxdj/mixxx/pull/11593)
+  [#11589](https://github.com/mixxxdj/mixxx/issues/11589)
+* Fixed resyncing when moving an active loop
+  [#11152](https://github.com/mixxxdj/mixxx/pull/11152)
+  [#11381](https://github.com/mixxxdj/mixxx/issues/11381)
 
 ## [2.3.5](https://github.com/mixxxdj/mixxx/milestone/39) (2023-05-10)
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 400fbf28d7..ba670709e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2168,11 +2168,17 @@ endif()
 target_include_directories(mixxx-lib SYSTEM PUBLIC lib/fidlib)
 target_link_libraries(mixxx-lib PRIVATE fidlib)
 
+# Create a list from CMAKE_PREFIX_PATH with an alternate separator
+# This is required to forward CMAKE_PREFIX_PATH in ExternalProject_Add()
+# using the LIST_SEPARATOR option
+string(REPLACE ";" "|" CMAKE_PREFIX_PATH_ALT_SEP "${CMAKE_PREFIX_PATH}")
+
 # KeyFinder
 option(KEYFINDER "KeyFinder support" ON)
 if(KEYFINDER)
-  set(LIBKEYFINDER_VERSION 2.2.6)
-  find_package(KeyFinder ${LIBKEYFINDER_VERSION})
+  set(MIN_LIBKEYFINDER_VERSION 2.2.4)
+  set(FETCH_LIBKEYFINDER_VERSION 2.2.6)
+  find_package(KeyFinder ${MIN_LIBKEYFINDER_VERSION})
   if (KeyFinder_FOUND)
     target_link_libraries(mixxx-lib PRIVATE KeyFinder::KeyFinder)
   else()
@@ -2189,7 +2195,7 @@ if(KEYFINDER)
     # copy it into DOWNLOAD_DIR under DOWNLOAD_NAME prior to starting
     # the configuration.
     ExternalProject_Add(libkeyfinder
-      URL "https://github.com/mixxxdj/libkeyfinder/archive/refs/tags/v${LIBKEYFINDER_VERSION}.zip"
+      URL "https://github.com/mixxxdj/libkeyfinder/archive/refs/tags/v${FETCH_LIBKEYFINDER_VERSION}.zip"
       URL_HASH SHA256=f15deb56c2dcaa6b10dc3717a7d2f42a8407c04ad550f694de42118be998d256
       DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}/downloads"
       DOWNLOAD_NAME "libkeyfinder-${LIBKEYFINDER_VERSION}.zip"
@@ -2201,11 +2207,13 @@ if(KEYFINDER)
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
         -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
         -DCMAKE_PREFIX_PATH=${PIPE_DELIMITED_CMAKE_PREFIX_PATH}
+        -DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}
         -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
         -DBUILD_TESTING=OFF
       BUILD_COMMAND ${CMAKE_COMMAND} --build .
       BUILD_BYPRODUCTS <INSTALL_DIR>/${KeyFinder_LIBRARY}
       EXCLUDE_FROM_ALL TRUE
+      LIST_SEPARATOR |
     )
 
     # This is a bit of a hack to make sure that the include directory actually
@@ -3088,7 +3096,7 @@ if(HID)
 endif()
 
 # USB Bulk controller support
-default_option(BULK "USB Bulk controller support" "LibUSB_FOUND")
+default_option(BULK "USB Bulk controller support" "LibUSB_FOUND;NOT WIN32")
 if(BULK)
   if(NOT LibUSB_FOUND)
     message(FATAL_ERROR "USB Bulk controller support requires libusb 1.0 and its development headers.")
diff --git a/cmake/modules/FindChromaprint.cmake b/cmake/modules/FindChromaprint.cmake
index 6a447ebc92..b4cff3c3b6 100644
--- a/cmake/modules/FindChromaprint.cmake
+++ b/cmake/modules/FindChromaprint.cmake
@@ -64,12 +64,15 @@ find_library(Chromaprint_LIBRARY
 )
 mark_as_advanced(Chromaprint_LIBRARY)
 
+if(DEFINED PC_Chromaprint_VERSION AND NOT PC_Chromaprint_VERSION STREQUAL "")
+  set(Chromaprint_VERSION "${PC_Chromaprint_VERSION}")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   Chromaprint
-  DEFAULT_MSG
-  Chromaprint_LIBRARY
-  Chromaprint_INCLUDE_DIR
+  REQUIRED_VARS Chromaprint_LIBRARY Chromaprint_INCLUDE_DIR
+  VERSION_VAR Chromaprint_VERSION
 )
 
 if(Chromaprint_FOUND)
diff --git a/cmake/modules/FindEbur128.cmake b/cmake/modules/FindEbur128.cmake
index cababeb37e..cf8309d03e 100644
--- a/cmake/modules/FindEbur128.cmake
+++ b/cmake/modules/FindEbur128.cmake
@@ -62,12 +62,15 @@ find_library(Ebur128_LIBRARY
 )
 mark_as_advanced(Ebur128_LIBRARY)
 
+if(DEFINED PC_Ebur128_VERSION AND NOT PC_Ebur128_VERSION STREQUAL "")
+  set(Ebur128_VERSION "${PC_Ebur128_VERSION}")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   Ebur128
-  DEFAULT_MSG
-  Ebur128_LIBRARY
-  Ebur128_INCLUDE_DIR
+  REQUIRED_VARS Ebur128_LIBRARY Ebur128_INCLUDE_DIR
+  VERSION_VAR Ebur128_VERSION
 )
 
 if(Ebur128_FOUND)
diff --git a/cmake/modules/FindFLAC.cmake b/cmake/modules/FindFLAC.cmake
index 5935319859..463861ee07 100644
--- a/cmake/modules/FindFLAC.cmake
+++ b/cmake/modules/FindFLAC.cmake
@@ -63,12 +63,15 @@ find_library(FLAC_LIBRARY
 )
 mark_as_advanced(FLAC_LIBRARY)
 
+if(DEFINED PC_FLAC_VERSION AND NOT PC_FLAC_VERSION STREQUAL "")
+  set(FLAC_VERSION "${PC_FLAC_VERSION}")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   FLAC
-  DEFAULT_MSG
-  FLAC_LIBRARY
-  FLAC_INCLUDE_DIR
+  REQUIRED_VARS FLAC_LIBRARY FLAC_INCLUDE_DIR
+  VERSION_VAR FLAC_VERSION
 )
 
 if(FLAC_FOUND)
diff --git a/cmake/modules/FindID3Tag.cmake b/cmake/modules/FindID3Tag.cmake
index 0080d74434..5d543d4633 100644
--- a/cmake/modules/FindID3Tag.cmake
+++ b/cmake/modules/FindID3Tag.cmake
@@ -62,12 +62,15 @@ find_library(ID3Tag_LIBRARY
 )
 mark_as_advanced(ID3Tag_LIBRARY)
 
+if(DEFINED PC_ID3Tag_VERSION AND NOT PC_ID3Tag_VERSION STREQUAL "")
+  set(ID3Tag_VERSION "${PC_ID3Tag_VERSION}")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   ID3Tag
-  DEFAULT_MSG
-  ID3Tag_LIBRARY
-  ID3Tag_INCLUDE_DIR
+  REQUIRED_VARS ID3Tag_LIBRARY ID3Tag_INCLUDE_DIR
+  VERSION_VAR ID3Tag_VERSION
 )
 
 if(ID3Tag_FOUND)
diff --git a/cmake/modules/FindJACK.cmake b/cmake/modules/FindJACK.cmake
index dfd2b0dad3..62f743aa49 100644
--- a/cmake/modules/FindJACK.cmake
+++ b/cmake/modules/FindJACK.cmake
@@ -24,17 +24,21 @@ This module provides the following imported targets, if found:
 find_package(PkgConfig QUIET)
 if(PkgConfig_FOUND)
   pkg_check_modules(JACK jack)
-else()
-  find_library(JACK_LINK_LIBRARIES
-    NAMES jack
-    DOC "JACK library"
-  )
-  find_path(JACK_INCLUDEDIR
-    NAMES jack/jack.h
-    DOC "JACK header"
-  )
 endif()
 
+find_path(JACK_INCLUDE_DIR
+  NAMES jack/jack.h
+  PATHS ${PC_JACK_INCLUDE_DIRS}
+  DOC "JACK include directory")
+mark_as_advanced(JACK_INCLUDE_DIR)
+
+find_library(JACK_LIBRARY
+  NAMES jack
+  PATHS ${PC_JACK_LIBRARY_DIRS}
+  DOC "JACK library"
+)
+mark_as_advanced(JACK_LIBRARY)
+
 if(WIN32)
     # vcpkg provides CMake targets for pthreads4w
     # This won't work if pthreads4w was built without vcpkg.
@@ -42,16 +46,30 @@ if(WIN32)
     list(APPEND JACK_LINK_LIBRARIES PThreads4W::PThreads4W)
 endif()
 
+if(DEFINED PC_JACK_VERSION AND NOT PC_JACK_VERSION STREQUAL "")
+  set(JACK_VERSION "${PC_JACK_VERSION}")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   JACK
-  DEFAULT_MSG
-  JACK_LINK_LIBRARIES
-  JACK_INCLUDEDIR
+  REQUIRED_VARS JACK_LIBRARY JACK_INCLUDE_DIR
+  VERSION_VAR JACK_VERSION
+
 )
 
-if(JACK_FOUND AND NOT TARGET JACK::jack)
-  add_library(JACK::jack INTERFACE IMPORTED)
-  target_link_libraries(JACK::jack INTERFACE "${JACK_LINK_LIBRARIES}")
-  target_include_directories(JACK::jack INTERFACE "${JACK_INCLUDEDIR}")
+if(JACK_FOUND)
+  set(JACK_LIBRARIES "${JACK_LIBRARY}")
+  set(JACK_INCLUDE_DIRS "${JACK_INCLUDE_DIR}")
+  set(JACK_DEFINITIONS ${PC_JACK_CFLAGS_OTHER})
+
+  if(NOT TARGET JACK::jack)
+  add_library(JACK::jack UNKNOWN IMPORTED)
+    set_target_properties(JACK::jack
+      PROPERTIES
+        IMPORTED_LOCATION "${JACK_LIBRARY}"
+        INTERFACE_COMPILE_OPTIONS "${PC_JACK_CFLAGS_OTHER}"
+        INTERFACE_INCLUDE_DIRECTORIES "${JACK_INCLUDE_DIR}"
+    )
+  endif()
 endif()
diff --git a/cmake/modules/FindKeyFinder.cmake b/cmake/modules/FindKeyFinder.cmake
index 055d591f78..e3ccc2fc7b 100644
--- a/cmake/modules/FindKeyFinder.cmake
+++ b/cmake/modules/FindKeyFinder.cmake
@@ -63,12 +63,15 @@ find_library(KeyFinder_LIBRARY
 )
 mark_as_advanced(KeyFinder_LIBRARY)
 
+if(DEFINED PC_KeyFinder_VERSION AND NOT PC_KeyFinder_VERSION STREQUAL "")
+  set(KeyFinder_VERSION "${PC_KeyFinder_VERSION}")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   KeyFinder
-  DEFAULT_MSG
-  KeyFinder_LIBRARY
-  KeyFinder_INCLUDE_DIR
+  REQUIRED_VARS KeyFinder_LIBRARY KeyFinder_INCLUDE_DIR
+  VERSION_VAR KeyFinder_VERSION
 )
 
 if(KeyFinder_FOUND)
diff --git a/cmake/modules/FindLibUSB.cmake b/cmake/modules/FindLibUSB.cmake
index 2a6c2144c1..df3ef65a3b 100644
--- a/cmake/modules/FindLibUSB.cmake
+++ b/cmake/modules/FindLibUSB.cmake
@@ -63,12 +63,15 @@ find_library(LibUSB_LIBRARY
 )
 mark_as_advanced(LibUSB_LIBRARY)
 
+if(DEFINED PC_LibUSB_VERSION AND NOT PC_LibUSB_VERSION STREQUAL "")
+  set(LibUSB_VERSION "${PC_LibUSB_VERSION}")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   LibUSB
-  DEFAULT_MSG
-  LibUSB_LIBRARY
-  LibUSB_INCLUDE_DIR
+  REQUIRED_VARS LibUSB_LIBRARY LibUSB_INCLUDE_DIR
+  VERSION_VAR LibUSB_VERSION
 )
 
 if(LibUSB_FOUND)
diff --git a/cmake/modules/FindMAD.cmake b/cmake/modules/FindMAD.cmake
index 531e6fdea5..a54e498bad 100644
--- a/cmake/modules/FindMAD.cmake
+++ b/cmake/modules/FindMAD.cmake
@@ -62,12 +62,15 @@ find_library(MAD_LIBRARY
 )
 mark_as_advanced(MAD_LIBRARY)
 
+if(DEFINED PC_MAD_VERSION AND NOT PC_MAD_VERSION STREQUAL "")
+  set(MAD_VERSION "${PC_MAD_VERSION}")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   MAD
-  DEFAULT_MSG
-  MAD_LIBRARY
-  MAD_INCLUDE_DIR
+  REQUIRED_VARS MAD_LIBRARY MAD_INCLUDE_DIR
+  VERSION_VAR MAD_VERSION
 )
 
 if(MAD_FOUND)
diff --git a/cmake/modules/FindMP4.cmake b/cmake/modules/FindMP4.cmake
index 31ab1849fc..1da34a65c4 100644
--- a/cmake/modules/FindMP4.cmake
+++ b/cmake/modules/FindMP4.cmake
@@ -61,12 +61,15 @@ find_library(MP4_LIBRARY
 )
 mark_as_advanced(MP4_LIBRARY)
 
+if(DEFINED PC_MP4_VERSION AND NOT PC_MP4_VERSION STREQUAL "")
+  set(MP4_VERSION "${PC_MP4_VERSION}")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   MP4
-  DEFAULT_MSG
-  MP4_LIBRARY
-  MP4_INCLUDE_DIR
+  REQUIRED_VARS MP4_LIBRARY MP4_INCLUDE_DIR
+  VERSION_VAR MP4_VERSION
 )
 
 if(MP4_FOUND)
diff --git a/cmake/modules/FindMP4v2.cmake b/cmake/modules/FindMP4v2.cmake
index 98927ad58f..a7433af024 100644
--- a/cmake/modules/FindMP4v2.cmake
+++ b/cmake/modules/FindMP4v2.cmake
@@ -61,12 +61,15 @@ find_library(MP4v2_LIBRARY
 )
 mark_as_advanced(MP4v2_LIBRARY)
 
+if(DEFINED PC_MP4v2_VERSION AND NOT PC_MP4v2_VERSION STREQUAL "")
+  set(MP4v2_VERSION "${PC_MP4v2_VERSION}")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   MP4v2
-  DEFAULT_MSG
-  MP4v2_LIBRARY
-  MP4v2_INCLUDE_DIR
+  REQUIRED_VARS MP4v2_LIBRARY MP4v2_INCLUDE_DIR
+  VERSION_VAR MP4v2_VERSION
 )
 
 if(MP4v2_FOUND)
diff --git a/cmake/modules/FindModplug.cmake b/cmake/modules/FindModplug.cmake
index c5cba1afd6..035885ffc0 100644
--- a/cmake/modules/FindModplug.cmake
+++ b/cmake/modules/FindModplug.cmake
@@ -61,12 +61,15 @@ find_library(Modplug_LIBRARY
 )
 mark_as_advanced(Modplug_LIBRARY)
 
+if(DEFINED PC_Modplug_VERSION AND NOT PC_Modplug_VERSION STREQUAL "")
+  set(Modplug_VERSION "${PC_Modplug_VERSION}")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   Modplug
-  DEFAULT_MSG
-  Modplug_LIBRARY
-  Modplug_INCLUDE_DIR
+  REQUIRED_VARS Modplug_LIBRARY Modplug_INCLUDE_DIR
+  VERSION_VAR Modplug_VERSION
 )
 
 if(Modplug_FOUND)
diff --git a/cmake/modules/FindOgg.cmake b/cmake/modules/FindOgg.cmake
index b792c469e6..931289ac11 100644
--- a/cmake/modules/FindOgg.cmake
+++ b/cmake/modules/FindOgg.cmake
@@ -53,12 +53,15 @@ find_library(Ogg_LIBRARY
 )
 mark_as_advanced(Ogg_LIBRARY)
 
+if(DEFINED PC_Ogg_VERSION AND NOT PC_Ogg_VERSION STREQUAL "")
+  set(Ogg_VERSION "${PC_Ogg_VERSION}")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   Ogg
-  REQUIRED_VARS
-  Ogg_INCLUDE_DIR
-  Ogg_LIBRARY
+  REQUIRED_VARS Ogg_LIBRARY Ogg_INCLUDE_DIR
+  VERSION_VAR Ogg_VERSION
 )
 
 if(Ogg_FOUND)
diff --git a/cmake/modules/FindOpus.cmake b/cmake/modules/FindOpus.cmake
index 70e93e31b5..2c01eb3b44 100644
--- a/cmake/modules/FindOpus.cmake
+++ b/cmake/modules/FindOpus.cmake
@@ -53,12 +53,15 @@ find_library(Opus_LIBRARY
 )
 mark_as_advanced(Opus_LIBRARY)
 
+if(DEFINED PC_Opus_VERSION AND NOT PC_Opus_VERSION STREQUAL "")
+  set(Opus_VERSION "${PC_Opus_VERSION}")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   Opus
-  DEFAULT_MSG
-  Opus_LIBRARY
-  Opus_INCLUDE_DIR
+  REQUIRED_VARS Opus_LIBRARY Opus_INCLUDE_DIR
+  VERSION_VAR Opus_VERSION
 )
 
 if(Opus_FOUND)
diff --git a/cmake/modules/FindOpusFile.cmake b/cmake/modules/FindOpusFile.cmake
index f9f84382d6..973a6be3d9 100644
--- a/cmake/modules/FindOpusFile.cmake
+++ b/cmake/modules/FindOpusFile.cmake
@@ -60,12 +60,15 @@ find_library(OpusFile_LIBRARY
 )
 mark_as_advanced(OpusFile_LIBRARY)
 
+if(DEFINED PC_OpusFile_VERSION AND NOT PC_OpusFile_VERSION STREQUAL "")
+  set(OpusFile_VERSION "${PC_OpusFile_VERSION}")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   OpusFile
-  DEFAULT_MSG
-  OpusFile_LIBRARY
-  OpusFile_INCLUDE_DIR
+  REQUIRED_VARS OpusFile_LIBRARY OpusFile_INCLUDE_DIR
+  VERSION_VAR OpusFile_VERSION
 )
 
 if(OpusFile_FOUND)
diff --git a/cmake/modules/FindPortAudio.cmake b/cmake/modules/FindPortAudio.cmake
index 55c28736b6..3c0a8b5c8f 100644
--- a/cmake/modules/FindPortAudio.cmake
+++ b/cmake/modules/FindPortAudio.cmake
@@ -67,12 +67,15 @@ find_library(PortAudio_LIBRARY
 )
 mark_as_advanced(PortAudio_LIBRARY)
 
+if(DEFINED PC_PortAudio_VERSION AND NOT PC_PortAudio_VERSION STREQUAL "")
+  set(PortAudio_VERSION "${PC_PortAudio_VERSION}")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   PortAudio
-  DEFAULT_MSG
-  PortAudio_LIBRARY
-  PortAudio_INCLUDE_DIR
+  REQUIRED_VARS PortAudio_LIBRARY PortAudio_INCLUDE_DIR
+  VERSION_VAR PortAudio_VERSION
 )
 
 if(PortAudio_FOUND)
diff --git a/cmake/modules/FindPortMidi.cmake b/cmake/modules/FindPortMidi.cmake
index 564af02632..5c88b4e5c7 100644
--- a/cmake/modules/FindPortMidi.cmake
+++ b/cmake/modules/FindPortMidi.cmake
@@ -61,13 +61,15 @@ find_library(PortTime_LIBRARY
 )
 mark_as_advanced(PortTime_LIBRARY)
 
+if(DEFINED PC_PortMidi_VERSION AND NOT PC_PortMidi_VERSION STREQUAL "")
+  set(PortMidi_VERSION "${PC_PortMidi_VERSION}")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   PortMidi
-  DEFAULT_MSG
-  PortMidi_LIBRARY
-  PortMidi_INCLUDE_DIR
-  PortTime_INCLUDE_DIR
+  REQUIRED_VARS PortMidi_LIBRARY PortMidi_INCLUDE_DIR PortTime_INCLUDE_DIR
+  VERSION_VAR PortMidi_VERSION
 )
 
 if(PortMidi_FOUND)
diff --git a/cmake/modules/FindShoutidjc.cmake b/cmake/modules/FindShoutidjc.cmake
index 3402909b0a..8b729a8739 100644
--- a/cmake/modules/FindShoutidjc.cmake
+++ b/cmake/modules/FindShoutidjc.cmake
@@ -63,12 +63,15 @@ find_library(Shoutidjc_LIBRARY
 )
 mark_as_advanced(Shoutidjc_LIBRARY)
 
+if(DEFINED PC_Shoutidjc_VERSION AND NOT PC_Shoutidjc_VERSION STREQUAL "")
+  set(Shoutidjc_VERSION "${PC_Shoutidjc_VERSION}")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   Shoutidjc
-  DEFAULT_MSG
-  Shoutidjc_LIBRARY
-  Shoutidjc_INCLUDE_DIR
+  REQUIRED_VARS Shoutidjc_LIBRARY Shoutidjc_INCLUDE_DIR
+  VERSION_VAR Shoutidjc_VERSION
 )
 
 if(Shoutidjc_FOUND)
diff --git a/cmake/modules/FindSndFile.cmake b/cmake/modules/FindSndFile.cmake
index 2603dd46a9..68bcbbb078 100644
--- a/cmake/modules/FindSndFile.cmake
+++ b/cmake/modules/FindSndFile.cmake
@@ -62,12 +62,15 @@ find_library(SndFile_LIBRARY
 )
 mark_as_advanced(SndFile_LIBRARY)
 
+if(DEFINED PC_SndFile_VERSION AND NOT PC_SndFile_VERSION STREQUAL "")
+  set(SndFile_VERSION "${PC_SndFile_VERSION}")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   SndFile
-  DEFAULT_MSG
-  SndFile_LIBRARY
-  SndFile_INCLUDE_DIR
+  REQUIRED_VARS SndFile_LIBRARY SndFile_INCLUDE_DIR
+  VERSION_VAR SndFile_VERSION
 )
 
 file(STRINGS "${SndFile_INCLUDE_DIR}/sndfile.h" SndFile_SUPPORTS_SET_COMPRESSION_LEVEL REGEX ".*SFC_SET_COMPRESSION_LEVEL.*")
diff --git a/cmake/modules/FindSoundTouch.cmake b/cmake/modules/FindSoundTouch.cmake
index 86c76caf82..5c0bd028d9 100644
--- a/cmake/modules/FindSoundTouch.cmake
+++ b/cmake/modules/FindSoundTouch.cmake
@@ -62,7 +62,7 @@ find_library(SoundTouch_LIBRARY
 mark_as_advanced(SoundTouch_LIBRARY)
 
 # Version detection
-if(DEFINED PC_SoundTouch_VERSION)
+if(DEFINED PC_SoundTouch_VERSION AND NOT PC_SoundTouch_VERSION STREQUAL "")
   set(SoundTouch_VERSION "${PC_SoundTouch_VERSION}")
 else()
   if(EXISTS "${SoundTouch_INCLUDE_DIR}/soundtouch/SoundTouch.h")
diff --git a/cmake/modules/FindTagLib.cmake b/cmake/modules/FindTagLib.cmake
index e07fc98b6d..be311a9f01 100644
--- a/cmake/modules/FindTagLib.cmake
+++ b/cmake/modules/FindTagLib.cmake
@@ -64,8 +64,19 @@ find_library(TagLib_LIBRARY
 )
 mark_as_advanced(TagLib_LIBRARY)
 
+if(DEFINED PC_TagLib_VERSION AND NOT PC_TagLib_VERSION STREQUAL "")
+  set(TagLib_VERSION "${PC_TagLib_VERSION}")
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+  TagLib
+  REQUIRED_VARS TagLib_LIBRARY TagLib_INCLUDE_DIR
+  VERSION_VAR TagLib_VERSION
+)
+
 # Version detection
-if(PC_TagLib_VERSION)
+if(DEFINED PC_TagLib_VERSION AND NOT PC_TagLib_VERSION STREQUAL "")
   set(TagLib_VERSION "${PC_TagLib_VERSION}")
 else()
   if (EXISTS "${TagLib_INCLUDE_DIR}/taglib.h")
diff --git a/cmake/modules/FindUpower.cmake b/cmake/modules/FindUpower.cmake
index 95598f19b7..ed8a49187c 100644
--- a/cmake/modules/FindUpower.cmake
+++ b/cmake/modules/FindUpower.cmake
@@ -62,12 +62,15 @@ find_library(Upower_LIBRARY
 )
 mark_as_advanced(Upower_LIBRARY)
 
+if(DEFINED PC_Upower_VERSION AND NOT PC_Upower_VERSION STREQUAL "")
+  set(Upower_VERSION "${PC_Upower_VERSION}")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   Upower
-  DEFAULT_MSG
-  Upower_LIBRARY
-  Upower_INCLUDE_DIR
+  REQUIRED_VARS Upower_LIBRARY Upower_INCLUDE_DIR
+  VERSION_VAR Upower_VERSION
 )
 
 if(Upower_FOUND)
diff --git a/cmake/modules/Findlilv.cmake b/cmake/modules/Findlilv.cmake
index 0385b81526..b793972faf 100644
--- a/cmake/modules/Findlilv.cmake
+++ b/cmake/modules/Findlilv.cmake
@@ -65,12 +65,15 @@ find_library(lilv_LIBRARY
 )
 mark_as_advanced(lilv_LIBRARY)
 
+if(DEFINED PC_lilv_VERSION AND NOT PC_lilv_VERSION STREQUAL "")
+  set(lilv_VERSION "${PC_lilv_VERSION}")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   lilv
-  DEFAULT_MSG