diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2021-11-10 17:28:59 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2021-11-11 00:19:01 +0100 |
| commit | bfd6858c5a58fe0054dbfc941407a49f543c929b (patch) | |
| tree | 07309867baee238d0e4b7d03159412d809c9b4fb | |
| parent | 5577f3698cce2a1c00765d12e7d1dc8e6afcc18f (diff) | |
Adjust the download directory and name of external dependencies
The file name in the URL doesn't match the actual file name that
is downloaded from GitHub.
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | res/linux/org.mixxx.Mixxx.metainfo.xml | 11 |
3 files changed, 24 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d46d5e397d..b3771faf3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,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.4.zip instead of build/download/libkeyfinder/v2.2.4.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 10e9b0a7f3..4684a138ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1808,7 +1808,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.4) +find_package(KeyFinder ${LIBKEYFINDER_VERSION}) option(KEYFINDER "KeyFinder support" ON) if(KEYFINDER) if (KeyFinder_FOUND) @@ -1818,11 +1819,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") + # 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 "https://github.com/mixxxdj/libkeyfinder/archive/refs/tags/v${LIBKEYFINDER_VERSION}.zip" URL_HASH SHA256=cb3fea8c7213257281b6c7006b2430809f466ad8a1d485663324378d6fc0782c - DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}/download/libkeyfinder" + 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 b2c80d7ba6..07004811b3 100644 --- a/res/linux/org.mixxx.Mixxx.metainfo.xml +++ b/res/linux/org.mixxx.Mixxx.metainfo.xml @@ -108,6 +108,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.4.zip instead of build/download/libkeyfinder/v2.2.4.zip + </li> + </ul> </description> </release> <release version="2.3.1" type="stable" date="2021-09-29" timestamp="1632873600"> |