Merge branch '2.3' of [email protected]:mixxxdj/mixxx.git

mixxxdj · Jul 19, 2021 · 80e9fa8 · 80e9fa8
2 parents 69a4193 + f48c276
commit 80e9fa8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/cmake/modules/FindLibUSB.cmake b/cmake/modules/FindLibUSB.cmake
@@ -57,7 +57,7 @@ find_path(LibUSB_INCLUDE_DIR
 mark_as_advanced(LibUSB_INCLUDE_DIR)
 
 find_library(LibUSB_LIBRARY
-  NAMES usb-1.0
+  NAMES usb-1.0 usb
   PATHS ${PC_LibUSB_LIBRARY_DIRS}
   DOC "LibUSB library"
 )

diff --git a/lib/rigtorp/SPSCQueue/include/rigtorp/SPSCQueue.h b/lib/rigtorp/SPSCQueue/include/rigtorp/SPSCQueue.h
@@ -189,7 +189,7 @@ template <typename T, typename Allocator = std::allocator<T>> class SPSCQueue {
 // on macOS there is a bug in libc++ where __cpp_lib_hardware_interference_size
 // is defined but std::hardware_destructive_interference_size is not actually implemented
 // https://bugs.llvm.org/show_bug.cgi?id=41423
-#if defined(__cpp_lib_hardware_interference_size) && ! defined(__APPLE__)
+#if defined(__cpp_lib_hardware_interference_size) && ! defined(__APPLE__) && ! defined(__BSD__)
   static constexpr size_t kCacheLineSize =
       std::hardware_destructive_interference_size;
 #else

diff --git a/src/util/versionstore.cpp b/src/util/versionstore.cpp
@@ -77,6 +77,11 @@ QString VersionStore::platform() {
     QString base = QStringLiteral("Linux");
 #elif defined(__WINDOWS__)
     QString base = QStringLiteral("Windows");
+// Mixxx's CMakeLists.txt does not define this, but FreeBSD's ports system does.
+#elif defined(__FREEBSD__)
+    QString base = QStringLiteral("FreeBSD");
+#elif defined(__BSD__)
+    QString base = QStringLiteral("BSD");
 #else
     QString base = QStringLiteral("Unknown OS");
 #endif