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

.gitignore

@@ -38,6 +38,14 @@ lib/googletest/googlemock/test
 lib/googletest/googletest/samples
 lib/googletest/googletest/test
 
+# Exclude unneeded files from the bundled hidapi library in the lib/
+# directory for future updates
+lib/hidapi/android
+lib/hidapi/dist
+lib/hidapi/doxygen
+lib/hidapi/hidtest
+lib/hidapi/testgui
+
 # Legacy compilation artifacts that are obsolete starting with 2.3
 # TODO: Delete after 2.2 with SCons has been abandoned. Developers
 # are supposed to clean their project directory!

CMakeLists.txt

@@ -725,16 +725,16 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/preferences/settingsmanager.cpp
   src/preferences/upgrade.cpp
   src/recording/recordingmanager.cpp
-  src/skin/colorschemeparser.cpp
-  src/skin/imgcolor.cpp
-  src/skin/imginvert.cpp
-  src/skin/imgloader.cpp
-  src/skin/launchimage.cpp
-  src/skin/legacyskinparser.cpp
-  src/skin/pixmapsource.cpp
-  src/skin/skincontext.cpp
+  src/skin/legacy/colorschemeparser.cpp
+  src/skin/legacy/imgcolor.cpp
+  src/skin/legacy/imginvert.cpp
+  src/skin/legacy/imgloader.cpp
+  src/skin/legacy/launchimage.cpp
+  src/skin/legacy/legacyskinparser.cpp
+  src/skin/legacy/pixmapsource.cpp
+  src/skin/legacy/skincontext.cpp
+  src/skin/legacy/tooltips.cpp
   src/skin/skinloader.cpp
-  src/skin/tooltips.cpp
   src/soundio/sounddevice.cpp
   src/soundio/sounddevicenetwork.cpp
   src/soundio/sounddeviceportaudio.cpp
@@ -2624,7 +2624,7 @@ option(HID "USB HID controller support" ON)
 if(HID)
   find_package(hidapi)
   # hidapi_VERSION is only available starting with 0.10.0
-  if(NOT hidapi_FOUND OR NOT hidapi_VERSION OR hidapi_VERSION VERSION_LESS 0.10.0)
+  if(NOT hidapi_FOUND OR NOT hidapi_VERSION OR hidapi_VERSION VERSION_LESS 0.10.1)
     message(STATUS "Linking internal libhidapi statically")
     add_library(mixxx-hidapi STATIC EXCLUDE_FROM_ALL)
     target_include_directories(mixxx-hidapi SYSTEM PUBLIC lib/hidapi/hidapi)

lib/hidapi/VERSION

@@ -1 +1 @@
-0.10.0
+0.10.1