diff options
author | Be <be@mixxx.org> | 2021-11-13 09:41:24 -0600 |
---|---|---|
committer | Be <be@mixxx.org> | 2021-11-13 09:41:24 -0600 |
commit | bfd5b1d5eef5a77ebde08b370d896d41538b685e (patch) | |
tree | 8d0023d08bc2527c37ad72bd666bffded92008c2 | |
parent | eec8c5988d1e4b7661facfd450775659e6f337ec (diff) | |
parent | abbfb22951789133e04acefafc70403aa57c5929 (diff) |
Merge remote-tracking branch 'upstream/2.3'
-rw-r--r-- | .eslintrc.json | 3 | ||||
-rw-r--r-- | CHANGELOG.md | 5 | ||||
-rw-r--r-- | CMakeLists.txt | 16 | ||||
-rw-r--r-- | res/linux/org.mixxx.Mixxx.metainfo.xml | 11 |
4 files changed, 27 insertions, 8 deletions
diff --git a/.eslintrc.json b/.eslintrc.json index 48f0e23596..9e7d744349 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -19,7 +19,7 @@ "computed-property-spacing" : ["warn", "never", { "enforceForClassMembers": true }], - "dot-location": "warn", + "dot-location": ["warn", "property"], "dot-notation": "warn", "eqeqeq": ["error", "always"], "func-call-spacing": "warn", @@ -30,6 +30,7 @@ "key-spacing": "warn", "keyword-spacing": "warn", "linebreak-style": ["warn", "unix"], + "newline-per-chained-call": "warn", "no-constructor-return": "warn", "no-extra-bind": "warn", "no-sequences": "warn", diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f65e91298..fe7733b640 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -406,6 +406,11 @@ * Improve robustness of file type detection by considering the actual MIME type of the content. [lp:1445885](https://bugs.launchpad.net/mixxx/+bug/1445885) [#4356](https://github.com/mixxxdj/mixxx/pull/4356) [#4357](https://github.com/mixxxdj/mixxx/pull/4357) +### Packaging + +* Downloads of external dependencies are placed in build/downloads +* The sources for libkeyfinder are now expected in build/downloads/libkeyfinder-2.2.5.zip instead of build/download/libkeyfinder/v2.2.5.zip + ## [2.3.1](https://launchpad.net/mixxx/+milestone/2.3.1) (2021-09-29) * Added mapping for the Numark DJ2GO2 Touch controller [#4108](https://github.com/mixxxdj/mixxx/pull/4108) [#4287](https://github.com/mixxxdj/mixxx/pull/4287) diff --git a/CMakeLists.txt b/CMakeLists.txt index 796e24b919..88022cf62e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1966,7 +1966,8 @@ target_include_directories(mixxx-lib SYSTEM PUBLIC lib/fidlib) target_link_libraries(mixxx-lib PRIVATE fidlib) # KeyFinder -find_package(KeyFinder) +set(LIBKEYFINDER_VERSION 2.2.5) +find_package(KeyFinder ${LIBKEYFINDER_VERSION}) option(KEYFINDER "KeyFinder support" ON) if(KEYFINDER) if (KeyFinder_FOUND) @@ -1976,13 +1977,14 @@ if(KEYFINDER) find_package(FFTW REQUIRED) set(KeyFinder_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/lib/keyfinder-install") set(KeyFinder_LIBRARY "${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}keyfinder${CMAKE_STATIC_LIBRARY_SUFFIX}") - file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/download") - # External project sources must be downloaded as an archive into DOWNLOAD_DIR - # from an URL to keep offline builds like for Fedora/RPM Fusion working! + # For offline builds download the archive file from the URL and + # copy it into DOWNLOAD_DIR under DOWNLOAD_NAME prior to starting + # the configuration. ExternalProject_Add(libkeyfinder - URL "https://github.com/mixxxdj/libkeyfinder/archive/v2.2.4.zip" - URL_HASH SHA256=cb3fea8c7213257281b6c7006b2430809f466ad8a1d485663324378d6fc0782c - DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}/download/libkeyfinder" + URL "https://github.com/mixxxdj/libkeyfinder/archive/refs/tags/v${LIBKEYFINDER_VERSION}.zip" + URL_HASH SHA256=a43bfa56333e8abbfa2bf7b31f896e553a8b250ba4c4ad21ec85338041651240 + DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}/downloads" + DOWNLOAD_NAME "libkeyfinder-${LIBKEYFINDER_VERSION}.zip" INSTALL_DIR "${KeyFinder_INSTALL_DIR}" CMAKE_ARGS -DBUILD_SHARED_LIBS=OFF diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml index 9110915d0c..107e9c33d1 100644 --- a/res/linux/org.mixxx.Mixxx.metainfo.xml +++ b/res/linux/org.mixxx.Mixxx.metainfo.xml @@ -706,6 +706,17 @@ #4357 </li> </ul> + <p> + Packaging + </p> + <ul> + <li> + Downloads of external dependencies are placed in build/downloads + </li> + <li> + The sources for libkeyfinder are now expected in build/downloads/libkeyfinder-2.2.5.zip instead of build/download/libkeyfinder/v2.2.5.zip + </li> + </ul> </description> </release> <release version="2.3.1" type="stable" date="2021-09-29" timestamp="1632873600"> |