Merge remote-tracking branch 'mixxxdj/2.4' into 2.4-rel

# Conflicts:
#	overlay/triplets/x64-windows.cmake

overlay/triplets/x64-windows.cmake

@@ -1,5 +1,12 @@
 set(VCPKG_TARGET_ARCHITECTURE x64)
 set(VCPKG_CRT_LINKAGE dynamic)
-set(VCPKG_LIBRARY_LINKAGE dynamic)
+
+# DjInterop has not yet a stable API. We link it statically to allow running 
+# experimental Mixxx build without conflicts
+if(${PORT} MATCHES "libdjinterop")
+    set(VCPKG_LIBRARY_LINKAGE static)
+else()
+    set(VCPKG_LIBRARY_LINKAGE dynamic)
+endif()
 
 set(VCPKG_BUILD_TYPE release)

ports/libdjinterop/portfile.cmake

@@ -1,18 +1,22 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xsco/libdjinterop
-    REF 0.16.0
-    SHA512 7653e3752b8d597a967fb5f83f8b14c0db5d9cdb05a9bb22f6d9f34a890327fafdbd81996ce9af09552b69da4b9f7f0b41d631b1704b11e46e335f205c6886bf
+    REF "${VERSION}"
+    SHA512 7becb83ab62412b3d437ddee23b248a697b162f6b8a64070cd8a9782a4fce7726baaf12ea193b8e21bcf561a00039ab1ae1f04d00e6cbe8344ec19751779db14
     HEAD_REF master
 )
 
-vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON
+    )
 vcpkg_cmake_install()
 
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/DjInterop)
+vcpkg_cmake_config_fixup(PACKAGE_NAME djinterop CONFIG_PATH lib/cmake/DjInterop)
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

ports/libdjinterop/vcpkg.json

@@ -1,9 +1,11 @@
 {
   "name": "libdjinterop",
-  "version": "0.16.0",
+  "version": "0.19.1",
+  "port-version": 1,
   "description": "C++ library for access to DJ record libraries. Currently only supports Denon Engine Prime databases",
   "homepage": "https://github.com/xsco/libdjinterop",
   "license": "LGPL-3.0-or-later",
+  "supports": "!xbox",
   "dependencies": [
     "sqlite3",
     {

versions/baseline.json

@@ -3897,8 +3897,8 @@
       "port-version": 1
     },
     "libdjinterop": {
-      "baseline": "0.16.0",
-      "port-version": 0
+      "baseline": "0.19.1",
+      "port-version": 1
     },
     "libdmx": {
       "baseline": "1.1.4",

versions/l-/libdjinterop.json

@@ -1,5 +1,20 @@
 {
   "versions": [
+    {
+      "git-tree": "997b5a399c620329f5f77f2bff49ffc4413bc2c9",
+      "version": "0.19.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "ccc1b924f1e3c41f94f22f26ceec66c89f469f74",
+      "version": "0.19.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "07081634d12b7ede73b9921d461f55061410a6c7",
+      "version": "0.16.0",
+      "port-version": 1
+    },
     {
       "git-tree": "c1c63ff4c5483425a19992ddefa98a3c1e2fabf3",
       "version": "0.16.0",