From 2de68fb7797c0974965db26cfe1b5b700acb42f6 Mon Sep 17 00:00:00 2001 From: clvn Date: Wed, 27 Dec 2017 12:18:50 +0100 Subject: [PATCH 1/2] [jack2] Initial commit --- ports/jack2/CMakeLists.txt | 14 ++++++++++++++ ports/jack2/CONTROL | 4 ++++ ports/jack2/portfile.cmake | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 ports/jack2/CMakeLists.txt create mode 100644 ports/jack2/CONTROL create mode 100644 ports/jack2/portfile.cmake diff --git a/ports/jack2/CMakeLists.txt b/ports/jack2/CMakeLists.txt new file mode 100644 index 000000000..2fb25edb8 --- /dev/null +++ b/ports/jack2/CMakeLists.txt @@ -0,0 +1,14 @@ +cmake_minimum_required(VERSION 3.8) +project(jack2 C) + +include_directories(common) + +add_library(jack2 STATIC common/JackWeakAPI.c) + +install(TARGETS jack2 + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(DIRECTORY common/jack DESTINATION include) diff --git a/ports/jack2/CONTROL b/ports/jack2/CONTROL new file mode 100644 index 000000000..6ccdc052a --- /dev/null +++ b/ports/jack2/CONTROL @@ -0,0 +1,4 @@ +Source: jack2 +Version: 1.9.12.1 +Description: Cross-platform API that enables device sharing and inter-application audio routing + diff --git a/ports/jack2/portfile.cmake b/ports/jack2/portfile.cmake new file mode 100644 index 000000000..6fe7a1100 --- /dev/null +++ b/ports/jack2/portfile.cmake @@ -0,0 +1,35 @@ +include(vcpkg_common_functions) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + message(STATUS "Warning: Dynamic building not supported. Building static.") + set(VCPKG_LIBRARY_LINKAGE static) +endif() + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "WindowsStore not supported") +endif() + +set(VERSION 1.9.12) + +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/jack2-${VERSION}) +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/jackaudio/jack2/releases/download/v${VERSION}/jack2-${VERSION}.tar.gz" + FILENAME "jack2-${VERSION}.tar.gz" + SHA512 f0271dfc8f8e2f2489ca52f431ad4fa420665816d6c67a01a76da1d4b5ae91f6dad8c4e3309ec5e0c159c9d312ed56021ab323d74bce828ace26f1b8d477ddfa +) +vcpkg_extract_source_archive(${ARCHIVE}) + +# Install headers and a statically built JackWeakAPI.c +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_install_cmake() + +# Remove duplicate headers +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/jack2 RENAME copyright) From 386e69c6b2f2047624cf4b2123cb53e810e78ae1 Mon Sep 17 00:00:00 2001 From: clvn Date: Mon, 1 Jan 2018 15:43:41 +0100 Subject: [PATCH 2/2] [jack2] Prefer using vcpkg_from_github. Removed check for Windows Store --- ports/jack2/CONTROL | 2 +- ports/jack2/portfile.cmake | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/ports/jack2/CONTROL b/ports/jack2/CONTROL index 6ccdc052a..ccf49a118 100644 --- a/ports/jack2/CONTROL +++ b/ports/jack2/CONTROL @@ -1,4 +1,4 @@ Source: jack2 -Version: 1.9.12.1 +Version: 1.9.12.2 Description: Cross-platform API that enables device sharing and inter-application audio routing diff --git a/ports/jack2/portfile.cmake b/ports/jack2/portfile.cmake index 6fe7a1100..a82f1be62 100644 --- a/ports/jack2/portfile.cmake +++ b/ports/jack2/portfile.cmake @@ -5,19 +5,13 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(VCPKG_LIBRARY_LINKAGE static) endif() -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "WindowsStore not supported") -endif() - -set(VERSION 1.9.12) - -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/jack2-${VERSION}) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/jackaudio/jack2/releases/download/v${VERSION}/jack2-${VERSION}.tar.gz" - FILENAME "jack2-${VERSION}.tar.gz" +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jackaudio/jack2 + REF v1.9.12 SHA512 f0271dfc8f8e2f2489ca52f431ad4fa420665816d6c67a01a76da1d4b5ae91f6dad8c4e3309ec5e0c159c9d312ed56021ab323d74bce828ace26f1b8d477ddfa + HEAD_REF master ) -vcpkg_extract_source_archive(${ARCHIVE}) # Install headers and a statically built JackWeakAPI.c file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})